selftests-vm-gup_test-introduce-the-dump_pages-sub-test.patch removed from -mm tree
The patch titled
Subject: selftests/vm: gup_test: introduce the dump_pages() sub-test
has been removed from the -mm tree. Its filename was
selftests-vm-gup_test-introduce-the-dump_pages-sub-test.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: John Hubbard <[email protected]>
Subject: selftests/vm: gup_test: introduce the dump_pages() sub-test
For quite a while, I was doing a quick hack to gup_test.c (previously, gup_benchmark.c) whenever I wanted to try out my changes to dump_page(). This makes that hack unnecessary, and instead allows anyone to easily get the same coverage from a user space program. That saves a lot of time because you don't have to change the kernel, in order to test different pages and options.
The new sub-test takes advantage of the existing gup_test infrastructure, which already provides a simple user space program, some allocated user space pages, an ioctl call, pinning of those pages (via either get_user_pages or pin_user_pages) and a corresponding kernel-side test invocation. There's not much more required, mainly just a couple of inputs from the user.
In fact, the new test re-uses the existing command line options in order to get various helpful combinations (THP or normal, _fast or slow gup, gup vs. pup, and more).
New command line options are: which pages to dump, and what type of "get/pin" to use.
In order to figure out which pages to dump, the logic is:
* If the user doesn't specify anything, the page 0 (the first page in the address range that the program sets up for testing) is dumped.
* Or, the user can type up to 8 page indices anywhere on the command line. If you type more than 8, then it uses the first 8 and ignores the remaining items.
For example:
./gup_test -ct -F 1 0 19 0x1000
Meaning:
-c: dump pages sub-test
-t: use THP pages
-F 1: use pin_user_pages() instead of get_user_pages()
0 19 0x1000: dump pages 0, 19, and 4096---
mm/Kconfig | 6 ++ mm/gup_test.c | 56 +++++++++++++++++++++++- mm/gup_test.h | 10 ++++ tools/testing/selftests/vm/gup_test.c | 45 ++++++++++++++++++- 4 files changed, 113 insertions(+), 4 deletions(-)
mm/gup_test.c renamed from mm/gup_test.c~selftests-vm-gup_test-introduce-the-dump_pages-sub-test +54 -2
@@ -7,7 +7,7 @@#include "gup_test.h" static void put_back_pages (unsigned int cmd,struct page **pages, -unsigned long nr_pages) +unsigned long nr_pages,unsigned int gup_test_flags) {unsigned long i;
@@ -23,6 +23,15 @@ static void put_back_pages(unsigned intcase PIN_LONGTERM_BENCHMARK :unpin_user_pages (pages, nr_pages);break ; +case DUMP_USER_PAGES_TEST : +if (gup_test_flags &GUP_TEST_FLAG_DUMP_PAGES_USE_PIN ) { +unpin_user_pages (pages, nr_pages); + }else { +for (i =0 ; i < nr_pages; i++) +put_page (pages[i]); + + } +break ; } }
@@ -49,6 +58,37 @@ static void verify_dma_pinned(unsigned i } } +static void dump_pages_test (struct gup_test *gup,struct page **pages, +unsigned long nr_pages) +{ +unsigned int index_to_dump; +unsigned int i; + +/* +* Zero out any user-supplied page index that is out of range. Remember: +* .which_pages[] contains a 1-based set of page indices. +*/ +for (i =0 ; i <GUP_TEST_MAX_PAGES_TO_DUMP ; i++) { +if (gup->which_pages[i] > nr_pages) { +pr_warn ("ZEROING due to out of range: .which_pages[%u]: %u\n" , + i, gup->which_pages[i]); + gup->which_pages[i] =0 ; + } + } + +for (i =0 ; i <GUP_TEST_MAX_PAGES_TO_DUMP ; i++) { + index_to_dump = gup->which_pages[i]; + +if (index_to_dump) { + index_to_dump--;// Decode from 1-based, to 0-based +pr_info ("---- page #%u, starting from user virt addr: 0x%llx\n" , + index_to_dump, gup->addr); +dump_page (pages[index_to_dump], +"gup_test: dump_pages() test" ); + } + } +} +static int __gup_test_ioctl (unsigned int cmd,struct gup_test *gup) {
@@ -111,6 +151,14 @@ static int __gup_test_ioctl(unsigned int gup->flags |FOLL_LONGTERM , pages + i, NULL);break ; +case DUMP_USER_PAGES_TEST : +if (gup->flags &GUP_TEST_FLAG_DUMP_PAGES_USE_PIN ) + nr =pin_user_pages (addr, nr, gup->flags, + pages + i,NULL ); +else + nr =get_user_pages (addr, nr, gup->flags, + pages + i,NULL ); +break ;default : ret = -EINVAL ; goto unlock;
@@ -134,9 +182,12 @@ static int __gup_test_ioctl(unsigned int*/ verify_dma_pinned (cmd, pages, nr_pages); +if (cmd ==DUMP_USER_PAGES_TEST ) +dump_pages_test (gup, pages, nr_pages); + start_time =ktime_get (); -put_back_pages (cmd, pages, nr_pages); +put_back_pages (cmd, pages, nr_pages, gup->flags); end_time =ktime_get (); gup->put_delta_usec =ktime_us_delta (end_time, start_time);
@@ -161,6 +212,7 @@ static long gup_test_ioctl(struct file *case PIN_LONGTERM_BENCHMARK :case GUP_BASIC_TEST :case PIN_BASIC_TEST : +case DUMP_USER_PAGES_TEST :break ;default :return -EINVAL ;
mm/gup_test.h renamed from mm/gup_test.h~selftests-vm-gup_test-introduce-the-dump_pages-sub-test +10 -0
@@ -9,6 +9,11 @@#define PIN_LONGTERM_BENCHMARK _IOWR('g', 3, struct gup_test)#define GUP_BASIC_TEST _IOWR('g', 4, struct gup_test)#define PIN_BASIC_TEST _IOWR('g', 5, struct gup_test) +#define DUMP_USER_PAGES_TEST _IOWR('g', 6, struct gup_test) + +#define GUP_TEST_MAX_PAGES_TO_DUMP 8 + +#define GUP_TEST_FLAG_DUMP_PAGES_USE_PIN 0x1struct gup_test {__u64 get_delta_usec;
@@ -17,6 +22,11 @@ struct gup_test {__u64 size;__u32 nr_pages_per_call;__u32 flags; +/* +* Each non-zero entry is the number of the page (1-based: first page is +* page 1, so that zero entries mean "do nothing") from the .addr base. +*/ + __u32 which_pages[GUP_TEST_MAX_PAGES_TO_DUMP]; };#endif /* __GUP_TEST_H */
mm/Kconfig renamed from mm/Kconfig~selftests-vm-gup_test-introduce-the-dump_pages-sub-test +6 -0
@@ -832,6 +832,12 @@ config GUP_TEST get_user_pages*() and pin_user_pages*(), as well as smoke tests of the non-_fast variants. + There is also a sub-test that allows running dump_page() on any + of up to eight pages (selected by command line args) within the + range of user-space addresses. These pages are either pinned via + pin_user_pages*(), or pinned via get_user_pages*(), as specified + by other command line arguments. + See tools/testing/selftests/vm/gup_test.c config GUP_GET_PTE_LOW_HIGH
tools/testing/selftests/vm/gup_test.c renamed from tools/testing/selftests/vm/gup_test.c~selftests-vm-gup_test-introduce-the-dump_pages-sub-test +43 -2
75 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are
secretmem-test-add-basic-selftest-for-memfd_secret2-fix.patch