Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7b78075 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

mm: gup: use get_user_pages_unlocked within get_user_pages_fast 



This allows the get_user_pages_fast slow path to release the mmap_sem
before blocking.

Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Reviewed-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andres Lagar-Cavilla <andreslc@google.com>
Cc: Peter Feiner <pfeiner@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0fd71a56

arch/mips/mm/gup.c

+3 −5
Original line number Diff line number Diff line
@@ -301,11 +301,9 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, 
	start += nr << PAGE_SHIFT;

	pages += nr;



	down_read(&mm->mmap_sem);

	ret = get_user_pages(current, mm, start,

	ret = get_user_pages_unlocked(current, mm, start,

				      (end - start) >> PAGE_SHIFT,

				write, 0, pages, NULL);

	up_read(&mm->mmap_sem);

				      write, 0, pages);



	/* Have to be a bit careful with return values */

	if (nr > 0) {

arch/s390/mm/gup.c

+2 −4
Original line number Diff line number Diff line
@@ -235,10 +235,8 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, 
	/* Try to get the remaining pages with get_user_pages */

	start += nr << PAGE_SHIFT;

	pages += nr;

	down_read(&mm->mmap_sem);

	ret = get_user_pages(current, mm, start,

			     nr_pages - nr, write, 0, pages, NULL);

	up_read(&mm->mmap_sem);

	ret = get_user_pages_unlocked(current, mm, start,

			     nr_pages - nr, write, 0, pages);

	/* Have to be a bit careful with return values */

	if (nr > 0)

		ret = (ret < 0) ? nr : ret + nr;

arch/sh/mm/gup.c

+2 −4
Original line number Diff line number Diff line
@@ -257,10 +257,8 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, 
		start += nr << PAGE_SHIFT;

		pages += nr;



		down_read(&mm->mmap_sem);

		ret = get_user_pages(current, mm, start,

			(end - start) >> PAGE_SHIFT, write, 0, pages, NULL);

		up_read(&mm->mmap_sem);

		ret = get_user_pages_unlocked(current, mm, start,

			(end - start) >> PAGE_SHIFT, write, 0, pages);



		/* Have to be a bit careful with return values */

		if (nr > 0) {

arch/sparc/mm/gup.c

+2 −4
Original line number Diff line number Diff line
@@ -249,10 +249,8 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, 
		start += nr << PAGE_SHIFT;

		pages += nr;



		down_read(&mm->mmap_sem);

		ret = get_user_pages(current, mm, start,

			(end - start) >> PAGE_SHIFT, write, 0, pages, NULL);

		up_read(&mm->mmap_sem);

		ret = get_user_pages_unlocked(current, mm, start,

			(end - start) >> PAGE_SHIFT, write, 0, pages);



		/* Have to be a bit careful with return values */

		if (nr > 0) {

arch/x86/mm/gup.c

+3 −4
Original line number Diff line number Diff line
@@ -388,10 +388,9 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, 
		start += nr << PAGE_SHIFT;

		pages += nr;



		down_read(&mm->mmap_sem);

		ret = get_user_pages(current, mm, start,

			(end - start) >> PAGE_SHIFT, write, 0, pages, NULL);

		up_read(&mm->mmap_sem);

		ret = get_user_pages_unlocked(current, mm, start,

					      (end - start) >> PAGE_SHIFT,

					      write, 0, pages);



		/* Have to be a bit careful with return values */

		if (nr > 0) {