selftests-mm-fix-force_read-to-read-input-value-correctly.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: fix FORCE_READ to read input value correctly
has been removed from the -mm tree. Its filename was
selftests-mm-fix-force_read-to-read-input-value-correctly.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Zi Yan <[email protected]>
Subject: selftests/mm: fix FORCE_READ to read input value correctly
Date: Tue, 5 Aug 2025 13:51:40 -0400
FORCE_READ() converts input value x to its pointer type then reads from address x. This is wrong. If x is a non-pointer, it would be caught it easily. But all FORCE_READ() callers are trying to read from a pointer and FORCE_READ() basically reads a pointer to a pointer instead of the original typed pointer. Almost no access violation was found, except the one from split_huge_page_test.
Fix it by implementing a simplified READ_ONCE() instead.
---
tools/testing/selftests/mm/cow.c | 4 ++-- tools/testing/selftests/mm/guard-regions.c | 2 +- tools/testing/selftests/mm/hugetlb-madvise.c | 4 +++- tools/testing/selftests/mm/migration.c | 2 +- tools/testing/selftests/mm/pagemap_ioctl.c | 2 +- tools/testing/selftests/mm/split_huge_page_test.c | 7 +++++-- tools/testing/selftests/mm/vm_util.h | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-)
tools/testing/selftests/mm/cow.c renamed from tools/testing/selftests/mm/cow.c~selftests-mm-fix-force_read-to-read-input-value-correctly +2 -2
@@ -1554,8 +1554,8 @@ static void run_with_zeropage(non_anon_t }/* Read from the page to populate the shared zeropage. */ -FORCE_READ (mem); -FORCE_READ (smem); +FORCE_READ (*mem); +FORCE_READ (*smem);fn (mem, smem, pagesize); munmap:
tools/testing/selftests/mm/guard-regions.c renamed from tools/testing/selftests/mm/guard-regions.c~selftests-mm-fix-force_read-to-read-input-value-correctly +1 -1
@@ -145,7 +145,7 @@ static bool try_access_buf(char *ptr, boif (write) *ptr ='x' ;else -FORCE_READ (ptr); +FORCE_READ (*ptr); } signal_jump_set = false;
tools/testing/selftests/mm/hugetlb-madvise.c renamed from tools/testing/selftests/mm/hugetlb-madvise.c~selftests-mm-fix-force_read-to-read-input-value-correctly +3 -1
@@ -50,8 +50,10 @@ void read_fault_pages(void *addr, unsignunsigned long i;for (i =0 ; i < nr_pages; i++) { +unsigned long *addr2 = + ((unsigned long *)(addr + (i * huge_page_size)));/* Prevent the compiler from optimizing out the entire loop: */ -FORCE_READ (((unsigned long *)(addr + (i * huge_page_size)))); +FORCE_READ (*addr2); } }
tools/testing/selftests/mm/migration.c renamed from tools/testing/selftests/mm/migration.c~selftests-mm-fix-force_read-to-read-input-value-correctly +1 -1
@@ -110,7 +110,7 @@ void *access_mem(void *ptr)* the memory access actually happens and prevents the compiler * from optimizing away this entire loop. */ -FORCE_READ ((uint64_t *)ptr); +FORCE_READ (*(uint64_t *)ptr); }return NULL ;
tools/testing/selftests/mm/pagemap_ioctl.c renamed from tools/testing/selftests/mm/pagemap_ioctl.c~selftests-mm-fix-force_read-to-read-input-value-correctly +1 -1
@@ -1525,7 +1525,7 @@ void zeropfn_tests(void) ret =madvise (mem, hpage_size,MADV_HUGEPAGE );if (!ret) { -FORCE_READ (mem); +FORCE_READ (*mem); ret =pagemap_ioctl (mem, hpage_size, &vec,1 ,0 ,0 ,PAGE_IS_PFNZERO ,0 ,0 ,PAGE_IS_PFNZERO );
tools/testing/selftests/mm/split_huge_page_test.c renamed from tools/testing/selftests/mm/split_huge_page_test.c~selftests-mm-fix-force_read-to-read-input-value-correctly +5 -2
@@ -439,8 +439,11 @@ int create_pagecache_thp_and_fd(const ch }madvise (*addr, fd_size,MADV_HUGEPAGE ); -for (size_t i =0 ; i < fd_size; i++) -FORCE_READ ((*addr + i)); +for (size_t i =0 ; i < fd_size; i++) { +char *addr2 = *addr + i; + +FORCE_READ (*addr2); + }if (!check_huge_file (*addr, fd_size / pmd_pagesize, pmd_pagesize)) {ksft_print_msg ("No large pagecache folio generated, please provide a filesystem supporting large folio\n" );
tools/testing/selftests/mm/vm_util.h renamed from tools/testing/selftests/mm/vm_util.h~selftests-mm-fix-force_read-to-read-input-value-correctly +1 -1
@@ -23,7 +23,7 @@* anything with it in order to trigger a read page fault. We therefore must use * volatile to stop the compiler from optimising this away. */ -#define FORCE_READ (x) (*(volatile typeof(x) *)x) +#define FORCE_READ (x) (*(const volatile typeof(x) *)&(x))extern unsigned int __page_size;extern unsigned int __page_shift;
_
Patches currently in -mm which might be from [email protected] are
mm-huge_memory-add-new_order-and-offset-to-split_huge_pages-pr_debug.patch selftests-mm-mark-all-functions-static-in-split_huge_page_testc.patch selftests-mm-reimplement-is_backed_by_thp-with-more-precise-check.patch selftests-mm-reimplement-is_backed_by_thp-with-more-precise-check-fix.patch selftests-mm-add-check_after_split_folio_orders-helper.patch selftests-mm-check-after-split-folio-orders-in-split_huge_page_test.patch