Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   John Hubbard <jhubbard@nvidia.com>
To:     Andrew Morton <akpm@linux-foundation.org>, <jgg@ziepe.ca>
CC:     <Liam.Howlett@oracle.com>, <daniel.m.jordan@oracle.com>,
        <dave@stgolabs.net>, <hughd@google.com>, <jglisse@redhat.com>,
        <jhubbard@nvidia.com>, <ldufour@linux.ibm.com>,
        <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
        <peterz@infradead.org>, <rientjes@google.com>, <vbabka@suse.cz>,
        <walken@google.com>, <willy@infradead.org>, <yinghan@google.com>
Subject: [PATCH] mm/gup: might_lock_read(mmap_sem) in get_user_pages_fast()
Date:   Thu, 21 May 2020 18:04:43 -0700
Message-ID: <20200522010443.1290485-1-jhubbard@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Instead of scattering these assertions across the drivers,
do this assertion inside the core of get_user_pages_fast*()
functions. That also includes pin_user_pages_fast*()
routines.

Add a might_lock_read(mmap_sem) call to internal_get_user_pages_fast().

Suggested-by: Matthew Wilcox <willy@infradead.org>
Cc: Michel Lespinasse <walken@google.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---

Hi Andrew,

This applies on top of [1], which in turn applies to
today's (20200521) linux-next.

As noted in the discussion [2], this will need changing from
mmap_sem to mmap_lock, after Michel Lespinasse's patchset
arrives.

[1]
https://lore.kernel.org/r/20200521233841.1279742-1-jhubbard@nvidia.com

[2] https://lore.kernel.org/linux-mm/20200520124817.GG31189@ziepe.ca/

thanks,
John Hubbard
NVIDIA

 mm/gup.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mm/gup.c b/mm/gup.c
index ada6aa79576dc..3462c076e8ecf 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2728,6 +2728,9 @@ static int internal_get_user_pages_fast(unsigned long=
 start, int nr_pages,
 				       FOLL_FAST_ONLY)))
 		return -EINVAL;
=20
+	if (!(gup_flags & FOLL_FAST_ONLY))
+		might_lock_read(&current->mm->mmap_sem);
+
 	start =3D untagged_addr(start) & PAGE_MASK;
 	addr =3D start;
 	len =3D (unsigned long) nr_pages << PAGE_SHIFT;
--=20
2.26.2