- Linux-kselftest-mirror - lists.linaro.org

[PATCH v1 0/9] kunit: Add test attributes API

by Rae Moar

Hello everyone, This patch series adds a test attributes framework to KUnit. There has been interest in filtering out "slow" KUnit tests. Most notably, a new config, CONFIG_MEMCPY_SLOW_KUNIT_TEST, has been added to exclude a particularly slow memcpy test (https://lore.kernel.org/all/20230118200653.give.574-kees@kernel.org/). This attributes framework can be used to save and access test associated data, including whether a test is slow. These attributes are reportable (via KTAP and command line output) and are also filterable. This framework is designed to allow for the addition of other attributes in the future. These attributes could include whether the test can be run concurrently, test file path, etc. To try out the framework I suggest running: "./tools/testing/kunit/kunit.py run --filter speed!=slow" This patch series was originally sent out as an RFC. Here is a link to the RFC v2: https://lore.kernel.org/all/20230707210947.1208717-1-rmoar@google.com/ Thanks! Rae Rae Moar (9): kunit: Add test attributes API structure kunit: Add speed attribute kunit: Add module attribute kunit: Add ability to filter attributes kunit: tool: Add command line interface to filter and report attributes kunit: memcpy: Mark tests as slow using test attributes kunit: time: Mark test as slow using test attributes kunit: add tests for filtering attributes kunit: Add documentation of KUnit test attributes .../dev-tools/kunit/running_tips.rst | 166 +++++++ include/kunit/attributes.h | 50 +++ include/kunit/test.h | 70 ++- kernel/time/time_test.c | 2 +- lib/Kconfig.debug | 3 + lib/kunit/Makefile | 3 +- lib/kunit/attributes.c | 421 ++++++++++++++++++ lib/kunit/executor.c | 115 ++++- lib/kunit/executor_test.c | 128 +++++- lib/kunit/kunit-example-test.c | 9 + lib/kunit/test.c | 27 +- lib/memcpy_kunit.c | 8 +- tools/testing/kunit/kunit.py | 70 ++- tools/testing/kunit/kunit_kernel.py | 8 +- tools/testing/kunit/kunit_parser.py | 11 +- tools/testing/kunit/kunit_tool_test.py | 39 +- 16 files changed, 1054 insertions(+), 76 deletions(-) create mode 100644 include/kunit/attributes.h create mode 100644 lib/kunit/attributes.c base-commit: 64bd4641310c41a1ecf07c13c67bc0ed61045dfd -- 2.41.0.255.g8b1d071c50-goog

2 years, 5 months

2
11
0 0

[BUG] sefltests: forwarding: gre_custom_multipath_hash.sh: [FAIL] and syntax errors

by Mirsad Todorovac

Hi, It's me again. Don't throw things at me, but it is the same old vanilla torvalds tree kernel 6.5-rc2 kselftest run, and after applying the patches I ran into the new problems: I have been free to add the timeout SIGTERM trap to the test, and this is the only change, save for the Ido's lib.sh patch (for filling the veth NETIFS array in default execution case). Here is the command output: # selftests: net/forwarding: gre_custom_multipath_hash.sh # TEST: ping [ OK ] # TEST: ping6 [ OK ] # INFO: Running IPv4 overlay custom multipath hash tests # TEST: Multipath hash field: Inner source IP (balanced) [ OK ] # INFO: Packets sent on path1 / path2: 6760 / 5859 # TEST: Multipath hash field: Inner source IP (unbalanced) [ OK ] # INFO: Packets sent on path1 / path2: 2 / 12603 # TEST: Multipath hash field: Inner destination IP (balanced) [ OK ] # INFO: Packets sent on path1 / path2: 5850 / 6750 # TEST: Multipath hash field: Inner destination IP (unbalanced) [ OK ] # INFO: Packets sent on path1 / path2: 12602 / 1 # TEST: Multipath hash field: Inner source port (balanced) [ OK ] # INFO: Packets sent on path1 / path2: 16411 / 16364 # TEST: Multipath hash field: Inner source port (unbalanced) [ OK ] # INFO: Packets sent on path1 / path2: 32773 / 3 # TEST: Multipath hash field: Inner destination port (balanced) [ OK ] # INFO: Packets sent on path1 / path2: 16410 / 16362 # TEST: Multipath hash field: Inner destination port (unbalanced) [ OK ] # INFO: Packets sent on path1 / path2: 32770 / 0 # INFO: Running IPv6 overlay custom multipath hash tests # TEST: Multipath hash field: Inner source IP (balanced) [ OK ] # INFO: Packets sent on path1 / path2: 6150 / 6452 # TEST: Multipath hash field: Inner source IP (unbalanced) [ OK ] # INFO: Packets sent on path1 / path2: 0 / 12600 # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # TEST: Multipath hash field: Inner destination IP (balanced) [FAIL] # Expected traffic to be balanced, but it is not # INFO: Packets sent on path1 / path2: -129763 / -77050 # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Invalid VRF name # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Runtime error (func=(main), adr=3): Divide by zero # (standard_in) 1: syntax error # TEST: Multipath hash field: Inner destination IP (unbalanced) [ OK ] # INFO: Packets sent on path1 / path2: 0 / 0 # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Runtime error (func=(main), adr=3): Divide by zero # (standard_in) 1: syntax error # TEST: Multipath hash field: Inner flowlabel (balanced) [FAIL] # Expected traffic to be balanced, but it is not # INFO: Packets sent on path1 / path2: 0 / 0 # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Invalid VRF name # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Runtime error (func=(main), adr=3): Divide by zero # (standard_in) 1: syntax error # TEST: Multipath hash field: Inner flowlabel (unbalanced) [ OK ] # INFO: Packets sent on path1 / path2: 0 / 0 # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Invalid VRF name # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Runtime error (func=(main), adr=3): Divide by zero # (standard_in) 1: syntax error # TEST: Multipath hash field: Inner source port (balanced) [FAIL] # Expected traffic to be balanced, but it is not # INFO: Packets sent on path1 / path2: 0 / 0 # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Invalid VRF name # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Runtime error (func=(main), adr=3): Divide by zero # (standard_in) 1: syntax error # TEST: Multipath hash field: Inner source port (unbalanced) [ OK ] # INFO: Packets sent on path1 / path2: 0 / 0 # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Invalid VRF name # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Runtime error (func=(main), adr=3): Divide by zero # (standard_in) 1: syntax error # TEST: Multipath hash field: Inner destination port (balanced) [FAIL] # Expected traffic to be balanced, but it is not # INFO: Packets sent on path1 / path2: 0 / 0 # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Invalid VRF name # jq: error (at <stdin>:1): Cannot iterate over null (null) # jq: error (at <stdin>:1): Cannot iterate over null (null) # Runtime error (func=(main), adr=3): Divide by zero # (standard_in) 1: syntax error # TEST: Multipath hash field: Inner destination port (unbalanced) [ OK ] # INFO: Packets sent on path1 / path2: 0 / 0 # Error: argument "vveth9" is wrong: Invalid VRF # # Error: argument "vveth9" is wrong: Invalid VRF # # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: No such process # RTNETLINK answers: No such process # Cannot find device "vveth9" # Error: argument "vveth8" is wrong: Invalid VRF # # Error: argument "vveth8" is wrong: Invalid VRF # # Error: argument "vveth8" is wrong: Invalid VRF # # Cannot find device "g2" # Cannot find device "g2" # Cannot find device "g2" # Cannot find device "g2" # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: No such process # RTNETLINK answers: No such process # Cannot find device "vveth8" # Error: Invalid handle. # Error: argument "vveth6" is wrong: Invalid VRF # # Error: argument "vveth6" is wrong: Invalid VRF # # Cannot find device "veth5.222" # Cannot find device "veth5.111" # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: No such process # RTNETLINK answers: No such process # Cannot find device "vveth6" # Error: argument "vveth3" is wrong: Invalid VRF # # Error: argument "vveth3" is wrong: Invalid VRF # # Cannot find device "veth4.222" # Cannot find device "veth4.111" # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: No such process # RTNETLINK answers: No such process # Cannot find device "vveth3" # Error: argument "vveth1" is wrong: Invalid VRF # # Error: argument "vveth1" is wrong: Invalid VRF # # Error: argument "vveth1" is wrong: Invalid VRF # # Cannot find device "g1" # Cannot find device "g1" # Cannot find device "g1" # Cannot find device "g1" # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: No such process # RTNETLINK answers: No such process # Cannot find device "vveth1" # Error: argument "vveth0" is wrong: Invalid VRF # # Error: argument "vveth0" is wrong: Invalid VRF # # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: Cannot assign requested address # RTNETLINK answers: No such process # RTNETLINK answers: No such process # Cannot find device "vveth0" # RTNETLINK answers: File exists # RTNETLINK answers: No such file or directory # RTNETLINK answers: File exists # RTNETLINK answers: No such file or directory # not ok 18 selftests: net/forwarding: gre_custom_multipath_hash.sh # TIMEOUT 240 seconds Those things like RTNETLINK errors probably mess up things beyond what cleanup does, so the reproducer might not be that easy to devise. I have tried to reduce the complexity by adding: trap cleanup INT TERM EXIT to the tests that timed out. Kind regards, Mirsad

2 years, 5 months

1
0
0 0

[PROBLEM] selftests: net/forwarding/*.sh: 'Command line is not complete. Try option "help"'

by Mirsad Todorovac

Hi, There seems to be a problem with net/forwarding line of 6.5-rc2 kselftests, vanilla Torvalds tree, commit fdf0eaf11452, on Ubuntu 22.04 LTS Jammy Jellyfish. (Confirmed on Ubuntu 22.10 Kinetic Kudu.) Tests fail with error message: Command line is not complete. Try option "help" Failed to create netif The script # tools/testing/seltests/net/forwarding/bridge_igmp.sh bash `set -x` ends with an error: ++ create_netif_veth ++ local i ++ (( i = 1 )) ++ (( i <= NUM_NETIFS )) ++ local j=2 ++ ip link show dev ++ [[ 255 -ne 0 ]] ++ ip link add type veth peer name Command line is not complete. Try option "help" ++ [[ 255 -ne 0 ]] ++ echo 'Failed to create netif' Failed to create netif ++ exit 1 The problem seems to be linked with this piece of code of "lib.sh": create_netif_veth() { local i for ((i = 1; i <= NUM_NETIFS; ++i)); do local j=$((i+1)) ip link show dev ${NETIFS[p$i]} &> /dev/null if [[ $? -ne 0 ]]; then ip link add ${NETIFS[p$i]} type veth \ peer name ${NETIFS[p$j]} if [[ $? -ne 0 ]]; then echo "Failed to create netif" exit 1 fi fi i=$j done } Somehow, ${NETIFS[p$i]} is evaluated to an empty string? However, I can't seem to see what is the expected result. The problem was confirmed in the backlogs of 6.5-rc1 and 6.4 kselftests. It is possible that I'm doing something terribly wrong, but it is basically the default kselftest suite on a rather minimal Ubuntu. Please find attached the bash output from `set -x`. Version of iproute2 is: ii iproute2 5.15.0-1ubuntu2 amd64 networking and traffic control tools Hope this helps. Best regards, Mirsad Todorovac

2 years, 5 months

3
7
0 0

[PATCH v2] selftests: prctl: Add new prctl test for PR_SET_NAME

by Osama Muhammad

This patch will add the new test, which covers the prctl call PR_SET_NAME command. The test tries to give a name using the PR_SET_NAME call and then confirm it that it changed correctly by using PR_GET_NAME. It also tries to rename it with empty name.In the test PR_GET_NAME is tested by passing null pointer to it and check its behaviour. Signed-off-by: Osama Muhammad <osmtendev(a)gmail.com> --- changes since v1: -Used TASK_COMM_LEN instead of using numerical value 16. --- tools/testing/selftests/prctl/Makefile | 2 +- .../selftests/prctl/set-process-name.c | 62 +++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/prctl/set-process-name.c diff --git a/tools/testing/selftests/prctl/Makefile b/tools/testing/selftests/prctl/Makefile index c058b81ee..cfc35d29f 100644 --- a/tools/testing/selftests/prctl/Makefile +++ b/tools/testing/selftests/prctl/Makefile @@ -5,7 +5,7 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) ifeq ($(ARCH),x86) TEST_PROGS := disable-tsc-ctxt-sw-stress-test disable-tsc-on-off-stress-test \ - disable-tsc-test set-anon-vma-name-test + disable-tsc-test set-anon-vma-name-test set-process-name all: $(TEST_PROGS) include ../lib.mk diff --git a/tools/testing/selftests/prctl/set-process-name.c b/tools/testing/selftests/prctl/set-process-name.c new file mode 100644 index 000000000..3bc5e0e09 --- /dev/null +++ b/tools/testing/selftests/prctl/set-process-name.c @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * This test covers the PR_SET_NAME functionality of prctl calls + */ + +#include <errno.h> +#include <sys/prctl.h> +#include <string.h> + +#include "../kselftest_harness.h" + +#define CHANGE_NAME "changename" +#define EMPTY_NAME "" +#define TASK_COMM_LEN 16 + +int set_name(char *name) +{ + int res; + + res = prctl(PR_SET_NAME, name, NULL, NULL, NULL); + + if (res < 0) + return -errno; + return res; +} + +int check_is_name_correct(char *check_name) +{ + char name[TASK_COMM_LEN]; + int res; + + res = prctl(PR_GET_NAME, name, NULL, NULL, NULL); + + if (res < 0) + return -errno; + + return !strcmp(name, check_name); +} + +int check_null_pointer(char *check_name) +{ + char *name = NULL; + int res; + + res = prctl(PR_GET_NAME, name, NULL, NULL, NULL); + + return res; +} + +TEST(rename_process) { + + EXPECT_GE(set_name(CHANGE_NAME), 0); + EXPECT_TRUE(check_is_name_correct(CHANGE_NAME)); + + EXPECT_GE(set_name(EMPTY_NAME), 0); + EXPECT_TRUE(check_is_name_correct(EMPTY_NAME)); + + EXPECT_GE(set_name(CHANGE_NAME), 0); + EXPECT_LT(check_null_pointer(CHANGE_NAME), 0); +} + +TEST_HARNESS_MAIN -- 2.34.1

2 years, 5 months

3
10
0 0

[PATCH] rust: doctests: Use tabs for indentation in generated C code

by David Gow

While Rust uses 4 spaces for indentation, we should use tabs in the generated C code. This does result in some scary-looking tab characters in a .rs file, but they're in a string literal, so shouldn't make anything complain too much. Fixes: a66d733da801 ("rust: support running Rust documentation tests as KUnit ones") Signed-off-by: David Gow <davidgow(a)google.com> --- scripts/rustdoc_test_gen.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/rustdoc_test_gen.rs b/scripts/rustdoc_test_gen.rs index 5ebd42ae4a3f..a625cf3517c0 100644 --- a/scripts/rustdoc_test_gen.rs +++ b/scripts/rustdoc_test_gen.rs @@ -242,13 +242,13 @@ macro_rules! assert_eq {{ {c_test_declarations} static struct kunit_case test_cases[] = {{ - {c_test_cases} - {{ }} + {c_test_cases} + {{ }} }}; static struct kunit_suite test_suite = {{ - .name = "rust_doctests_kernel", - .test_cases = test_cases, + .name = "rust_doctests_kernel", + .test_cases = test_cases, }}; kunit_test_suite(test_suite); -- 2.41.0.255.g8b1d071c50-goog

2 years, 5 months

3
3
0 0

Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning

by Muhammad Usama Anjum

Thank you Michał. On 7/21/23 12:28 AM, Michał Mirosław wrote: > b. rename match "flags" to 'page categories' everywhere - this makes > it easier to differentiate the ioctl()s categorisation of pages > from struct page flags; > c. change {required + excluded} to {inverted + required}. This was > rejected before, but I'd like to illustrate the difference. > Old interface can be translated to the new by: > categories_inverted = excluded_mask > categories_mask = required_mask | excluded_mask > categories_anyof_mask = anyof_mask > The new way allows filtering by: A & (B | !C) > categories_inverted = C > categories_mask = A > categories_anyof_mask = B | C Andrei and Danylo, Are you okay with these masks? It were you two who had proposed these. -- BR, Muhammad Usama Anjum

2 years, 5 months

2
1
0 0

[PATCH RFC 0/7] selftests/nolibc: KTAP output

by Thomas Weißschuh

This series demonstrates how KTAP output can be used by nolibc-test to make the test results better to read for people and machines. Especially when running multiple invocations for different architectors or build configurations we can make use of the kernels TAP parser to automatically provide aggregated test reports. The code is very hacky and incomplete and mostly meant to validate if the output format is useful. Start with the last patch of the series to actually see the generated format, or run it for yourself. Signed-off-by: Thomas Weißschuh <linux(a)weissschuh.net> --- Thomas Weißschuh (7): selftests/nolibc: statically calculate number of testsuites selftests/nolibc: use unsigned indices for testcases selftests/nolibc: replace repetitive test structure with macro selftests/nolibc: count subtests kselftest: support KTAP format kselftest: support skipping tests with testname selftests/nolibc: proof of concept for TAP output tools/testing/selftests/kselftest.h | 20 +++ tools/testing/selftests/nolibc/nolibc-test.c | 197 ++++++++++-------------- tools/testing/selftests/nolibc/run-all-tests.sh | 22 +++ 3 files changed, 127 insertions(+), 112 deletions(-) --- base-commit: dfef4fc45d5713eb23d87f0863aff9c33bd4bfaf change-id: 20230718-nolibc-ktap-tmp-4408f505408d Best regards, -- Thomas Weißschuh <linux(a)weissschuh.net>

2 years, 5 months

2
9
0 0

Re: Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning

by kernel test robot

Hi Michał, kernel test robot noticed the following build errors: [auto build test ERROR on akpm-mm/mm-everything] [also build test ERROR on linus/master v6.5-rc2 next-20230721] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Micha-Miros-aw/Re-fs-proc-ta… base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/a0b5c6776b2ed91f78a7575649f8b100e58bd3a9.16898810… patch subject: Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning config: powerpc-randconfig-r015-20230720 (https://download.01.org/0day-ci/archive/20230721/202307211507.xOl45LiR-lkp@…) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a) reproduce: (https://download.01.org/0day-ci/archive/20230721/202307211507.xOl45LiR-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202307211507.xOl45LiR-lkp@intel.com/ All errors (new ones prefixed by >>): >> fs/proc/task_mmu.c:1921:6: error: call to undeclared function 'userfaultfd_wp_async'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 1921 | if (userfaultfd_wp_async(vma) && userfaultfd_wp_use_markers(vma)) | ^ >> fs/proc/task_mmu.c:2200:12: error: call to undeclared function 'uffd_wp_range'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 2200 | int err = uffd_wp_range(vma, addr, end - addr, true); | ^ 2 errors generated. vim +/userfaultfd_wp_async +1921 fs/proc/task_mmu.c 1913 1914 static int pagemap_scan_test_walk(unsigned long start, unsigned long end, 1915 struct mm_walk *walk) 1916 { 1917 struct pagemap_scan_private *p = walk->private; 1918 struct vm_area_struct *vma = walk->vma; 1919 unsigned long vma_category = 0; 1920 > 1921 if (userfaultfd_wp_async(vma) && userfaultfd_wp_use_markers(vma)) 1922 vma_category |= PAGE_IS_WPASYNC; 1923 else if (p->arg.flags & PM_SCAN_CHECK_WPASYNC) 1924 return -EPERM; 1925 1926 if (vma->vm_flags & VM_PFNMAP) 1927 return 1; 1928 1929 if (!pagemap_scan_is_interesting_vma(vma_category, p)) 1930 return 1; 1931 1932 p->cur_vma_category = vma_category; 1933 return 0; 1934 } 1935 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

2 years, 5 months

1
0
0 0

Re: Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning

by kernel test robot

Hi Michał, kernel test robot noticed the following build errors: [auto build test ERROR on akpm-mm/mm-everything] [also build test ERROR on linus/master v6.5-rc2 next-20230720] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Micha-Miros-aw/Re-fs-proc-ta… base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/a0b5c6776b2ed91f78a7575649f8b100e58bd3a9.16898810… patch subject: Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning config: i386-randconfig-r022-20230720 (https://download.01.org/0day-ci/archive/20230721/202307211337.5dwCMeHb-lkp@…) compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a) reproduce: (https://download.01.org/0day-ci/archive/20230721/202307211337.5dwCMeHb-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202307211337.5dwCMeHb-lkp@intel.com/ All errors (new ones prefixed by >>): >> fs/proc/task_mmu.c:1921:6: error: call to undeclared function 'userfaultfd_wp_async'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] if (userfaultfd_wp_async(vma) && userfaultfd_wp_use_markers(vma)) ^ >> fs/proc/task_mmu.c:2200:12: error: call to undeclared function 'uffd_wp_range'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] int err = uffd_wp_range(vma, addr, end - addr, true); ^ 2 errors generated. vim +/userfaultfd_wp_async +1921 fs/proc/task_mmu.c 1913 1914 static int pagemap_scan_test_walk(unsigned long start, unsigned long end, 1915 struct mm_walk *walk) 1916 { 1917 struct pagemap_scan_private *p = walk->private; 1918 struct vm_area_struct *vma = walk->vma; 1919 unsigned long vma_category = 0; 1920 > 1921 if (userfaultfd_wp_async(vma) && userfaultfd_wp_use_markers(vma)) 1922 vma_category |= PAGE_IS_WPASYNC; 1923 else if (p->arg.flags & PM_SCAN_CHECK_WPASYNC) 1924 return -EPERM; 1925 1926 if (vma->vm_flags & VM_PFNMAP) 1927 return 1; 1928 1929 if (!pagemap_scan_is_interesting_vma(vma_category, p)) 1930 return 1; 1931 1932 p->cur_vma_category = vma_category; 1933 return 0; 1934 } 1935 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

2 years, 5 months

1
0
0 0

[PATCH net-next v2 0/4] nexthop: Refactor and fix nexthop selection for multipath routes

by Benjamin Poirier

In order to select a nexthop for multipath routes, fib_select_multipath() is used with legacy nexthops and nexthop_select_path_hthr() is used with nexthop objects. Those two functions perform a validity test on the neighbor related to each nexthop but their logic is structured differently. This causes a divergence in behavior and nexthop_select_path_hthr() may return a nexthop that failed the neighbor validity test even if there was one that passed. Refactor nexthop_select_path_hthr() to make it more similar to fib_select_multipath() and fix the problem mentioned above. v2: Removed unnecessary "first" variable in "nexthop: Do not return invalid nexthop object during multipath selection". v1: https://lore.kernel.org/netdev/20230529201914.69828-1-bpoirier@nvidia.com/ --- Benjamin Poirier (4): nexthop: Factor out hash threshold fdb nexthop selection nexthop: Factor out neighbor validity check nexthop: Do not return invalid nexthop object during multipath selection selftests: net: Add test cases for nexthop groups with invalid neighbors net/ipv4/nexthop.c | 61 +++++++++---- tools/testing/selftests/net/fib_nexthops.sh | 129 ++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 19 deletions(-) --- base-commit: 36395b2efe905650cd179d67411ffee3b770268b change-id: 20230719-nh_select-0303d55a1fb0 Best regards, -- Benjamin Poirier <bpoirier(a)nvidia.com>

2 years, 5 months

3
6
0 0

Re: Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning

by kernel test robot

Hi Michał, kernel test robot noticed the following build errors: [auto build test ERROR on akpm-mm/mm-everything] [also build test ERROR on linus/master v6.5-rc2 next-20230720] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Micha-Miros-aw/Re-fs-proc-ta… base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/a0b5c6776b2ed91f78a7575649f8b100e58bd3a9.16898810… patch subject: Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning config: arc-randconfig-r035-20230720 (https://download.01.org/0day-ci/archive/20230721/202307211030.2CJH6TkM-lkp@…) compiler: arceb-elf-gcc (GCC) 12.3.0 reproduce: (https://download.01.org/0day-ci/archive/20230721/202307211030.2CJH6TkM-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202307211030.2CJH6TkM-lkp@intel.com/ All errors (new ones prefixed by >>): fs/proc/task_mmu.c: In function 'pagemap_scan_test_walk': fs/proc/task_mmu.c:1921:13: error: implicit declaration of function 'userfaultfd_wp_async'; did you mean 'userfaultfd_wp'? [-Werror=implicit-function-declaration] 1921 | if (userfaultfd_wp_async(vma) && userfaultfd_wp_use_markers(vma)) | ^~~~~~~~~~~~~~~~~~~~ | userfaultfd_wp fs/proc/task_mmu.c: In function 'pagemap_scan_pte_hole': >> fs/proc/task_mmu.c:2200:19: error: implicit declaration of function 'uffd_wp_range' [-Werror=implicit-function-declaration] 2200 | int err = uffd_wp_range(vma, addr, end - addr, true); | ^~~~~~~~~~~~~ fs/proc/task_mmu.c: In function 'pagemap_scan_init_bounce_buffer': fs/proc/task_mmu.c:2290:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 2290 | p->vec_out = (void __user *)p->arg.vec; | ^ fs/proc/task_mmu.c: At top level: fs/proc/task_mmu.c:1967:13: warning: 'pagemap_scan_backout_range' defined but not used [-Wunused-function] 1967 | static void pagemap_scan_backout_range(struct pagemap_scan_private *p, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/uffd_wp_range +2200 fs/proc/task_mmu.c 2182 2183 static int pagemap_scan_pte_hole(unsigned long addr, unsigned long end, 2184 int depth, struct mm_walk *walk) 2185 { 2186 struct pagemap_scan_private *p = walk->private; 2187 struct vm_area_struct *vma = walk->vma; 2188 int ret; 2189 2190 if (!vma || !pagemap_scan_is_interesting_page(p->cur_vma_category, p)) 2191 return 0; 2192 2193 ret = pagemap_scan_output(p->cur_vma_category, p, addr, &end); 2194 if (addr == end) 2195 return ret; 2196 2197 if (~p->arg.flags & PM_SCAN_WP_MATCHING) 2198 return ret; 2199 > 2200 int err = uffd_wp_range(vma, addr, end - addr, true); 2201 if (err < 0) 2202 ret = err; 2203 2204 return ret; 2205 } 2206 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

2 years, 5 months

1
0
0 0

Re: Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning

by kernel test robot

Hi Michał, kernel test robot noticed the following build warnings: [auto build test WARNING on akpm-mm/mm-everything] [also build test WARNING on linus/master v6.5-rc2 next-20230720] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Micha-Miros-aw/Re-fs-proc-ta… base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/a0b5c6776b2ed91f78a7575649f8b100e58bd3a9.16898810… patch subject: Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning config: mips-allyesconfig (https://download.01.org/0day-ci/archive/20230721/202307210528.2qgK1vwi-lkp@…) compiler: mips-linux-gcc (GCC) 12.3.0 reproduce: (https://download.01.org/0day-ci/archive/20230721/202307210528.2qgK1vwi-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202307210528.2qgK1vwi-lkp@intel.com/ All warnings (new ones prefixed by >>): fs/proc/task_mmu.c: In function 'pagemap_scan_test_walk': fs/proc/task_mmu.c:1921:13: error: implicit declaration of function 'userfaultfd_wp_async'; did you mean 'userfaultfd_wp'? [-Werror=implicit-function-declaration] 1921 | if (userfaultfd_wp_async(vma) && userfaultfd_wp_use_markers(vma)) | ^~~~~~~~~~~~~~~~~~~~ | userfaultfd_wp fs/proc/task_mmu.c: In function 'pagemap_scan_init_bounce_buffer': >> fs/proc/task_mmu.c:2290:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 2290 | p->vec_out = (void __user *)p->arg.vec; | ^ fs/proc/task_mmu.c: At top level: fs/proc/task_mmu.c:1967:13: warning: 'pagemap_scan_backout_range' defined but not used [-Wunused-function] 1967 | static void pagemap_scan_backout_range(struct pagemap_scan_private *p, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +2290 fs/proc/task_mmu.c 2264 2265 static int pagemap_scan_init_bounce_buffer(struct pagemap_scan_private *p) 2266 { 2267 if (!p->arg.vec_len) { 2268 /* 2269 * An arbitrary non-page-aligned sentinel value for 2270 * pagemap_scan_push_range(). 2271 */ 2272 p->cur_buf.start = p->cur_buf.end = ULLONG_MAX; 2273 return 0; 2274 } 2275 2276 /* 2277 * Allocate a smaller buffer to get output from inside the page 2278 * walk functions and walk the range in PAGEMAP_WALK_SIZE chunks. 2279 * The last range is always stored in p.cur_buf to allow coalescing 2280 * consecutive ranges that have the same categories returned across 2281 * walk_page_range() calls. 2282 */ 2283 p->vec_buf_len = min_t(size_t, PAGEMAP_WALK_SIZE >> PAGE_SHIFT, 2284 p->arg.vec_len - 1); 2285 p->vec_buf = kmalloc_array(p->vec_buf_len, sizeof(*p->vec_buf), 2286 GFP_KERNEL); 2287 if (!p->vec_buf) 2288 return -ENOMEM; 2289 > 2290 p->vec_out = (void __user *)p->arg.vec; 2291 2292 return 0; 2293 } 2294 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

2 years, 5 months

1
0
0 0

[PATCH bpf-next v5 0/5] Support defragmenting IPv(4|6) packets in BPF

by Daniel Xu

=== Context === In the context of a middlebox, fragmented packets are tricky to handle. The full 5-tuple of a packet is often only available in the first fragment which makes enforcing consistent policy difficult. There are really only two stateless options, neither of which are very nice: 1. Enforce policy on first fragment and accept all subsequent fragments. This works but may let in certain attacks or allow data exfiltration. 2. Enforce policy on first fragment and drop all subsequent fragments. This does not really work b/c some protocols may rely on fragmentation. For example, DNS may rely on oversized UDP packets for large responses. So stateful tracking is the only sane option. RFC 8900 [0] calls this out as well in section 6.3: Middleboxes [...] should process IP fragments in a manner that is consistent with [RFC0791] and [RFC8200]. In many cases, middleboxes must maintain state in order to achieve this goal. === BPF related bits === Policy has traditionally been enforced from XDP/TC hooks. Both hooks run before kernel reassembly facilities. However, with the new BPF_PROG_TYPE_NETFILTER, we can rather easily hook into existing netfilter reassembly infra. The basic idea is we bump a refcnt on the netfilter defrag module and then run the bpf prog after the defrag module runs. This allows bpf progs to transparently see full, reassembled packets. The nice thing about this is that progs don't have to carry around logic to detect fragments. === Changelog === Changes from v4: * Refactor module handling code to not sleep in rcu_read_lock() * Also unify the v4 and v6 hook structs so they can share codepaths * Fixed some checkpatch.pl formatting warnings Changes from v3: * Correctly initialize `addrlen` stack var for recvmsg() Changes from v2: * module_put() if ->enable() fails * Fix CI build errors Changes from v1: * Drop bpf_program__attach_netfilter() patches * static -> static const where appropriate * Fix callback assignment order during registration * Only request_module() if callbacks are missing * Fix retval when modprobe fails in userspace * Fix v6 defrag module name (nf_defrag_ipv6_hooks -> nf_defrag_ipv6) * Simplify priority checking code * Add warning if module doesn't assign callbacks in the future * Take refcnt on module while defrag link is active [0]: https://datatracker.ietf.org/doc/html/rfc8900 Daniel Xu (5): netfilter: defrag: Add glue hooks for enabling/disabling defrag netfilter: bpf: Support BPF_F_NETFILTER_IP_DEFRAG in netfilter link bpf: selftests: Support not connecting client socket bpf: selftests: Support custom type and proto for client sockets bpf: selftests: Add defrag selftests include/linux/netfilter.h | 10 + include/uapi/linux/bpf.h | 5 + net/ipv4/netfilter/nf_defrag_ipv4.c | 17 +- net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 11 + net/netfilter/core.c | 6 + net/netfilter/nf_bpf_link.c | 116 ++++++- tools/include/uapi/linux/bpf.h | 5 + tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/generate_udp_fragments.py | 90 ++++++ .../selftests/bpf/ip_check_defrag_frags.h | 57 ++++ tools/testing/selftests/bpf/network_helpers.c | 26 +- tools/testing/selftests/bpf/network_helpers.h | 3 + .../bpf/prog_tests/ip_check_defrag.c | 283 ++++++++++++++++++ .../selftests/bpf/progs/ip_check_defrag.c | 104 +++++++ 14 files changed, 715 insertions(+), 22 deletions(-) create mode 100755 tools/testing/selftests/bpf/generate_udp_fragments.py create mode 100644 tools/testing/selftests/bpf/ip_check_defrag_frags.h create mode 100644 tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c create mode 100644 tools/testing/selftests/bpf/progs/ip_check_defrag.c -- 2.41.0

2 years, 5 months

1
3
0 0

Re: fs/proc/task_mmu: Implement IOCTL for efficient page table scanning

by Michał Mirosław

On Thu, Jul 20, 2023 at 09:28:52PM +0200, Michał Mirosław wrote: > This is a massaged version of patch by Muhammad Usama Anjum [1] > to illustrate my review comments and hopefully push the implementation > efforts closer to conclusion. The changes are: [...] > +static void pagemap_scan_backout_range(struct pagemap_scan_private *p, > + unsigned long addr, unsigned long end) > +{ > + struct page_region *cur_buf = &p->cur_buf; > + > + if (cur_buf->start != addr) { > + cur_buf->end = addr; > + } else { > + cur_buf->start = cur_buf->end = 0; > + } > + > + p->end_addr = 0; Just noticed that this is missing: p->found_pages -= (end - addr) / PAGE_SIZE; > +} [...] Best Regards Michał Mirosław

2 years, 5 months

1
0
0 0

[PATCH v2 0/7] KUnit integration for Rust doctests

by Miguel Ojeda

v1: https://lore.kernel.org/rust-for-linux/20230614180837.630180-1-ojeda@kernel… v2: - Rebased on top of v6.5-rc1, which requires a change from `kunit_do_failed_assertion` to `__kunit_do_failed_assertion` (since the former became a macro) and the addition of a call to `__kunit_abort` (since previously the call was done by the old function which we cannot use anymore since it is a macro). (David) - Added prerequisite patch to KUnit header to include `stddef.h` to support the `KUNIT=y` case. (Reported by Boqun) - Added comment on the purpose of `trait FromErrno`. (Martin asked about it) - Simplify code to use `std::fs::write` instead of `write!`, which improves code size too. (Suggested by Alice) - Fix copy-paste type in docs from "error" to "info" and, to make it proper English, copy the `printk` docs style, i.e. from "info" to "info-level message" -- and same for the "error" one. (Miguel) - Swap `FILE` and `LINE` `static`s to keep the same order as done elsewhere. (Miguel) - Rename config option from `RUST_KERNEL_KUNIT_TEST` to `RUST_KERNEL_DOCTESTS` (and update its title), so that we can use the former for the "normal" (i.e. non-doctests, e.g. `#[test]` ones) tests in the future. (David) - Follow the syntax proposed for declaring test metadata in the KTAP v2 spec, which may also get used for the KUnit test attributes API. Thus, instead of "# Doctest from line {line}", use "# {test_name}.location: {file}.{line}", which ideally will allow to migrate to a KUnit attribute later. This is done in all cases, i.e. when the tests succeeds, because it may be useful for users running KUnit manually, or when passing `--raw_output` to `kunit.py`. (David) David: I used "location" instead of your suggested "line" alone, in order to have both in a single line, which looked nice and closer to the "ASSERTION FAILURE" case/line, since now we do have the original file (please see below). - Figure out the original line. This is done by deploying an anchor so that the difference in lines between the beginning of the test and the assert, in the generated file, can be computed. Then, we offset the line number of the original test, which is given by `rustdoc`. (developed by Boqun) - Figure out the original file. This is done by walking the filesystem, checking directory prefixes to reduce the amount of combinations to check, and it is only done once per file (rather than per test). Ambiguities are detected and reported. It does limit the filenames (module names) we can use, but it is unlikely we will hit it soon and this should be temporary anyway until `rustdoc` provides us with the real path. (Miguel) Tested with both in-tree and `O=` builds, but I would appreciate extra testing on this one, including via the `kunit.py` script. - The three last items combined means that we now see this output even for successful cases: # rust_doctest_kernel_sync_locked_by_rs_0.location: rust/kernel/sync/locked_by.rs:28 ok 53 rust_doctest_kernel_sync_locked_by_rs_0 Which basically gives the user all the information they need to go back to the source code of the doctest, while keeping them fairly stable for bisection, and while avoiding to require users to write test names manually. (David + Boqun + Miguel) David: from what I saw in v2 of the RFC for the test attributes API, the syntax still contains the test name when it is not a suite, so I followed that, but if you prefer to omit it, please feel free to do so (for me either way it is fine, and if this is the expected attribute syntax, I guess it is worth to follow it to make migration easier later on): # location: rust/kernel/sync/locked_by.rs:28 ok 53 rust_doctest_kernel_sync_locked_by_rs_0 - Collected `Reviewed-by`s and `Tested-by`s, except for the main commit due to the substantial changes. Miguel Ojeda (7): kunit: test-bug.h: include `stddef.h` for `NULL` rust: init: make doctests compilable/testable rust: str: make doctests compilable/testable rust: sync: make doctests compilable/testable rust: types: make doctests compilable/testable rust: support running Rust documentation tests as KUnit ones MAINTAINERS: add Rust KUnit files to the KUnit entry MAINTAINERS | 2 + include/kunit/test-bug.h | 2 + lib/Kconfig.debug | 13 ++ rust/.gitignore | 2 + rust/Makefile | 29 ++++ rust/bindings/bindings_helper.h | 1 + rust/helpers.c | 7 + rust/kernel/init.rs | 26 +-- rust/kernel/kunit.rs | 163 +++++++++++++++++++ rust/kernel/lib.rs | 2 + rust/kernel/str.rs | 4 +- rust/kernel/sync/arc.rs | 9 +- rust/kernel/sync/lock/mutex.rs | 1 + rust/kernel/sync/lock/spinlock.rs | 1 + rust/kernel/types.rs | 6 +- scripts/.gitignore | 2 + scripts/Makefile | 4 + scripts/rustdoc_test_builder.rs | 72 +++++++++ scripts/rustdoc_test_gen.rs | 260 ++++++++++++++++++++++++++++++ 19 files changed, 591 insertions(+), 15 deletions(-) create mode 100644 rust/kernel/kunit.rs create mode 100644 scripts/rustdoc_test_builder.rs create mode 100644 scripts/rustdoc_test_gen.rs base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 -- 2.41.0

2 years, 5 months

4
16
0 0

[PATCH 0/3] arm64/fpsimd: Fix use after free in SME when changing SVE VL

by Mark Brown

This series fixes an issue which David Spickett found where if we change the SVE VL while SME is in use we can end up attempting to save state to an unallocated buffer and adds testing coverage for that plus a bit more coverage of VL changes, just for paranioa. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Mark Brown (3): arm64/fpsimd: Ensure SME storage is allocated after SVE VL changes kselftest/arm64: Add a test case for SVE VL changes with SME active kselftest/arm64: Validate that changing one VL type does not affect another arch/arm64/kernel/fpsimd.c | 32 +++++-- tools/testing/selftests/arm64/fp/vec-syscfg.c | 127 +++++++++++++++++++++++++- 2 files changed, 148 insertions(+), 11 deletions(-) --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230713-arm64-fix-sve-sme-vl-change-60eb1fa6a707 Best regards, -- Mark Brown <broonie(a)kernel.org>

2 years, 5 months

3
6
0 0

[PATCH v2 0/3] drivers: base: Add tests showing devm handling inconsistencies

by Maxime Ripard

Hi, This follows the discussion here: https://lore.kernel.org/linux-kselftest/20230324123157.bbwvfq4gsxnlnfwb@hou… This shows a couple of inconsistencies with regard to how device-managed resources are cleaned up. Basically, devm resources will only be cleaned up if the device is attached to a bus and bound to a driver. Failing any of these cases, a call to device_unregister will not end up in the devm resources being released. We had to work around it in DRM to provide helpers to create a device for kunit tests, but the current discussion around creating similar, generic, helpers for kunit resumed interest in fixing this. This can be tested using the command: ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/base/test/ I added the fix David suggested back in that discussion which does fix the tests. The SoB is missing, since David didn't provide it back then. Let me know what you think, Maxime Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> --- Changes in v2: - Use an init function - Document the tests - Add a fix for the bugs - Link to v1: https://lore.kernel.org/r/20230329-kunit-devm-inconsistencies-test-v1-0-c33… --- David Gow (1): drivers: base: Free devm resources when unregistering a device Maxime Ripard (2): drivers: base: Add basic devm tests for root devices drivers: base: Add basic devm tests for platform devices drivers/base/core.c | 11 ++ drivers/base/test/.kunitconfig | 2 + drivers/base/test/Kconfig | 4 + drivers/base/test/Makefile | 3 + drivers/base/test/platform-device-test.c | 220 +++++++++++++++++++++++++++++++ drivers/base/test/root-device-test.c | 108 +++++++++++++++ 6 files changed, 348 insertions(+) --- base-commit: 53cdf865f90ba922a854c65ed05b519f9d728424 change-id: 20230329-kunit-devm-inconsistencies-test-5e5a7d01e60d Best regards, -- Maxime Ripard <mripard(a)kernel.org>

2 years, 5 months

2
11
0 0

[PATCH v5 0/6] KVM: selftests: Improve PMU event filter settings and add test cases

by Jinrong Liang

Hi, This patch series aims to improve the PMU event filter settings with a cleaner and more organized structure and adds several test cases related to PMU event filters. These changes help to ensure that KVM's PMU event filter functions as expected in all supported use cases. Any feedback or suggestions are greatly appreciated. Sincerely, Jinrong Liang Changes log: v5: - Add more x86 properties for Intel PMU; - Designated initializer instead of overwrite all members; (Isaku Yamahata) - PMU event filter invalid flag modified to "KVM_PMU_EVENT_FLAGS_VALID_MASK << 1"; (Isaku Yamahata) - sizeof(bitmap) is modified to "sizeof(bitmap) * 8" to represent the number of bits that can be represented by the bitmap variable. (Isaku Yamahata) Previous: https://lore.kernel.org/kvm/20230717062343.3743-1-cloudliang@tencent.com/T/ Jinrong Liang (6): KVM: selftests: Add x86 properties for Intel PMU in processor.h KVM: selftests: Drop the return of remove_event() KVM: selftests: Introduce __kvm_pmu_event_filter to improved event filter settings KVM: selftests: Add test cases for unsupported PMU event filter input values KVM: selftests: Test if event filter meets expectations on fixed counters KVM: selftests: Test gp event filters don't affect fixed event filters .../selftests/kvm/include/x86_64/processor.h | 5 + .../kvm/x86_64/pmu_event_filter_test.c | 317 ++++++++++++------ 2 files changed, 228 insertions(+), 94 deletions(-) base-commit: 88bb466c9dec4f70d682cf38c685324e7b1b3d60 -- 2.39.3

2 years, 5 months

1
6
0 0

[PATCH v2] kselftest/arm64: Exit streaming mode after collecting signal context

by Mark Brown

When we collect a signal context with one of the SME modes enabled we will have enabled that mode behind the compiler and libc's back so they may issue some instructions not valid in streaming mode, causing spurious failures. For the code prior to issuing the BRK to trigger signal handling we need to stay in streaming mode if we were already there since that's a part of the signal context the caller is trying to collect. Unfortunately this code includes a memset() which is likely to be heavily optimised and is likely to use FP instructions incompatible with streaming mode. We can avoid this happening by open coding the memset(), inserting a volatile assembly statement to avoid the compiler recognising what's being done and doing something in optimisation. This code is not performance critical so the inefficiency should not be an issue. After collecting the context we can simply exit streaming mode, avoiding these issues. Use a full SMSTOP for safety to prevent any issues appearing with ZA. Reported-by: Will Deacon <will(a)kernel.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Changes in v2: - Rebase onto v6.5-rc1. - Link to v1: https://lore.kernel.org/r/20230628-arm64-signal-memcpy-fix-v1-1-db3e0300829… --- .../selftests/arm64/signal/test_signals_utils.h | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/arm64/signal/test_signals_utils.h b/tools/testing/selftests/arm64/signal/test_signals_utils.h index 222093f51b67..db28409fd44b 100644 --- a/tools/testing/selftests/arm64/signal/test_signals_utils.h +++ b/tools/testing/selftests/arm64/signal/test_signals_utils.h @@ -60,13 +60,28 @@ static __always_inline bool get_current_context(struct tdescr *td, size_t dest_sz) { static volatile bool seen_already; + int i; + char *uc = (char *)dest_uc; assert(td && dest_uc); /* it's a genuine invocation..reinit */ seen_already = 0; td->live_uc_valid = 0; td->live_sz = dest_sz; - memset(dest_uc, 0x00, td->live_sz); + + /* + * This is a memset() but we don't want the compiler to + * optimise it into either instructions or a library call + * which might be incompatible with streaming mode. + */ + for (i = 0; i < td->live_sz; i++) { + asm volatile("nop" + : "+m" (*dest_uc) + : + : "memory"); + uc[i] = 0; + } + td->live_uc = dest_uc; /* * Grab ucontext_t triggering a SIGTRAP. @@ -103,6 +118,17 @@ static __always_inline bool get_current_context(struct tdescr *td, : : "memory"); + /* + * If we were grabbing a streaming mode context then we may + * have entered streaming mode behind the system's back and + * libc or compiler generated code might decide to do + * something invalid in streaming mode, or potentially even + * the state of ZA. Issue a SMSTOP to exit both now we have + * grabbed the state. + */ + if (td->feats_supported & FEAT_SME) + asm volatile("msr S0_3_C4_C6_3, xzr"); + /* * If we get here with seen_already==1 it implies the td->live_uc * context has been used to get back here....this probably means --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230628-arm64-signal-memcpy-fix-7de3b3c8fa10 Best regards, -- Mark Brown <broonie(a)kernel.org>

2 years, 5 months

2
2
0 0

[PATCH v2 0/8] selftests/mm fixes for arm64

by Ryan Roberts

Hi All, This is v2 of my series to clean up mm selftests so that they run correctly on arm64. See [1] for full explanation. Changes Since v1 [1] -------------------- - Patch 1: Explicitly set line buffer mode in ksft_print_header() - Dropped v1 patch 2 (set execute permissions): Andrew has taken this into his branch separately. - Patch 2: Don't compile `soft-dirty` suite for arm64 instead of skipping it at runtime. - Patch 2: Declare fewer tests and skip all of test_softdirty() if soft-dirty is not supported, rather than conditionally marking each check as skipped. - Added Reviewed-by tags: thanks DavidH! - Patch 8: Clarified commit message. [1] https://lore.kernel.org/linux-mm/20230713135440.3651409-1-ryan.roberts@arm.… Thanks, Ryan Ryan Roberts (8): selftests: Line buffer test program's stdout selftests/mm: Skip soft-dirty tests on arm64 selftests/mm: Enable mrelease_test for arm64 selftests/mm: Fix thuge-gen test bugs selftests/mm: va_high_addr_switch should skip unsupported arm64 configs selftests/mm: Make migration test robust to failure selftests/mm: Optionally pass duration to transhuge-stress selftests/mm: Run all tests from run_vmtests.sh tools/testing/selftests/kselftest.h | 9 ++ tools/testing/selftests/kselftest/runner.sh | 7 +- tools/testing/selftests/mm/Makefile | 82 ++++++++++--------- tools/testing/selftests/mm/madv_populate.c | 26 +++++- tools/testing/selftests/mm/migration.c | 14 +++- tools/testing/selftests/mm/mrelease_test.c | 1 + tools/testing/selftests/mm/run_vmtests.sh | 28 ++++++- tools/testing/selftests/mm/settings | 2 +- tools/testing/selftests/mm/thuge-gen.c | 4 +- tools/testing/selftests/mm/transhuge-stress.c | 12 ++- .../selftests/mm/va_high_addr_switch.c | 2 +- 11 files changed, 133 insertions(+), 54 deletions(-) -- 2.25.1

2 years, 5 months

4
21
0 0

[PROBLEM] selftests: net/forwarding/bridge_mdb.sh: 'Command "replace" is unknown, try "bridge mdb help"'

by Mirsad Todorovac

Hi, Consequential to the previous problem report, this one addresses almost the very next test script. The testing environment is the same: 6.5-rc2 vanilla Torvalds tree on Ubuntu 22.04 LTS. The used config is the same, please find it with the bridge_mdb.sh normal and "set -x" output on this link (too large to attach): https://domac.alu.unizg.hr/~mtodorov/linux/selftests/net-forwarding/bridge_… root@defiant:# ./bridge_mdb.sh INFO: # Host entries configuration tests TEST: Common host entries configuration tests (IPv4) [FAIL] Managed to add IPv4 host entry with a filter mode TEST: Common host entries configuration tests (IPv6) [FAIL] Managed to add IPv6 host entry with a filter mode TEST: Common host entries configuration tests (L2) [FAIL] Managed to add L2 host entry with a filter mode INFO: # Port group entries configuration tests - (*, G) Command "replace" is unknown, try "bridge mdb help". TEST: Common port group entries configuration tests (IPv4 (*, G)) [FAIL] Failed to replace IPv4 (*, G) entry Command "replace" is unknown, try "bridge mdb help". TEST: Common port group entries configuration tests (IPv6 (*, G)) [FAIL] Failed to replace IPv6 (*, G) entry Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". RTNETLINK answers: Invalid argument Error: bridge: (*, G) group is already joined by port. Error: bridge: (*, G) group is already joined by port. TEST: IPv4 (*, G) port group entries configuration tests [FAIL] (S, G) entry not created Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". RTNETLINK answers: Invalid argument Error: bridge: (*, G) group is already joined by port. Error: bridge: (*, G) group is already joined by port. TEST: IPv6 (*, G) port group entries configuration tests [FAIL] (S, G) entry not created INFO: # Port group entries configuration tests - (S, G) Command "replace" is unknown, try "bridge mdb help". TEST: Common port group entries configuration tests (IPv4 (S, G)) [FAIL] Failed to replace IPv4 (S, G) entry Command "replace" is unknown, try "bridge mdb help". TEST: Common port group entries configuration tests (IPv6 (S, G)) [FAIL] Failed to replace IPv6 (S, G) entry Error: bridge: (S, G) group is already joined by port. Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". TEST: IPv4 (S, G) port group entries configuration tests [FAIL] Managed to add an entry with a filter mode Error: bridge: (S, G) group is already joined by port. Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". Command "replace" is unknown, try "bridge mdb help". TEST: IPv6 (S, G) port group entries configuration tests [FAIL] "temp" entry has an unpending group timer INFO: # Port group entries configuration tests - L2 Command "replace" is unknown, try "bridge mdb help". TEST: Common port group entries configuration tests (L2 (*, G)) [FAIL] Failed to replace L2 (*, G) entry TEST: L2 (*, G) port group entries configuration tests [FAIL] Managed to add an entry with a filter mode INFO: # Large scale dump tests TEST: IPv4 large scale dump tests [ OK ] TEST: IPv6 large scale dump tests [ OK ] TEST: L2 large scale dump tests [ OK ] INFO: # Forwarding tests Error: bridge: Group is already joined by host. TEST: IPv4 host entries forwarding tests [FAIL] Packet not locally received after adding a host entry Error: bridge: Group is already joined by host. TEST: IPv6 host entries forwarding tests [FAIL] Packet locally received after flood TEST: L2 host entries forwarding tests [FAIL] Packet not locally received after flood Command "replace" is unknown, try "bridge mdb help". TEST: IPv4 port group "exclude" entries forwarding tests [FAIL] Packet from valid source not received on H2 after adding entry Command "replace" is unknown, try "bridge mdb help". TEST: IPv6 port group "exclude" entries forwarding tests [FAIL] Packet from invalid source received on H2 after adding entry Command "replace" is unknown, try "bridge mdb help". TEST: IPv4 port group "include" entries forwarding tests [FAIL] Packet from valid source not received on H2 after adding entry Command "replace" is unknown, try "bridge mdb help". TEST: IPv6 port group "include" entries forwarding tests [FAIL] Packet from invalid source received on H2 after adding entry TEST: L2 port entries forwarding tests [ OK ] INFO: # Control packets tests Command "replace" is unknown, try "bridge mdb help". TEST: IGMPv3 MODE_IS_INCLUDE tests [FAIL] Source not add to source list Command "replace" is unknown, try "bridge mdb help". TEST: MLDv2 MODE_IS_INCLUDE tests [FAIL] Source not add to source list root@defiant:# bridge mdb show root@defiant:# NOTE that several "sleep 10" command looped in the script can easily exceed the default timeout of 45 seconds, and SIGTERM to the script isn't processed, so it leaves the system in an unpredictable state from which even "systemctl restart networking" didn't bail out. Setting tools/testing/selftests/net/forwarding/settings:timeout=150 seemed enough. Best regards, Mirsad Todorovac

2 years, 5 months

2
2
0 0

[PATCH v2 bpf-next 0/4] allow bpf_map_sum_elem_count for all program types

by Anton Protopopov

This series is a follow up to the recent change [1] which added per-cpu insert/delete statistics for maps. The bpf_map_sum_elem_count kfunc presented in the original series was only available to tracing programs, so let's make it available to all. The first patch makes types listed in the reg2btf_ids[] array to be considered trusted by kfuncs. The second patch allows to treat CONST_PTR_TO_MAP as trusted pointers from kfunc's point of view by adding it to the reg2btf_ids[] array. The third patch adds missing const to the map argument of the bpf_map_sum_elem_count kfunc. The fourth patch registers the bpf_map_sum_elem_count for all programs, and patches selftests correspondingly. [1] https://lore.kernel.org/bpf/20230705160139.19967-1-aspsk@isovalent.com/ v1 -> v2: * treat the whole reg2btf_ids array as trusted (Alexei) Anton Protopopov (4): bpf: consider types listed in reg2btf_ids as trusted bpf: consider CONST_PTR_TO_MAP as trusted pointer to struct bpf_map bpf: make an argument const in the bpf_map_sum_elem_count kfunc bpf: allow any program to use the bpf_map_sum_elem_count kfunc include/linux/btf_ids.h | 1 + kernel/bpf/map_iter.c | 7 +++--- kernel/bpf/verifier.c | 22 +++++++++++-------- .../selftests/bpf/progs/map_ptr_kern.c | 5 +++++ 4 files changed, 22 insertions(+), 13 deletions(-) -- 2.34.1

2 years, 5 months

2
5
0 0

[PATCH v2 1/3] bpf: Allow NULL buffers in bpf_dynptr_slice(_rw)

by Daniel Rosenberg

bpf_dynptr_slice(_rw) uses a user provided buffer if it can not provide a pointer to a block of contiguous memory. This buffer is unused in the case of local dynptrs, and may be unused in other cases as well. There is no need to require the buffer, as the kfunc can just return NULL if it was needed and not provided. This adds another kfunc annotation, __opt, which combines with __sz and __szk to allow the buffer associated with the size to be NULL. If the buffer is NULL, the verifier does not check that the buffer is of sufficient size. Signed-off-by: Daniel Rosenberg <drosen(a)google.com> --- Documentation/bpf/kfuncs.rst | 23 ++++++++++++++++++++++- include/linux/skbuff.h | 2 +- kernel/bpf/helpers.c | 30 ++++++++++++++++++------------ kernel/bpf/verifier.c | 17 +++++++++++++---- 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/Documentation/bpf/kfuncs.rst b/Documentation/bpf/kfuncs.rst index ea2516374d92..7a3d9de5f315 100644 --- a/Documentation/bpf/kfuncs.rst +++ b/Documentation/bpf/kfuncs.rst @@ -100,7 +100,7 @@ Hence, whenever a constant scalar argument is accepted by a kfunc which is not a size parameter, and the value of the constant matters for program safety, __k suffix should be used. -2.2.2 __uninit Annotation +2.2.3 __uninit Annotation ------------------------- This annotation is used to indicate that the argument will be treated as @@ -117,6 +117,27 @@ Here, the dynptr will be treated as an uninitialized dynptr. Without this annotation, the verifier will reject the program if the dynptr passed in is not initialized. +2.2.4 __opt Annotation +------------------------- + +This annotation is used to indicate that the buffer associated with an __sz or __szk +argument may be null. If the function is passed a nullptr in place of the buffer, +the verifier will not check that length is appropriate for the buffer. The kfunc is +responsible for checking if this buffer is null before using it. + +An example is given below:: + + __bpf_kfunc void *bpf_dynptr_slice(..., void *buffer__opt, u32 buffer__szk) + { + ... + } + +Here, the buffer may be null. If buffer is not null, it at least of size buffer_szk. +Either way, the returned buffer is either NULL, or of size buffer_szk. Without this +annotation, the verifier will reject the program if a null pointer is passed in with +a nonzero size. + + .. _BPF_kfunc_nodef: 2.3 Using an existing kernel function diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 738776ab8838..8ddb4af1a501 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -4033,7 +4033,7 @@ __skb_header_pointer(const struct sk_buff *skb, int offset, int len, if (likely(hlen - offset >= len)) return (void *)data + offset; - if (!skb || unlikely(skb_copy_bits(skb, offset, buffer, len) < 0)) + if (!skb || !buffer || unlikely(skb_copy_bits(skb, offset, buffer, len) < 0)) return NULL; return buffer; diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 8d368fa353f9..26efb6fbeab2 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -2167,13 +2167,15 @@ __bpf_kfunc struct task_struct *bpf_task_from_pid(s32 pid) * bpf_dynptr_slice() - Obtain a read-only pointer to the dynptr data. * @ptr: The dynptr whose data slice to retrieve * @offset: Offset into the dynptr - * @buffer: User-provided buffer to copy contents into - * @buffer__szk: Size (in bytes) of the buffer. This is the length of the - * requested slice. This must be a constant. + * @buffer__opt: User-provided buffer to copy contents into. May be NULL + * @buffer__szk: Size (in bytes) of the buffer if present. This is the + * length of the requested slice. This must be a constant. * * For non-skb and non-xdp type dynptrs, there is no difference between * bpf_dynptr_slice and bpf_dynptr_data. * + * If buffer__opt is NULL, the call will fail if buffer_opt was needed. + * * If the intention is to write to the data slice, please use * bpf_dynptr_slice_rdwr. * @@ -2190,7 +2192,7 @@ __bpf_kfunc struct task_struct *bpf_task_from_pid(s32 pid) * direct pointer) */ __bpf_kfunc void *bpf_dynptr_slice(const struct bpf_dynptr_kern *ptr, u32 offset, - void *buffer, u32 buffer__szk) + void *buffer__opt, u32 buffer__szk) { enum bpf_dynptr_type type; u32 len = buffer__szk; @@ -2210,15 +2212,17 @@ __bpf_kfunc void *bpf_dynptr_slice(const struct bpf_dynptr_kern *ptr, u32 offset case BPF_DYNPTR_TYPE_RINGBUF: return ptr->data + ptr->offset + offset; case BPF_DYNPTR_TYPE_SKB: - return skb_header_pointer(ptr->data, ptr->offset + offset, len, buffer); + return skb_header_pointer(ptr->data, ptr->offset + offset, len, buffer__opt); case BPF_DYNPTR_TYPE_XDP: { void *xdp_ptr = bpf_xdp_pointer(ptr->data, ptr->offset + offset, len); if (xdp_ptr) return xdp_ptr; - bpf_xdp_copy_buf(ptr->data, ptr->offset + offset, buffer, len, false); - return buffer; + if (!buffer__opt) + return NULL; + bpf_xdp_copy_buf(ptr->data, ptr->offset + offset, buffer__opt, len, false); + return buffer__opt; } default: WARN_ONCE(true, "unknown dynptr type %d\n", type); @@ -2230,13 +2234,15 @@ __bpf_kfunc void *bpf_dynptr_slice(const struct bpf_dynptr_kern *ptr, u32 offset * bpf_dynptr_slice_rdwr() - Obtain a writable pointer to the dynptr data. * @ptr: The dynptr whose data slice to retrieve * @offset: Offset into the dynptr - * @buffer: User-provided buffer to copy contents into - * @buffer__szk: Size (in bytes) of the buffer. This is the length of the - * requested slice. This must be a constant. + * @buffer__opt: User-provided buffer to copy contents into. May be NULL + * @buffer__szk: Size (in bytes) of the buffer if present. This is the + * length of the requested slice. This must be a constant. * * For non-skb and non-xdp type dynptrs, there is no difference between * bpf_dynptr_slice and bpf_dynptr_data. * + * If buffer__opt is NULL, the call will fail if buffer_opt was needed. + * * The returned pointer is writable and may point to either directly the dynptr * data at the requested offset or to the buffer if unable to obtain a direct * data pointer to (example: the requested slice is to the paged area of an skb @@ -2267,7 +2273,7 @@ __bpf_kfunc void *bpf_dynptr_slice(const struct bpf_dynptr_kern *ptr, u32 offset * direct pointer) */ __bpf_kfunc void *bpf_dynptr_slice_rdwr(const struct bpf_dynptr_kern *ptr, u32 offset, - void *buffer, u32 buffer__szk) + void *buffer__opt, u32 buffer__szk) { if (!ptr->data || bpf_dynptr_is_rdonly(ptr)) return NULL; @@ -2294,7 +2300,7 @@ __bpf_kfunc void *bpf_dynptr_slice_rdwr(const struct bpf_dynptr_kern *ptr, u32 o * will be copied out into the buffer and the user will need to call * bpf_dynptr_write() to commit changes. */ - return bpf_dynptr_slice(ptr, offset, buffer, buffer__szk); + return bpf_dynptr_slice(ptr, offset, buffer__opt, buffer__szk); } __bpf_kfunc void *bpf_cast_to_kern_ctx(void *obj) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index fbcf5a4e2fcd..708ae7bca1fe 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -9398,6 +9398,11 @@ static bool is_kfunc_arg_const_mem_size(const struct btf *btf, return __kfunc_param_match_suffix(btf, arg, "__szk"); } +static bool is_kfunc_arg_optional(const struct btf *btf, const struct btf_param *arg) +{ + return __kfunc_param_match_suffix(btf, arg, "__opt"); +} + static bool is_kfunc_arg_constant(const struct btf *btf, const struct btf_param *arg) { return __kfunc_param_match_suffix(btf, arg, "__k"); @@ -10464,13 +10469,17 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_ break; case KF_ARG_PTR_TO_MEM_SIZE: { + struct bpf_reg_state *buff_reg = &regs[regno]; + const struct btf_param *buff_arg = &args[i]; struct bpf_reg_state *size_reg = &regs[regno + 1]; const struct btf_param *size_arg = &args[i + 1]; - ret = check_kfunc_mem_size_reg(env, size_reg, regno + 1); - if (ret < 0) { - verbose(env, "arg#%d arg#%d memory, len pair leads to invalid memory access\n", i, i + 1); - return ret; + if (!register_is_null(buff_reg) || !is_kfunc_arg_optional(meta->btf, buff_arg)) { + ret = check_kfunc_mem_size_reg(env, size_reg, regno + 1); + if (ret < 0) { + verbose(env, "arg#%d arg#%d memory, len pair leads to invalid memory access\n", i, i + 1); + return ret; + } } if (is_kfunc_arg_const_mem_size(meta->btf, size_arg, size_reg)) { base-commit: 6e98b09da931a00bf4e0477d0fa52748bf28fcce -- 2.40.1.495.gc816e09b53d-goog

2 years, 5 months

5
17
0 0

[PATCH 00/35] arm64/gcs: Provide support for GCS at EL0

by Mark Brown

The arm64 Guarded Control Stack (GCS) feature provides support for hardware protected stacks of return addresses, intended to provide hardening against return oriented programming (ROP) attacks and to make it easier to gather call stacks for applications such as profiling. When GCS is active a secondary stack called the Guarded Control Stack is maintained, protected with a memory attribute which means that it can only be written with specific GCS operations. When a BL is executed the value stored in LR is also pushed onto the GCS, and when a RET is executed the top of the GCS is popped and compared to LR with a fault being raised if the values do not match. GCS operations may only be performed on GCS pages, a data abort is generated if they are not. This series implements support for use of GCS by EL0, along with support for use of GCS within KVM guests. It does not enable use of GCS by either EL1 or EL2. Executables are started without GCS and must use a prctl() to enable it, it is expected that this will be done very early in application execution by the dynamic linker or other startup code. x86 has an equivalent feature called shadow stacks, this series depends on the x86 patches for generic memory management support for the new guarded/shadow stack page type and shares APIs as much as possible. As there has been extensive discussion with the wider community around the ABI for shadow stacks I have as far as practical kept implementation decisions close to those for x86, anticipating that review would lead to similar conclusions in the absence of strong reasoning for divergence. The main divergence I am concious of is that x86 allows shadow stack to be enabled and disabled repeatedly, freeing the shadow stack for the thread whenever disabled, while this implementation keeps the GCS allocated after disable but refuses to reenable it. This is to avoid races with things actively walking the GCS during a disable, we do anticipate that some systems will wish to disable GCS at runtime but are not aware of any demand for subsequently reenabling it. x86 uses an arch_prctl() to manage enable and disable, since only x86 and S/390 use arch_prctl() a generic prctl() was proposed[1] as part of a patch set for the equivalent RISC-V zisslpcfi feature which is adopted with some enhancements here. There's a few bits where I'm not convinced with where I've placed things, in particular the GCS write operation is in the GCS header not in uaccess.h, I wasn't sure what was clearest there and am probably too close to the code to have a clear opinion. The series depends on the x86 shadow stack support: https://lore.kernel.org/lkml/20230227222957.24501-1-rick.p.edgecombe@intel.… I've rebased this onto v6.5-rc1 but not included it in the series in order to avoid confusion with Rick's work and cut down the size of the series, you can see the branch at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git arm64-gcs [1] https://lore.kernel.org/lkml/20230213045351.3945824-1-debug@rivosinc.com/ Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Deepak Gupta (1): prctl: arch-agnostic prctl for shadow stack Mark Brown (34): prctl: Add flag for shadow stack writeability and push/pop arm64: Document boot requirements for Guarded Control Stacks arm64/gcs: Document the ABI for Guarded Control Stacks arm64/sysreg: Add new system registers for GCS arm64/sysreg: Add definitions for architected GCS caps arm64/gcs: Add manual encodings of GCS instructions arm64/gcs: Provide copy_to_user_gcs() arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) arm64/mm: Allocate PIE slots for EL0 guarded control stack mm: Define VM_SHADOW_STACK for arm64 when we support GCS arm64/mm: Map pages for guarded control stack KVM: arm64: Manage GCS registers for guests arm64: Disable traps for GCS usage at EL0 and EL1 arm64/idreg: Add overrride for GCS arm64/hwcap: Add hwcap for GCS arm64/traps: Handle GCS exceptions arm64/mm: Handle GCS data aborts arm64/gcs: Context switch GCS registers for EL0 arm64/gcs: Allocate a new GCS for threads with GCS enabled arm64/gcs: Implement shadow stack prctl() interface arm64/mm: Implement map_shadow_stack() arm64/signal: Set up and restore the GCS context for signal handlers arm64/signal: Expose GCS state in signal frames arm64/ptrace: Expose GCS via ptrace and core files arm64: Add Kconfig for Guarded Control Stack (GCS) kselftest/arm64: Verify the GCS hwcap kselftest/arm64: Add GCS as a detected feature in the signal tests kselftest/arm64: Add framework support for GCS to signal handling tests kselftest/arm64: Allow signals tests to specify an expected si_code kselftest/arm64: Always run signals tests with GCS enabled kselftest/arm64: Add very basic GCS test program kselftest/arm64: Add a GCS test program built with the system libc selftests/arm64: Add GCS signal tests kselftest/arm64: Enable GCS for the FP stress tests Documentation/admin-guide/kernel-parameters.txt | 3 + Documentation/arch/arm64/booting.rst | 22 ++ Documentation/arch/arm64/elf_hwcaps.rst | 3 + Documentation/arch/arm64/gcs.rst | 216 +++++++++++++ Documentation/arch/arm64/index.rst | 1 + Documentation/filesystems/proc.rst | 2 +- arch/arm64/Kconfig | 19 ++ arch/arm64/include/asm/cpufeature.h | 6 + arch/arm64/include/asm/el2_setup.h | 9 + arch/arm64/include/asm/esr.h | 26 +- arch/arm64/include/asm/exception.h | 2 + arch/arm64/include/asm/gcs.h | 88 ++++++ arch/arm64/include/asm/hwcap.h | 1 + arch/arm64/include/asm/kvm_host.h | 12 + arch/arm64/include/asm/pgtable-prot.h | 14 +- arch/arm64/include/asm/processor.h | 6 + arch/arm64/include/asm/sysreg.h | 20 ++ arch/arm64/include/asm/uaccess.h | 42 +++ arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/include/uapi/asm/ptrace.h | 7 + arch/arm64/include/uapi/asm/sigcontext.h | 9 + arch/arm64/kernel/cpufeature.c | 23 ++ arch/arm64/kernel/cpuinfo.c | 1 + arch/arm64/kernel/entry-common.c | 23 ++ arch/arm64/kernel/idreg-override.c | 2 + arch/arm64/kernel/process.c | 77 +++++ arch/arm64/kernel/ptrace.c | 50 +++ arch/arm64/kernel/signal.c | 240 +++++++++++++- arch/arm64/kernel/traps.c | 11 + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 17 + arch/arm64/kvm/sys_regs.c | 22 ++ arch/arm64/mm/Makefile | 1 + arch/arm64/mm/fault.c | 75 ++++- arch/arm64/mm/gcs.c | 202 ++++++++++++ arch/arm64/mm/mmap.c | 17 +- arch/arm64/tools/cpucaps | 1 + arch/arm64/tools/sysreg | 55 ++++ fs/proc/task_mmu.c | 3 + include/linux/mm.h | 15 +- include/linux/syscalls.h | 1 + include/uapi/asm-generic/unistd.h | 5 +- include/uapi/linux/elf.h | 1 + include/uapi/linux/prctl.h | 19 ++ kernel/sys.c | 20 ++ kernel/sys_ni.c | 1 + tools/testing/selftests/arm64/Makefile | 2 +- tools/testing/selftests/arm64/abi/hwcap.c | 19 ++ tools/testing/selftests/arm64/fp/assembler.h | 15 + tools/testing/selftests/arm64/fp/fpsimd-test.S | 2 + tools/testing/selftests/arm64/fp/sve-test.S | 2 + tools/testing/selftests/arm64/fp/za-test.S | 2 + tools/testing/selftests/arm64/fp/zt-test.S | 2 + tools/testing/selftests/arm64/gcs/.gitignore | 2 + tools/testing/selftests/arm64/gcs/Makefile | 19 ++ tools/testing/selftests/arm64/gcs/basic-gcs.c | 350 +++++++++++++++++++++ tools/testing/selftests/arm64/gcs/gcs-util.h | 65 ++++ tools/testing/selftests/arm64/gcs/libc-gcs.c | 217 +++++++++++++ tools/testing/selftests/arm64/signal/.gitignore | 1 + .../testing/selftests/arm64/signal/test_signals.c | 17 +- .../testing/selftests/arm64/signal/test_signals.h | 6 + .../selftests/arm64/signal/test_signals_utils.c | 32 +- .../selftests/arm64/signal/test_signals_utils.h | 39 +++ .../arm64/signal/testcases/gcs_exception_fault.c | 59 ++++ .../selftests/arm64/signal/testcases/gcs_frame.c | 78 +++++ .../arm64/signal/testcases/gcs_write_fault.c | 67 ++++ .../selftests/arm64/signal/testcases/testcases.c | 7 + .../selftests/arm64/signal/testcases/testcases.h | 1 + 67 files changed, 2363 insertions(+), 32 deletions(-) --- base-commit: 023ee2d672f3d7c2d15acf62bcfc4bc49c3677e5 change-id: 20230303-arm64-gcs-e311ab0d8729 Best regards, -- Mark Brown <broonie(a)kernel.org>

2 years, 5 months

5
50
0 0

[PATCH v2 0/5] ASoC: Improve coverage in default KUnit runs

by Mark Brown

We have some KUnit tests for ASoC but they're not being run as much as they should be since ASoC isn't enabled in the configs used by default with KUnit and in the case of the topology tests there is no way to enable them without enabling drivers that use them. This series provides a Kconfig option which KUnit can use directly rather than worry about drivers. Further, since KUnit is typically run in UML but ALSA prevents build with UML we need to remove that Kconfig conflict. As far as I can tell the motiviation for this is that many ALSA drivers use iomem APIs which are not available under UML and it's more trouble than it's worth to go through and add per driver dependencies. In order to avoid these issues we also provide stubs for these APIs so there are no build time issues if a driver relies on iomem but does not depend on it. With these stubs I am able to build all the sound drivers available in a UML defconfig (UML allmodconfig appears to have substantial other issues in a quick test). With this series I am able to run the topology KUnit tests as part of a kunit --alltests run. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Changes in v2: - Add support for building ALSA with UML. - Link to v1: https://lore.kernel.org/r/20230712-asoc-topology-kunit-enable-v1-0-b9f2da9d… --- Mark Brown (5): driver core: Provide stubs for !IOMEM builds platform: Provide stubs for !HAS_IOMEM builds ALSA: Enable build with UML kunit: Enable ASoC in all_tests.config ASoC: topology: Add explicit build option include/linux/device.h | 26 ++++++++++++++++++++++++++ include/linux/platform_device.h | 28 ++++++++++++++++++++++++++++ sound/Kconfig | 4 ---- sound/soc/Kconfig | 11 +++++++++++ tools/testing/kunit/configs/all_tests.config | 5 +++++ 5 files changed, 70 insertions(+), 4 deletions(-) --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230701-asoc-topology-kunit-enable-5e8dd50d0ed7 Best regards, -- Mark Brown <broonie(a)kernel.org>

2 years, 5 months

4
14
0 0

[PATCH 0/2] ASoC: Improve coverage in default KUnit runs

by Mark Brown

We have some KUnit tests for ASoC but they're not being run as much as they should be since ASoC isn't enabled in the configs used by default with KUnit and in the case of the topolofy tests there is no way to enable them without enabling drivers that use them. Let's improve that. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Mark Brown (2): kunit: Enable ASoC in all_tests.config ASoC: topology: Add explicit build option sound/soc/Kconfig | 11 +++++++++++ tools/testing/kunit/configs/all_tests.config | 5 +++++ 2 files changed, 16 insertions(+) --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230701-asoc-topology-kunit-enable-5e8dd50d0ed7 Best regards, -- Mark Brown <broonie(a)kernel.org>

2 years, 5 months

2
6
0 0

[PATCH net-next 0/4] nexthop: Refactor and fix nexthop selection for multipath routes

by Benjamin Poirier

In order to select a nexthop for multipath routes, fib_select_multipath() is used with legacy nexthops and nexthop_select_path_hthr() is used with nexthop objects. Those two functions perform a validity test on the neighbor related to each nexthop but their logic is structured differently. This causes a divergence in behavior and nexthop_select_path_hthr() may return a nexthop that failed the neighbor validity test even if there was one that passed. Refactor nexthop_select_path_hthr() to make it more similar to fib_select_multipath() and fix the problem mentioned above. Benjamin Poirier (4): nexthop: Factor out hash threshold fdb nexthop selection nexthop: Factor out neighbor validity check nexthop: Do not return invalid nexthop object during multipath selection selftests: net: Add test cases for nexthop groups with invalid neighbors net/ipv4/nexthop.c | 64 +++++++--- tools/testing/selftests/net/fib_nexthops.sh | 129 ++++++++++++++++++++ 2 files changed, 174 insertions(+), 19 deletions(-) -- 2.40.1

2 years, 5 months

3
10
0 0

[PATCH net-next 00/13] selftests: mptcp: format subtests results in TAP

by Matthieu Baerts

The current selftests infrastructure formats the results in TAP 13. This version doesn't support subtests and only the end result of each selftest is taken into account. It means that a single issue in a subtest of a selftest containing multiple subtests forces the whole selftest to be marked as failed. It also means that subtests results are not tracked by CI executing selftests. MPTCP selftests run hundreds of various subtests. It is then important to track each of them and not one result per selftest. It is particularly interesting to do that when validating stable kernels with the last version of the test suite: tests might fail because a feature is not supported but the test didn't skip that part. In this case, if subtests are not tracked, the whole selftest will be marked as failed making the other subtests useless because their results are ignored. Regarding this patch set: - The two first patches modify connect and userspace_pm selftests to continue executing other tests if there is an error before the end. This is what is done in the other MPTCP selftests. - Patches 3-5 are refactoring the code in userspace_pm selftest to reduce duplicated code, suppress some shellcheck warnings and prepare subtests' support by using new helpers. - Patch 6 adds new helpers in mptcp_lib.sh to easily support printing the subtests results in the different MPTCP selftests. - Patch 7-13 format subtests results in TAP 13 in the different MPTCP selftests. Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net> --- Matthieu Baerts (13): selftests: mptcp: connect: don't stop if error selftests: mptcp: userspace pm: don't stop if error selftests: mptcp: userspace_pm: fix shellcheck warnings selftests: mptcp: userspace_pm: uniform results printing selftests: mptcp: userspace_pm: reduce dup code around printf selftests: mptcp: lib: format subtests results in TAP selftests: mptcp: connect: format subtests results in TAP selftests: mptcp: pm_netlink: format subtests results in TAP selftests: mptcp: join: format subtests results in TAP selftests: mptcp: diag: format subtests results in TAP selftests: mptcp: simult flows: format subtests results in TAP selftests: mptcp: sockopt: format subtests results in TAP selftests: mptcp: userspace_pm: format subtests results in TAP tools/testing/selftests/net/mptcp/diag.sh | 7 + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 66 ++++++-- tools/testing/selftests/net/mptcp/mptcp_join.sh | 37 ++++- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 66 ++++++++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 20 ++- tools/testing/selftests/net/mptcp/pm_netlink.sh | 6 +- tools/testing/selftests/net/mptcp/simult_flows.sh | 4 + tools/testing/selftests/net/mptcp/userspace_pm.sh | 181 +++++++++++++-------- 8 files changed, 298 insertions(+), 89 deletions(-) --- base-commit: 60cc1f7d0605598b47ee3c0c2b4b6fbd4da50a06 change-id: 20230712-upstream-net-next-20230712-selftests-mptcp-subtests-25d250d77886 Best regards, -- Matthieu Baerts <matthieu.baerts(a)tessares.net>

2 years, 5 months

2
14
0 0

[RFC v2 0/9] kunit: Add test attributes API

by Rae Moar

Hello everyone, This is an RFC patch series to propose the addition of a test attributes framework to KUnit. There has been interest in filtering out "slow" KUnit tests. Most notably, a new config, CONFIG_MEMCPY_SLOW_KUNIT_TEST, has been added to exclude a particularly slow memcpy test (https://lore.kernel.org/all/20230118200653.give.574-kees@kernel.org/). This proposed attributes framework would be used to save and access test associated data, including whether a test is slow. These attributes would be reportable (via KTAP and command line output) and some will be filterable. This framework is designed to allow for the addition of other attributes in the future. These attributes could include whether the test is flaky, associated test files, etc. This is the second version of the RFC I have added a few big changes: - Change method for inputting filters to allow for spaces in filtering values - Add option to skip filtered tests instead of not run or show them with the --filter_skip flag - Separate the new feature to list tests and their attributes into both --list_tests (lists just tests) and --list_tests_attr (lists all) - Add new attribute to store module name associated with test - Add Tests to executor_test.c - Add Documentation - A few small changes to code commented on previously I would love to hear about the new features. If the series seems overall good I will send out the next version as an official patch series. Thanks! Rae Rae Moar (9): kunit: Add test attributes API structure kunit: Add speed attribute kunit: Add module attribute kunit: Add ability to filter attributes kunit: tool: Add command line interface to filter and report attributes kunit: memcpy: Mark tests as slow using test attributes kunit: time: Mark test as slow using test attributes kunit: add tests for filtering attributes kunit: Add documentation of KUnit test attributes .../dev-tools/kunit/running_tips.rst | 163 +++++++ include/kunit/attributes.h | 50 +++ include/kunit/test.h | 68 ++- kernel/time/time_test.c | 2 +- lib/Kconfig.debug | 3 + lib/kunit/Makefile | 3 +- lib/kunit/attributes.c | 406 ++++++++++++++++++ lib/kunit/executor.c | 115 ++++- lib/kunit/executor_test.c | 119 ++++- lib/kunit/kunit-example-test.c | 9 + lib/kunit/test.c | 27 +- lib/memcpy_kunit.c | 8 +- tools/testing/kunit/kunit.py | 80 +++- tools/testing/kunit/kunit_kernel.py | 6 +- tools/testing/kunit/kunit_tool_test.py | 39 +- 15 files changed, 1022 insertions(+), 76 deletions(-) create mode 100644 include/kunit/attributes.h create mode 100644 lib/kunit/attributes.c base-commit: 2e66833579ed759d7b7da1a8f07eb727ec6e80db -- 2.41.0.255.g8b1d071c50-goog

2 years, 5 months

4
26
0 0

[PATCH v3] selftests/input: add tests for the EVIOCSCLOCKID ioctl

by Dana Elfassy

From: Dana Elfassy <dangel101(a)gmail.com> This patch introduces tests for the EVIOCSCLOCKID ioctl, for full coverage of the different clkids Signed-off-by: Dana Elfassy <delfassy(a)redhat.com> Reviewed-by: Enric Balletbo Serra <eballetbo(a)gmail.com> Reviewed-by: Shuah Khan <skhan(a)linuxfoundation.org> --- Changes in v3: - Modified signed-off-by email - Added Reviewed-by tag Changes in v2: - Replaced clkids numerical values with their equivalent definition This patch depends on '[v3] selftests/input: Introduce basic tests for evdev ioctls' [1] sent to the ML. [1] https://patchwork.kernel.org/project/linux-input/patch/20230607153214.15933… tools/testing/selftests/input/evioc-test.c | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tools/testing/selftests/input/evioc-test.c b/tools/testing/selftests/input/evioc-test.c index ad7b93fe39cf..83ce1a3c9b84 100644 --- a/tools/testing/selftests/input/evioc-test.c +++ b/tools/testing/selftests/input/evioc-test.c @@ -17,6 +17,7 @@ #include <sys/stat.h> #include <time.h> #include <unistd.h> +#include <linux/time.h> #include "../kselftest_harness.h" @@ -234,4 +235,33 @@ TEST(eviocsrep_set_repeat_settings) selftest_uinput_destroy(uidev); } +TEST(eviocsclockid_set_clockid) +{ + struct selftest_uinput *uidev; + int clkid = CLOCK_REALTIME; + int rc; + + rc = selftest_uinput_create_device(&uidev, -1); + ASSERT_EQ(0, rc); + ASSERT_NE(NULL, uidev); + + rc = ioctl(uidev->evdev_fd, EVIOCSCLOCKID, &clkid); + ASSERT_EQ(0, rc); + + clkid = CLOCK_MONOTONIC; + rc = ioctl(uidev->evdev_fd, EVIOCSCLOCKID, &clkid); + ASSERT_EQ(0, rc); + + clkid = CLOCK_BOOTTIME; + rc = ioctl(uidev->evdev_fd, EVIOCSCLOCKID, &clkid); + ASSERT_EQ(0, rc); + + // case default + clkid = -1; + rc = ioctl(uidev->evdev_fd, EVIOCSCLOCKID, &clkid); + ASSERT_EQ(-1, rc); + + selftest_uinput_destroy(uidev); +} + TEST_HARNESS_MAIN -- 2.41.0

2 years, 5 months

1
0
0 0

[PATCH bpf-next 0/3] allow bpf_map_sum_elem_count for all program types

by Anton Protopopov

This short series is a follow up to the recent series [1] which added per-cpu insert/delete statistics for maps. The bpf_map_sum_elem_count kfunc presented in the original series was only available to tracing programs, so let's make it available to all. The first patch allows to treat CONST_PTR_TO_MAP as trusted pointers from kfunc's point of view. The second patch just adds const to the map argument of the bpf_map_sum_elem_count kfunc. The third patch registers the bpf_map_sum_elem_count for all programs, and patches selftests correspondingly. Anton Protopopov (3): bpf: consider CONST_PTR_TO_MAP as trusted pointer to struct bpf_map bpf: make an argument const in the bpf_map_sum_elem_count kfunc bpf: allow any program to use the bpf_map_sum_elem_count kfunc include/linux/btf_ids.h | 1 + kernel/bpf/map_iter.c | 7 +++---- kernel/bpf/verifier.c | 5 ++++- tools/testing/selftests/bpf/progs/map_ptr_kern.c | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-) -- 2.34.1

2 years, 5 months

2
7
0 0

[PATCH v4 0/6] KVM: selftests: Improve PMU event filter settings and add test cases

by Jinrong Liang

Hi, This patch series aims to improve the PMU event filter settings with a cleaner and more organized structure and adds several test cases related to PMU event filters. These changes help to ensure that KVM's PMU event filter functions as expected in all supported use cases. Any feedback or suggestions are greatly appreciated. Sincerely, Jinrong Liang Changes log: v4: - Rebased to 88bb466c9dec(tag: kvm-x86-next-2023.06.22); - Add a patch to add macros for fixed counters in processor.h; - Add a patch to drop the return of remove_event(); (Sean) - Reverse xmas tree; (Sean) - Optimize code style and comments; (Sean) Previous: https://lore.kernel.org/kvm/20230607123700.40229-1-cloudliang@tencent.com/T Jinrong Liang (6): KVM: selftests: Add macros for fixed counters in processor.h KVM: selftests: Drop the return of remove_event() KVM: selftests: Introduce __kvm_pmu_event_filter to improved event filter settings KVM: selftests: Add test cases for unsupported PMU event filter input values KVM: selftests: Test if event filter meets expectations on fixed counters KVM: selftests: Test gp event filters don't affect fixed event filters .../selftests/kvm/include/x86_64/processor.h | 2 + .../kvm/x86_64/pmu_event_filter_test.c | 314 ++++++++++++------ 2 files changed, 222 insertions(+), 94 deletions(-) base-commit: 88bb466c9dec4f70d682cf38c685324e7b1b3d60 -- 2.39.3

2 years, 5 months

2
12
0 0

[PATCH v4] selftests/net: replace manual array size calc with ARRAYSIZE macro.

by Mahmoud Maatuq

fixes coccinelle WARNING: Use ARRAY_SIZE Signed-off-by: Mahmoud Maatuq <mahmoudmatook.mm(a)gmail.com> --- changelog since v3: - move changelog outside commit message. changelog since v2: - integrat a commit that contains actual replacement for ARRAY_SIZE. - use ARRAY_SIZE for net/psock_lib.h changelog since v1: - remove unnecessary extra new line changelog since v0: - update net/Makefile to include kselftest.h - remove redefinition of ARRAYSIZE. --- tools/testing/selftests/net/Makefile | 2 ++ tools/testing/selftests/net/csum.c | 6 ++++-- tools/testing/selftests/net/hwtstamp_config.c | 6 ++++-- tools/testing/selftests/net/psock_lib.h | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 7f3ab2a93ed6..a06cc25489f9 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -3,6 +3,8 @@ CFLAGS = -Wall -Wl,--no-as-needed -O2 -g CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES) +# Additional include paths needed by kselftest.h +CFLAGS += -I../ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \ rtnetlink.sh xfrm_policy.sh test_blackhole_dev.sh diff --git a/tools/testing/selftests/net/csum.c b/tools/testing/selftests/net/csum.c index 82a1c1839da6..90eb06fefa59 100644 --- a/tools/testing/selftests/net/csum.c +++ b/tools/testing/selftests/net/csum.c @@ -91,6 +91,8 @@ #include <sys/types.h> #include <unistd.h> +#include "kselftest.h" + static bool cfg_bad_csum; static int cfg_family = PF_INET6; static int cfg_num_pkt = 4; @@ -450,7 +452,7 @@ static void send_packet(int fd, const char *buf, int len) iov[2].iov_len = len; msg.msg_iov = iov; - msg.msg_iovlen = sizeof(iov) / sizeof(iov[0]); + msg.msg_iovlen = ARRAY_SIZE(iov); msg.msg_name = &addr; msg.msg_namelen = sizeof(addr); @@ -505,7 +507,7 @@ static void __recv_prepare_packet_filter(int fd, int off_nexthdr, int off_dport) struct sock_fprog prog = {}; prog.filter = filter; - prog.len = sizeof(filter) / sizeof(struct sock_filter); + prog.len = ARRAY_SIZE(filter); if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog))) error(1, errno, "setsockopt filter"); } diff --git a/tools/testing/selftests/net/hwtstamp_config.c b/tools/testing/selftests/net/hwtstamp_config.c index e1fdee841021..170728c96c46 100644 --- a/tools/testing/selftests/net/hwtstamp_config.c +++ b/tools/testing/selftests/net/hwtstamp_config.c @@ -16,6 +16,8 @@ #include <linux/net_tstamp.h> #include <linux/sockios.h> +#include "kselftest.h" + static int lookup_value(const char **names, int size, const char *name) { @@ -50,7 +52,7 @@ static const char *tx_types[] = { TX_TYPE(ONESTEP_SYNC) #undef TX_TYPE }; -#define N_TX_TYPES ((int)(sizeof(tx_types) / sizeof(tx_types[0]))) +#define N_TX_TYPES ((int)(ARRAY_SIZE(tx_types))) static const char *rx_filters[] = { #define RX_FILTER(name) [HWTSTAMP_FILTER_ ## name] = #name @@ -71,7 +73,7 @@ static const char *rx_filters[] = { RX_FILTER(PTP_V2_DELAY_REQ), #undef RX_FILTER }; -#define N_RX_FILTERS ((int)(sizeof(rx_filters) / sizeof(rx_filters[0]))) +#define N_RX_FILTERS ((int)(ARRAY_SIZE(rx_filters))) static void usage(void) { diff --git a/tools/testing/selftests/net/psock_lib.h b/tools/testing/selftests/net/psock_lib.h index faa884385c45..6e4fef560873 100644 --- a/tools/testing/selftests/net/psock_lib.h +++ b/tools/testing/selftests/net/psock_lib.h @@ -14,6 +14,8 @@ #include <arpa/inet.h> #include <unistd.h> +#include "kselftest.h" + #define DATA_LEN 100 #define DATA_CHAR 'a' #define DATA_CHAR_1 'b' @@ -63,7 +65,7 @@ static __maybe_unused void pair_udp_setfilter(int fd) struct sock_fprog bpf_prog; bpf_prog.filter = bpf_filter; - bpf_prog.len = sizeof(bpf_filter) / sizeof(struct sock_filter); + bpf_prog.len = ARRAY_SIZE(bpf_filter); if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &bpf_prog, sizeof(bpf_prog))) { -- 2.34.1

2 years, 5 months

2
1
0 0

[PATCH net 0/3] selftests: tc: increase timeout and add missing kconfig

by Matthieu Baerts

When looking for something else in LKFT reports [1], I noticed that the TC selftest ended with a timeout error: not ok 1 selftests: tc-testing: tdc.sh # TIMEOUT 45 seconds I also noticed most of the tests were skipped because the "teardown stage" did not complete successfully. It was due to missing kconfig. These patches fix these two errors plus an extra one because this selftest reads info from "/proc/net/nf_conntrack". Thank you Pedro for having helped me fixing these issues [2]. Link: https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20230711/te… [1] Link: https://lore.kernel.org/netdev/0e061d4a-9a23-9f58-3b35-d8919de332d7@tessare… [2] Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net> --- Matthieu Baerts (3): selftests: tc: set timeout to 15 minutes selftests: tc: add 'ct' action kconfig dep selftests: tc: add ConnTrack procfs kconfig tools/testing/selftests/tc-testing/config | 2 ++ tools/testing/selftests/tc-testing/settings | 1 + 2 files changed, 3 insertions(+) --- base-commit: 9d23aac8a85f69239e585c8656c6fdb21be65695 change-id: 20230713-tc-selftests-lkft-363e4590f105 Best regards, -- Matthieu Baerts <matthieu.baerts(a)tessares.net>

2 years, 5 months

5
12
0 0

nolibc: KTAP output and test reports

by Thomas Weißschuh

Hi Willy, Zhangjin, after your recent discussions about the test output and report I wondered if it would make sense to switch nolibc-test to KTAP output format [0]. With this it would be possible to have a wrapper script run each architecture test as its own test subcomponent. A (K)TAP parser/runner could then directly recognize and report failing testcases, making it easier to validate. Also maybe we can hook it up into the regular kselftests setup and have the bots run it as part of that. The kernel even includes a header-only library to implement the format [1]. It also should be fairly easy to emit the format without a library. Thomas [0] Documentation/dev-tools/ktap.rst [1] Documentation/dev-tools/kselftest.rst (Test harness)

2 years, 5 months

3
3
0 0

[PATCH v1 00/22] selftests/nolibc: add minimal kernel config support

by Zhangjin Wu

Willy, Thomas We just sent the 'selftests/nolibc: allow run with minimal kernel config' series [1], Here is the 'minimal' kernel config support, with both of them, it is possible to run nolibc-test for all architectures with oneline command and in less than ~30 minutes - 1 hour (not fullly measured yet): // run with tiny config + qemu-system // Note: rv32 and loongarch require to download the bios at first $ time make run-tiny-all QUIET_RUN=1 // run with default config + qemu-system $ time make run-default-all QUIET_RUN=1 // run with qemu-user $ time make run-user-all QUIET_RUN=1 Besides the 'tinyconfig' suggestion from Thomas, this patch also merge the generic part of my local powerpc porting (the extconfig to add additional console support). This is applied after the test report patchset [2] and the rv32 compile patchset [3], because all of them touched the same Makefile. Even without the 'selftests/nolibc: allow run with minimal kernel config' series [1], all of the tests can pass except the /proc/self/net related ones (We haven't enable CONFIG_NET in this patchset), the chmod_net one will be removed by Thomas from this patchset [4] for the wrong chmodable attribute issue of /proc/self/net, the link_cross one can be simply fixed up by using another /proc/self interface (like /proc/self/cmdline), which will be covered in our revision of the [1] series. Beside the core 'minimal' config support, some generic patch are added together to avoid patch conflicts. * selftests/nolibc: add test for -include /path/to/nolibc.h Add a test switch to allow run nolibc-test with nolibc.h * selftests/nolibc: print result to the screen too Let the run targets print results by default, allow disable by QUIET_RUN=1 * selftests/nolibc: allow use x86_64 toolchain for i386 Allow use x86_64 toolchains for i386 * selftests/nolibc: add menuconfig target for manual config a new 'menuconfig' target added for development and debugging * selftests/nolibc: add tinyconfig target a new 'tinyconfig' compare to 'defconfig', smaller and faster, but not enough for boot and print, require following 'extconfig' target * selftests/nolibc: allow customize extra kernel config options a new 'extconfig' allows to add extra config options for 'defconfig' and 'tinyconfig' * selftests/nolibc: add common extra config options selftests/nolibc: add power reset control support selftests/nolibc: add procfs, shmem and tmpfs Add common extra configs, the 3rd one (procfs, shmem and tmpfs) can be completely reverted after [1] series, but as discuss with Thomas, procfs may be still a hard requirement. * selftests/nolibc: add extra configs for i386 selftests/nolibc: add extra configs for x86_64 selftests/nolibc: add extra configs for arm64 selftests/nolibc: add extra configs for arm selftests/nolibc: add extra configs for mips selftests/nolibc: add extra configs for riscv32 selftests/nolibc: add extra configs for riscv64 selftests/nolibc: add extra configs for s390x selftests/nolibc: add extra configs for loongarch Add architecture specific extra configs to let kernel boot and nolibc-test print. The rv32 added here is only for test, it should not be merged before the missing 64bit syscalls are added (still wait for the merging of the __sysret and -ENOSYS patches). * selftests/nolibc: config default CROSS_COMPILE selftests/nolibc: add run-tiny and run-default both run-tiny and run-default are added to do config and run together, this easier test a log. * selftests/nolibc: allow run tests on all targets selftests/nolibc: detect bios existing to avoid hang Further allow do run-user, run-tiny and run-default for all architectures at once, the -all suffix is added to do so. Since some generic patches are still in review, before sending the left rv32 patches, I'm will send more generic patches later, the coming one is arch-xxx.h cleanup, and then, the 32bit powerpc porting support. For the compile speedup, the next step may be add architecture specific 'O' support, which may allow us rerun across architectures without mrproper, for a single architecture development, this 'minimal' config should be enough ;-) Thanks. Best regards, Zhangjin --- [1]: https://lore.kernel.org/lkml/cover.1687344643.git.falcon@tinylab.org/ [2]: https://lore.kernel.org/lkml/cover.1687156559.git.falcon@tinylab.org/ [3]: https://lore.kernel.org/linux-riscv/cover.1687176996.git.falcon@tinylab.org/ [4]: https://lore.kernel.org/lkml/20230624-proc-net-setattr-v1-0-73176812adee@we… Zhangjin Wu (22): selftests/nolibc: add test for -include /path/to/nolibc.h selftests/nolibc: print result to the screen too selftests/nolibc: allow use x86_64 toolchain for i386 selftests/nolibc: add menuconfig target for manual config selftests/nolibc: add tinyconfig target selftests/nolibc: allow customize extra kernel config options selftests/nolibc: add common extra config options selftests/nolibc: add power reset control support selftests/nolibc: add procfs, shmem and tmpfs selftests/nolibc: add extra configs for i386 selftests/nolibc: add extra configs for x86_64 selftests/nolibc: add extra configs for arm64 selftests/nolibc: add extra configs for arm selftests/nolibc: add extra configs for mips selftests/nolibc: add extra configs for riscv32 selftests/nolibc: add extra configs for riscv64 selftests/nolibc: add extra configs for s390x selftests/nolibc: add extra configs for loongarch selftests/nolibc: config default CROSS_COMPILE selftests/nolibc: add run-tiny and run-default selftests/nolibc: allow run tests on all targets selftests/nolibc: detect bios existing to avoid hang tools/testing/selftests/nolibc/Makefile | 125 ++++++++++++++++++++++-- 1 file changed, 119 insertions(+), 6 deletions(-) -- 2.25.1

2 years, 5 months

3
30
0 0

[GIT PULL] Kselftest fixes update for Linux 6.5-rc3

by Shuah Khan

Hi Linus, Please pull the following Kselftest fixes update for Linux 6.5-rc3. This Kselftest fixes update for Linux 6.5-rc3 consists of fixes to bugs that are interfering with arm64 and riscv workflows. This update also includes two fixes to timer and mincore tests that are causing test failures. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5: Linux 6.5-rc1 (2023-07-09 13:53:13 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-fixes-6.5-rc3 for you to fetch changes up to 569f8b501b177f21121d483a96491716ab8905f4: selftests/arm64: fix build failure during the "emit_tests" step (2023-07-14 12:33:35 -0600) ---------------------------------------------------------------- linux-kselftest-fixes-6.5-rc3 This Kselftest fixes update for Linux 6.5-rc3 consists of fixes to bugs that are interfering with arm64 and riscv workflows. This update also includes two fixes to timer and mincore tests that are causing test failures. ---------------------------------------------------------------- John Hubbard (2): selftests/riscv: fix potential build failure during the "emit_tests" step selftests/arm64: fix build failure during the "emit_tests" step Minjie Du (1): tools: timers: fix freq average calculation Ricardo Cañuelo (1): selftests/mincore: fix skip condition for check_huge_pages test tools/testing/selftests/arm64/Makefile | 2 +- tools/testing/selftests/mincore/mincore_selftest.c | 4 ++-- tools/testing/selftests/riscv/Makefile | 2 +- tools/testing/selftests/timers/raw_skew.c | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------

2 years, 5 months

2
1
0 0

[PATCH v25 0/5] Implement IOCTL to get and optionally clear info about PTEs

by Muhammad Usama Anjum

*Changes in v25*: - Do proper filtering on hole as well (hole got missed earlier) *Changes in v24*: - Rebase on top of next-20230710 - Place WP markers in case of hole as well *Changes in v23*: - Set vec_buf_index in loop only when vec_buf_index is set - Return -EFAULT instead of -EINVAL if vec is NULL - Correctly return the walk ending address to the page granularity *Changes in v22*: - Interface change: - Replace [start start + len) with [start, end) - Return the ending address of the address walk in start *Changes in v21*: - Abort walk instead of returning error if WP is to be performed on partial hugetlb *Changes in v20* - Correct PAGE_IS_FILE and add PAGE_IS_PFNZERO *Changes in v19* - Minor changes and interface updates *Changes in v18* - Rebase on top of next-20230613 - Minor updates *Changes in v17* - Rebase on top of next-20230606 - Minor improvements in PAGEMAP_SCAN IOCTL patch *Changes in v16* - Fix a corner case - Add exclusive PM_SCAN_OP_WP back *Changes in v15* - Build fix (Add missed build fix in RESEND) *Changes in v14* - Fix build error caused by #ifdef added at last minute in some configs *Changes in v13* - Rebase on top of next-20230414 - Give-up on using uffd_wp_range() and write new helpers, flush tlb only once *Changes in v12* - Update and other memory types to UFFD_FEATURE_WP_ASYNC - Rebaase on top of next-20230406 - Review updates *Changes in v11* - Rebase on top of next-20230307 - Base patches on UFFD_FEATURE_WP_UNPOPULATED - Do a lot of cosmetic changes and review updates - Remove ENGAGE_WP + !GET operation as it can be performed with UFFDIO_WRITEPROTECT *Changes in v10* - Add specific condition to return error if hugetlb is used with wp async - Move changes in tools/include/uapi/linux/fs.h to separate patch - Add documentation *Changes in v9:* - Correct fault resolution for userfaultfd wp async - Fix build warnings and errors which were happening on some configs - Simplify pagemap ioctl's code *Changes in v8:* - Update uffd async wp implementation - Improve PAGEMAP_IOCTL implementation *Changes in v7:* - Add uffd wp async - Update the IOCTL to use uffd under the hood instead of soft-dirty flags *Motivation* The real motivation for adding PAGEMAP_SCAN IOCTL is to emulate Windows GetWriteWatch() syscall [1]. The GetWriteWatch{} retrieves the addresses of the pages that are written to in a region of virtual memory. This syscall is used in Windows applications and games etc. This syscall is being emulated in pretty slow manner in userspace. Our purpose is to enhance the kernel such that we translate it efficiently in a better way. Currently some out of tree hack patches are being used to efficiently emulate it in some kernels. We intend to replace those with these patches. So the whole gaming on Linux can effectively get benefit from this. It means there would be tons of users of this code. CRIU use case [2] was mentioned by Andrei and Danylo: > Use cases for migrating sparse VMAs are binaries sanitized with ASAN, > MSAN or TSAN [3]. All of these sanitizers produce sparse mappings of > shadow memory [4]. Being able to migrate such binaries allows to highly > reduce the amount of work needed to identify and fix post-migration > crashes, which happen constantly. Andrei's defines the following uses of this code: * it is more granular and allows us to track changed pages more effectively. The current interface can clear dirty bits for the entire process only. In addition, reading info about pages is a separate operation. It means we must freeze the process to read information about all its pages, reset dirty bits, only then we can start dumping pages. The information about pages becomes more and more outdated, while we are processing pages. The new interface solves both these downsides. First, it allows us to read pte bits and clear the soft-dirty bit atomically. It means that CRIU will not need to freeze processes to pre-dump their memory. Second, it clears soft-dirty bits for a specified region of memory. It means CRIU will have actual info about pages to the moment of dumping them. * The new interface has to be much faster because basic page filtering is happening in the kernel. With the old interface, we have to read pagemap for each page. *Implementation Evolution (Short Summary)* From the definition of GetWriteWatch(), we feel like kernel's soft-dirty feature can be used under the hood with some additions like: * reset soft-dirty flag for only a specific region of memory instead of clearing the flag for the entire process * get and clear soft-dirty flag for a specific region atomically So we decided to use ioctl on pagemap file to read or/and reset soft-dirty flag. But using soft-dirty flag, sometimes we get extra pages which weren't even written. They had become soft-dirty because of VMA merging and VM_SOFTDIRTY flag. This breaks the definition of GetWriteWatch(). We were able to by-pass this short coming by ignoring VM_SOFTDIRTY until David reported that mprotect etc messes up the soft-dirty flag while ignoring VM_SOFTDIRTY [5]. This wasn't happening until [6] got introduced. We discussed if we can revert these patches. But we could not reach to any conclusion. So at this point, I made couple of tries to solve this whole VM_SOFTDIRTY issue by correcting the soft-dirty implementation: * [7] Correct the bug fixed wrongly back in 2014. It had potential to cause regression. We left it behind. * [8] Keep a list of soft-dirty part of a VMA across splits and merges. I got the reply don't increase the size of the VMA by 8 bytes. At this point, we left soft-dirty considering it is too much delicate and userfaultfd [9] seemed like the only way forward. From there onward, we have been basing soft-dirty emulation on userfaultfd wp feature where kernel resolves the faults itself when WP_ASYNC feature is used. It was straight forward to add WP_ASYNC feature in userfautlfd. Now we get only those pages dirty or written-to which are really written in reality. (PS There is another WP_UNPOPULATED userfautfd feature is required which is needed to avoid pre-faulting memory before write-protecting [9].) All the different masks were added on the request of CRIU devs to create interface more generic and better. [1] https://learn.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-… [2] https://lore.kernel.org/all/20221014134802.1361436-1-mdanylo@google.com [3] https://github.com/google/sanitizers [4] https://github.com/google/sanitizers/wiki/AddressSanitizerAlgorithm#64-bit [5] https://lore.kernel.org/all/bfcae708-db21-04b4-0bbe-712badd03071@redhat.com [6] https://lore.kernel.org/all/20220725142048.30450-1-peterx@redhat.com/ [7] https://lore.kernel.org/all/20221122115007.2787017-1-usama.anjum@collabora.… [8] https://lore.kernel.org/all/20221220162606.1595355-1-usama.anjum@collabora.… [9] https://lore.kernel.org/all/20230306213925.617814-1-peterx@redhat.com [10] https://lore.kernel.org/all/20230125144529.1630917-1-mdanylo@google.com * Original Cover letter from v8* Hello, Note: Soft-dirty pages and pages which have been written-to are synonyms. As kernel already has soft-dirty feature inside which we have given up to use, we are using written-to terminology while using UFFD async WP under the hood. This IOCTL, PAGEMAP_SCAN on pagemap file can be used to get and/or clear the info about page table entries. The following operations are supported in this ioctl: - Get the information if the pages have been written-to (PAGE_IS_WRITTEN), file mapped (PAGE_IS_FILE), present (PAGE_IS_PRESENT) or swapped (PAGE_IS_SWAPPED). - Write-protect the pages (PAGEMAP_WP_ENGAGE) to start finding which pages have been written-to. - Find pages which have been written-to and write protect the pages (atomic PAGE_IS_WRITTEN + PAGEMAP_WP_ENGAGE) It is possible to find and clear soft-dirty pages entirely in userspace. But it isn't efficient: - The mprotect and SIGSEGV handler for bookkeeping - The userfaultfd wp (synchronous) with the handler for bookkeeping Some benchmarks can be seen here[1]. This series adds features that weren't present earlier: - There is no atomic get soft-dirty/Written-to status and clear present in the kernel. - The pages which have been written-to can not be found in accurate way. (Kernel's soft-dirty PTE bit + sof_dirty VMA bit shows more soft-dirty pages than there actually are.) Historically, soft-dirty PTE bit tracking has been used in the CRIU project. The procfs interface is enough for finding the soft-dirty bit status and clearing the soft-dirty bit of all the pages of a process. We have the use case where we need to track the soft-dirty PTE bit for only specific pages on-demand. We need this tracking and clear mechanism of a region of memory while the process is running to emulate the getWriteWatch() syscall of Windows. *(Moved to using UFFD instead of soft-dirtyi feature to find pages which have been written-to from v7 patch series)*: Stop using the soft-dirty flags for finding which pages have been written to. It is too delicate and wrong as it shows more soft-dirty pages than the actual soft-dirty pages. There is no interest in correcting it [2][3] as this is how the feature was written years ago. It shouldn't be updated to changed behaviour. Peter Xu has suggested using the async version of the UFFD WP [4] as it is based inherently on the PTEs. So in this patch series, I've added a new mode to the UFFD which is asynchronous version of the write protect. When this variant of the UFFD WP is used, the page faults are resolved automatically by the kernel. The pages which have been written-to can be found by reading pagemap file (!PM_UFFD_WP). This feature can be used successfully to find which pages have been written to from the time the pages were write protected. This works just like the soft-dirty flag without showing any extra pages which aren't soft-dirty in reality. The information related to pages if the page is file mapped, present and swapped is required for the CRIU project [5][6]. The addition of the required mask, any mask, excluded mask and return masks are also required for the CRIU project [5]. The IOCTL returns the addresses of the pages which match the specific masks. The page addresses are returned in struct page_region in a compact form. The max_pages is needed to support a use case where user only wants to get a specific number of pages. So there is no need to find all the pages of interest in the range when max_pages is specified. The IOCTL returns when the maximum number of the pages are found. The max_pages is optional. If max_pages is specified, it must be equal or greater than the vec_size. This restriction is needed to handle worse case when one page_region only contains info of one page and it cannot be compacted. This is needed to emulate the Windows getWriteWatch() syscall. The patch series include the detailed selftest which can be used as an example for the uffd async wp test and PAGEMAP_IOCTL. It shows the interface usages as well. [1] https://lore.kernel.org/lkml/54d4c322-cd6e-eefd-b161-2af2b56aae24@collabora… [2] https://lore.kernel.org/all/20221220162606.1595355-1-usama.anjum@collabora.… [3] https://lore.kernel.org/all/20221122115007.2787017-1-usama.anjum@collabora.… [4] https://lore.kernel.org/all/Y6Hc2d+7eTKs7AiH@x1n [5] https://lore.kernel.org/all/YyiDg79flhWoMDZB@gmail.com/ [6] https://lore.kernel.org/all/20221014134802.1361436-1-mdanylo@google.com/ Regards, Muhammad Usama Anjum Muhammad Usama Anjum (4): fs/proc/task_mmu: Implement IOCTL to get and optionally clear info about PTEs tools headers UAPI: Update linux/fs.h with the kernel sources mm/pagemap: add documentation of PAGEMAP_SCAN IOCTL selftests: mm: add pagemap ioctl tests Peter Xu (1): userfaultfd: UFFD_FEATURE_WP_ASYNC Documentation/admin-guide/mm/pagemap.rst | 58 + Documentation/admin-guide/mm/userfaultfd.rst | 35 + fs/proc/task_mmu.c | 591 +++++++ fs/userfaultfd.c | 26 +- include/linux/hugetlb.h | 1 + include/linux/userfaultfd_k.h | 21 +- include/uapi/linux/fs.h | 55 + include/uapi/linux/userfaultfd.h | 9 +- mm/hugetlb.c | 34 +- mm/memory.c | 27 +- tools/include/uapi/linux/fs.h | 55 + tools/testing/selftests/mm/.gitignore | 2 + tools/testing/selftests/mm/Makefile | 3 +- tools/testing/selftests/mm/config | 1 + tools/testing/selftests/mm/pagemap_ioctl.c | 1464 ++++++++++++++++++ tools/testing/selftests/mm/run_vmtests.sh | 4 + 16 files changed, 2362 insertions(+), 24 deletions(-) create mode 100644 tools/testing/selftests/mm/pagemap_ioctl.c mode change 100644 => 100755 tools/testing/selftests/mm/run_vmtests.sh -- 2.39.2

2 years, 5 months

3
10
0 0

[PATCH] selftests: Fix arm64 test installation

by Mark Brown

The recent change fc96c7c19df ("selftests: error out if kernel header files are not yet built") to generate an error message when building kselftests without having installed the headers is generating spurious failures during the install step which breaks the arm64 selftests (and only the arm64 selftests): Emit Tests for arm64 make[5]: *** [../../lib.mk:81: kernel_header_files] Error 1 make[5]: *** [../../lib.mk:81: kernel_header_files] Error 1 make[5]: *** [../../lib.mk:81: kernel_header_files] Error 1 make[5]: *** [../../lib.mk:81: kernel_header_files] Error 1 make[5]: *** [../../lib.mk:81: kernel_header_files] Error 1 make[5]: *** [../../lib.mk:81: kernel_header_files] Error 1 make[5]: *** [../../lib.mk:81: kernel_header_files] Error 1 make[4]: *** [Makefile:26: all] Error 2 Presumably the arm64 tests are doing something unusual in their build setup which could be adjusted but I didn't immediately see it and since this is having a serious impact on test coverage in automation let's just revert for now. This is causing failures in KernelCI with the command: make KBUILD_BUILD_USER=KernelCI FORMAT=.xz ARCH=arm64 HOSTCC=gcc CROSS_COMPILE=aarch64-linux-gnu- CROSS_COMPILE_COMPAT=arm-linux-gnueabihf- CC="ccache aarch64-linux-gnu-gcc" O=/tmp/kci/linux/build -C/tmp/kci/linux -j10 kselftest-gen_tar and also when building using tuxmake. Full log: https://storage.kernelci.org/mainline/master/v6.5-rc1/arm64/defconfig/gcc-1… Fixes: 9fc96c7c19df ("selftests: error out if kernel header files are not yet built") Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/Makefile | 21 +-------------------- tools/testing/selftests/lib.mk | 40 +++------------------------------------- 2 files changed, 4 insertions(+), 57 deletions(-) diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 666b56f22a41..405683b8cb39 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -146,12 +146,10 @@ ifneq ($(KBUILD_OUTPUT),) abs_objtree := $(realpath $(abs_objtree)) BUILD := $(abs_objtree)/kselftest KHDR_INCLUDES := -isystem ${abs_objtree}/usr/include - KHDR_DIR := ${abs_objtree}/usr/include else BUILD := $(CURDIR) abs_srctree := $(shell cd $(top_srcdir) && pwd) KHDR_INCLUDES := -isystem ${abs_srctree}/usr/include - KHDR_DIR := ${abs_srctree}/usr/include DEFAULT_INSTALL_HDR_PATH := 1 endif @@ -165,7 +163,7 @@ export KHDR_INCLUDES # all isn't the first target in the file. .DEFAULT_GOAL := all -all: kernel_header_files +all: @ret=1; \ for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ @@ -176,23 +174,6 @@ all: kernel_header_files ret=$$((ret * $$?)); \ done; exit $$ret; -kernel_header_files: - @ls $(KHDR_DIR)/linux/*.h >/dev/null 2>/dev/null; \ - if [ $$? -ne 0 ]; then \ - RED='\033[1;31m'; \ - NOCOLOR='\033[0m'; \ - echo; \ - echo -e "$${RED}error$${NOCOLOR}: missing kernel header files."; \ - echo "Please run this and try again:"; \ - echo; \ - echo " cd $(top_srcdir)"; \ - echo " make headers"; \ - echo; \ - exit 1; \ - fi - -.PHONY: kernel_header_files - run_tests: all @for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index d17854285f2b..05400462c779 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -44,26 +44,10 @@ endif selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST)))) top_srcdir = $(selfdir)/../../.. -ifeq ("$(origin O)", "command line") - KBUILD_OUTPUT := $(O) +ifeq ($(KHDR_INCLUDES),) +KHDR_INCLUDES := -isystem $(top_srcdir)/usr/include endif -ifneq ($(KBUILD_OUTPUT),) - # Make's built-in functions such as $(abspath ...), $(realpath ...) cannot - # expand a shell special character '~'. We use a somewhat tedious way here. - abs_objtree := $(shell cd $(top_srcdir) && mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) && pwd) - $(if $(abs_objtree),, \ - $(error failed to create output directory "$(KBUILD_OUTPUT)")) - # $(realpath ...) resolves symlinks - abs_objtree := $(realpath $(abs_objtree)) - KHDR_DIR := ${abs_objtree}/usr/include -else - abs_srctree := $(shell cd $(top_srcdir) && pwd) - KHDR_DIR := ${abs_srctree}/usr/include -endif - -KHDR_INCLUDES := -isystem $(KHDR_DIR) - # The following are built by lib.mk common compile rules. # TEST_CUSTOM_PROGS should be used by tests that require # custom build rule and prevent common build rule use. @@ -74,25 +58,7 @@ TEST_GEN_PROGS := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS)) TEST_GEN_PROGS_EXTENDED := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS_EXTENDED)) TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES)) -all: kernel_header_files $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) \ - $(TEST_GEN_FILES) - -kernel_header_files: - @ls $(KHDR_DIR)/linux/*.h >/dev/null 2>/dev/null; \ - if [ $$? -ne 0 ]; then \ - RED='\033[1;31m'; \ - NOCOLOR='\033[0m'; \ - echo; \ - echo -e "$${RED}error$${NOCOLOR}: missing kernel header files."; \ - echo "Please run this and try again:"; \ - echo; \ - echo " cd $(top_srcdir)"; \ - echo " make headers"; \ - echo; \ - exit 1; \ - fi - -.PHONY: kernel_header_files +all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) define RUN_TESTS BASE_DIR="$(selfdir)"; \ --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230710-kselftest-fix-arm64-c023160018d7 Best regards, -- Mark Brown <broonie(a)kernel.org>

2 years, 5 months

4
19
0 0

[PATCH] selftests: vDSO: fix Makefile so that it uses lib.mk correctly

by Aditya Deshpande

kselftest.rst states that flags must be specified before including lib.mk, but the vDSO selftest Makefile does not follow this order. As a result, changes made by lib.mk to flags and other variables are overwritten by the Makefile. For example, it is impossible to pass CFLAGS to the compiler via make. Rectify this by including lib.mk after assigning flag values. Also change the paths of the generated programs from absolute to relative paths as lib.mk will now correctly prepend the output directory path to the program name as intended. Cc: Shuah Khan <shuah(a)kernel.org> Cc: Andy Lutomirski <luto(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Vincenzo Frascino <vincenzo.frascino(a)arm.com> Signed-off-by: Aditya Deshpande <aditya.deshpande(a)arm.com> --- tools/testing/selftests/vDSO/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile index d53a4d8008f9..19145210d044 100644 --- a/tools/testing/selftests/vDSO/Makefile +++ b/tools/testing/selftests/vDSO/Makefile @@ -1,16 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 -include ../lib.mk - uname_M := $(shell uname -m 2>/dev/null || echo not) ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) -TEST_GEN_PROGS := $(OUTPUT)/vdso_test_gettimeofday $(OUTPUT)/vdso_test_getcpu -TEST_GEN_PROGS += $(OUTPUT)/vdso_test_abi -TEST_GEN_PROGS += $(OUTPUT)/vdso_test_clock_getres +TEST_GEN_PROGS := vdso_test_gettimeofday +TEST_GEN_PROGS += vdso_test_getcpu +TEST_GEN_PROGS += vdso_test_abi +TEST_GEN_PROGS += vdso_test_clock_getres ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64)) -TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86 +TEST_GEN_PROGS += vdso_standalone_test_x86 endif -TEST_GEN_PROGS += $(OUTPUT)/vdso_test_correctness +TEST_GEN_PROGS += vdso_test_correctness CFLAGS := -std=gnu99 CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector @@ -19,7 +18,8 @@ ifeq ($(CONFIG_X86_32),y) LDLIBS += -lgcc_s endif -all: $(TEST_GEN_PROGS) +include ../lib.mk + $(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c $(OUTPUT)/vdso_test_getcpu: parse_vdso.c vdso_test_getcpu.c $(OUTPUT)/vdso_test_abi: parse_vdso.c vdso_test_abi.c -- 2.25.1

2 years, 5 months

2
1
0 0

[PATCH v4] selftests: rtc: Improves rtctest error handling.

by Atul Kumar Pant

When running the rtctest if we pass wrong rtc device file as an argument the test fails expectedly, but prints the logs that are not useful to point out the issue. To handle this, the patch adds a checks to verify if the rtc_file is valid. Signed-off-by: Atul Kumar Pant <atulpant.linux(a)gmail.com> --- changes since v3: Added Linux-kselftest and Linux-kernel mailing lists. changes since v2: Changed error message when rtc file does not exist. changes since v1: Removed check for uid=0 If rtc file is invalid, then exit the test. tools/testing/selftests/rtc/rtctest.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/rtc/rtctest.c b/tools/testing/selftests/rtc/rtctest.c index 63ce02d1d5cc..630fef735c7e 100644 --- a/tools/testing/selftests/rtc/rtctest.c +++ b/tools/testing/selftests/rtc/rtctest.c @@ -17,6 +17,7 @@ #include <unistd.h> #include "../kselftest_harness.h" +#include "../kselftest.h" #define NUM_UIE 3 #define ALARM_DELTA 3 @@ -419,6 +420,8 @@ __constructor_order_last(void) int main(int argc, char **argv) { + int ret = -1; + switch (argc) { case 2: rtc_file = argv[1]; @@ -430,5 +433,11 @@ int main(int argc, char **argv) return 1; } - return test_harness_run(argc, argv); + // Run the test if rtc_file is valid + if (access(rtc_file, F_OK) == 0) + ret = test_harness_run(argc, argv); + else + ksft_exit_fail_msg("[ERROR]: Cannot access rtc file %s - Exiting\n", rtc_file); + + return ret; } -- 2.25.1

2 years, 5 months

2
1
0 0

[PATCH v3 0/4] kernel.h: Split out a couple of macros to args.h

by Andy Shevchenko

There are macros in kernel.h that can be used outside of that header. Split them to args.h and replace open coded variants. Test compiled with `make allmodconfig` for x86_64. (Note that positive diff statistics is due to documentation being updated.) In v3: - split to a series of patches - fixed build issue on `make allmodconfig` for x86_64 (Andrew) In v2: - converted existing users at the same time (Andrew, Rasmus) - documented how it does work (Andrew, Rasmus) Andy Shevchenko (4): kernel.h: Split out COUNT_ARGS() and CONCATENATE() to args.h x86/asm: Replace custom COUNT_ARGS() & CONCATENATE() implementations arm64: smccc: Replace custom COUNT_ARGS() & CONCATENATE() implementations genetlink: Replace custom CONCATENATE() implementation arch/x86/include/asm/rmwcc.h | 11 +++-------- include/kunit/test.h | 1 + include/linux/args.h | 28 ++++++++++++++++++++++++++++ include/linux/arm-smccc.h | 27 ++++++++++----------------- include/linux/genl_magic_func.h | 27 ++++++++++++++------------- include/linux/genl_magic_struct.h | 8 +++----- include/linux/kernel.h | 7 ------- include/linux/pci.h | 2 +- include/trace/bpf_probe.h | 2 ++ 9 files changed, 62 insertions(+), 51 deletions(-) create mode 100644 include/linux/args.h -- 2.40.0.1.gaa8946217a0b

2 years, 5 months

1
4
0 0

[PATCH v2 1/1] kernel.h: Split out COUNT_ARGS() and CONCATENATE() to args.h

by Andy Shevchenko

kernel.h is being used as a dump for all kinds of stuff for a long time. The COUNT_ARGS() and CONCATENATE() macros may be used in some places without need of the full kernel.h dependency train with it. Here is the attempt on cleaning it up by splitting out these macros(). While at it, include new header where it's being used and drop custom implementation of these macros and document how it works. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- v2: converted existing users at the same time, documented (Andrew, Rasmus) arch/x86/include/asm/rmwcc.h | 11 +++-------- include/kunit/test.h | 1 + include/linux/args.h | 28 ++++++++++++++++++++++++++++ include/linux/arm-smccc.h | 27 ++++++++++----------------- include/linux/genl_magic_struct.h | 8 +++----- include/linux/kernel.h | 7 ------- include/linux/pci.h | 2 +- include/trace/bpf_probe.h | 2 ++ 8 files changed, 48 insertions(+), 38 deletions(-) create mode 100644 include/linux/args.h diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h index 7fa611216417..4b081e0d3306 100644 --- a/arch/x86/include/asm/rmwcc.h +++ b/arch/x86/include/asm/rmwcc.h @@ -2,12 +2,7 @@ #ifndef _ASM_X86_RMWcc #define _ASM_X86_RMWcc -/* This counts to 12. Any more, it will return 13th argument. */ -#define __RMWcc_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _n, X...) _n -#define RMWcc_ARGS(X...) __RMWcc_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) - -#define __RMWcc_CONCAT(a, b) a ## b -#define RMWcc_CONCAT(a, b) __RMWcc_CONCAT(a, b) +#include <linux/args.h> #define __CLOBBERS_MEM(clb...) "memory", ## clb @@ -48,7 +43,7 @@ cc_label: c = true; \ #define GEN_UNARY_RMWcc_3(op, var, cc) \ GEN_UNARY_RMWcc_4(op, var, cc, "%[var]") -#define GEN_UNARY_RMWcc(X...) RMWcc_CONCAT(GEN_UNARY_RMWcc_, RMWcc_ARGS(X))(X) +#define GEN_UNARY_RMWcc(X...) CONCATENATE(GEN_UNARY_RMWcc_, COUNT_ARGS(X))(X) #define GEN_BINARY_RMWcc_6(op, var, cc, vcon, _val, arg0) \ __GEN_RMWcc(op " %[val], " arg0, var, cc, \ @@ -57,7 +52,7 @@ cc_label: c = true; \ #define GEN_BINARY_RMWcc_5(op, var, cc, vcon, val) \ GEN_BINARY_RMWcc_6(op, var, cc, vcon, val, "%[var]") -#define GEN_BINARY_RMWcc(X...) RMWcc_CONCAT(GEN_BINARY_RMWcc_, RMWcc_ARGS(X))(X) +#define GEN_BINARY_RMWcc(X...) CONCATENATE(GEN_BINARY_RMWcc_, COUNT_ARGS(X))(X) #define GEN_UNARY_SUFFIXED_RMWcc(op, suffix, var, cc, clobbers...) \ __GEN_RMWcc(op " %[var]\n\t" suffix, var, cc, \ diff --git a/include/kunit/test.h b/include/kunit/test.h index 23120d50499e..107c81431634 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -12,6 +12,7 @@ #include <kunit/assert.h> #include <kunit/try-catch.h> +#include <linux/args.h> #include <linux/compiler.h> #include <linux/container_of.h> #include <linux/err.h> diff --git a/include/linux/args.h b/include/linux/args.h new file mode 100644 index 000000000000..8ff60a54eb7d --- /dev/null +++ b/include/linux/args.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_ARGS_H +#define _LINUX_ARGS_H + +/* + * How do these macros work? + * + * In __COUNT_ARGS() _0 to _12 are just placeholders from the start + * in order to make sure _n is positioned over the correct number + * from 12 to 0 (depending on X, which is a variadic argument list). + * They serve no purpose other than occupying a position. Since each + * macro parameter must have a distinct identifier, those identifiers + * are as good as any. + * + * In COUNT_ARGS() we use actual integers, so __COUNT_ARGS() returns + * that as _n. + */ + +/* This counts to 12. Any more, it will return 13th argument. */ +#define __COUNT_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _n, X...) _n +#define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) + +/* Concatenate two parameters, but allow them to be expanded beforehand. */ +#define __CONCAT(a, b) a ## b +#define CONCATENATE(a, b) __CONCAT(a, b) + +#endif /* _LINUX_ARGS_H */ diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index f196c19f8e55..2865b14c2bba 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -5,6 +5,7 @@ #ifndef __LINUX_ARM_SMCCC_H #define __LINUX_ARM_SMCCC_H +#include <linux/args.h> #include <linux/init.h> #include <uapi/linux/const.h> @@ -413,11 +414,6 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, #endif -#define ___count_args(_0, _1, _2, _3, _4, _5, _6, _7, _8, x, ...) x - -#define __count_args(...) \ - ___count_args(__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1, 0) - #define __constraint_read_0 "r" (arg0) #define __constraint_read_1 __constraint_read_0, "r" (arg1) #define __constraint_read_2 __constraint_read_1, "r" (arg2) @@ -475,14 +471,6 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, __declare_arg_6(a0, a1, a2, a3, a4, a5, a6, res); \ register typeof(a7) arg7 asm("r7") = __a7 -#define ___declare_args(count, ...) __declare_arg_ ## count(__VA_ARGS__) -#define __declare_args(count, ...) ___declare_args(count, __VA_ARGS__) - -#define ___constraints(count) \ - : __constraint_read_ ## count \ - : smccc_sve_clobbers "memory" -#define __constraints(count) ___constraints(count) - /* * We have an output list that is not necessarily used, and GCC feels * entitled to optimise the whole sequence away. "volatile" is what @@ -494,11 +482,13 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, register unsigned long r1 asm("r1"); \ register unsigned long r2 asm("r2"); \ register unsigned long r3 asm("r3"); \ - __declare_args(__count_args(__VA_ARGS__), __VA_ARGS__); \ + CONCATENATE(__declare_arg_, COUNT_ARGS(__VA_ARGS__)); \ asm volatile(SMCCC_SVE_CHECK \ inst "\n" : \ "=r" (r0), "=r" (r1), "=r" (r2), "=r" (r3) \ - __constraints(__count_args(__VA_ARGS__))); \ + : CONCATENATE(__constraint_read_, \ + COUNT_ARGS(__VA_ARGS__)) \ + : smccc_sve_clobbers "memory"); \ if (___res) \ *___res = (typeof(*___res)){r0, r1, r2, r3}; \ } while (0) @@ -542,8 +532,11 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, */ #define __fail_smccc_1_1(...) \ do { \ - __declare_args(__count_args(__VA_ARGS__), __VA_ARGS__); \ - asm ("" : __constraints(__count_args(__VA_ARGS__))); \ + CONCATENATE(__declare_arg_, COUNT_ARGS(__VA_ARGS__)); \ + asm ("" : \ + : CONCATENATE(__constraint_read_, \ + COUNT_ARGS(__VA_ARGS__)) \ + : smccc_sve_clobbers "memory"); \ if (___res) \ ___res->a0 = SMCCC_RET_NOT_SUPPORTED; \ } while (0) diff --git a/include/linux/genl_magic_struct.h b/include/linux/genl_magic_struct.h index f81d48987528..a419d93789ff 100644 --- a/include/linux/genl_magic_struct.h +++ b/include/linux/genl_magic_struct.h @@ -14,14 +14,12 @@ # error "you need to define GENL_MAGIC_INCLUDE_FILE before inclusion" #endif +#include <linux/args.h> #include <linux/genetlink.h> #include <linux/types.h> -#define CONCAT__(a,b) a ## b -#define CONCAT_(a,b) CONCAT__(a,b) - -extern int CONCAT_(GENL_MAGIC_FAMILY, _genl_register)(void); -extern void CONCAT_(GENL_MAGIC_FAMILY, _genl_unregister)(void); +extern int CONCATENATE(GENL_MAGIC_FAMILY, _genl_register)(void); +extern void CONCATENATE(GENL_MAGIC_FAMILY, _genl_unregister)(void); /* * Extension of genl attribute validation policies {{{2 diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 0b00e1aef33d..15d9496db169 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -419,13 +419,6 @@ ftrace_vprintk(const char *fmt, va_list ap) static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } #endif /* CONFIG_TRACING */ -/* This counts to 12. Any more, it will return 13th argument. */ -#define __COUNT_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _n, X...) _n -#define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) - -#define __CONCAT(a, b) a ## b -#define CONCATENATE(a, b) __CONCAT(a, b) - /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ #ifdef CONFIG_FTRACE_MCOUNT_RECORD # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD diff --git a/include/linux/pci.h b/include/linux/pci.h index 0ff7500772e6..eeb2e6f6130f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -23,7 +23,7 @@ #ifndef LINUX_PCI_H #define LINUX_PCI_H - +#include <linux/args.h> #include <linux/mod_devicetable.h> #include <linux/types.h> diff --git a/include/trace/bpf_probe.h b/include/trace/bpf_probe.h index 1f7fc1fc590c..e609cd7da47e 100644 --- a/include/trace/bpf_probe.h +++ b/include/trace/bpf_probe.h @@ -12,6 +12,8 @@ #undef __perf_task #define __perf_task(t) (t) +#include <linux/args.h> + /* cast any integer, pointer, or small struct to u64 */ #define UINTTYPE(size) \ __typeof__(__builtin_choose_expr(size == 1, (u8)1, \ -- 2.40.0.1.gaa8946217a0b

2 years, 5 months

3
3
0 0

[PATCH v1 0/9] selftests/mm fixes for arm64

by Ryan Roberts

Hi All, Given my on-going work on large anon folios and contpte mappings, I decided it would be a good idea to start running mm selftests to help guard against regressions. However, it soon became clear that I couldn't get the suite to run cleanly on arm64 with a vanilla v6.5-rc1 kernel (perhaps I'm just doing it wrong??), so got stuck in a rabbit hole trying to debug and fix all the issues. Some were down to misconfigurations, but I also found a number of issues with the tests and even a couple of issues with the kernel. This series aims to fix (most of) the test issues. It applies on top of v6.5-rc1. Reproducing ----------- What follows is a write up of how I'm running the tests and the results I see with this series applied. I don't yet have a concrete understanding of all of the remaining failures. So if anyone has any comments on my setup or reasons for the test failures it would be great to hear. Source: v6.5-rc1 + this series + [1] + [2]. [1] is a patch from Florent Revest to fix mdwe mmap_FIXED tests. [2] is a fix for a regression in the kernel that I found by running `mlock-random-test` and `mlock2-tests`. Compile the kernel (on arm64 system): $ make defconfig $ ./scripts/config --enable CONFIG_SQUASHFS_LZ4 $ ./scripts/config --enable CONFIG_SQUASHFS_LZO $ ./scripts/config --enable CONFIG_SQUASHFS_XZ $ ./scripts/config --enable CONFIG_SQUASHFS_ZSTD $ ./scripts/config --enable CONFIG_XFS_FS $ ./scripts/config --enable CONFIG_SYSVIPC $ ./scripts/config --enable CONFIG_USERFAULTFD $ ./scripts/config --enable CONFIG_TEST_VMALLOC $ ./scripts/config --enable CONFIG_GUP_TEST $ ./scripts/config --enable CONFIG_TRANSPARENT_HUGEPAGE $ ./scripts/config --enable CONFIG_MEM_SOFT_DIRTY $ make olddefconfig $ make -s -j`nproc` Image (In the above case, I'm building/testing a 4K kernel). Note that it turns out that arm64 doesn't really support ZONE_DEVICE; Although it defines ARCH_HAS_PTE_DEVMAP, it can't allocate `struct page`s for arbitrary physical addresses. This means that the TEST_HMM module causes warnings to be emitted when initializing because it tries to reserve arbitrary PA range then requests struct page's for them. I haven't fully investigated this yet, but for now, I'm just deliverately excluding ZONE_DEVICE, (which TEST_HMM depends upon). This means that the `hmm-tests` selftest gets skipped at runtime. Compile the tests: $ make -j`nproc` headers_install $ make -C tools/testing/selftests TARGETS=mm install INSTALL_PATH=<path/to/install> Start a VM running the kernel we just compiled: $ taskset -c 8-15 qemu-system-aarch64 \ -object memory-backend-file,id=mem0,size=6G,mem-path=/hugetlbfs,merge=off,prealloc=on,host-nodes=0,policy=bind,align=1G \ -object memory-backend-file,id=mem1,size=6G,mem-path=/hugetlbfs,merge=off,prealloc=on,host-nodes=0,policy=bind,align=1G \ -nographic -enable-kvm -machine virt,gic-version=3 -cpu max \ -smp 8 -m 12G \ -numa node,memdev=mem0,cpus=0-3,nodeid=0 \ -numa node,memdev=mem1,cpus=4-7,nodeid=1 \ -drive if=virtio,format=raw,file=ubuntu-22.04.xfs \ -object rng-random,filename=/dev/urandom,id=rng0 \ -device virtio-scsi-pci,id=scsi0 \ -netdev user,id=net0,hostfwd=tcp::8022-:22 \ -device virtio-rng-pci,rng=rng0 \ -device virtio-net-pci,netdev=net0 \ -kernel arch/arm64/boot/Image \ -append "earlycon root=/dev/vda2 secretmem.enable hugepagesz=1G hugepages=0:2,1:2 hugepagesz=32M hugepages=0:2,1:2 default_hugepagesz=2M hugepages=0:64,1:64 hugepagesz=64K hugepages=0:2,1:2" This starts a VM with 2 numa nodes (needed by ksm and migration tests), with 6G of memory and 4 CPUs on each node. The kernel command line enables secretmem (needed for `memfd_secret` test), and preallocates a bunch of huge pages (divined by reading the comments and source for a bunch of tests that require huge pages). 128M of the default huge page size, and 4 pages of each of the other sizes appear to be sufficient. I'm allocating half on each numa node. Once booted, copy the selftests we just compiled onto it. On the VM, run the tests: $ cd path/to/selftests $ sudo ./run_kselftest.sh or alternatively: $ cd path/to/selftests/mm $ sudo ./run_vmtests.sh Test Results ------------ TOP-LEVEL SUMMARY: PASS=42 SKIP=4 FAIL=2 Only showing nested tests if they are skipped or failed. [PASS] hugepage-mmap [PASS] hugepage-shm [PASS] map_hugetlb [PASS] hugepage-mremap [PASS] hugepage-vmemmap [PASS] hugetlb-madvise [PASS] map_fixed_noreplace [PASS] gup_test -u [PASS] gup_test -a [PASS] gup_test -ct -F 0x1 0 19 0x1000 [PASS] gup_longterm [PASS] uffd-unit-tests [PASS] uffd-stress anon 20 16 [PASS] uffd-stress hugetlb 128 32 [PASS] uffd-stress hugetlb-private 128 32 [PASS] uffd-stress shmem 20 16 [PASS] uffd-stress shmem-private 20 16 [PASS] compaction_test [PASS] on-fault-limit [PASS] map_populate [PASS] mlock-random-test [PASS] mlock2-tests [PASS] mrelease_test [PASS] mremap_test [PASS] thuge-gen [PASS] virtual_address_range [SKIP] va_high_addr_switch.sh # 4K kernel does not support big enough VA space for test [SKIP] test_vmalloc.sh smoke # Test requires test_vmalloc kernel module which isn't present [PASS] mremap_dontunmap [SKIP] test_hmm.sh smoke # Test requires test_hmm kernel module - see ZONE_DEVICE issue above [PASS] madv_populate [PASS] test_softdirty [SKIP] range is not softdirty [SKIP] MADV_POPULATE_READ [SKIP] range is not softdirty [SKIP] MADV_POPULATE_WRITE [SKIP] range is softdirty # All skipped because arm64 does not support soft-dirty [PASS] memfd_secret [PASS] ksm_tests -M -p 10 [PASS] ksm_tests -U [PASS] ksm_tests -Z -p 10 -z 0 [PASS] ksm_tests -Z -p 10 -z 1 [PASS] ksm_tests -N -m 1 [PASS] ksm_tests -N -m 0 [PASS] ksm_functional_tests [SKIP] test_unmerge_uffd_wp # UFFD_FEATURE_PAGEFAULT_FLAG_WP not available on arm64 [PASS] ksm_functional_tests [SKIP] test_unmerge_uffd_wp # UFFD_FEATURE_PAGEFAULT_FLAG_WP not available on arm64 [SKIP] soft-dirty # Skipped because arm64 does not support soft-dirty [FAIL] cow [FAIL] vmsplice() + unmap in child ... with hugetlb [FAIL] vmsplice() + unmap in child with mprotect() optimization ... with hugetlb [FAIL] vmsplice() before fork(), unmap in parent after fork() ... with hugetlb [FAIL] vmsplice() + unmap in parent after fork() ... with hugetlb # Above are known issues for vmsplice + hugetlb # Reproduces on x86 [SKIP] Basic COW after fork() ... with swapped-out, PTE-mapped THP [SKIP] Basic COW after fork() with mprotect() optimization ... with swapped-out, PTE-mapped THP [SKIP] vmsplice() + unmap in child ... with swapped-out, PTE-mapped THP [SKIP] vmsplice() + unmap in child with mprotect() optimization ... with swapped-out, PTE-mapped THP [SKIP] vmsplice() before fork(), unmap in parent after fork() ... with swapped-out, PTE-mapped THP [SKIP] vmsplice() + unmap in parent after fork() ... with swapped-out, PTE-mapped THP [SKIP] R/O-mapping a page registered as iouring fixed buffer ... with swapped-out, PTE-mapped THP [SKIP] fork() with an iouring fixed buffer ... with swapped-out, PTE-mapped THP [SKIP] R/O GUP pin on R/O-mapped shared page ... with swapped-out, PTE-mapped THP [SKIP] R/O GUP-fast pin on R/O-mapped shared page ... with swapped-out, PTE-mapped THP [SKIP] R/O GUP pin on R/O-mapped previously-shared page ... with swapped-out, PTE-mapped THP [SKIP] R/O GUP-fast pin on R/O-mapped previously-shared page ... with swapped-out, PTE-mapped THP [SKIP] R/O GUP pin on R/O-mapped exclusive page ... with swapped-out, PTE-mapped THP [SKIP] R/O GUP-fast pin on R/O-mapped exclusive page ... with swapped-out, PTE-mapped THP # Above all skipped due to "MADV_PAGEOUT did not work, is swap enabled?" # swap is enabled though # Reproduces on x86 [SKIP] Basic COW after fork() when collapsing after fork() (fully shared) # MADV_COLLAPSE failed: Invalid argument [PASS] khugepaged [PASS] transhuge-stress -d 20 [PASS] split_huge_page_test [FAIL] migration [FAIL] migration.shared_anon # move_pages() reports that the requested page was not migrated # after a few iterations. [PASS] mkdirty [PASS] mdwe_test [1] https://lore.kernel.org/lkml/20230704153630.1591122-3-revest@chromium.org/ [2] https://lore.kernel.org/linux-mm/20230711175020.4091336-1-Liam.Howlett@orac… Thanks, Ryan Ryan Roberts (9): selftests: Line buffer test program's stdout selftests/mm: Give scripts execute permission selftests/mm: Skip soft-dirty tests on arm64 selftests/mm: Enable mrelease_test for arm64 selftests/mm: Fix thuge-gen test bugs selftests/mm: va_high_addr_switch should skip unsupported arm64 configs selftests/mm: Make migration test robust to failure selftests/mm: Optionally pass duration to transhuge-stress selftests/mm: Run all tests from run_vmtests.sh tools/testing/selftests/kselftest/runner.sh | 5 +- tools/testing/selftests/mm/Makefile | 79 ++++++++++--------- .../selftests/mm/charge_reserved_hugetlb.sh | 0 tools/testing/selftests/mm/check_config.sh | 0 .../selftests/mm/hugetlb_reparenting_test.sh | 0 tools/testing/selftests/mm/madv_populate.c | 18 +++-- tools/testing/selftests/mm/migration.c | 14 +++- tools/testing/selftests/mm/mrelease_test.c | 1 + tools/testing/selftests/mm/run_vmtests.sh | 23 ++++++ tools/testing/selftests/mm/settings | 2 +- tools/testing/selftests/mm/soft-dirty.c | 3 + tools/testing/selftests/mm/test_hmm.sh | 0 tools/testing/selftests/mm/test_vmalloc.sh | 0 tools/testing/selftests/mm/thuge-gen.c | 4 +- tools/testing/selftests/mm/transhuge-stress.c | 12 ++- .../selftests/mm/va_high_addr_switch.c | 3 +- .../selftests/mm/va_high_addr_switch.sh | 0 tools/testing/selftests/mm/vm_util.c | 17 ++++ tools/testing/selftests/mm/vm_util.h | 1 + .../selftests/mm/write_hugetlb_memory.sh | 0 20 files changed, 127 insertions(+), 55 deletions(-) mode change 100644 => 100755 tools/testing/selftests/mm/charge_reserved_hugetlb.sh mode change 100644 => 100755 tools/testing/selftests/mm/check_config.sh mode change 100644 => 100755 tools/testing/selftests/mm/hugetlb_reparenting_test.sh mode change 100644 => 100755 tools/testing/selftests/mm/run_vmtests.sh mode change 100644 => 100755 tools/testing/selftests/mm/test_hmm.sh mode change 100644 => 100755 tools/testing/selftests/mm/test_vmalloc.sh mode change 100644 => 100755 tools/testing/selftests/mm/va_high_addr_switch.sh mode change 100644 => 100755 tools/testing/selftests/mm/write_hugetlb_memory.sh -- 2.25.1

2 years, 5 months

6
39
0 0

[PATCH] selftests/bpf: Fix errors in log_fixup.c

by shijie001＠208suo.com

The following checkpatch errors are removed: ERROR: "foo* bar" should be "foo *bar" Signed-off-by: Jie Shi <shijie001(a)208suo.com> --- tools/testing/selftests/bpf/prog_tests/log_fixup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/log_fixup.c b/tools/testing/selftests/bpf/prog_tests/log_fixup.c index dba71d98a227..69959748d466 100644 --- a/tools/testing/selftests/bpf/prog_tests/log_fixup.c +++ b/tools/testing/selftests/bpf/prog_tests/log_fixup.c @@ -14,7 +14,7 @@ enum trunc_type { static void bad_core_relo(size_t log_buf_size, enum trunc_type trunc_type) { char log_buf[8 * 1024]; - struct test_log_fixup* skel; + struct test_log_fixup *skel; int err; skel = test_log_fixup__open(); @@ -72,7 +72,7 @@ static void bad_core_relo(size_t log_buf_size, enum trunc_type trunc_type) static void bad_core_relo_subprog(void) { char log_buf[8 * 1024]; - struct test_log_fixup* skel; + struct test_log_fixup *skel; int err; skel = test_log_fixup__open(); @@ -104,7 +104,7 @@ static void bad_core_relo_subprog(void) static void missing_map(void) { char log_buf[8 * 1024]; - struct test_log_fixup* skel; + struct test_log_fixup *skel; int err; skel = test_log_fixup__open(); @@ -138,7 +138,7 @@ static void missing_map(void) static void missing_kfunc(void) { char log_buf[8 * 1024]; - struct test_log_fixup* skel; + struct test_log_fixup *skel; int err; skel = test_log_fixup__open();

2 years, 5 months

1
0
0 0

[PATCH] selftests/bpf: Fix errors in btf_write.c

by shijie001＠208suo.com

The following checkpatch errors are removed: ERROR: Bad function definition - void test_btf_add() should probably be void test_btf_add(void) ERROR: Bad function definition - void test_btf_add_btf() should probably be void test_btf_add_btf(void) ERROR: Bad function definition - void test_btf_write() should probably be void test_btf_write(void) Signed-off-by: Jie Shi <shijie001(a)208suo.com> --- tools/testing/selftests/bpf/prog_tests/btf_write.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/btf_write.c b/tools/testing/selftests/bpf/prog_tests/btf_write.c index 6e36de1302fc..209a230ffeec 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf_write.c +++ b/tools/testing/selftests/bpf/prog_tests/btf_write.c @@ -352,7 +352,7 @@ static void gen_btf(struct btf *btf) "\t'v1' val=18446744073709551615", "raw_dump"); } -static void test_btf_add() +static void test_btf_add(void) { struct btf *btf; @@ -401,7 +401,7 @@ static void test_btf_add() btf__free(btf); } -static void test_btf_add_btf() +static void test_btf_add_btf(void) { struct btf *btf1 = NULL, *btf2 = NULL; int id; @@ -497,7 +497,7 @@ static void test_btf_add_btf() btf__free(btf2); } -void test_btf_write() +void test_btf_write(void) { if (test__start_subtest("btf_add")) test_btf_add();

2 years, 5 months

1
0
0 0

[PATCH v3] selftests/net: replace manual array size calc with ARRAYSIZE macro.

by Mahmoud Maatuq

fixes coccinelle WARNING: Use ARRAY_SIZE changelog since v2: - integrat a commit that contains actual replacement for ARRAY_SIZE. - use ARRAY_SIZE for net/psock_lib.h changelog since v1: - remove unnecessary extra new line changelog since v0: - update net/Makefile to include kselftest.h - remove redefinition of ARRAYSIZE. Signed-off-by: Mahmoud Maatuq <mahmoudmatook.mm(a)gmail.com> --- tools/testing/selftests/net/Makefile | 2 ++ tools/testing/selftests/net/csum.c | 6 ++++-- tools/testing/selftests/net/hwtstamp_config.c | 6 ++++-- tools/testing/selftests/net/psock_lib.h | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 7f3ab2a93ed6..a06cc25489f9 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -3,6 +3,8 @@ CFLAGS = -Wall -Wl,--no-as-needed -O2 -g CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES) +# Additional include paths needed by kselftest.h +CFLAGS += -I../ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \ rtnetlink.sh xfrm_policy.sh test_blackhole_dev.sh diff --git a/tools/testing/selftests/net/csum.c b/tools/testing/selftests/net/csum.c index 82a1c1839da6..90eb06fefa59 100644 --- a/tools/testing/selftests/net/csum.c +++ b/tools/testing/selftests/net/csum.c @@ -91,6 +91,8 @@ #include <sys/types.h> #include <unistd.h> +#include "kselftest.h" + static bool cfg_bad_csum; static int cfg_family = PF_INET6; static int cfg_num_pkt = 4; @@ -450,7 +452,7 @@ static void send_packet(int fd, const char *buf, int len) iov[2].iov_len = len; msg.msg_iov = iov; - msg.msg_iovlen = sizeof(iov) / sizeof(iov[0]); + msg.msg_iovlen = ARRAY_SIZE(iov); msg.msg_name = &addr; msg.msg_namelen = sizeof(addr); @@ -505,7 +507,7 @@ static void __recv_prepare_packet_filter(int fd, int off_nexthdr, int off_dport) struct sock_fprog prog = {}; prog.filter = filter; - prog.len = sizeof(filter) / sizeof(struct sock_filter); + prog.len = ARRAY_SIZE(filter); if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog))) error(1, errno, "setsockopt filter"); } diff --git a/tools/testing/selftests/net/hwtstamp_config.c b/tools/testing/selftests/net/hwtstamp_config.c index e1fdee841021..170728c96c46 100644 --- a/tools/testing/selftests/net/hwtstamp_config.c +++ b/tools/testing/selftests/net/hwtstamp_config.c @@ -16,6 +16,8 @@ #include <linux/net_tstamp.h> #include <linux/sockios.h> +#include "kselftest.h" + static int lookup_value(const char **names, int size, const char *name) { @@ -50,7 +52,7 @@ static const char *tx_types[] = { TX_TYPE(ONESTEP_SYNC) #undef TX_TYPE }; -#define N_TX_TYPES ((int)(sizeof(tx_types) / sizeof(tx_types[0]))) +#define N_TX_TYPES ((int)(ARRAY_SIZE(tx_types))) static const char *rx_filters[] = { #define RX_FILTER(name) [HWTSTAMP_FILTER_ ## name] = #name @@ -71,7 +73,7 @@ static const char *rx_filters[] = { RX_FILTER(PTP_V2_DELAY_REQ), #undef RX_FILTER }; -#define N_RX_FILTERS ((int)(sizeof(rx_filters) / sizeof(rx_filters[0]))) +#define N_RX_FILTERS ((int)(ARRAY_SIZE(rx_filters))) static void usage(void) { diff --git a/tools/testing/selftests/net/psock_lib.h b/tools/testing/selftests/net/psock_lib.h index faa884385c45..6e4fef560873 100644 --- a/tools/testing/selftests/net/psock_lib.h +++ b/tools/testing/selftests/net/psock_lib.h @@ -14,6 +14,8 @@ #include <arpa/inet.h> #include <unistd.h> +#include "kselftest.h" + #define DATA_LEN 100 #define DATA_CHAR 'a' #define DATA_CHAR_1 'b' @@ -63,7 +65,7 @@ static __maybe_unused void pair_udp_setfilter(int fd) struct sock_fprog bpf_prog; bpf_prog.filter = bpf_filter; - bpf_prog.len = sizeof(bpf_filter) / sizeof(struct sock_filter); + bpf_prog.len = ARRAY_SIZE(bpf_filter); if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &bpf_prog, sizeof(bpf_prog))) { -- 2.34.1

2 years, 5 months

1
0
0 0

[PATCH v2] selftests/net: replace manual array size calc with ARRAYSIZE macro.

by Mahmoud Maatuq

fixes coccinelle WARNING: Use ARRAY_SIZE changelog since v1: - remove unnecessary extra new line changelog since v0: - update net/Makefile to include kselftest.h - remove redefinition of ARRAYSIZE. Signed-off-by: Mahmoud Maatuq <mahmoudmatook.mm(a)gmail.com> --- tools/testing/selftests/net/Makefile | 2 ++ tools/testing/selftests/net/csum.c | 6 ++---- tools/testing/selftests/net/hwtstamp_config.c | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 7f3ab2a93ed6..a06cc25489f9 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -3,6 +3,8 @@ CFLAGS = -Wall -Wl,--no-as-needed -O2 -g CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES) +# Additional include paths needed by kselftest.h +CFLAGS += -I../ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \ rtnetlink.sh xfrm_policy.sh test_blackhole_dev.sh diff --git a/tools/testing/selftests/net/csum.c b/tools/testing/selftests/net/csum.c index 702f34a9d506..90eb06fefa59 100644 --- a/tools/testing/selftests/net/csum.c +++ b/tools/testing/selftests/net/csum.c @@ -91,6 +91,8 @@ #include <sys/types.h> #include <unistd.h> +#include "kselftest.h" + static bool cfg_bad_csum; static int cfg_family = PF_INET6; static int cfg_num_pkt = 4; @@ -123,10 +125,6 @@ static struct sockaddr_in6 cfg_saddr6 = {.sin6_family = AF_INET6}; #define MAX_HEADER_LEN (sizeof(struct ipv6hdr) + ENC_HEADER_LEN + sizeof(struct tcphdr)) #define MAX_PAYLOAD_LEN 1024 -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -#endif - /* Trivial demo encap. Stand-in for transport layer protocols like ESP or PSP */ struct udp_encap_hdr { uint8_t nexthdr; diff --git a/tools/testing/selftests/net/hwtstamp_config.c b/tools/testing/selftests/net/hwtstamp_config.c index 263cc1c34165..60970d98eb9b 100644 --- a/tools/testing/selftests/net/hwtstamp_config.c +++ b/tools/testing/selftests/net/hwtstamp_config.c @@ -16,9 +16,7 @@ #include <linux/net_tstamp.h> #include <linux/sockios.h> -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -#endif +#include "kselftest.h" static int lookup_value(const char **names, int size, const char *name) -- 2.34.1

2 years, 5 months

1
0
0 0

[PATCH v4 00/18] tools/nolibc: shrink arch support

by Zhangjin Wu

Hi, Willy, Thomas Thanks very much for your careful review and great suggestions, now, we get v4 revision of the arch shrink series [1], it mainly include a new fixup for -O0 under gcc < 11.1.0, the stackprotector support for _start_c(), new testcases for startup code and two new test targets. All of the tests passed or skipped (tinyconfig + few options + qemu-system) for both -Os and -O0: arch/board | result ------------|------------ arm/versatilepb | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. arm/vexpress-a9 | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. arm/virt | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. aarch64/virt | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. i386/pc | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. x86_64/pc | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. mipsel/malta | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. loongarch64/virt | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. riscv64/virt | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. s390x/s390-ccw-virtio | 165 test(s): 158 passed, 7 skipped, 0 failed => status: warning. And more, for both -Os and -O0: $ for r in run-user run-nolibc-test run-libc-test; do make clean > /dev/null; make $r | grep status; done 165 test(s): 157 passed, 8 skipped, 0 failed => status: warning 165 test(s): 157 passed, 8 skipped, 0 failed => status: warning 165 test(s): 153 passed, 12 skipped, 0 failed => status: warning // for make run-user, the euid0 and 32bit limit related tests are // skipped $ make clean && make run-user $ grep -i skip run.out 17 chroot_root [SKIPPED] 39 link_dir [SKIPPED] 62 limit_intptr_min_32 [SKIPPED] 63 limit_intptr_max_32 [SKIPPED] 64 limit_uintptr_max_32 [SKIPPED] 65 limit_ptrdiff_min_32 [SKIPPED] 66 limit_ptrdiff_max_32 [SKIPPED] 67 limit_size_max_32 [SKIPPED] // for run-libc-test, the _auxv variables, euid0, 32bits limit and // stackprotector related tests are skipped $ make clean && make run-libc-test $ grep -i skip run.out 9 environ_auxv [SKIPPED] 10 environ_total [SKIPPED] 12 auxv_addr [SKIPPED] 17 chroot_root [SKIPPED] 39 link_dir [SKIPPED] 62 limit_intptr_min_32 [SKIPPED] 63 limit_intptr_max_32 [SKIPPED] 64 limit_uintptr_max_32 [SKIPPED] 65 limit_ptrdiff_min_32 [SKIPPED] 66 limit_ptrdiff_max_32 [SKIPPED] 67 limit_size_max_32 [SKIPPED] 0 -fstackprotector not supported [SKIPPED] $ make clean >/dev/null; make run-libc-test CC=/labs/linux-lab/src/examples/musl-install/bin/musl-gcc | grep status 165 test(s): 151 passed, 12 skipped, 2 failed => status: failure // The failures are expected for musl has disabled both sbrk and brk // but not the sbrk(0); the _auxv variables, euid0, 32bits limit and // stackprotector related tests are skipped for musl too $ grep FAIL -ur run.out 9 sbrk = 1 ENOMEM [FAIL] 10 brk = -1 ENOMEM [FAIL] $ grep "SKIP" -ur run.out 9 environ_auxv [SKIPPED] 10 environ_total [SKIPPED] 12 auxv_addr [SKIPPED] 17 chroot_root [SKIPPED] 39 link_dir [SKIPPED] 62 limit_intptr_min_32 [SKIPPED] 63 limit_intptr_max_32 [SKIPPED] 64 limit_uintptr_max_32 [SKIPPED] 65 limit_ptrdiff_min_32 [SKIPPED] 66 limit_ptrdiff_max_32 [SKIPPED] 67 limit_size_max_32 [SKIPPED] 0 -fstackprotector not supported [SKIPPED] For stackprotector, gcc 13.1.0 is used to test on x86_64 standalonely: $ make run-user CROSS_COMPILE=x86_64-linux- | grep status 165 test(s): 157 passed, 8 skipped, 0 failed => status: warning $ grep stack -ur run.out 0 -fstackprotector [OK] $ make run-nolibc-test CROSS_COMPILE=x86_64-linux- | grep status 165 test(s): 157 passed, 8 skipped, 0 failed => status: warning $ grep stack -ur run.out 0 -fstackprotector [OK] Changes from v3 --> v4: * tools/nolibc: arch-*.h: add missing space after ',' tools/nolibc: fix up startup failures for -O0 under gcc < 11.1.0 Both of the above changes are for _start, it is able to merge them if necessary. The first one is old for format errors reported by scripts/checkpatch.pl The second one is for -O0 failure under gcc < 11.1.0, applied the optimize("-Os", "omit-frame-pointer") suggestion from Thomas. * tools/nolibc: remove the old sys_stat support As suggested by Willy, Document carefully about the statx supported Linux version info. * tools/nolibc: add new crt.h with _start_c The code is polished carefully for smaller size and better readability. * tools/nolibc: stackprotector.h: add empty __stack_chk_init for !_NOLIBC_STACKPROTECTOR tools/nolibc: crt.h: initialize stack protector As suggested by Thomas, init stackprotector in _start_c() too. * tools/nolibc: arm: shrink _start with _start_c tools/nolibc: aarch64: shrink _start with _start_c tools/nolibc: i386: shrink _start with _start_c tools/nolibc: x86_64: shrink _start with _start_c tools/nolibc: mips: shrink _start with _start_c tools/nolibc: loongarch: shrink _start with _start_c tools/nolibc: riscv: shrink _start with _start_c tools/nolibc: s390: shrink _start with _start_c Removed the stackprotector initialization from _start too, we already have it in _start_c(). * selftests/nolibc: add EXPECT_PTRGE, EXPECT_PTRGT, EXPECT_PTRLE, EXPECT_PTRLT selftests/nolibc: add testcases for startup code Add a new startup test group to cover the testing of argc, argv/argv0, envp/environ and _auxv. Some testcases are enhanced, some are newly added from after the discussion during v3 review. * selftests/nolibc: allow run nolibc-test locally selftests/nolibc: allow test -include /path/to/nolibc.h Two new test targets are added to cover more scenes. Hope you like this revisoin ;-) Next patchset is powerpc & powerpc64 support, after that we will send the v2 of tinyconfig support, at last the left rv32 patches (mainly 64bit time). Best regards, Zhangjin --- [1]: https://lore.kernel.org/lkml/20230715100134.GD24086@1wt.eu/ Zhangjin Wu (18): tools/nolibc: arch-*.h: add missing space after ',' tools/nolibc: fix up startup failures for -O0 under gcc < 11.1.0 tools/nolibc: remove the old sys_stat support tools/nolibc: add new crt.h with _start_c tools/nolibc: stackprotector.h: add empty __stack_chk_init for !_NOLIBC_STACKPROTECTOR tools/nolibc: crt.h: initialize stack protector tools/nolibc: arm: shrink _start with _start_c tools/nolibc: aarch64: shrink _start with _start_c tools/nolibc: i386: shrink _start with _start_c tools/nolibc: x86_64: shrink _start with _start_c tools/nolibc: mips: shrink _start with _start_c tools/nolibc: loongarch: shrink _start with _start_c tools/nolibc: riscv: shrink _start with _start_c tools/nolibc: s390: shrink _start with _start_c selftests/nolibc: add EXPECT_PTRGE, EXPECT_PTRGT, EXPECT_PTRLE, EXPECT_PTRLT selftests/nolibc: add testcases for startup code selftests/nolibc: allow run nolibc-test locally selftests/nolibc: allow test -include /path/to/nolibc.h tools/include/nolibc/Makefile | 1 + tools/include/nolibc/arch-aarch64.h | 57 +--------- tools/include/nolibc/arch-arm.h | 83 ++------------- tools/include/nolibc/arch-i386.h | 62 ++--------- tools/include/nolibc/arch-loongarch.h | 46 +------- tools/include/nolibc/arch-mips.h | 76 ++----------- tools/include/nolibc/arch-riscv.h | 69 ++---------- tools/include/nolibc/arch-s390.h | 63 ++--------- tools/include/nolibc/arch-x86_64.h | 58 ++-------- tools/include/nolibc/crt.h | 61 +++++++++++ tools/include/nolibc/stackprotector.h | 2 + tools/include/nolibc/sys.h | 63 ++--------- tools/include/nolibc/types.h | 4 +- tools/testing/selftests/nolibc/Makefile | 12 +++ tools/testing/selftests/nolibc/nolibc-test.c | 106 ++++++++++++++++++- 15 files changed, 246 insertions(+), 517 deletions(-) create mode 100644 tools/include/nolibc/crt.h -- 2.25.1

2 years, 5 months

2
21
0 0

[PATCH v3 00/11] tools/nolibc: shrink arch support

by Zhangjin Wu

Hi, Willy, Thomas Here is the revision of the v2 arch support shrink patchset [1], it mainly applies suggestions from you. It is based on the 20230710-nolibc-ser2-tom-syscall-configv4-report branch of nolibc repo. Tested for all of the supported archs: arch/board | result ------------|------------ arm/versatilepb | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. arm/vexpress-a9 | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. arm/virt | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. aarch64/virt | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. i386/pc | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. x86_64/pc | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. mipsel/malta | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. loongarch64/virt | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. riscv64/virt | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. riscv32/virt | 151 test(s): 122 passed, 7 skipped, 22 failed => status: failure. s390x/s390-ccw-virtio | 151 test(s): 144 passed, 7 skipped, 0 failed => status: warning. Changes from v2 --> v3: * tools/nolibc: remove the old sys_stat support Revert the reorg operation, basically the same as v1 * tools/nolibc: add new crt.h with _start_c Revert the reorg operation Add crt.h in Makefile Add _nolibc_main alias for main to silence the compile warning about * tools/nolibc: arm: shrink _start with _start_c tools/nolibc: aarch64: shrink _start with _start_c tools/nolibc: i386: shrink _start with _start_c tools/nolibc: x86_64: shrink _start with _start_c tools/nolibc: mips: shrink _start with _start_c tools/nolibc: loongarch: shrink _start with _start_c tools/nolibc: riscv: shrink _start with _start_c tools/nolibc: s390: shrink _start with _start_c Revert the reorg operation, but still use post-whitespaces instead of post-tab. Include "crt.h" in arch-<ARCH>.h * tools/nolibc: arch-*.h: add missing space after ',' Fix up the errors reported by scripts/checkpatch.pl Best regards, Zhangjin --- [1]: https://lore.kernel.org/lkml/cover.1688828139.git.falcon@tinylab.org/ Zhangjin Wu (11): tools/nolibc: remove the old sys_stat support tools/nolibc: add new crt.h with _start_c tools/nolibc: arm: shrink _start with _start_c tools/nolibc: aarch64: shrink _start with _start_c tools/nolibc: i386: shrink _start with _start_c tools/nolibc: x86_64: shrink _start with _start_c tools/nolibc: mips: shrink _start with _start_c tools/nolibc: loongarch: shrink _start with _start_c tools/nolibc: riscv: shrink _start with _start_c tools/nolibc: s390: shrink _start with _start_c tools/nolibc: arch-*.h: add missing space after ',' tools/include/nolibc/Makefile | 1 + tools/include/nolibc/arch-aarch64.h | 56 ++---------------- tools/include/nolibc/arch-arm.h | 82 +++------------------------ tools/include/nolibc/arch-i386.h | 61 +++----------------- tools/include/nolibc/arch-loongarch.h | 45 ++------------- tools/include/nolibc/arch-mips.h | 76 ++++--------------------- tools/include/nolibc/arch-riscv.h | 68 +++------------------- tools/include/nolibc/arch-s390.h | 63 ++------------------ tools/include/nolibc/arch-x86_64.h | 57 +++---------------- tools/include/nolibc/crt.h | 59 +++++++++++++++++++ tools/include/nolibc/sys.h | 63 ++++---------------- tools/include/nolibc/types.h | 4 +- 12 files changed, 133 insertions(+), 502 deletions(-) create mode 100644 tools/include/nolibc/crt.h -- 2.25.1

2 years, 5 months

3
26
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror