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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 1EFF7C3F2D7 for ; Mon, 2 Mar 2020 20:07:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BF367214DB for ; Mon, 2 Mar 2020 20:07:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="K+OyGJ7t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF367214DB 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 E41556B0005; Mon, 2 Mar 2020 15:07:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF2716B0006; Mon, 2 Mar 2020 15:07:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE1436B0007; Mon, 2 Mar 2020 15:07:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0140.hostedemail.com [216.40.44.140]) by kanga.kvack.org (Postfix) with ESMTP id B2CB36B0005 for ; Mon, 2 Mar 2020 15:07:40 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 79EA2181AC9CB for ; Mon, 2 Mar 2020 20:07:40 +0000 (UTC) X-FDA: 76551507480.30.key81_600ed7b2bd902 X-HE-Tag: key81_600ed7b2bd902 X-Filterd-Recvd-Size: 6149 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Mar 2020 20:07:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583179659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CFw76B8uA1FYa5LeC7grLaOVApf5E1gWum+RRoD0p54=; b=K+OyGJ7tvwuCkgY+B7VF5vNWtlFbcOHtNpc18YjnzCDSIv64OEeoAym71uc+FeubGY5ZCV Va57g2dXUWDzovNrC5I2GyiUS/vlRfaYLS8L9/QsvgVRln7s/8bM20WtxTr+8YEW4+2fxT YOXYWiZ3MRhNhjZ7dumOrNF3/S7tfxI= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-13-ySkwgk4cOcy6_bhOhJUh1A-1; Mon, 02 Mar 2020 15:07:35 -0500 X-MC-Unique: ySkwgk4cOcy6_bhOhJUh1A-1 Received: by mail-qv1-f72.google.com with SMTP id o13so585222qvl.2 for ; Mon, 02 Mar 2020 12:07:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=xNlKnbLN0v72Ztmp2WjTjNwQkPfjH13OEcSBlAuwDK8=; b=LUoeS/bXIvvw8/KHdiJxzxeCvGu0z3UhZom1ZgEY+AAMKRHLt7M2x5OLpa5pQMkK9p Abl0m128RJIgmLjMx2TLurCHNFOrW7q0a47xxcWj0VIby4i1fu+SKVTnPhM5+JrINFcA t5an6dHIl2sMgZoPdqmGAetSPnsYvwcZQV4o9d4hONXVfuBcqTQewTUWGIia2mPySYTK FrYvSWH6lOaOfSW3PavBS/4I59VCOr5xlyUPGbb5ouwwA4KMZw9lTRgVhkVKOfRMN5je k580a6w68Nln7ZxHXzcoXQp0R0ggBBH9eaD+X8w0uqHDF695lIiDM/De+6yvAxvPaPOh 8/8g== X-Gm-Message-State: ANhLgQ2/vJrbXYH8UzHbaI8NPdQDEIajuqvnqUQmuu3J7OmcUUWqVKEG fz8Of1tyJMYuAoMP+yPbvEm+liPWTmjwTHBouVXyn5TJjwgllwl8TlYB0avPJeIYLpIPwgk9rsX apm3gE6z75gQ= X-Received: by 2002:a05:620a:a1d:: with SMTP id i29mr818682qka.343.1583179655107; Mon, 02 Mar 2020 12:07:35 -0800 (PST) X-Google-Smtp-Source: ADFU+vt4mLwVG8IPiAAyTTiGWUspe6vZEnd6gPc3TKBTEpjy2EAlI/KijkqJ4tNw1XwrD+Qjdbn2Wg== X-Received: by 2002:a05:620a:a1d:: with SMTP id i29mr818663qka.343.1583179654817; Mon, 02 Mar 2020 12:07:34 -0800 (PST) Received: from xz-x1 ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id i16sm10439193qkh.120.2020.03.02.12.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 12:07:33 -0800 (PST) Date: Mon, 2 Mar 2020 15:07:31 -0500 From: Peter Xu To: David Hildenbrand Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrea Arcangeli , Martin Cracauer , Linus Torvalds , Mike Rapoport , "Kirill A . Shutemov" , Johannes Weiner , "Dr . David Alan Gilbert" , Bobby Powers , Maya Gokhale , Jerome Glisse , Mike Kravetz , Matthew Wilcox , Marty McFadden , Mel Gorman , Hugh Dickins , Brian Geffon , Denis Plotnikov , Pavel Emelyanov Subject: Re: [PATCH RESEND v6 02/16] mm/gup: Fix __get_user_pages() on fault retry of hugetlb Message-ID: <20200302200731.GA464129@xz-x1> References: <20200220155353.8676-1-peterx@redhat.com> <20200220155353.8676-3-peterx@redhat.com> <795d9bd0-3f82-d5ce-fe03-4d405d9e6bce@redhat.com> MIME-Version: 1.0 In-Reply-To: <795d9bd0-3f82-d5ce-fe03-4d405d9e6bce@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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: On Mon, Mar 02, 2020 at 08:02:34PM +0100, David Hildenbrand wrote: > On 20.02.20 16:53, Peter Xu wrote: > > When follow_hugetlb_page() returns with *locked=3D=3D0, it means we've = got > > a VM_FAULT_RETRY within the fauling process and we've released the > > mmap_sem. When that happens, we should stop and bail out. > >=20 > > Signed-off-by: Peter Xu > > --- > > mm/gup.c | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > >=20 > > diff --git a/mm/gup.c b/mm/gup.c > > index 1b4411bd0042..76cb420c0fb7 100644 > > --- a/mm/gup.c > > +++ b/mm/gup.c > > @@ -849,6 +849,16 @@ static long __get_user_pages(struct task_struct *t= sk, struct mm_struct *mm, > > =09=09=09=09i =3D follow_hugetlb_page(mm, vma, pages, vmas, > > =09=09=09=09=09=09&start, &nr_pages, i, > > =09=09=09=09=09=09gup_flags, locked); > > +=09=09=09=09if (locked && *locked =3D=3D 0) { > > +=09=09=09=09=09/* > > +=09=09=09=09=09 * We've got a VM_FAULT_RETRY > > +=09=09=09=09=09 * and we've lost mmap_sem. > > +=09=09=09=09=09 * We must stop here. > > +=09=09=09=09=09 */ > > +=09=09=09=09=09BUG_ON(gup_flags & FOLL_NOWAIT); > > +=09=09=09=09=09BUG_ON(ret !=3D 0); >=20 > Can we be sure ret is really set to !=3D 0 at this point? At least, > reading the code this is not clear to me. Here I wanted to make sure ret is zero (it's BUG_ON, not assert). "ret" is the fallback return value only if error happens when i=3D=3D0. Here we want to make sure even if no page is pinned we'll return zero gracefully when VM_FAULT_RETRY happened when following the hugetlb pages. >=20 > Shouldn't we set "ret =3D i" and assert that i is an error (e.g., EBUSY?)= . > Or set -EBUSY explicitly? No. Here "i" could only be either positive (when we've got some pages pinned no matter where), or zero (when follow_hugetlb_page released the mmap_sem on the first page that it wants to pin). So imo "i" should never be negative instead. Thanks, --=20 Peter Xu