selftests-mm-drop-global-hpage_size-in-uffd-tests.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: drop global hpage_size in uffd tests
has been removed from the -mm tree. Its filename was
selftests-mm-drop-global-hpage_size-in-uffd-tests.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: Peter Xu <[email protected]>
Subject: selftests/mm: drop global hpage_size in uffd tests
Date: Wed, 12 Apr 2023 12:43:33 -0400
hpage_size was wrongly used. Sometimes it means hugetlb default size, sometimes it was used as thp size.
Remove the global variable and use the right one at each place.
---
tools/testing/selftests/mm/uffd-common.c | 7 ++++--- tools/testing/selftests/mm/uffd-common.h | 2 +- tools/testing/selftests/mm/uffd-stress.c | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-)
tools/testing/selftests/mm/uffd-common.c renamed from tools/testing/selftests/mm/uffd-common.c~selftests-mm-drop-global-hpage_size-in-uffd-tests +4 -3
@@ -10,7 +10,7 @@#define BASE_PMD_ADDR ((void *)(1UL << 30))volatile bool test_uffdio_copy_eexist = true; -unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size, hpage_size; +unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size;char *area_src, *area_src_alias, *area_dst, *area_dst_alias, *area_remap;int uffd =-1 , uffd_flags, finished, *pipefd, test_type;bool map_shared, test_collapse, test_dev_userfaultfd;
@@ -115,7 +115,7 @@ static void shmem_release_pages(char *restatic void shmem_allocate_area (void **alloc_area,bool is_src) {void *area_alias =NULL ; -size_t bytes = nr_pages * page_size; +size_t bytes = nr_pages * page_size, hpage_size =read_pmd_pagesize ();unsigned long offset = is_src ?0 : bytes;char *p =NULL , *p_alias =NULL ;int mem_fd =uffd_mem_fd_create (bytes *2 , false);
@@ -159,7 +159,8 @@ static void shmem_alias_mapping(__u64 *sstatic void shmem_check_pmd_mapping (void *p,int expect_nr_hpages) { -if (!check_huge_shmem (area_dst_alias, expect_nr_hpages, hpage_size)) +if (!check_huge_shmem (area_dst_alias, expect_nr_hpages, +read_pmd_pagesize ()))err ("Did not find expected %d number of hugepages" , expect_nr_hpages); }
tools/testing/selftests/mm/uffd-common.h renamed from tools/testing/selftests/mm/uffd-common.h~selftests-mm-drop-global-hpage_size-in-uffd-tests +1 -1
@@ -85,7 +85,7 @@ struct uffd_test_ops { };typedef struct uffd_test_ops uffd_test_ops_t ; -extern unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size, hpage_size; +extern unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size;extern char *area_src, *area_src_alias, *area_dst, *area_dst_alias, *area_remap;extern int uffd, uffd_flags, finished, *pipefd, test_type;extern bool map_shared, test_collapse, test_dev_userfaultfd;
tools/testing/selftests/mm/uffd-stress.c renamed from tools/testing/selftests/mm/uffd-stress.c~selftests-mm-drop-global-hpage_size-in-uffd-tests +3 -3
@@ -655,7 +655,7 @@ static int userfaultfd_minor_test(void) uffd_test_ops->check_pmd_mapping (area_dst, nr_pages * page_size / - hpage_size); +read_pmd_pagesize ());/* * This won't cause uffd-fault - it purely just makes sure there * was no corruption.
@@ -997,7 +997,7 @@ static void parse_test_type_arg(const cherr ("Unsupported test: %s" , raw_type);if (test_type ==TEST_HUGETLB ) - page_size = hpage_size; + page_size =default_huge_page_size ();else page_size =sysconf (_SC_PAGE_SIZE);
@@ -1035,6 +1035,7 @@ static void sigalrm(int sig)int main (int argc,char **argv) {size_t bytes; +size_t hpage_size =read_pmd_pagesize ();if (argc <4 )usage ();
@@ -1043,7 +1044,6 @@ int main(int argc, char **argv)err ("failed to arm SIGALRM" );alarm (ALARM_INTERVAL_SECS ); - hpage_size =default_huge_page_size ();parse_test_type_arg (argv[1 ]); bytes =atol (argv[2 ]) *1024 *1024 ;
_
Patches currently in -mm which might be from [email protected] are
selftests-mm-rename-uffd_stats-to-uffd_args.patch selftests-mm-let-uffd_handle_page_fault-take-wp-parameter.patch selftests-mm-allow-allocate_area-to-fail-properly.patch selftests-mm-add-framework-for-uffd-unit-test.patch selftests-mm-move-uffd-pagemap-test-to-unit-test.patch selftests-mm-move-uffd-minor-test-to-unit-test.patch selftests-mm-move-uffd-sig-events-tests-into-uffd-unit-tests.patch selftests-mm-move-zeropage-test-into-uffd-unit-tests.patch selftests-mm-workaround-no-way-to-detect-uffd-minor-wp.patch selftests-mm-allow-uffd-test-to-skip-properly-with-no-privilege.patch selftests-mm-drop-sys-dev-test-in-uffd-stress-test.patch selftests-mm-add-shmem-private-test-to-uffd-stress.patch selftests-mm-add-uffdio-register-ioctls-test.patch mm-hugetlb-fix-uffd-wp-during-fork.patch mm-hugetlb-fix-uffd-wp-bit-lost-when-unsharing-happens.patch selftests-mm-add-a-few-options-for-uffd-unit-test.patch selftests-mm-extend-and-rename-uffd-pagemap-test.patch selftests-mm-rename-cow_extra_libs-to-iouring_extra_libs.patch selftests-mm-add-tests-for-ro-pinning-vs-fork.patch