selftest-vm-add-utilh-and-and-move-helper-functions-there.patch removed from -mm tree
The patch titled
Subject: selftest/vm: add util.h and and move helper functions there
has been removed from the -mm tree. Its filename was
selftest-vm-add-utilh-and-and-move-helper-functions-there.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: "Aneesh Kumar K.V" <[email protected]>
Subject: selftest/vm: add util.h and and move helper functions there
Avoid code duplication by adding util.h. No functional change in this patch.
Signed-off-by Aneesh Kumar K.V <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Mike Rapoport <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
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(-)
tools/testing/selftests/vm/ksm_tests.c renamed from tools/testing/selftests/vm/ksm_tests.c~selftest-vm-add-utilh-and-and-move-helper-functions-there +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 @@ err_out:return 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 renamed from tools/testing/selftests/vm/transhuge-stress.c~selftest-vm-add-utilh-and-and-move-helper-functions-there +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
_
Patches currently in -mm which might be from [email protected] are