selftests-mm-merge-default_huge_page_size-into-one.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: merge default_huge_page_size() into one
has been removed from the -mm tree. Its filename was
selftests-mm-merge-default_huge_page_size-into-one.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: merge default_huge_page_size() into one
Date: Wed, 12 Apr 2023 12:42:23 -0400
There're already 3 same definitions of the three functions. Move it into vm_util.[ch].
---
tools/testing/selftests/mm/hugetlb-madvise.c | 25 ----------------- tools/testing/selftests/mm/thuge-gen.c | 19 ------------ tools/testing/selftests/mm/userfaultfd.c | 24 ---------------- tools/testing/selftests/mm/vm_util.c | 21 ++++++++++++++ tools/testing/selftests/mm/vm_util.h | 1 5 files changed, 24 insertions(+), 66 deletions(-)
tools/testing/selftests/mm/hugetlb-madvise.c renamed from tools/testing/selftests/mm/hugetlb-madvise.c~selftests-mm-merge-default_huge_page_size-into-one +1 -24
@@ -18,6 +18,7 @@#include <unistd.h> #include <sys/mman.h> #include <fcntl.h> +#include "vm_util.h" #define MIN_FREE_PAGES 20#define NR_HUGE_PAGES 10/* common number of pages to map/allocate */
@@ -35,30 +36,6 @@unsigned long huge_page_size;unsigned long base_page_size; -/* -* default_huge_page_size copied from mlock2-tests.c -*/ -unsigned long default_huge_page_size (void ) -{ -unsigned long hps =0 ; -char *line =NULL ; -size_t linelen =0 ; -FILE *f =fopen ("/proc/meminfo" ,"r" ); - -if (!f) -return 0 ; -while (getline (&line, &linelen, f) >0 ) { -if (sscanf (line,"Hugepagesize: %lu kB" , &hps) ==1 ) { - hps <<=10 ; -break ; - } - } - -free (line); -fclose (f); -return hps; -} -unsigned long get_free_hugepages (void ) {unsigned long fhp =0 ;
tools/testing/selftests/mm/thuge-gen.c renamed from tools/testing/selftests/mm/thuge-gen.c~selftests-mm-merge-default_huge_page_size-into-one +1 -18
@@ -24,6 +24,7 @@#include <unistd.h> #include <stdarg.h> #include <string.h> +#include "vm_util.h" #define err (x) perror(x), exit(1)
@@ -74,24 +75,6 @@ void find_pagesizes(void)globfree (&g); } -unsigned long default_huge_page_size (void ) -{ -unsigned long hps =0 ; -char *line =NULL ; -size_t linelen =0 ; -FILE *f =fopen ("/proc/meminfo" ,"r" ); -if (!f) -return 0 ; -while (getline (&line, &linelen, f) >0 ) { -if (sscanf (line,"Hugepagesize: %lu kB" , &hps) ==1 ) { - hps <<=10 ; -break ; - } - } -free (line); -return hps; -} -void show (unsigned long ps) {char buf[100 ];
tools/testing/selftests/mm/userfaultfd.c renamed from tools/testing/selftests/mm/userfaultfd.c~selftests-mm-merge-default_huge_page_size-into-one +0 -24
@@ -1703,30 +1703,6 @@ static int userfaultfd_stress(void) || userfaultfd_events_test() || userfaultfd_minor_test(); } -/* -* Copied from mlock2-tests.c -*/ -unsigned long default_huge_page_size (void ) -{ -unsigned long hps =0 ; -char *line =NULL ; -size_t linelen =0 ; -FILE *f =fopen ("/proc/meminfo" ,"r" ); - -if (!f) -return 0 ; -while (getline (&line, &linelen, f) >0 ) { -if (sscanf (line,"Hugepagesize: %lu kB" , &hps) ==1 ) { - hps <<=10 ; -break ; - } - } - -free (line); -fclose (f); -return hps; -} -static void set_test_type (const char *type) {if (!strcmp (type,"anon" )) {
tools/testing/selftests/mm/vm_util.c renamed from tools/testing/selftests/mm/vm_util.c~selftests-mm-merge-default_huge_page_size-into-one +21 -0
@@ -180,3 +180,24 @@ int64_t allocate_transhuge(void *ptr, inreturn -1 ; } + +unsigned long default_huge_page_size (void ) +{ +unsigned long hps =0 ; +char *line =NULL ; +size_t linelen =0 ; +FILE *f =fopen ("/proc/meminfo" ,"r" ); + +if (!f) +return 0 ; +while (getline (&line, &linelen, f) >0 ) { +if (sscanf (line,"Hugepagesize: %lu kB" , &hps) ==1 ) { + hps <<=10 ; +break ; + } + } + +free (line); +fclose (f); +return hps; +}
tools/testing/selftests/mm/vm_util.h renamed from tools/testing/selftests/mm/vm_util.h~selftests-mm-merge-default_huge_page_size-into-one +1 -0
@@ -35,6 +35,7 @@ bool check_huge_anon(void *addr, int nr_bool check_huge_file (void *addr,int nr_hpages,uint64_t hpage_size);bool check_huge_shmem (void *addr,int nr_hpages,uint64_t hpage_size);int64_t allocate_transhuge (void *ptr,int pagemap_fd); +unsigned long default_huge_page_size (void );/* * On ppc64 this will only work with radix 2M hugepage size
_
Patches currently in -mm which might be from [email protected] are
selftests-mm-use-pm_-macros-in-vm_utilsh.patch selftests-mm-reuse-pagemap_get_entry-in-vm_utilh.patch selftests-mm-test-uffdio_zeropage-only-when-hugetlb.patch selftests-mm-drop-test_uffdio_zeropage_eexist.patch selftests-mm-create-uffd-common.patch selftests-mm-split-uffd-tests-into-uffd-stress-and-uffd-unit-tests.patch selftests-mm-uffd_register.patch selftests-mm-uffd_open_devsys.patch selftests-mm-uffdio_api-test.patch selftests-mm-drop-global-mem_fd-in-uffd-tests.patch selftests-mm-drop-global-hpage_size-in-uffd-tests.patch 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