From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34A7CC47E48 for ; Thu, 26 Sep 2019 09:39:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 054B4222C3 for ; Thu, 26 Sep 2019 09:39:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 054B4222C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AD38D6B000A; Thu, 26 Sep 2019 05:39:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A845D6B000D; Thu, 26 Sep 2019 05:39:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A25D6B000A; Thu, 26 Sep 2019 05:39:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0099.hostedemail.com [216.40.44.99]) by kanga.kvack.org (Postfix) with ESMTP id 7739F6B000A for ; Thu, 26 Sep 2019 05:39:37 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 2700C1A4B4 for ; Thu, 26 Sep 2019 09:39:37 +0000 (UTC) X-FDA: 75976574394.16.son45_70fe8c249042c X-HE-Tag: son45_70fe8c249042c X-Filterd-Recvd-Size: 4269 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Thu, 26 Sep 2019 09:39:36 +0000 (UTC) Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9A25BC06512C for ; Thu, 26 Sep 2019 09:39:35 +0000 (UTC) Received: by mail-pg1-f197.google.com with SMTP id o32so1059242pgm.18 for ; Thu, 26 Sep 2019 02:39:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nL20lZzBbwkIGL5V1u5lEN6f2V609pKVyYfWwZ4NMZQ=; b=SB1XH4zhd5QtAXOI7sSlmy5d79nmr7cjZ4GbZKhXmqkQeSjug7xq8QKjNIyyN6ii4k gwN0PfxvB/w9KO9GVy2T+66rBQmsNxKG3bBgDux5jDG/UyuMdjxe1jpUKKjjthWxuqeE ZislyMPRBVcwpWBSRyAyqQe/6olwTAyGceZB2nkJj8BEVLfTwEjYkBc1OzXxDn7NDcVQ LWdxO8O8iorRVzJ7zk1XsshIRjKnslq4C9z2J0sJDHf1Y6oq1PIH5yM+j7VV7oPL89CU Vlk3B5PaKJpU2vqKZGdBw2hQ4PT1aICPXM9gHObrS7qePwHpWsiqelw1+t+qMzrB8Nw+ 1G1Q== X-Gm-Message-State: APjAAAU3DEAtfa+YkoG24UHzWJJEDrDaJ4DQN6qTfKXoq04y0lgmp957 fQxRkgpLfw6q1sOkyuJpTU6ONoXlz7WLcrJZjP5c+enbOqKOanp51t190CuBmH4W7ZwVYZqSGH1 59wbsvVO4n8E= X-Received: by 2002:a63:5807:: with SMTP id m7mr2441415pgb.371.1569490774573; Thu, 26 Sep 2019 02:39:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqygg2Fz4n5y2GLmYVjuAatu7ERh1+nfGR8vHRiW6krMcMD+JGfGkv1cX87Z1ZdlzHDovLsjPg== X-Received: by 2002:a63:5807:: with SMTP id m7mr2441382pgb.371.1569490774350; Thu, 26 Sep 2019 02:39:34 -0700 (PDT) Received: from xz-x1.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p68sm3224982pfp.9.2019.09.26.02.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2019 02:39:33 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Hugh Dickins , Maya Gokhale , Jerome Glisse , Pavel Emelyanov , Johannes Weiner , peterx@redhat.com, Martin Cracauer , Matthew Wilcox , Shaohua Li , Marty McFadden , Andrea Arcangeli , Mike Kravetz , Denis Plotnikov , Mike Rapoport , Linus Torvalds , Mel Gorman , "Kirill A . Shutemov" , "Dr . David Alan Gilbert" Subject: [PATCH v5 02/16] mm/gup: Fix __get_user_pages() on fault retry of hugetlb Date: Thu, 26 Sep 2019 17:38:50 +0800 Message-Id: <20190926093904.5090-3-peterx@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190926093904.5090-1-peterx@redhat.com> References: <20190926093904.5090-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When follow_hugetlb_page() returns with *locked=3D=3D0, it means we've go= t a VM_FAULT_RETRY within the fauling process and we've released the mmap_sem. When that happens, we should stop and bail out. Signed-off-by: Peter Xu --- mm/gup.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mm/gup.c b/mm/gup.c index eddbb95dcb8f..e60d32f1674d 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -833,6 +833,16 @@ static long __get_user_pages(struct task_struct *tsk= , struct mm_struct *mm, i =3D follow_hugetlb_page(mm, vma, pages, vmas, &start, &nr_pages, i, gup_flags, locked); + if (locked && *locked =3D=3D 0) { + /* + * We've got a VM_FAULT_RETRY + * and we've lost mmap_sem. + * We must stop here. + */ + BUG_ON(gup_flags & FOLL_NOWAIT); + BUG_ON(ret !=3D 0); + goto out; + } continue; } } --=20 2.21.0