October 2020 - Linux-kselftest-mirror

[PATCH v2 0/8] selftests/vm: gup_test, hmm-tests, assorted improvements

by John Hubbard

Changes since v1: * check_config.sh now invokes the compiler via the Makefile's ($CC), thanks to Jason Gunthorpe for calling that out. * Removed a misleading sentence from patch #6, as identified by Ira Weiny. * Removed a forward-looking sentence, about using -lpthread in gup_test.c soon, from the commit message in patch #4, since I'm not yet sure if my local pthread-based stress tests are actually worthwhile or not. Original cover letter, still accurate at this point: This is based on the latest mmotm. Summary: This series provides two main things, and a number of smaller supporting goodies. The two main points are: 1) Add a new sub-test to gup_test, which in turn is a renamed version of gup_benchmark. This sub-test allows nicer testing of dump_pages(), at least on user-space pages. For quite a while, I was doing a quick hack to gup_test.c whenever I wanted to try out changes to dump_page(). Then Matthew Wilcox asked me what I meant when I said "I used my dump_page() unit test", and I realized that it might be nice to check in a polished up version of that. Details about how it works and how to use it are in the commit description for patch #6. 2) Fixes a limitation of hmm-tests: these tests are incredibly useful, but only if people actually build and run them. And it turns out that libhugetlbfs is a little too effective at throwing a wrench in the works, there. So I've added a little configuration check that removes just two of the 21 hmm-tests, if libhugetlbfs is not available. Further details in the commit description of patch #8. Other smaller things that this series does: a) Remove code duplication by creating gup_test.h. b) Clear up the sub-test organization, and their invocation within run_vmtests.sh. c) Other minor assorted improvements. John Hubbard (8): mm/gup_benchmark: rename to mm/gup_test selftests/vm: use a common gup_test.h selftests/vm: rename run_vmtests --> run_vmtests.sh selftests/vm: minor cleanup: Makefile and gup_test.c selftests/vm: only some gup_test items are really benchmarks selftests/vm: gup_test: introduce the dump_pages() sub-test selftests/vm: run_vmtest.sh: update and clean up gup_test invocation selftests/vm: hmm-tests: remove the libhugetlbfs dependency Documentation/core-api/pin_user_pages.rst | 6 +- arch/s390/configs/debug_defconfig | 2 +- arch/s390/configs/defconfig | 2 +- mm/Kconfig | 21 +- mm/Makefile | 2 +- mm/{gup_benchmark.c => gup_test.c} | 109 ++++++---- mm/gup_test.h | 32 +++ tools/testing/selftests/vm/.gitignore | 3 +- tools/testing/selftests/vm/Makefile | 38 +++- tools/testing/selftests/vm/check_config.sh | 31 +++ tools/testing/selftests/vm/config | 2 +- tools/testing/selftests/vm/gup_benchmark.c | 137 ------------- tools/testing/selftests/vm/gup_test.c | 188 ++++++++++++++++++ tools/testing/selftests/vm/hmm-tests.c | 10 +- .../vm/{run_vmtests => run_vmtest.sh} | 24 ++- 15 files changed, 404 insertions(+), 203 deletions(-) rename mm/{gup_benchmark.c => gup_test.c} (59%) create mode 100644 mm/gup_test.h create mode 100755 tools/testing/selftests/vm/check_config.sh delete mode 100644 tools/testing/selftests/vm/gup_benchmark.c create mode 100644 tools/testing/selftests/vm/gup_test.c rename tools/testing/selftests/vm/{run_vmtests => run_vmtest.sh} (91%) -- 2.28.0

4 years, 2 months

2
10
0 0

Re: [PATCH v2 1/6] kselftests: vm: Add mremap tests

by Kalesh Singh

On Sat, Oct 3, 2020 at 3:13 AM John Hubbard <jhubbard(a)nvidia.com> wrote: > > On 10/2/20 9:20 AM, Kalesh Singh wrote: > > Test mremap on regions of various sizes and alignments and validate > > data after remapping. Also provide total time for remapping > > the region which is useful for performance comparison of the mremap > > optimizations that move pages at the PMD/PUD levels if HAVE_MOVE_PMD > > and/or HAVE_MOVE_PUD are enabled. > > > > Signed-off-by: Kalesh Singh <kaleshsingh(a)google.com> > > --- > > Changes in v2: > > - Reduce test time by only validating a certain threshold of the > > remapped region (4MB by default). The -t flag can be used to > > set a custom threshold in MB or no threshold by passing 0. (-t0). > > mremap time is not provided in stdout for only partially validated > > regions. This time is only applicable for comparison if the entire > > mapped region was faulted in. > > - Use a random pattern for validating the remapped region. The -p > > flag can be used to run the tests with a specified seed for the > > random pattern. > > - Print test configs (threshold_mb and pattern_seed) to stdout. > > - Remove MAKE_SIMPLE_TEST macro. > > - Define named flags instead of 0 / 1. > > - Add comments for destination address' align_mask and offset. > > Thanks for making those changes. This all looks much nicer, both in the > code and on the screen. Now it's easy to see which code generates which > output, and the tests are readable. The new comments are also helpful. > > I ran it locally and it came in at 0.6 sec, so that looks good. > > A remaining nit: there are lots of > 80 col lines here. Only those lines > that contain printf output strings really need to be extra-long. The > others can all be easily made to fit. Thanks for the review John. I can fix the lines that don't need to be >80 col. FWIW checkpatch now allows 100 col lines: https://lore.kernel.org/r/9c360bfa43580ce7726dd3d9d247f1216a690ef0.camel@pe… > > ... > > + > > +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > > +#define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) > > > Not really a comment on this patch, but: at least two other test suites > in selftests/ have had to recreate MIN() or min(), and probably a few > other common things as well. It would be nice to gather up some of these > common things into one of the shared header files in selftests/. > > I'm certainly not saying that this patchset has that responsibility, > though. Just pointing it out in case someone has a moment to clean up a > few here and there. Thanks for pointing this out. I'll leave it as a task for a separate patch if time permits or no one gets around to it before :-) > > I'll assume that any changes to make things fit within 80 cols are > trivial, so you can add: > > Reviewed-by: John Hubbard <jhubbard(a)nvidia.com> > > thanks, > -- > John Hubbard > NVIDIA > > > + > > +struct config { > > + unsigned long long src_alignment; > > + unsigned long long dest_alignment; > > + unsigned long long region_size; > > + int overlapping; > > +}; > > + > > +struct test { > > + const char *name; > > + struct config config; > > + int expect_failure; > > +}; > > + > > +enum { > > + _1KB = 1ULL << 10, /* 1KB -> not page aligned */ > > + _4KB = 4ULL << 10, > > + _8KB = 8ULL << 10, > > + _1MB = 1ULL << 20, > > + _2MB = 2ULL << 20, > > + _4MB = 4ULL << 20, > > + _1GB = 1ULL << 30, > > + _2GB = 2ULL << 30, > > + PTE = _4KB, > > + PMD = _2MB, > > + PUD = _1GB, > > +}; > > + > > +#define MAKE_TEST(source_align, destination_align, size, \ > > + overlaps, should_fail, test_name) \ > > +{ \ > > + .name = test_name, \ > > + .config = { \ > > + .src_alignment = source_align, \ > > + .dest_alignment = destination_align, \ > > + .region_size = size, \ > > + .overlapping = overlaps, \ > > + }, \ > > + .expect_failure = should_fail \ > > +} > > + > > +/* > > + * Returns the start address of the mapping on success, else returns > > + * NULL on failure. > > + */ > > +static void *get_source_mapping(struct config c) > > +{ > > + unsigned long long addr = 0ULL; > > + void *src_addr = NULL; > > +retry: > > + addr += c.src_alignment; > > + src_addr = mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE, > > + MAP_FIXED | MAP_ANONYMOUS | MAP_SHARED, -1, 0); > > + if (src_addr == MAP_FAILED) { > > + if (errno == EPERM) > > + goto retry; > > + goto error; > > + } > > + /* > > + * Check that the address is aligned to the specified alignment. Addresses > > + * which have alignments that are multiples of that specified are not considered > > + * valid. For instance, 1GB address is 2MB-aligned, however it will not be > > + * considered valid for a requested alignment of 2MB. This is done to > > + * reduce coincidental alignment in the tests. > > + */ > > + if (((unsigned long long) src_addr & (c.src_alignment - 1)) || > > + !((unsigned long long) src_addr & c.src_alignment)) > > + goto retry; > > + > > + if (!src_addr) > > + goto error; > > + > > + return src_addr; > > +error: > > + ksft_print_msg("Failed to map source region: %s\n", > > + strerror(errno)); > > + return NULL; > > +} > > + > > +/* Returns the time taken for the remap on success else returns -1. */ > > +static long long remap_region(struct config c, unsigned int threshold_mb, > > + char pattern_seed) > > +{ > > + void *addr, *src_addr, *dest_addr; > > + unsigned long long i; > > + struct timespec t_start = {0, 0}, t_end = {0, 0}; > > + long long start_ns, end_ns, align_mask, ret, offset; > > + unsigned long long threshold; > > + > > + if (threshold_mb == VALIDATION_NO_THRESHOLD) > > + threshold = c.region_size; > > + else > > + threshold = MIN(threshold_mb * _1MB, c.region_size); > > + > > + src_addr = get_source_mapping(c); > > + if (!src_addr) { > > + ret = -1; > > + goto out; > > + } > > + > > + /* Set byte pattern */ > > + srand(pattern_seed); > > + for (i = 0; i < threshold; i++) > > + memset((char *) src_addr + i, (char) rand(), 1); > > + > > + /* Mask to zero out lower bits of address for alignment */ > > + align_mask = ~(c.dest_alignment - 1); > > + /* Offset of destination address from the end of the source region */ > > + offset = (c.overlapping) ? -c.dest_alignment : c.dest_alignment; > > + addr = (void *) (((unsigned long long) src_addr + c.region_size + offset) > > + & align_mask); > > + > > + /* See comment in get_source_mapping() */ > > + if (!((unsigned long long) addr & c.dest_alignment)) > > + addr = (void *) ((unsigned long long) addr | c.dest_alignment); > > + > > + clock_gettime(CLOCK_MONOTONIC, &t_start); > > + dest_addr = mremap(src_addr, c.region_size, c.region_size, > > + MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); > > + clock_gettime(CLOCK_MONOTONIC, &t_end); > > + > > + if (dest_addr == MAP_FAILED) { > > + ksft_print_msg("mremap failed: %s\n", strerror(errno)); > > + ret = -1; > > + goto clean_up_src; > > + } > > + > > + /* Verify byte pattern after remapping */ > > + srand(pattern_seed); > > + for (i = 0; i < threshold; i++) { > > + char c = (char) rand(); > > + > > + if (((char *) dest_addr)[i] != c) { > > + ksft_print_msg("Data after remap doesn't match at offset %d\n", > > + i); > > + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, > > + ((char *) dest_addr)[i] & 0xff); > > + ret = -1; > > + goto clean_up_dest; > > + } > > + } > > + > > + start_ns = t_start.tv_sec * NS_PER_SEC + t_start.tv_nsec; > > + end_ns = t_end.tv_sec * NS_PER_SEC + t_end.tv_nsec; > > + ret = end_ns - start_ns; > > + > > +/* > > + * Since the destination address is specified using MREMAP_FIXED, subsequent mremap will unmap any > > + * previous mapping at the address range specified by dest_addr and region_size. This significantly > > + * affects the remap time of subsequent tests. So we clean up mappings after each test. > > + */ > > +clean_up_dest: > > + munmap(dest_addr, c.region_size); > > +clean_up_src: > > + munmap(src_addr, c.region_size); > > +out: > > + return ret; > > +} > > + > > +static void run_mremap_test_case(struct test test_case, int *failures, unsigned int threshold_mb, > > + unsigned int pattern_seed) > > +{ > > + long long remap_time = remap_region(test_case.config, threshold_mb, pattern_seed); > > + > > + if (remap_time < 0) { > > + if (test_case.expect_failure) > > + ksft_test_result_pass("%s\n\tExpected mremap failure\n", test_case.name); > > + else { > > + ksft_test_result_fail("%s\n", test_case.name); > > + *failures += 1; > > + } > > + } else { > > + /* Comparing mremap time is only applicable if entire region was faulted in */ > > + if (threshold_mb == VALIDATION_NO_THRESHOLD || > > + test_case.config.region_size <= threshold_mb * _1MB) > > + ksft_test_result_pass("%s\n\tmremap time: %12lldns\n", > > + test_case.name, remap_time); > > + else > > + ksft_test_result_pass("%s\n", test_case.name); > > + } > > +} > > + > > +static void usage(const char *cmd) > > +{ > > + fprintf(stderr, > > + "Usage: %s [[-t <threshold_mb>] [-p <pattern_seed>]]\n" > > + "-t\t only validate threshold_mb of the remapped region\n" > > + " \t if 0 is supplied no threshold is used; all tests\n" > > + " \t are run and remapped regions validated fully.\n" > > + " \t The default threshold used is 4MB.\n" > > + "-p\t provide a seed to generate the random pattern for\n" > > + " \t validating the remapped region.\n", cmd); > > +} > > + > > +static int parse_args(int argc, char **argv, unsigned int *threshold_mb, > > + unsigned int *pattern_seed) > > +{ > > + const char *optstr = "t:p:"; > > + int opt; > > + > > + while ((opt = getopt(argc, argv, optstr)) != -1) { > > + switch (opt) { > > + case 't': > > + *threshold_mb = atoi(optarg); > > + break; > > + case 'p': > > + *pattern_seed = atoi(optarg); > > + break; > > + default: > > + usage(argv[0]); > > + return -1; > > + } > > + } > > + > > + if (optind < argc) { > > + usage(argv[0]); > > + return -1; > > + } > > + > > + return 0; > > +} > > + > > +int main(int argc, char **argv) > > +{ > > + int failures = 0; > > + int i, run_perf_tests; > > + unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; > > + unsigned int pattern_seed; > > + time_t t; > > + > > + pattern_seed = (unsigned int) time(&t); > > + > > + if (parse_args(argc, argv, &threshold_mb, &pattern_seed) < 0) > > + exit(EXIT_FAILURE); > > + > > + ksft_print_msg("Test configs:\n\tthreshold_mb=%u\n\tpattern_seed=%u\n\n", > > + threshold_mb, pattern_seed); > > + > > + struct test test_cases[] = { > > + /* Expected mremap failures */ > > + MAKE_TEST(_4KB, _4KB, _4KB, OVERLAPPING, EXPECT_FAILURE, > > + "mremap - Source and Destination Regions Overlapping"), > > + MAKE_TEST(_4KB, _1KB, _4KB, NON_OVERLAPPING, EXPECT_FAILURE, > > + "mremap - Destination Address Misaligned (1KB-aligned)"), > > + MAKE_TEST(_1KB, _4KB, _4KB, NON_OVERLAPPING, EXPECT_FAILURE, > > + "mremap - Source Address Misaligned (1KB-aligned)"), > > + > > + /* Src addr PTE aligned */ > > + MAKE_TEST(PTE, PTE, _8KB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "8KB mremap - Source PTE-aligned, Destination PTE-aligned"), > > + > > + /* Src addr 1MB aligned */ > > + MAKE_TEST(_1MB, PTE, _2MB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "2MB mremap - Source 1MB-aligned, Destination PTE-aligned"), > > + MAKE_TEST(_1MB, _1MB, _2MB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "2MB mremap - Source 1MB-aligned, Destination 1MB-aligned"), > > + > > + /* Src addr PMD aligned */ > > + MAKE_TEST(PMD, PTE, _4MB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "4MB mremap - Source PMD-aligned, Destination PTE-aligned"), > > + MAKE_TEST(PMD, _1MB, _4MB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "4MB mremap - Source PMD-aligned, Destination 1MB-aligned"), > > + MAKE_TEST(PMD, PMD, _4MB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "4MB mremap - Source PMD-aligned, Destination PMD-aligned"), > > + > > + /* Src addr PUD aligned */ > > + MAKE_TEST(PUD, PTE, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "2GB mremap - Source PUD-aligned, Destination PTE-aligned"), > > + MAKE_TEST(PUD, _1MB, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "2GB mremap - Source PUD-aligned, Destination 1MB-aligned"), > > + MAKE_TEST(PUD, PMD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "2GB mremap - Source PUD-aligned, Destination PMD-aligned"), > > + MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "2GB mremap - Source PUD-aligned, Destination PUD-aligned"), > > + }; > > + > > + struct test perf_test_cases[] = { > > + /* mremap 1GB region - Page table level aligned time comparison */ > > + MAKE_TEST(PTE, PTE, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "1GB mremap - Source PTE-aligned, Destination PTE-aligned"), > > + MAKE_TEST(PMD, PMD, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "1GB mremap - Source PMD-aligned, Destination PMD-aligned"), > > + MAKE_TEST(PUD, PUD, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, > > + "1GB mremap - Source PUD-aligned, Destination PUD-aligned"), > > + }; > > + > > + run_perf_tests = (threshold_mb == VALIDATION_NO_THRESHOLD) || > > + (threshold_mb * _1MB >= _1GB); > > + > > + ksft_set_plan(ARRAY_SIZE(test_cases) + (run_perf_tests ? > > + ARRAY_SIZE(perf_test_cases) : 0)); > > + > > + for (i = 0; i < ARRAY_SIZE(test_cases); i++) > > + run_mremap_test_case(test_cases[i], &failures, threshold_mb, pattern_seed); > > + > > + if (run_perf_tests) { > > + ksft_print_msg("\n%s\n", > > + "mremap HAVE_MOVE_PMD/PUD optimization time comparison for 1GB region:"); > > + for (i = 0; i < ARRAY_SIZE(perf_test_cases); i++) > > + run_mremap_test_case(perf_test_cases[i], &failures, threshold_mb, > > + pattern_seed); > > + } > > + > > + if (failures > 0) > > + ksft_exit_fail(); > > + else > > + ksft_exit_pass(); > > +} > > diff --git a/tools/testing/selftests/vm/run_vmtests b/tools/testing/selftests/vm/run_vmtests > > index a3f4f30f0a2e..d578ad831813 100755 > > --- a/tools/testing/selftests/vm/run_vmtests > > +++ b/tools/testing/selftests/vm/run_vmtests > > @@ -241,6 +241,17 @@ else > > echo "[PASS]" > > fi > > > > +echo "-------------------" > > +echo "running mremap_test" > > +echo "-------------------" > > +./mremap_test > > +if [ $? -ne 0 ]; then > > + echo "[FAIL]" > > + exitcode=1 > > +else > > + echo "[PASS]" > > +fi > > + > > echo "-----------------" > > echo "running thuge-gen" > > echo "-----------------" > > > > -- > To unsubscribe from this group and stop receiving emails from it, send an email to kernel-team+unsubscribe(a)android.com. >

