selftests-mm-fix-unused-variable-warnings-in-hugetlb-madvisec-migrationc.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: fix unused variable warnings in hugetlb-madvise.c, migration.c
has been removed from the -mm tree. Its filename was
selftests-mm-fix-unused-variable-warnings-in-hugetlb-madvisec-migrationc.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: John Hubbard <[email protected]>
Subject: selftests/mm: fix unused variable warnings in hugetlb-madvise.c, migration.c
Date: Tue, 6 Jun 2023 00:16:28 -0700
Dummy variables are required in order to make these two (similar) routines work, so in both cases, declare the variables as volatile in order to avoid the clang compiler warning.
Furthermore, in order to ensure that each test actually does what is intended, add an asm volatile invocation (thanks to David Hildenbrand for the suggestion), with a clarifying comment so that it survives future maintenance.
---
tools/testing/selftests/mm/hugetlb-madvise.c | 8 ++++++-- tools/testing/selftests/mm/migration.c | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-)
tools/testing/selftests/mm/hugetlb-madvise.c renamed from tools/testing/selftests/mm/hugetlb-madvise.c~selftests-mm-fix-unused-variable-warnings-in-hugetlb-madvisec-migrationc +6 -2
@@ -65,11 +65,15 @@ void write_fault_pages(void *addr, unsigvoid read_fault_pages (void *addr,unsigned long nr_pages) { -unsigned long dummy =0 ; +volatile unsigned long dummy =0 ;unsigned long i; -for (i =0 ; i < nr_pages; i++) +for (i =0 ; i < nr_pages; i++) { dummy += *((unsigned long *)(addr + (i * huge_page_size))); + +/* Prevent the compiler from optimizing out the entire loop: */ + asmvolatile ("" :"+r" (dummy)); + } }int main (int argc,char **argv)
tools/testing/selftests/mm/migration.c renamed from tools/testing/selftests/mm/migration.c~selftests-mm-fix-unused-variable-warnings-in-hugetlb-madvisec-migrationc +4 -1
@@ -95,12 +95,15 @@ int migrate(uint64_t *ptr, int n1, int nvoid *access_mem (void *ptr) { -uint64_t y =0 ; +volatile uint64_t y =0 ;volatile uint64_t *x = ptr;while (1 ) {pthread_testcancel (); y += *x; + +/* Prevent the compiler from optimizing out the writes to y: */ + asmvolatile ("" :"+r" (y)); }return NULL ;
_
Patches currently in -mm which might be from [email protected] are