selftest/vm: Add util.h and and move helper functions there
Subsystems (2)
PATCH v4 1/2 selftest/vm: Add util.h and and move helper functions there
Avoid code duplication by adding util.h. No functional change in this patch.
Cc Shuah Khan <[email protected]>
Signed-off-by Aneesh Kumar K.V <[email protected]>
---
Changes from v3:
* rebased to linux-next-20220302
tools/testing/selftests/vm/ksm_tests.c | 38 +-------------- tools/testing/selftests/vm/transhuge-stress.c | 41 ++-------------- tools/testing/selftests/vm/util.h | 48 +++++++++++++++++++ 3 files changed, 52 insertions(+), 75 deletions(-) create mode 100644 tools/testing/selftests/vm/util.h
tools/testing/selftests/vm/ksm_tests.c +1 -37
@@ -12,6 +12,7 @@#include "../kselftest.h" #include "../../../../include/vdso/time64.h" +#include "util.h" #define KSM_SYSFS_PATH "/sys/kernel/mm/ksm/"#define KSM_FP (s) (KSM_SYSFS_PATH s)
@@ -22,15 +23,6 @@#define KSM_MERGE_ACROSS_NODES_DEFAULT true#define MB (1ul << 20) -#define PAGE_SHIFT 12 -#define HPAGE_SHIFT 21 - -#define PAGE_SIZE (1 << PAGE_SHIFT) -#define HPAGE_SIZE (1 << HPAGE_SHIFT) - -#define PAGEMAP_PRESENT (ent) (((ent) & (1ull << 63)) != 0) -#define PAGEMAP_PFN (ent) ((ent) & ((1ull << 55) - 1)) -struct ksm_sysfs {unsigned long max_page_sharing;unsigned long merge_across_nodes;
@@ -456,34 +448,6 @@ static int check_ksm_numa_merge(int mapping, int prot, int timeout, bool merge_areturn KSFT_FAIL ; } -int64_t allocate_transhuge (void *ptr,int pagemap_fd) -{ -uint64_t ent[2 ]; - -/* drop pmd */ -if (mmap (ptr,HPAGE_SIZE ,PROT_READ |PROT_WRITE , -MAP_FIXED |MAP_ANONYMOUS | -MAP_NORESERVE |MAP_PRIVATE ,-1 ,0 ) != ptr) -errx (2 ,"mmap transhuge" ); - -if (madvise (ptr,HPAGE_SIZE ,MADV_HUGEPAGE )) -err (2 ,"MADV_HUGEPAGE" ); - -/* allocate transparent huge page */ - *(volatile void **)ptr = ptr; - -if (pread (pagemap_fd, ent,sizeof (ent), - (uintptr_t )ptr >> (PAGE_SHIFT -3 )) !=sizeof (ent)) -err (2 ,"read pagemap" ); - -if (PAGEMAP_PRESENT (ent[0 ]) &&PAGEMAP_PRESENT (ent[1 ]) && -PAGEMAP_PFN (ent[0 ]) +1 ==PAGEMAP_PFN (ent[1 ]) && - !(PAGEMAP_PFN (ent[0 ]) & ((1 << (HPAGE_SHIFT -PAGE_SHIFT )) -1 ))) -return PAGEMAP_PFN (ent[0 ]); - -return -1 ; -} -static int ksm_merge_hugepages_time (int mapping,int prot,int timeout,size_t map_size) {void *map_ptr, *map_ptr_orig;
tools/testing/selftests/vm/transhuge-stress.c +3 -38
64 lines not on this page · raw message
tools/testing/selftests/vm/util.h new file +48 -0
48 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v4 2/2 selftest/vm: add helpers to detect PAGE_SIZE and PAGE_SHIFT
From: Mike Rapoport <[email protected]>
PAGE_SIZE is not 4096 in many configurations, particularly ppc64 uses 64K pages in majority of cases.
Add helpers to detect PAGE_SIZE and PAGE_SHIFT dynamically.
Without this tests are broken w.r.t reading /proc/self/pagemap
if (pread(pagemap_fd, ent, sizeof(ent),
(uintptr_t)ptr >> (PAGE_SHIFT - 3)) != sizeof(ent))
err(2, "read pagemap");Cc Shuah Khan <[email protected]>
Signed-off-by Mike Rapoport <[email protected]>
Signed-off-by Aneesh Kumar K.V <[email protected]>
--- tools/testing/selftests/vm/gup_test.c | 3 ++- tools/testing/selftests/vm/util.h | 27 ++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-)
tools/testing/selftests/vm/gup_test.c +2 -1
@@ -10,8 +10,9 @@#include <assert.h> #include "../../../../mm/gup_test.h" +#include "util.h" +#define MB (1UL << 20) -#define PAGE_SIZE sysconf(_SC_PAGESIZE)/* Just the flags we need, copied from mm.h: */ #define FOLL_WRITE 0x01/* check pte is writable */
tools/testing/selftests/vm/util.h +24 -3
@@ -6,11 +6,32 @@#include <stdint.h> #include <sys/mman.h> #include <err.h> +#include <string.h> /* ffsl() */ +#include <unistd.h> /* _SC_PAGESIZE */ -#define PAGE_SHIFT 12 -#define HPAGE_SHIFT 21 +static unsigned int __page_size; +static unsigned int __page_shift; -#define PAGE_SIZE (1 << PAGE_SHIFT) +static inline unsigned int page_size (void ) +{ +if (!__page_size) + __page_size =sysconf (_SC_PAGESIZE); +return __page_size; +} + +static inline unsigned int page_shift (void ) +{ +if (!__page_shift) + __page_shift = (ffsl (page_size ()) -1 ); +return __page_shift; +} + +#define PAGE_SHIFT (page_shift()) +#define PAGE_SIZE (page_size()) +/* +* On ppc64 this will only work with radix 2M hugepage size +*/ +#define HPAGE_SHIFT 21#define HPAGE_SIZE (1 << HPAGE_SHIFT)#define PAGEMAP_PRESENT (ent) (((ent) & (1ull << 63)) != 0)
Signature · 1 line
2.35.1