| Message ID | 20220315085014.1047291-1-usama.anjum@collabora.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [V4,1/2] selftests: vm: bring common functions to a new file | expand |
On 15.03.22 09:50, Muhammad Usama Anjum wrote: > Bring common functions to a new file. These functions can be used in the > new tests. This helps in code duplication. > > Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> > --- > tools/testing/selftests/vm/Makefile | 7 +- > tools/testing/selftests/vm/madv_populate.c | 34 +----- > .../selftests/vm/split_huge_page_test.c | 77 +------------ > tools/testing/selftests/vm/vm_util.c | 103 ++++++++++++++++++ > tools/testing/selftests/vm/vm_util.h | 15 +++ > 5 files changed, 125 insertions(+), 111 deletions(-) > create mode 100644 tools/testing/selftests/vm/vm_util.c > create mode 100644 tools/testing/selftests/vm/vm_util.h > > diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile > index 5e43f072f5b76..4e68edb26d6b6 100644 > --- a/tools/testing/selftests/vm/Makefile > +++ b/tools/testing/selftests/vm/Makefile > @@ -34,7 +34,7 @@ TEST_GEN_FILES += hugepage-mremap > TEST_GEN_FILES += hugepage-shm > TEST_GEN_FILES += hugepage-vmemmap > TEST_GEN_FILES += khugepaged > -TEST_GEN_FILES += madv_populate > +TEST_GEN_PROGS = madv_populate > TEST_GEN_FILES += map_fixed_noreplace > TEST_GEN_FILES += map_hugetlb > TEST_GEN_FILES += map_populate > @@ -47,7 +47,7 @@ TEST_GEN_FILES += on-fault-limit > TEST_GEN_FILES += thuge-gen > TEST_GEN_FILES += transhuge-stress > TEST_GEN_FILES += userfaultfd > -TEST_GEN_FILES += split_huge_page_test > +TEST_GEN_PROGS += split_huge_page_test > TEST_GEN_FILES += ksm_tests > > ifeq ($(MACHINE),x86_64) > @@ -91,6 +91,9 @@ TEST_FILES := test_vmalloc.sh > KSFT_KHDR_INSTALL := 1 > include ../lib.mk > > +$(OUTPUT)/madv_populate: vm_util.c > +$(OUTPUT)/split_huge_page_test: vm_util.c > + [...] > +// SPDX-License-Identifier: GPL-2.0 > +#include <stdbool.h> > +#include <string.h> > +#include "vm_util.h" > + > +uint64_t pagemap_get_entry(int fd, char *start) > +{ > + const unsigned long pfn = (unsigned long)start / getpagesize(); > + uint64_t entry; > + int ret; > + > + ret = pread(fd, &entry, sizeof(entry), pfn * sizeof(entry)); > + if (ret != sizeof(entry)) > + ksft_exit_fail_msg("reading pagemap failed\n"); > + return entry; > +} > + > +bool pagemap_is_softdirty(int fd, char *start) > +{ > + uint64_t entry = pagemap_get_entry(fd, start); > + > + return ((entry >> DIRTY_BIT_LOCATION) & 1); > +} Please leave code you're moving around as untouched as possible to avoid unrelated bugs that happen by mistake and are hard to review. > + > +void clear_softdirty(void) > +{ > + int ret; > + const char *ctrl = "4"; > + int fd = open("/proc/self/clear_refs", O_WRONLY); > + > + if (fd < 0) > + ksft_exit_fail_msg("opening clear_refs failed\n"); > + ret = write(fd, ctrl, strlen(ctrl)); > + close(fd); > + if (ret != strlen(ctrl)) > + ksft_exit_fail_msg("writing clear_refs failed\n"); > +} > + > + > +static bool check_for_pattern(FILE *fp, const char *pattern, char *buf) > +{ > + while (fgets(buf, MAX_LINE_LENGTH, fp) != NULL) { > + if (!strncmp(buf, pattern, strlen(pattern))) > + return true; > + } > + return false; > +} > + > +uint64_t read_pmd_pagesize(void) > +{ > + int fd; > + char buf[20]; > + ssize_t num_read; > + > + fd = open(PMD_SIZE, O_RDONLY); > + if (fd == -1) > + ksft_exit_fail_msg("Open hpage_pmd_size failed\n"); > + > + num_read = read(fd, buf, 19); > + if (num_read < 1) { > + close(fd); > + ksft_exit_fail_msg("Read hpage_pmd_size failed\n"); > + } > + buf[num_read] = '\0'; > + close(fd); > + > + return strtoul(buf, NULL, 10); > +} > + > +uint64_t check_huge(void *addr) > +{ > + uint64_t thp = 0; > + int ret; > + FILE *fp; > + char buffer[MAX_LINE_LENGTH]; > + char addr_pattern[MAX_LINE_LENGTH]; > + > + ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "%08lx-", > + (unsigned long) addr); > + if (ret >= MAX_LINE_LENGTH) > + ksft_exit_fail_msg("%s: Pattern is too long\n", __func__); > + > + fp = fopen(SMAP, "r"); > + if (!fp) > + ksft_exit_fail_msg("%s: Failed to open file %s\n", __func__, SMAP); > + > + if (!check_for_pattern(fp, addr_pattern, buffer)) > + goto err_out; > + > + /* > + * Fetch the AnonHugePages: in the same block and check the number of > + * hugepages. > + */ > + if (!check_for_pattern(fp, "AnonHugePages:", buffer)) > + goto err_out; > + > + if (sscanf(buffer, "AnonHugePages:%10ld kB", &thp) != 1) > + ksft_exit_fail_msg("Reading smap error\n"); > + > +err_out: > + fclose(fp); > + return thp; > +} > diff --git a/tools/testing/selftests/vm/vm_util.h b/tools/testing/selftests/vm/vm_util.h > new file mode 100644 > index 0000000000000..7522dbb859f0f > --- /dev/null > +++ b/tools/testing/selftests/vm/vm_util.h > @@ -0,0 +1,15 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#include <stdint.h> > +#include <fcntl.h> > +#include "../kselftest.h" > + > +#define PMD_SIZE "/sys/kernel/mm/transparent_hugepage/hpage_pmd_size" Ehm no. PMD_SIZE_PATH at best -- just as it used to. > +#define SMAP "/proc/self/smaps" SMAPS_PATH > +#define DIRTY_BIT_LOCATION 55 Please inline that just as it used to. There is no value in a magic define without any proper namespace. > +#define MAX_LINE_LENGTH 512 This used to be 500. Why the change? Also: weird indentation and these all look like the should go into vm_util.c. They are not used outside that file.
Hi David, Thank you for the review. I'll correct everything mentioned here in the next iteration. +[Gabriel] On 3/16/22 1:55 PM, David Hildenbrand wrote: > On 15.03.22 09:50, Muhammad Usama Anjum wrote: >> Bring common functions to a new file. These functions can be used in the >> new tests. This helps in code duplication. >> >> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> >> --- >> tools/testing/selftests/vm/Makefile | 7 +- >> tools/testing/selftests/vm/madv_populate.c | 34 +----- >> .../selftests/vm/split_huge_page_test.c | 77 +------------ >> tools/testing/selftests/vm/vm_util.c | 103 ++++++++++++++++++ >> tools/testing/selftests/vm/vm_util.h | 15 +++ >> 5 files changed, 125 insertions(+), 111 deletions(-) >> create mode 100644 tools/testing/selftests/vm/vm_util.c >> create mode 100644 tools/testing/selftests/vm/vm_util.h >> >> diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile >> index 5e43f072f5b76..4e68edb26d6b6 100644 >> --- a/tools/testing/selftests/vm/Makefile >> +++ b/tools/testing/selftests/vm/Makefile >> @@ -34,7 +34,7 @@ TEST_GEN_FILES += hugepage-mremap >> TEST_GEN_FILES += hugepage-shm >> TEST_GEN_FILES += hugepage-vmemmap >> TEST_GEN_FILES += khugepaged >> -TEST_GEN_FILES += madv_populate >> +TEST_GEN_PROGS = madv_populate >> TEST_GEN_FILES += map_fixed_noreplace >> TEST_GEN_FILES += map_hugetlb >> TEST_GEN_FILES += map_populate >> @@ -47,7 +47,7 @@ TEST_GEN_FILES += on-fault-limit >> TEST_GEN_FILES += thuge-gen >> TEST_GEN_FILES += transhuge-stress >> TEST_GEN_FILES += userfaultfd >> -TEST_GEN_FILES += split_huge_page_test >> +TEST_GEN_PROGS += split_huge_page_test >> TEST_GEN_FILES += ksm_tests >> >> ifeq ($(MACHINE),x86_64) >> @@ -91,6 +91,9 @@ TEST_FILES := test_vmalloc.sh >> KSFT_KHDR_INSTALL := 1 >> include ../lib.mk >> >> +$(OUTPUT)/madv_populate: vm_util.c >> +$(OUTPUT)/split_huge_page_test: vm_util.c >> + > > > [...] > >> +// SPDX-License-Identifier: GPL-2.0 >> +#include <stdbool.h> >> +#include <string.h> >> +#include "vm_util.h" >> + >> +uint64_t pagemap_get_entry(int fd, char *start) >> +{ >> + const unsigned long pfn = (unsigned long)start / getpagesize(); >> + uint64_t entry; >> + int ret; >> + >> + ret = pread(fd, &entry, sizeof(entry), pfn * sizeof(entry)); >> + if (ret != sizeof(entry)) >> + ksft_exit_fail_msg("reading pagemap failed\n"); >> + return entry; >> +} >> + >> +bool pagemap_is_softdirty(int fd, char *start) >> +{ >> + uint64_t entry = pagemap_get_entry(fd, start); >> + >> + return ((entry >> DIRTY_BIT_LOCATION) & 1); >> +} > > Please leave code you're moving around as untouched as possible to avoid > unrelated bugs that happen by mistake and are hard to review. > >> + >> +void clear_softdirty(void) >> +{ >> + int ret; >> + const char *ctrl = "4"; >> + int fd = open("/proc/self/clear_refs", O_WRONLY); >> + >> + if (fd < 0) >> + ksft_exit_fail_msg("opening clear_refs failed\n"); >> + ret = write(fd, ctrl, strlen(ctrl)); >> + close(fd); >> + if (ret != strlen(ctrl)) >> + ksft_exit_fail_msg("writing clear_refs failed\n"); >> +} >> + >> + >> +static bool check_for_pattern(FILE *fp, const char *pattern, char *buf) >> +{ >> + while (fgets(buf, MAX_LINE_LENGTH, fp) != NULL) { >> + if (!strncmp(buf, pattern, strlen(pattern))) >> + return true; >> + } >> + return false; >> +} >> + >> +uint64_t read_pmd_pagesize(void) >> +{ >> + int fd; >> + char buf[20]; >> + ssize_t num_read; >> + >> + fd = open(PMD_SIZE, O_RDONLY); >> + if (fd == -1) >> + ksft_exit_fail_msg("Open hpage_pmd_size failed\n"); >> + >> + num_read = read(fd, buf, 19); >> + if (num_read < 1) { >> + close(fd); >> + ksft_exit_fail_msg("Read hpage_pmd_size failed\n"); >> + } >> + buf[num_read] = '\0'; >> + close(fd); >> + >> + return strtoul(buf, NULL, 10); >> +} >> + >> +uint64_t check_huge(void *addr) >> +{ >> + uint64_t thp = 0; >> + int ret; >> + FILE *fp; >> + char buffer[MAX_LINE_LENGTH]; >> + char addr_pattern[MAX_LINE_LENGTH]; >> + >> + ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "%08lx-", >> + (unsigned long) addr); >> + if (ret >= MAX_LINE_LENGTH) >> + ksft_exit_fail_msg("%s: Pattern is too long\n", __func__); >> + >> + fp = fopen(SMAP, "r"); >> + if (!fp) >> + ksft_exit_fail_msg("%s: Failed to open file %s\n", __func__, SMAP); >> + >> + if (!check_for_pattern(fp, addr_pattern, buffer)) >> + goto err_out; >> + >> + /* >> + * Fetch the AnonHugePages: in the same block and check the number of >> + * hugepages. >> + */ >> + if (!check_for_pattern(fp, "AnonHugePages:", buffer)) >> + goto err_out; >> + >> + if (sscanf(buffer, "AnonHugePages:%10ld kB", &thp) != 1) >> + ksft_exit_fail_msg("Reading smap error\n"); >> + >> +err_out: >> + fclose(fp); >> + return thp; >> +} >> diff --git a/tools/testing/selftests/vm/vm_util.h b/tools/testing/selftests/vm/vm_util.h >> new file mode 100644 >> index 0000000000000..7522dbb859f0f >> --- /dev/null >> +++ b/tools/testing/selftests/vm/vm_util.h >> @@ -0,0 +1,15 @@ >> +/* SPDX-License-Identifier: GPL-2.0 */ >> +#include <stdint.h> >> +#include <fcntl.h> >> +#include "../kselftest.h" >> + >> +#define PMD_SIZE "/sys/kernel/mm/transparent_hugepage/hpage_pmd_size" > > Ehm no. PMD_SIZE_PATH at best -- just as it used to. > >> +#define SMAP "/proc/self/smaps" > > SMAPS_PATH > >> +#define DIRTY_BIT_LOCATION 55 > > Please inline that just as it used to. There is no value in a magic > define without any proper namespace. > >> +#define MAX_LINE_LENGTH 512 > > This used to be 500. Why the change? > > > Also: weird indentation and these all look like the should go into > vm_util.c. They are not used outside that file. > > >
On 3/16/22 1:53 AM, Gabriel Krisman Bertazi wrote: > Muhammad Usama Anjum <usama.anjum@collabora.com> writes: > >> From: Gabriel Krisman Bertazi <krisman@collabora.com> > > Hi Usama, > > Please, cc me on the whole thread. I didn't get the patch 1/2 or the > cover letter. > Sorry, I'll correct it. >> This introduces three tests: >> 1) Sanity check soft dirty basic semantics: allocate area, clean, dirty, >> check if the SD bit is flipped. >> 2) Check VMA reuse: validate the VM_SOFTDIRTY usage >> 3) Check soft-dirty on huge pages >> >> This was motivated by Will Deacon's fix commit 912efa17e512 ("mm: proc: >> Invalidate TLB after clearing soft-dirty page state"). I was tracking the >> same issue that he fixed, and this test would have caught it. >> >> CC: Will Deacon <will@kernel.org> >> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com> >> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> >> --- >> V3 of this patch is in Andrew's tree. Please drop that. > > v3 is still in linux-next and this note is quite hidden in the middle of > the commit message. I've tried to put this message at the top of the changelog. I can add "Note" in the start of it. What can be some other way to highlight this kind of important message? >> >> Changes in V4: >> Cosmetic changes >> Removed global variables >> Replaced ksft_print_msg with ksft_exit_fail_msg to exit the program at >> once >> Some other minor changes >> Correct the authorship of the patch >> >> Tests of soft dirty bit in this patch and in madv_populate.c are >> non-overlapping. madv_populate.c has only one soft-dirty bit test in the >> context of different advise (MADV_POPULATE_READ and >> MADV_POPULATE_WRITE). This new test adds more tests. >> >> Tab width of 8 has been used to align the macros. This alignment may look >> odd in shell or email. But it looks alright in editors. > > I'm curious if you tested reverting 912efa17e512. Did the new versions > of this patch still catch the original issue? Yeah, it did after I reverted the patch and fixed build errors because of some function's signature change and one test failed and hence issue is caught: TAP version 13 1..5 # dirty bit was 0, but should be 1 (i=1) not ok 1 Test test_simple ok 2 Test test_vma_reuse reused memory location ok 3 Test test_vma_reuse dirty bit of previous page ok 4 # SKIP Test test_hugepage huge page allocation ok 5 # SKIP Test test_hugepage huge page dirty bit # Totals: pass:2 fail:1 xfail:0 xpass:0 skip:2 error:0 >> Test output: >> TAP version 13 >> 1..5 >> ok 1 Test test_simple >> ok 2 Test test_vma_reuse reused memory location >> ok 3 Test test_vma_reuse dirty bit of previous page >> ok 4 Test test_hugepage huge page allocation >> ok 5 Test test_hugepage huge page dirty bit >> # Totals: pass:5 fail:0 xfail:0 xpass:0 skip:0 error:0 >> >> Or >> >> TAP version 13 >> 1..5 >> ok 1 Test test_simple >> ok 2 Test test_vma_reuse reused memory location >> ok 3 Test test_vma_reuse dirty bit of previous page >> ok 4 # SKIP Test test_hugepage huge page allocation >> ok 5 # SKIP Test test_hugepage huge page dirty bit >> # Totals: pass:3 fail:0 xfail:0 xpass:0 skip:2 error:0 [..] >> + >> +#define PAGEMAP "/proc/self/pagemap" >> +#define CLEAR_REFS "/proc/self/clear_refs" >> +#define MAX_LINE_LENGTH 512 > > MAX_LINE_LENGTH is no longer used after check_for_pattern was dropped. > > Can't the previous defines and file handling functions also go the > vm_util.h? > I don't want to make changes in other two tests. I just want to move some functions which we need for this test into vm_util.h while keeping changes less. >> +#define TEST_ITERATIONS 10000 >> + >> +static void test_simple(int pagemap_fd, int pagesize) >> +{ >> + int i; >> + char *map; >> + >> + map = aligned_alloc(pagesize, pagesize); >> + if (!map) >> + ksft_exit_fail_msg("mmap failed\n"); >> + >> + clear_softdirty(); >> + >> + for (i = 0 ; i < TEST_ITERATIONS; i++) { >> + if (pagemap_is_softdirty(pagemap_fd, map) == 1) { >> + ksft_print_msg("dirty bit was 1, but should be 0 (i=%d)\n", i); >> + break; >> + } >> + >> + clear_softdirty(); >> + map[0]++; > > > This will overflow several times during TEST_ITERATIONS. While it is > not broken, since we care about causing the page fault, it is not > obvious. Can you add a comment or do something like this instead? > > map[0] = !map[0]; Yeah, it is less obvious. I'll add a comment
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index 5e43f072f5b76..4e68edb26d6b6 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -34,7 +34,7 @@ TEST_GEN_FILES += hugepage-mremap TEST_GEN_FILES += hugepage-shm TEST_GEN_FILES += hugepage-vmemmap TEST_GEN_FILES += khugepaged -TEST_GEN_FILES += madv_populate +TEST_GEN_PROGS = madv_populate TEST_GEN_FILES += map_fixed_noreplace TEST_GEN_FILES += map_hugetlb TEST_GEN_FILES += map_populate @@ -47,7 +47,7 @@ TEST_GEN_FILES += on-fault-limit TEST_GEN_FILES += thuge-gen TEST_GEN_FILES += transhuge-stress TEST_GEN_FILES += userfaultfd -TEST_GEN_FILES += split_huge_page_test +TEST_GEN_PROGS += split_huge_page_test TEST_GEN_FILES += ksm_tests ifeq ($(MACHINE),x86_64) @@ -91,6 +91,9 @@ TEST_FILES := test_vmalloc.sh KSFT_KHDR_INSTALL := 1 include ../lib.mk +$(OUTPUT)/madv_populate: vm_util.c +$(OUTPUT)/split_huge_page_test: vm_util.c + ifeq ($(MACHINE),x86_64) BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32)) BINARIES_64 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_64)) diff --git a/tools/testing/selftests/vm/madv_populate.c b/tools/testing/selftests/vm/madv_populate.c index 3ee0e82756002..715a42e8e2cdb 100644 --- a/tools/testing/selftests/vm/madv_populate.c +++ b/tools/testing/selftests/vm/madv_populate.c @@ -18,6 +18,7 @@ #include <sys/mman.h> #include "../kselftest.h" +#include "vm_util.h" /* * For now, we're using 2 MiB of private anonymous memory for all tests. @@ -26,18 +27,6 @@ static size_t pagesize; -static uint64_t pagemap_get_entry(int fd, char *start) -{ - const unsigned long pfn = (unsigned long)start / pagesize; - uint64_t entry; - int ret; - - ret = pread(fd, &entry, sizeof(entry), pfn * sizeof(entry)); - if (ret != sizeof(entry)) - ksft_exit_fail_msg("reading pagemap failed\n"); - return entry; -} - static bool pagemap_is_populated(int fd, char *start) { uint64_t entry = pagemap_get_entry(fd, start); @@ -46,13 +35,6 @@ static bool pagemap_is_populated(int fd, char *start) return entry & 0xc000000000000000ull; } -static bool pagemap_is_softdirty(int fd, char *start) -{ - uint64_t entry = pagemap_get_entry(fd, start); - - return entry & 0x0080000000000000ull; -} - static void sense_support(void) { char *addr; @@ -258,20 +240,6 @@ static bool range_is_not_softdirty(char *start, ssize_t size) return ret; } -static void clear_softdirty(void) -{ - int fd = open("/proc/self/clear_refs", O_WRONLY); - const char *ctrl = "4"; - int ret; - - if (fd < 0) - ksft_exit_fail_msg("opening clear_refs failed\n"); - ret = write(fd, ctrl, strlen(ctrl)); - if (ret != strlen(ctrl)) - ksft_exit_fail_msg("writing clear_refs failed\n"); - close(fd); -} - static void test_softdirty(void) { char *addr; diff --git a/tools/testing/selftests/vm/split_huge_page_test.c b/tools/testing/selftests/vm/split_huge_page_test.c index 52497b7b9f1db..b6b381611fb6d 100644 --- a/tools/testing/selftests/vm/split_huge_page_test.c +++ b/tools/testing/selftests/vm/split_huge_page_test.c @@ -16,6 +16,7 @@ #include <sys/mount.h> #include <malloc.h> #include <stdbool.h> +#include "vm_util.h" uint64_t pagesize; unsigned int pageshift; @@ -51,30 +52,6 @@ int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file) return 0; } - -static uint64_t read_pmd_pagesize(void) -{ - int fd; - char buf[20]; - ssize_t num_read; - - fd = open(PMD_SIZE_PATH, O_RDONLY); - if (fd == -1) { - perror("Open hpage_pmd_size failed"); - exit(EXIT_FAILURE); - } - num_read = read(fd, buf, 19); - if (num_read < 1) { - close(fd); - perror("Read hpage_pmd_size failed"); - exit(EXIT_FAILURE); - } - buf[num_read] = '\0'; - close(fd); - - return strtoul(buf, NULL, 10); -} - static int write_file(const char *path, const char *buf, size_t buflen) { int fd; @@ -113,58 +90,6 @@ static void write_debugfs(const char *fmt, ...) } } -#define MAX_LINE_LENGTH 500 - -static bool check_for_pattern(FILE *fp, const char *pattern, char *buf) -{ - while (fgets(buf, MAX_LINE_LENGTH, fp) != NULL) { - if (!strncmp(buf, pattern, strlen(pattern))) - return true; - } - return false; -} - -static uint64_t check_huge(void *addr) -{ - uint64_t thp = 0; - int ret; - FILE *fp; - char buffer[MAX_LINE_LENGTH]; - char addr_pattern[MAX_LINE_LENGTH]; - - ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "%08lx-", - (unsigned long) addr); - if (ret >= MAX_LINE_LENGTH) { - printf("%s: Pattern is too long\n", __func__); - exit(EXIT_FAILURE); - } - - - fp = fopen(SMAP_PATH, "r"); - if (!fp) { - printf("%s: Failed to open file %s\n", __func__, SMAP_PATH); - exit(EXIT_FAILURE); - } - if (!check_for_pattern(fp, addr_pattern, buffer)) - goto err_out; - - /* - * Fetch the AnonHugePages: in the same block and check the number of - * hugepages. - */ - if (!check_for_pattern(fp, "AnonHugePages:", buffer)) - goto err_out; - - if (sscanf(buffer, "AnonHugePages:%10ld kB", &thp) != 1) { - printf("Reading smap error\n"); - exit(EXIT_FAILURE); - } - -err_out: - fclose(fp); - return thp; -} - void split_pmd_thp(void) { char *one_page; diff --git a/tools/testing/selftests/vm/vm_util.c b/tools/testing/selftests/vm/vm_util.c new file mode 100644 index 0000000000000..c946e04df9236 --- /dev/null +++ b/tools/testing/selftests/vm/vm_util.c @@ -0,0 +1,103 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <string.h> +#include "vm_util.h" + +uint64_t pagemap_get_entry(int fd, char *start) +{ + const unsigned long pfn = (unsigned long)start / getpagesize(); + uint64_t entry; + int ret; + + ret = pread(fd, &entry, sizeof(entry), pfn * sizeof(entry)); + if (ret != sizeof(entry)) + ksft_exit_fail_msg("reading pagemap failed\n"); + return entry; +} + +bool pagemap_is_softdirty(int fd, char *start) +{ + uint64_t entry = pagemap_get_entry(fd, start); + + return ((entry >> DIRTY_BIT_LOCATION) & 1); +} + +void clear_softdirty(void) +{ + int ret; + const char *ctrl = "4"; + int fd = open("/proc/self/clear_refs", O_WRONLY); + + if (fd < 0) + ksft_exit_fail_msg("opening clear_refs failed\n"); + ret = write(fd, ctrl, strlen(ctrl)); + close(fd); + if (ret != strlen(ctrl)) + ksft_exit_fail_msg("writing clear_refs failed\n"); +} + + +static bool check_for_pattern(FILE *fp, const char *pattern, char *buf) +{ + while (fgets(buf, MAX_LINE_LENGTH, fp) != NULL) { + if (!strncmp(buf, pattern, strlen(pattern))) + return true; + } + return false; +} + +uint64_t read_pmd_pagesize(void) +{ + int fd; + char buf[20]; + ssize_t num_read; + + fd = open(PMD_SIZE, O_RDONLY); + if (fd == -1) + ksft_exit_fail_msg("Open hpage_pmd_size failed\n"); + + num_read = read(fd, buf, 19); + if (num_read < 1) { + close(fd); + ksft_exit_fail_msg("Read hpage_pmd_size failed\n"); + } + buf[num_read] = '\0'; + close(fd); + + return strtoul(buf, NULL, 10); +} + +uint64_t check_huge(void *addr) +{ + uint64_t thp = 0; + int ret; + FILE *fp; + char buffer[MAX_LINE_LENGTH]; + char addr_pattern[MAX_LINE_LENGTH]; + + ret = snprintf(addr_pattern, MAX_LINE_LENGTH, "%08lx-", + (unsigned long) addr); + if (ret >= MAX_LINE_LENGTH) + ksft_exit_fail_msg("%s: Pattern is too long\n", __func__); + + fp = fopen(SMAP, "r"); + if (!fp) + ksft_exit_fail_msg("%s: Failed to open file %s\n", __func__, SMAP); + + if (!check_for_pattern(fp, addr_pattern, buffer)) + goto err_out; + + /* + * Fetch the AnonHugePages: in the same block and check the number of + * hugepages. + */ + if (!check_for_pattern(fp, "AnonHugePages:", buffer)) + goto err_out; + + if (sscanf(buffer, "AnonHugePages:%10ld kB", &thp) != 1) + ksft_exit_fail_msg("Reading smap error\n"); + +err_out: + fclose(fp); + return thp; +} diff --git a/tools/testing/selftests/vm/vm_util.h b/tools/testing/selftests/vm/vm_util.h new file mode 100644 index 0000000000000..7522dbb859f0f --- /dev/null +++ b/tools/testing/selftests/vm/vm_util.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <stdint.h> +#include <fcntl.h> +#include "../kselftest.h" + +#define PMD_SIZE "/sys/kernel/mm/transparent_hugepage/hpage_pmd_size" +#define SMAP "/proc/self/smaps" +#define DIRTY_BIT_LOCATION 55 +#define MAX_LINE_LENGTH 512 + +uint64_t pagemap_get_entry(int fd, char *start); +bool pagemap_is_softdirty(int fd, char *start); +void clear_softdirty(void); +uint64_t read_pmd_pagesize(void); +uint64_t check_huge(void *addr);
Bring common functions to a new file. These functions can be used in the new tests. This helps in code duplication. Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> --- tools/testing/selftests/vm/Makefile | 7 +- tools/testing/selftests/vm/madv_populate.c | 34 +----- .../selftests/vm/split_huge_page_test.c | 77 +------------ tools/testing/selftests/vm/vm_util.c | 103 ++++++++++++++++++ tools/testing/selftests/vm/vm_util.h | 15 +++ 5 files changed, 125 insertions(+), 111 deletions(-) create mode 100644 tools/testing/selftests/vm/vm_util.c create mode 100644 tools/testing/selftests/vm/vm_util.h