Skip to contentSkip to conversation

mm-gup_test-fix-pin_longterm_test_read-with-highmem.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Dec 12, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/gup_test: fix PIN_LONGTERM_TEST_READ with highmem
has been removed from the -mm tree. Its filename was
mm-gup_test-fix-pin_longterm_test_read-with-highmem.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/gup_test: fix PIN_LONGTERM_TEST_READ with highmem
Date: Mon, 5 Dec 2022 20:37:13 +0100

Patch series "selftests/vm: fix some tests on 32bit".

I finally had the time to run some of the selftests written by me (especially "cow") on x86 PAE. I found some unexpected "surprises" :)

With these changes, and with [1] on top of mm-unstable, the "cow" tests and the "ksm_functional_tests" compile and pass as expected (expected failures with hugetlb in the "cow" tests). "madv_populate" has one expected test failure -- x86 does not support softdirty tracking.

#1-#3 fix commits with stable commit ids. #4 fixes a test that is not in mm-stable yet.

A note that there are many other compile errors/warnings when compiling on 32bit and with older Linux headers ... something for another day.

[1] https://lkml.kernel.org/r/[email protected]

This patch (of 4):

... we have to kmap()/kunmap(), otherwise this won't work as expected with highmem.

Fixes c77369b437f9 ("mm/gup_test: start/stop/read functionality for PIN LONGTERM test")
Cc Shuah Khan <[email protected]>,
Cc Yang Li <[email protected]>

---

 mm/gup_test.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
mm/gup_test.c renamed from mm/gup_test.c~mm-gup_test-fix-pin_longterm_test_read-with-highmem +7 -3
@@ -4,6 +4,7 @@
 #include <linux/uaccess.h>
 #include <linux/ktime.h>
 #include <linux/debugfs.h>
+#include <linux/highmem.h>
 #include "gup_test.h"
 
 static void put_back_pages(unsigned int cmd, struct page **pages,
@@ -297,10 +298,13 @@ static inline int pin_longterm_test_read
 		return -EFAULT;
 
 	for (i = 0; i < pin_longterm_test_nr_pages; i++) {
-		void *addr = page_to_virt(pin_longterm_test_pages[i]);
+		void *addr = kmap_local_page(pin_longterm_test_pages[i]);
+		unsigned long ret;
 
-		if (copy_to_user((void __user *)(unsigned long)user_addr, addr,
-				 PAGE_SIZE))
+		ret = copy_to_user((void __user *)(unsigned long)user_addr, addr,
+				   PAGE_SIZE);
+		kunmap_local(addr);
+		if (ret)
 			return -EFAULT;
 		user_addr += PAGE_SIZE;
 	}

_

Patches currently in -mm which might be from [email protected] are