4 years, 2 months

1
0
0 0

[PATCH v2 0/6] Speed up mremap on large regions

by Kalesh Singh

This version 2 of the mremap speed up patches previously posted at: https://lore.kernel.org/r/20200930222130.4175584-1-kaleshsingh@google.com mremap time can be optimized by moving entries at the PMD/PUD level if the source and destination addresses are PMD/PUD-aligned and PMD/PUD-sized. Enable moving at the PMD and PUD levels on arm64 and x86. Other architectures where this type of move is supported and known to be safe can also opt-in to these optimizations by enabling HAVE_MOVE_PMD and HAVE_MOVE_PUD. Observed Performance Improvements for remapping a PUD-aligned 1GB-sized region on x86 and arm64: - HAVE_MOVE_PMD is already enabled on x86 : N/A - Enabling HAVE_MOVE_PUD on x86 : ~13x speed up - Enabling HAVE_MOVE_PMD on arm64 : ~ 8x speed up - Enabling HAVE_MOVE_PUD on arm64 : ~19x speed up Altogether, HAVE_MOVE_PMD and HAVE_MOVE_PUD give a total of ~150x speed up on arm64. Changes in v2: - Reduce mremap_test time by only validating a configurable threshold of the remapped region, as per John. - Use a random pattern for mremap validation. Provide pattern seed in test output, as per John. - Moved set_pud_at() to separate patch, per Kirill. - Use switch() instead of ifs in move_pgt_entry(), per Kirill. - Update commit message with description of Android garbage collector use case for HAVE_MOVE_PUD, as per Joel. - Fix build test error reported by kernel test robot in [1]. [1] https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/thread/CKPGL4F… Kalesh Singh (6): kselftests: vm: Add mremap tests arm64: mremap speedup - Enable HAVE_MOVE_PMD mm: Speedup mremap on 1GB or larger regions arm64: Add set_pud_at() functions arm64: mremap speedup - Enable HAVE_MOVE_PUD x86: mremap speedup - Enable HAVE_MOVE_PUD arch/Kconfig | 7 + arch/arm64/Kconfig | 2 + arch/arm64/include/asm/pgtable.h | 1 + arch/x86/Kconfig | 1 + mm/mremap.c | 220 +++++++++++++-- tools/testing/selftests/vm/.gitignore | 1 + tools/testing/selftests/vm/Makefile | 1 + tools/testing/selftests/vm/mremap_test.c | 333 +++++++++++++++++++++++ tools/testing/selftests/vm/run_vmtests | 11 + 9 files changed, 547 insertions(+), 30 deletions(-) create mode 100644 tools/testing/selftests/vm/mremap_test.c base-commit: 472e5b056f000a778abb41f1e443de58eb259783 -- 2.28.0.806.g8561365e88-goog

4 years, 2 months

2
11
0 0

[PATCH 0/1] selftests/vm: 8x compaction_test speedup

by John Hubbard

Hi, Maybe this should really be an RFC, given that I don't fully understand why the compaction_test.c program was mmap'ing 1 MB at a time. So apologies in advance if I've mucked up something important, but if so, maybe we can still find a way to get this fixed up to something better. Anyway: there are 20+ tests in tools/testing/selftests/vm/. The entire running time for these (via run_vmtest.sh) is about 56 seconds, of which over half is due to just one test: compaction_test, which takes 27 sec! (A runner-up is HMM, at 11 sec, so it's up for a look next.) The other tests mostly take a few ms, and a few take 1.0 sec. This drops the compaction_test run time from 27, to 3.3 sec. Enjoy. :) thanks, John Hubbard NVIDIA John Hubbard (1): selftests/vm: 8x compaction_test speedup tools/testing/selftests/vm/compaction_test.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- 2.28.0

4 years, 2 months

3
3
0 0

[PATCH] selftests/ftrace: check for do_sys_openat2 in user-memory test

by Colin King

From: Colin Ian King <colin.king(a)canonical.com> More recent libc implementations are now using openat/openat2 system calls so also add do_sys_openat2 to the tracing so that the test passes on these systems because do_sys_open may not be called. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- .../testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc index a30a9c07290d..cf1b4c3e9e6b 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc @@ -9,6 +9,8 @@ grep -A10 "fetcharg:" README | grep -q '\[u\]<offset>' || exit_unsupported :;: "user-memory access syntax and ustring working on user memory";: echo 'p:myevent do_sys_open path=+0($arg2):ustring path2=+u0($arg2):string' \ > kprobe_events +echo 'p:myevent2 do_sys_openat2 path=+0($arg2):ustring path2=+u0($arg2):string' \ + > kprobe_events grep myevent kprobe_events | \ grep -q 'path=+0($arg2):ustring path2=+u0($arg2):string' -- 2.27.0

4 years, 2 months

4
6
0 0

[PATCH bpf-next v2 2/4] selftests: bpf: Add helper to compare socket cookies

by Lorenz Bauer

We compare socket cookies to ensure that insertion into a sockmap worked. Pull this out into a helper function for use in other tests. Signed-off-by: Lorenz Bauer <lmb(a)cloudflare.com> --- .../selftests/bpf/prog_tests/sockmap_basic.c | 50 +++++++++++++------ 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c index 4b7a527e7e82..67d3301bdf81 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c @@ -50,6 +50,37 @@ static int connected_socket_v4(void) return -1; } +static void compare_cookies(struct bpf_map *src, struct bpf_map *dst) +{ + __u32 i, max_entries = bpf_map__max_entries(src); + int err, duration, src_fd, dst_fd; + + src_fd = bpf_map__fd(src); + dst_fd = bpf_map__fd(dst); + + for (i = 0; i < max_entries; i++) { + __u64 src_cookie, dst_cookie; + + err = bpf_map_lookup_elem(src_fd, &i, &src_cookie); + if (err && errno == ENOENT) { + err = bpf_map_lookup_elem(dst_fd, &i, &dst_cookie); + CHECK(!err, "map_lookup_elem(dst)", "element %u not deleted\n", i); + CHECK(err && errno != ENOENT, "map_lookup_elem(dst)", "%s\n", + strerror(errno)); + continue; + } + if (CHECK(err, "lookup_elem(src)", "%s\n", strerror(errno))) + continue; + + err = bpf_map_lookup_elem(dst_fd, &i, &dst_cookie); + if (CHECK(err, "lookup_elem(dst)", "%s\n", strerror(errno))) + continue; + + CHECK(dst_cookie != src_cookie, "cookie mismatch", + "%llu != %llu (pos %u)\n", dst_cookie, src_cookie, i); + } +} + /* Create a map, populate it with one socket, and free the map. */ static void test_sockmap_create_update_free(enum bpf_map_type map_type) { @@ -109,9 +140,9 @@ static void test_skmsg_helpers(enum bpf_map_type map_type) static void test_sockmap_update(enum bpf_map_type map_type) { struct bpf_prog_test_run_attr tattr; - int err, prog, src, dst, duration = 0; + int err, prog, src, duration = 0; struct test_sockmap_update *skel; - __u64 src_cookie, dst_cookie; + struct bpf_map *dst_map; const __u32 zero = 0; char dummy[14] = {0}; __s64 sk; @@ -127,18 +158,14 @@ static void test_sockmap_update(enum bpf_map_type map_type) prog = bpf_program__fd(skel->progs.copy_sock_map); src = bpf_map__fd(skel->maps.src); if (map_type == BPF_MAP_TYPE_SOCKMAP) - dst = bpf_map__fd(skel->maps.dst_sock_map); + dst_map = skel->maps.dst_sock_map; else - dst = bpf_map__fd(skel->maps.dst_sock_hash); + dst_map = skel->maps.dst_sock_hash; err = bpf_map_update_elem(src, &zero, &sk, BPF_NOEXIST); if (CHECK(err, "update_elem(src)", "errno=%u\n", errno)) goto out; - err = bpf_map_lookup_elem(src, &zero, &src_cookie); - if (CHECK(err, "lookup_elem(src, cookie)", "errno=%u\n", errno)) - goto out; - tattr = (struct bpf_prog_test_run_attr){ .prog_fd = prog, .repeat = 1, @@ -151,12 +178,7 @@ static void test_sockmap_update(enum bpf_map_type map_type) "errno=%u retval=%u\n", errno, tattr.retval)) goto out; - err = bpf_map_lookup_elem(dst, &zero, &dst_cookie); - if (CHECK(err, "lookup_elem(dst, cookie)", "errno=%u\n", errno)) - goto out; - - CHECK(dst_cookie != src_cookie, "cookie mismatch", "%llu != %llu\n", - dst_cookie, src_cookie); + compare_cookies(skel->maps.src, dst_map); out: test_sockmap_update__destroy(skel); -- 2.25.1

4 years, 2 months

4
7
0 0

WARNING:at arch/x86/kvm/vmx/vmx.c:4809 handle_exception_nmi+0x5ab/0x5c0

by Naresh Kamboju

While running kselftest kvm evmcs_test the following kernel warning was noticed on x86_64 running linux next 20201001 kernel. WARNING: CPU: 0 PID: 11202 at /usr/src/kernel/arch/x86/kvm/vmx/vmx.c:4809 handle_exception_nmi+0x5ab/0x5c0 Reported-by: Naresh Kamboju <naresh.kamboju(a)linaro.org> steps to reproduce: # cd /opt/kselftests/kvm # ./evmcs_test metadata: git branch: master git repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git git commit: d39294091fee6b89d9c4a683bb19441b25098330 git describe: next-20201001 make_kernelversion: 5.9.0-rc7 kernel-config: http://snapshots.linaro.org/openembedded/lkft/lkft/sumo/intel-corei7-64/lkf… # selftests: kvm: evmcs_test [ 492.217268] ------------[ cut here ]------------ [ 492.222034] WARNING: CPU: 0 PID: 11202 at /usr/src/kernel/arch/x86/kvm/vmx/vmx.c:4809 handle_exception_nmi+0x5ab/0x5c0 [ 492.232747] Modules linked in: sch_fq sch_ingress veth algif_hash x86_pkg_temp_thermal fuse [last unloaded: gpio_mockup] [ 492.243664] CPU: 0 PID: 11202 Comm: evmcs_test Tainted: G W 5.9.0-rc7-next-20201001 #1 [ 492.252899] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.0b 07/27/2017 [ 492.260398] RIP: 0010:handle_exception_nmi+0x5ab/0x5c0 [ 492.265554] Code: 84 f7 fb ff ff 8b 93 ac 0e 00 00 85 d2 0f 84 e4 fb ff ff c7 83 ac 0e 00 00 00 00 00 00 48 89 df e8 9a f2 fa ff e9 d2 fb ff ff <0f> 0b e9 cc fd ff ff 0f 1f 40 00 66 2e 0f 1f 84 00 00 00 00 00 0f [ 492.284317] RSP: 0018:ffffbf3001323cf8 EFLAGS: 00010246 [ 492.289568] RAX: 0000000000000060 RBX: ffff9f5b08048000 RCX: 0000000000000000 [ 492.296716] RDX: 00000000f359fd01 RSI: 0000000000000000 RDI: 000000008000030e [ 492.303868] RBP: ffffbf3001323d20 R08: 0000000080000306 R09: 0000000000000000 [ 492.311018] R10: ffffbf3001323c30 R11: ffffbf30013e7000 R12: 0000000000000000 [ 492.318167] R13: 0000000000000000 R14: ffff9f5b52714000 R15: 0000000000000000 [ 492.325492] FS: 00007f22a58cc740(0000) GS:ffff9f5b5fc00000(0000) knlGS:0000000000000000 [ 492.333596] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 492.339362] CR2: 0000000000000000 CR3: 00000004013c0006 CR4: 00000000003726f0 [ 492.346513] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 492.353662] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 492.360814] Call Trace: [ 492.363293] vmx_handle_exit+0x102/0x5e0 [ 492.367241] vcpu_enter_guest+0xe27/0x18a0 [ 492.371361] ? lock_acquire+0x9c/0x390 [ 492.375132] ? kvm_arch_vcpu_ioctl_run+0x9c/0x620 [ 492.379865] kvm_arch_vcpu_ioctl_run+0x12b/0x620 [ 492.384501] ? kvm_arch_vcpu_ioctl_run+0x12b/0x620 [ 492.389316] kvm_vcpu_ioctl+0x261/0x670 [ 492.393183] ? security_file_ioctl+0x37/0x50 [ 492.397500] __x64_sys_ioctl+0x96/0xd0 [ 492.401283] do_syscall_64+0x37/0x50 [ 492.404878] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 492.409954] RIP: 0033:0x7f22a51ca8f7 [ 492.413551] Code: b3 66 90 48 8b 05 a1 35 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 71 35 2c 00 f7 d8 64 89 01 48 [ 492.432312] RSP: 002b:00007ffe09251188 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 492.439895] RAX: ffffffffffffffda RBX: 00000000007d23d0 RCX: 00007f22a51ca8f7 [ 492.447043] RDX: 0000000000000000 RSI: 000000000000ae80 RDI: 0000000000000009 [ 492.454195] RBP: 000000000000000b R08: 000000000040d893 R09: 0000000000000005 [ 492.461344] R10: 0000000000000000 R11: 0000000000000246 R12: 00007ffe09251210 [ 492.468495] R13: 00007f22a58c5000 R14: 00007ffe092512a0 R15: 000000000000000b [ 492.475658] CPU: 0 PID: 11202 Comm: evmcs_test Tainted: G W 5.9.0-rc7-next-20201001 #1 [ 492.484879] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.0b 07/27/2017 [ 492.492357] Call Trace: [ 492.494803] dump_stack+0x7d/0x9f [ 492.498126] __warn+0x94/0x100 [ 492.501183] ? handle_exception_nmi+0x5ab/0x5c0 [ 492.505715] report_bug+0xc0/0x150 [ 492.509123] handle_bug+0x48/0x80 [ 492.512442] exc_invalid_op+0x18/0x70 [ 492.516108] asm_exc_invalid_op+0x12/0x20 [ 492.520119] RIP: 0010:handle_exception_nmi+0x5ab/0x5c0 [ 492.525257] Code: 84 f7 fb ff ff 8b 93 ac 0e 00 00 85 d2 0f 84 e4 fb ff ff c7 83 ac 0e 00 00 00 00 00 00 48 89 df e8 9a f2 fa ff e9 d2 fb ff ff <0f> 0b e9 cc fd ff ff 0f 1f 40 00 66 2e 0f 1f 84 00 00 00 00 00 0f [ 492.544001] RSP: 0018:ffffbf3001323cf8 EFLAGS: 00010246 [ 492.549229] RAX: 0000000000000060 RBX: ffff9f5b08048000 RCX: 0000000000000000 [ 492.556361] RDX: 00000000f359fd01 RSI: 0000000000000000 RDI: 000000008000030e [ 492.563492] RBP: ffffbf3001323d20 R08: 0000000080000306 R09: 0000000000000000 [ 492.570625] R10: ffffbf3001323c30 R11: ffffbf30013e7000 R12: 0000000000000000 [ 492.577757] R13: 0000000000000000 R14: ffff9f5b52714000 R15: 0000000000000000 [ 492.584900] vmx_handle_exit+0x102/0x5e0 [ 492.588839] vcpu_enter_guest+0xe27/0x18a0 [ 492.592943] ? lock_acquire+0x9c/0x390 [ 492.596697] ? kvm_arch_vcpu_ioctl_run+0x9c/0x620 [ 492.601411] kvm_arch_vcpu_ioctl_run+0x12b/0x620 [ 492.606037] ? kvm_arch_vcpu_ioctl_run+0x12b/0x620 [ 492.610833] kvm_vcpu_ioctl+0x261/0x670 [ 492.614675] ? security_file_ioctl+0x37/0x50 [ 492.618963] __x64_sys_ioctl+0x96/0xd0 [ 492.622725] do_syscall_64+0x37/0x50 [ 492.626308] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 492.631362] RIP: 0033:0x7f22a51ca8f7 [ 492.634938] Code: b3 66 90 48 8b 05 a1 35 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 71 35 2c 00 f7 d8 64 89 01 48 [ 492.653676] RSP: 002b:00007ffe09251188 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 492.661243] RAX: ffffffffffffffda RBX: 00000000007d23d0 RCX: 00007f22a51ca8f7 [ 492.668373] RDX: 0000000000000000 RSI: 000000000000ae80 RDI: 0000000000000009 [ 492.675498] RBP: 000000000000000b R08: 000000000040d893 R09: 0000000000000005 [ 492.682632] R10: 0000000000000000 R11: 0000000000000246 R12: 00007ffe09251210 [ 492.689763] R13: 00007f22a58c5000 R14: 00007ffe092512a0 R15: 000000000000000b [ 492.696921] irq event stamp: 33513 [ 492.700345] hardirqs last enabled at (33523): [<ffffffffa4a3f229>] console_unlock+0x4a9/0x5b0 [ 492.708970] hardirqs last disabled at (33532): [<ffffffffa4a3f183>] console_unlock+0x403/0x5b0 [ 492.717596] softirqs last enabled at (33388): [<ffffffffa5c00308>] __do_softirq+0x308/0x42a [ 492.726043] softirqs last disabled at (33351): [<ffffffffa5a00f82>] asm_call_irq_on_stack+0x12/0x20 [ 492.735099] ---[ end trace 3a8d97eed7321275 ]--- full test log link, https://lkft.validation.linaro.org/scheduler/job/1809553#L6581 -- Linaro LKFT https://lkft.linaro.org

4 years, 2 months

1
0
0 0

[PATCH 0/5] Speed up mremap on large regions

by Kalesh Singh

mremap time can be optimized by moving entries at the PMD/PUD level if the source and destination addresses are PMD/PUD-aligned and PMD/PUD-sized. Enable moving at the PMD and PUD levels on arm64 and x86. Other architectures where this type of move is supported and known to be safe can also opt-in to these optimizations by enabling HAVE_MOVE_PMD and HAVE_MOVE_PUD. Observed Performance Improvements for remapping a PUD-aligned 1GB-sized region on x86 and arm64: - HAVE_MOVE_PMD is already enabled on x86 : N/A - Enabling HAVE_MOVE_PUD on x86 : ~13x speed up - Enabling HAVE_MOVE_PMD on arm64 : ~ 8x speed up - Enabling HAVE_MOVE_PUD on arm64 : ~19x speed up Altogether, HAVE_MOVE_PMD and HAVE_MOVE_PUD give a total of ~150x speed up on arm64. Kalesh Singh (5): kselftests: vm: Add mremap tests arm64: mremap speedup - Enable HAVE_MOVE_PMD mm: Speedup mremap on 1GB or larger regions arm64: mremap speedup - Enable HAVE_MOVE_PUD x86: mremap speedup - Enable HAVE_MOVE_PUD arch/Kconfig | 7 + arch/arm64/Kconfig | 2 + arch/arm64/include/asm/pgtable.h | 1 + arch/x86/Kconfig | 1 + mm/mremap.c | 211 +++++++++++++++++--- tools/testing/selftests/vm/.gitignore | 1 + tools/testing/selftests/vm/Makefile | 1 + tools/testing/selftests/vm/mremap_test.c | 243 +++++++++++++++++++++++ tools/testing/selftests/vm/run_vmtests | 11 + 9 files changed, 448 insertions(+), 30 deletions(-) create mode 100644 tools/testing/selftests/vm/mremap_test.c -- 2.28.0.709.gb0816b6eb0-goog

4 years, 2 months

5
19
0 0

[RFC v1 00/12] kunit: introduce class mocking support.

by Daniel Latypov

# Background KUnit currently lacks any first-class support for mocking. For an overview and discussion on the pros and cons, see https://martinfowler.com/articles/mocksArentStubs.html This patch set introduces the basic machinery needed for mocking: setting and validating expectations, setting default actions, etc. Using that basic infrastructure, we add macros for "class mocking", as it's probably the easiest type of mocking to start with. ## Class mocking By "class mocking", we're referring mocking out function pointers stored in structs like: struct sender { int (*send)(struct sender *sender, int data); }; After the necessary DEFINE_* macros, we can then write code like struct MOCK(sender) mock_sender = CONSTRUCT_MOCK(sender, test); /* Fake an error for a specific input. */ handle = KUNIT_EXPECT_CALL(send(<omitted>, kunit_int_eq(42))); handle->action = kunit_int_return(test, -EINVAL); /* Pass the mocked object to some code under test. */ KUNIT_EXPECT_EQ(test, -EINVAL, send_message(...)); I.e. the goal is to make it easier to test 1) with less dependencies (we don't need to setup a real `sender`) 2) unusual/error conditions more easily. In the future, we hope to build upon this to support mocking in more contexts, e.g. standalone funcs, etc. # TODOs ## Naming This introduces a number of new macros for dealing with mocks, e.g: DEFINE_STRUCT_CLASS_MOCK(METHOD(foo), CLASS(example), RETURNS(int), PARAMS(struct example *, int)); ... KUNIT_EXPECT_CALL(foo(mock_get_ctrl(mock_example), ...); For consistency, we could prefix everything with KUNIT, e.g. `KUNIT_DEFINE_STRUCT_CLASS_MOCK` and `kunit_mock_get_ctrl`, but it feels like the names might be long enough that they would hinder readability. ## Usage For now the only use of class mocking is in kunit-example-test.c As part of changing this from an RFC to a real patch set, we're hoping to include at least one example. Pointers to bits of code where this would be useful that aren't too hairy would be appreciated. E.g. could easily add a test for tools/perf/ui/progress.h, e.g. that ui_progress__init() calls ui_progress_ops.init(), but that likely isn't useful to anyone. Brendan Higgins (9): kunit: test: add kunit_stream a std::stream like logger kunit: test: add concept of post conditions checkpatch: add support for struct MOCK(foo) syntax kunit: mock: add parameter list manipulation macros kunit: mock: add internal mock infrastructure kunit: mock: add basic matchers and actions kunit: mock: add class mocking support kunit: mock: add struct param matcher kunit: mock: implement nice, strict and naggy mock distinctions Daniel Latypov (2): Revert "kunit: move string-stream.h to lib/kunit" kunit: expose kunit_set_failure() for use by mocking Marcelo Schmitt (1): kunit: mock: add macro machinery to pick correct format args include/kunit/assert.h | 3 +- include/kunit/kunit-stream.h | 94 +++ include/kunit/mock.h | 902 +++++++++++++++++++++++++ include/kunit/params.h | 305 +++++++++ {lib => include}/kunit/string-stream.h | 2 + include/kunit/test.h | 9 + lib/kunit/Makefile | 9 +- lib/kunit/assert.c | 2 - lib/kunit/common-mocks.c | 409 +++++++++++ lib/kunit/kunit-example-test.c | 90 +++ lib/kunit/kunit-stream.c | 110 +++ lib/kunit/mock-macro-test.c | 241 +++++++ lib/kunit/mock-test.c | 531 +++++++++++++++ lib/kunit/mock.c | 370 ++++++++++ lib/kunit/string-stream-test.c | 3 +- lib/kunit/string-stream.c | 5 +- lib/kunit/test.c | 15 +- scripts/checkpatch.pl | 4 + 18 files changed, 3091 insertions(+), 13 deletions(-) create mode 100644 include/kunit/kunit-stream.h create mode 100644 include/kunit/mock.h create mode 100644 include/kunit/params.h rename {lib => include}/kunit/string-stream.h (95%) create mode 100644 lib/kunit/common-mocks.c create mode 100644 lib/kunit/kunit-stream.c create mode 100644 lib/kunit/mock-macro-test.c create mode 100644 lib/kunit/mock-test.c create mode 100644 lib/kunit/mock.c base-commit: 10b82d5176488acee2820e5a2cf0f2ec5c3488b6 -- 2.28.0.681.g6f77f65b4e-goog

4 years, 2 months

2
15
0 0

[RFC PATCH 21/22] selftest/x86/amx: Include test cases for the AMX state management

by Chang S. Bae

This selftest exercises the kernel's ability to inherit and context switch AMX state, by verifying that they retain unique data when creating a child process and between multiple threads. Also, ptrace() is used to insert AMX state into existing threads -- both before and after the existing thread has initialized its AMX state. For the signal handling path, verify in the signal handler that the signal frame either include or exclude AMX data -- depending on if the signaled thread has initialized AMX state. Collect the test cases of validating those operations together, as they share some common setup for the AMX state. These test cases do not depend on AMX compiler support, as they employ user-space-XSAVE directly to access AMX state. Signed-off-by: Chang S. Bae <chang.seok.bae(a)intel.com> Reviewed-by: Len Brown <len.brown(a)intel.com> Cc: x86(a)kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-kselftest(a)vger.kernel.org --- tools/testing/selftests/x86/Makefile | 2 +- tools/testing/selftests/x86/amx.c | 736 +++++++++++++++++++++++++++ 2 files changed, 737 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/x86/amx.c diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile index e0c52e5ab49e..6f6e6cabca69 100644 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -17,7 +17,7 @@ TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt test_mremap TARGETS_C_32BIT_ONLY := entry_from_vm86 test_syscall_vdso unwind_vdso \ test_FCMOV test_FCOMI test_FISTTP \ vdso_restorer -TARGETS_C_64BIT_ONLY := fsgsbase sysret_rip syscall_numbering +TARGETS_C_64BIT_ONLY := fsgsbase sysret_rip syscall_numbering amx # Some selftests require 32bit support enabled also on 64bit systems TARGETS_C_32BIT_NEEDED := ldt_gdt ptrace_syscall diff --git a/tools/testing/selftests/x86/amx.c b/tools/testing/selftests/x86/amx.c new file mode 100644 index 000000000000..bf766b22cf77 --- /dev/null +++ b/tools/testing/selftests/x86/amx.c @@ -0,0 +1,736 @@ +// SPDX-License-Identifier: GPL-2.0 + +#define _GNU_SOURCE +#include <err.h> +#include <elf.h> +#include <pthread.h> +#include <sched.h> +#include <signal.h> +#include <stdio.h> +#include <string.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdlib.h> +#include <time.h> +#include <malloc.h> +#include <unistd.h> +#include <ucontext.h> + +#include <linux/futex.h> + +#include <sys/ipc.h> +#include <sys/mman.h> +#include <sys/ptrace.h> +#include <sys/shm.h> +#include <sys/signal.h> +#include <sys/syscall.h> +#include <sys/time.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <sys/uio.h> +#include <sys/ucontext.h> + +#include <x86intrin.h> + +#ifndef __x86_64__ +# error This test is 64-bit only +#endif + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; +typedef uint64_t u64; + +#define PAGE_SIZE (1 << 12) + +#define NUM_TILES 8 +#define TILE_SIZE 1024 +#define XSAVE_SIZE ((NUM_TILES * TILE_SIZE) + PAGE_SIZE) + +struct xsave_data { + u8 area[XSAVE_SIZE]; +} __attribute__((aligned(64))); + +/* Tile configuration associated: */ +#define MAX_TILES 16 +#define RESERVED_BYTES 14 + +struct tile_config { + u8 palette_id; + u8 start_row; + u8 reserved[RESERVED_BYTES]; + u16 colsb[MAX_TILES]; + u8 rows[MAX_TILES]; +}; + +struct tile_data { + u8 data[NUM_TILES * TILE_SIZE]; +}; + +static inline u64 __xgetbv(u32 index) +{ + u32 eax, edx; + + asm volatile(".byte 0x0f,0x01,0xd0" + : "=a" (eax), "=d" (edx) + : "c" (index)); + return eax + ((u64)edx << 32); +} + +static inline void __cpuid(u32 *eax, u32 *ebx, u32 *ecx, u32 *edx) +{ + asm volatile("cpuid;" + : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) + : "0" (*eax), "2" (*ecx)); +} + +/* Load tile configuration */ +static inline void __ldtilecfg(void *cfg) +{ + asm volatile(".byte 0xc4,0xe2,0x78,0x49,0x00" + : : "a"(cfg)); +} + +/* Load tile data to %tmm0 register only */ +static inline void __tileloadd(void *tile) +{ + asm volatile(".byte 0xc4,0xe2,0x7b,0x4b,0x04,0x10" + : : "a"(tile), "d"(0)); +} + +/* Save extended states */ +static inline void __xsave(void *area, u32 lo, u32 hi) +{ + asm volatile(".byte 0x48,0x0f,0xae,0x27" + : : "D" (area), "a" (lo), "d" (hi) + : "memory"); +} + +/* Restore extended states */ +static inline void __xrstor(void *area, u32 lo, u32 hi) +{ + asm volatile(".byte 0x48,0x0f,0xae,0x2f" + : : "D" (area), "a" (lo), "d" (hi)); +} + +/* Release tile states to init values */ +static inline void __tilerelease(void) +{ + asm volatile(".byte 0xc4, 0xe2, 0x78, 0x49, 0xc0" ::); +} + +/* Hardware info check: */ + +static inline bool check_xsave_supports_xtile(void) +{ + u32 eax, ebx, ecx, edx; + bool available = false; + +#define XSAVE_CPUID 0x1 +#define XSAVE_ECX_BIT 26 +#define XFEATURE_XTILE_CFG 17 +#define XFEATURE_XTILE_DATA 18 +#define XFEATURE_MASK_XTILE ((1 << XFEATURE_XTILE_DATA) | \ + (1 << XFEATURE_XTILE_CFG)) + + eax = XSAVE_CPUID; + ecx = 0; + + __cpuid(&eax, &ebx, &ecx, &edx); + if (!(ecx & (1 << XSAVE_ECX_BIT))) + return available; + + if (__xgetbv(0) & XFEATURE_MASK_XTILE) + available = true; + + return available; +} + +struct xtile_hwinfo { + struct { + u16 bytes_per_tile; + u16 bytes_per_row; + u16 max_names; + u16 max_rows; + } spec; + + struct { + u32 offset; + u32 size; + } xsave; +}; + +static struct xtile_hwinfo xtile; + +static bool __enum_xtile_config(void) +{ + u32 eax, ebx, ecx, edx; + u16 bytes_per_tile; + bool valid = false; + +#define TILE_CPUID 0x1d +#define TILE_PALETTE_CPUID_SUBLEAVE 0x1 + + eax = TILE_CPUID; + ecx = TILE_PALETTE_CPUID_SUBLEAVE; + + __cpuid(&eax, &ebx, &ecx, &edx); + if (!eax || !ebx || !ecx) + return valid; + + xtile.spec.max_names = ebx >> 16; + if (xtile.spec.max_names < NUM_TILES) + return valid; + + bytes_per_tile = eax >> 16; + if (bytes_per_tile < TILE_SIZE) + return valid; + + xtile.spec.bytes_per_row = ebx; + xtile.spec.max_rows = ecx; + valid = true; + + return valid; +} + +static bool __enum_xsave_tile(void) +{ + u32 eax, ebx, ecx, edx; + bool valid = false; + +#define XSTATE_CPUID 0xd +#define XSTATE_USER_STATE_SUBLEAVE 0x0 + + eax = XSTATE_CPUID; + ecx = XFEATURE_XTILE_DATA; + + __cpuid(&eax, &ebx, &ecx, &edx); + if (!eax || !ebx) + return valid; + + xtile.xsave.offset = ebx; + xtile.xsave.size = eax; + valid = true; + + return valid; +} + +static bool __check_xsave_size(void) +{ + u32 eax, ebx, ecx, edx; + bool valid = false; + + eax = XSTATE_CPUID; + ecx = XSTATE_USER_STATE_SUBLEAVE; + + __cpuid(&eax, &ebx, &ecx, &edx); + if (ebx && ebx <= XSAVE_SIZE) + valid = true; + + return valid; +} + +/* + * Check the hardware-provided tile state info and cross-check it with the + * hard-coded values: XSAVE_SIZE, NUM_TILES, and TILE_SIZE. + */ +static int check_xtile_hwinfo(void) +{ + bool success = false; + + if (!__check_xsave_size()) + return success; + + if (!__enum_xsave_tile()) + return success; + + if (!__enum_xtile_config()) + return success; + + if (sizeof(struct tile_data) >= xtile.xsave.size) + success = true; + + return success; +} + +/* The helpers for managing XSAVE area and tile states: */ + +/* Use the uncompacted format without 'init optimization' */ +static void save_xdata(void *data) +{ + __xsave(data, -1, -1); +} + +static void restore_xdata(void *data) +{ + __xrstor(data, -1, -1); +} + +static inline u64 __get_xsave_xstate_bv(void *data) +{ +#define XSAVE_HDR_OFFSET 512 + return *(u64 *)(data + XSAVE_HDR_OFFSET); +} + +static void set_tilecfg(struct tile_config *cfg) +{ + int i; + + memset(cfg, 0, sizeof(*cfg)); + /* The first implementation has one significant palette with id 1 */ + cfg->palette_id = 1; + for (i = 0; i < xtile.spec.max_names; i++) { + cfg->colsb[i] = xtile.spec.bytes_per_row; + cfg->rows[i] = xtile.spec.max_rows; + } +} + +static void load_tilecfg(struct tile_config *cfg) +{ + __ldtilecfg(cfg); +} + +static void make_tiles(void *tiles) +{ + u32 iterations = xtile.xsave.size / sizeof(u32); + static u32 value = 1; + u32 *ptr = tiles; + int i; + + for (i = 0, ptr = tiles; i < iterations; i++, ptr++) + *ptr = value; + value++; +} + +/* + * Initialize the XSAVE area: + * + * Make sure tile configuration loaded already. Load limited tile data (%tmm0 only) + * and save all the states. XSAVE area is ready to complete tile data. + */ +static void init_xdata(void *data) +{ + struct tile_data tiles; + + make_tiles(&tiles); + __tileloadd(&tiles); + __xsave(data, -1, -1); +} + +static inline void *__get_xsave_tile_data_addr(void *data) +{ + return data + xtile.xsave.offset; +} + +static void copy_tiles_to_xdata(void *xdata, void *tiles) +{ + void *dst = __get_xsave_tile_data_addr(xdata); + + memcpy(dst, tiles, xtile.xsave.size); +} + +static int compare_xdata_tiles(void *xdata, void *tiles) +{ + void *tile_data = __get_xsave_tile_data_addr(xdata); + + if (memcmp(tile_data, tiles, xtile.xsave.size)) + return 1; + + return 0; +} + +static int nerrs, errs; + +/* Testing tile data inheritance */ + +static void test_tile_data_inheritance(void) +{ + struct xsave_data xdata; + struct tile_data tiles; + struct tile_config cfg; + pid_t child; + int status; + + set_tilecfg(&cfg); + load_tilecfg(&cfg); + init_xdata(&xdata); + + make_tiles(&tiles); + copy_tiles_to_xdata(&xdata, &tiles); + restore_xdata(&xdata); + + errs = 0; + + child = fork(); + if (child < 0) + err(1, "fork"); + + if (child == 0) { + memset(&xdata, 0, sizeof(xdata)); + save_xdata(&xdata); + if (compare_xdata_tiles(&xdata, &tiles)) { + printf("[FAIL]\tchild failed to inherit tile data during fork()\n"); + nerrs++; + } else { + printf("[OK]\tchild inherited tile data during fork()\n"); + } + _exit(0); + } + wait(&status); +} + +static void test_fork(void) +{ + pid_t child; + int status; + + child = fork(); + if (child < 0) + err(1, "fork"); + + if (child == 0) { + test_tile_data_inheritance(); + _exit(0); + } + + wait(&status); +} + +/* Context switching test */ + +#define ITERATIONS 10 +#define NUM_THREADS 5 + +struct futex_info { + int current; + int next; + int *futex; +}; + +static inline void command_wait(struct futex_info *info, int value) +{ + do { + sched_yield(); + } while (syscall(SYS_futex, info->futex, FUTEX_WAIT, value, 0, 0, 0)); +} + +static inline void command_wake(struct futex_info *info, int value) +{ + do { + *info->futex = value; + while (!syscall(SYS_futex, info->futex, FUTEX_WAKE, 1, 0, 0, 0)) + sched_yield(); + } while (0); +} + +static inline int get_iterative_value(int id) +{ + return ((id << 1) & ~0x1); +} + +static inline int get_endpoint_value(int id) +{ + return ((id << 1) | 0x1); +} + +static void *check_tiles(void *info) +{ + struct futex_info *finfo = (struct futex_info *)info; + struct xsave_data xdata; + struct tile_data tiles; + struct tile_config cfg; + int i; + + set_tilecfg(&cfg); + load_tilecfg(&cfg); + init_xdata(&xdata); + + make_tiles(&tiles); + copy_tiles_to_xdata(&xdata, &tiles); + restore_xdata(&xdata); + + for (i = 0; i < ITERATIONS; i++) { + command_wait(finfo, get_iterative_value(finfo->current)); + + memset(&xdata, 0, sizeof(xdata)); + save_xdata(&xdata); + errs += compare_xdata_tiles(&xdata, &tiles); + + make_tiles(&tiles); + copy_tiles_to_xdata(&xdata, &tiles); + restore_xdata(&xdata); + + command_wake(finfo, get_iterative_value(finfo->next)); + } + + command_wait(finfo, get_endpoint_value(finfo->current)); + __tilerelease(); + return NULL; +} + +static int create_children(int num, struct futex_info *finfo) +{ + const int shm_id = shmget(IPC_PRIVATE, sizeof(int), IPC_CREAT | 0666); + int *futex = shmat(shm_id, NULL, 0); + pthread_t thread; + int i; + + for (i = 0; i < num; i++) { + finfo[i].futex = futex; + finfo[i].current = i + 1; + finfo[i].next = (i + 2) % (num + 1); + + if (pthread_create(&thread, NULL, check_tiles, &finfo[i])) { + err(1, "pthread_create"); + return 1; + } + } + return 0; +} + +static void test_context_switch(void) +{ + struct futex_info *finfo; + cpu_set_t cpuset; + int i; + + printf("[RUN]\t%u context switches of tile states in %d threads\n", + ITERATIONS * NUM_THREADS, NUM_THREADS); + + errs = 0; + + CPU_ZERO(&cpuset); + CPU_SET(0, &cpuset); + if (sched_setaffinity(0, sizeof(cpuset), &cpuset) != 0) + err(1, "sched_setaffinity to CPU 0"); + + finfo = malloc(sizeof(*finfo) * NUM_THREADS); + + if (create_children(NUM_THREADS, finfo)) + return; + + for (i = 0; i < ITERATIONS; i++) { + command_wake(finfo, get_iterative_value(1)); + command_wait(finfo, get_iterative_value(0)); + } + + for (i = 1; i <= NUM_THREADS; i++) + command_wake(finfo, get_endpoint_value(i)); + + if (errs) { + printf("[FAIL]\t%u incorrect tile states\n", errs); + nerrs += errs; + return; + } + + printf("[OK]\tall tile states are correct\n"); +} + +/* Ptrace test */ + +static inline long get_tile_state(pid_t child, struct iovec *iov) +{ + return ptrace(PTRACE_GETREGSET, child, (u32)NT_X86_XSTATE, iov); +} + +static inline long set_tile_state(pid_t child, struct iovec *iov) +{ + return ptrace(PTRACE_SETREGSET, child, (u32)NT_X86_XSTATE, iov); +} + +static int write_tile_state(bool load_tile, pid_t child) +{ + struct xsave_data xdata; + struct tile_data tiles; + struct iovec iov; + + iov.iov_base = &xdata; + iov.iov_len = sizeof(xdata); + + if (get_tile_state(child, &iov)) + err(1, "PTRACE_GETREGSET"); + + make_tiles(&tiles); + copy_tiles_to_xdata(&xdata, &tiles); + if (set_tile_state(child, &iov)) + err(1, "PTRACE_SETREGSET"); + + memset(&xdata, 0, sizeof(xdata)); + if (get_tile_state(child, &iov)) + err(1, "PTRACE_GETREGSET"); + + if (!load_tile) + memset(&tiles, 0, sizeof(tiles)); + + return compare_xdata_tiles(&xdata, &tiles); +} + +static void test_tile_state_write(bool load_tile) +{ + pid_t child; + int status; + + child = fork(); + if (child < 0) + err(1, "fork"); + + if (child == 0) { + printf("[RUN]\tPtrace-induced tile state write, "); + printf("%s tile data loaded\n", load_tile ? "with" : "without"); + + if (ptrace(PTRACE_TRACEME, 0, NULL, NULL)) + err(1, "PTRACE_TRACEME"); + + if (load_tile) { + struct tile_config cfg; + struct tile_data tiles; + + set_tilecfg(&cfg); + load_tilecfg(&cfg); + make_tiles(&tiles); + /* Load only %tmm0 but inducing the #NM */ + __tileloadd(&tiles); + } + + raise(SIGTRAP); + _exit(0); + } + + do { + wait(&status); + } while (WSTOPSIG(status) != SIGTRAP); + + errs = write_tile_state(load_tile, child); + if (errs) { + nerrs++; + printf("[FAIL]\t%s write\n", load_tile ? "incorrect" : "unexpected"); + } else { + printf("[OK]\t%s write\n", load_tile ? "correct" : "no"); + } + + ptrace(PTRACE_DETACH, child, NULL, NULL); + wait(&status); +} + +static void test_ptrace(void) +{ + bool ptracee_loads_tiles; + + ptracee_loads_tiles = true; + test_tile_state_write(ptracee_loads_tiles); + + ptracee_loads_tiles = false; + test_tile_state_write(ptracee_loads_tiles); +} + +/* Signal handling test */ + +static int sigtrapped; +struct tile_data sig_tiles, sighdl_tiles; + +static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *), + int flags) +{ + struct sigaction sa; + + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = handler; + sa.sa_flags = SA_SIGINFO | flags; + sigemptyset(&sa.sa_mask); + if (sigaction(sig, &sa, 0)) + err(1, "sigaction"); +} + +static void clearhandler(int sig) +{ + struct sigaction sa; + + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = SIG_DFL; + sigemptyset(&sa.sa_mask); + if (sigaction(sig, &sa, 0)) + err(1, "sigaction"); +} + +static void sighandler(int sig, siginfo_t *info, void *ctx_void) +{ + ucontext_t *uctxt = (ucontext_t *)ctx_void; + struct xsave_data xdata; + struct tile_config cfg; + struct tile_data tiles; + u64 header; + + header = __get_xsave_xstate_bv((void *)uctxt->uc_mcontext.fpregs); + + if (header & (1 << XFEATURE_XTILE_DATA)) + printf("[FAIL]\ttile data was written in sigframe\n"); + else + printf("[OK]\ttile data was skipped in sigframe\n"); + + set_tilecfg(&cfg); + load_tilecfg(&cfg); + init_xdata(&xdata); + + make_tiles(&tiles); + copy_tiles_to_xdata(&xdata, &tiles); + restore_xdata(&xdata); + + save_xdata(&xdata); + if (compare_xdata_tiles(&xdata, &tiles)) + err(1, "tile load file"); + + printf("\tsignal handler: load tile data\n"); + + sigtrapped = sig; +} + +static void test_signal_handling(void) +{ + struct xsave_data xdata = { 0 }; + struct tile_data tiles = { 0 }; + + clearhandler(SIGTRAP); + sethandler(SIGTRAP, sighandler, 1); + sigtrapped = 0; + + printf("[RUN]\tCheck tile state management in handling signal\n"); + + printf("\tbefore signal: initial tile data state\n"); + + raise(SIGTRAP); + + if (sigtrapped == 0) + err(1, "sigtrap"); + + save_xdata(&xdata); + if (compare_xdata_tiles(&xdata, &tiles)) { + printf("[FAIL]\ttile data was not loaded at sigreturn\n"); + nerrs++; + } else { + printf("[OK]\ttile data was re-initialized at sigreturn\n"); + } +} + +int main(void) +{ + /* Check hardware availability at first */ + + if (!check_xsave_supports_xtile()) { + printf("\tTile state is not supported in the XSAVE.\n"); + return 0; + } + + if (!check_xtile_hwinfo()) { + printf("\tAvailable tile state size is insufficient to test.\n"); + return 0; + } + + nerrs = 0; + + test_fork(); + test_context_switch(); + test_ptrace(); + test_signal_handling(); + + return nerrs ? 1 : 0; +} -- 2.17.1

4 years, 2 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror October 2020