April 2023 - Linux-kselftest-mirror

[PATCH 0/6] tools/nolibc: add stackprotector support for more architectures

by Thomas Weißschuh

Add stackprotector support for all remaining architectures, except s390. On s390 the stackprotectors are not supported in "global" mode; only "sysreg" mode which is not suppored in nolibc. The series also contains a small optimization to strace output during execution of nolibc-test. This series is based on the 20230415-nolibc-updates-4a branch of the nolibc tree. Signed-off-by: Thomas Weißschuh <linux(a)weissschuh.net> --- Thomas Weißschuh (6): selftests/nolibc: reduce syscalls during space padding tools/nolibc: riscv: add stackprotector support tools/nolibc: aarch64: add stackprotector support tools/nolibc: arm: add stackprotector support tools/nolibc: loongarch: add stackprotector support tools/nolibc: mips: add stackprotector support tools/include/nolibc/arch-aarch64.h | 7 ++++++- tools/include/nolibc/arch-arm.h | 7 ++++++- tools/include/nolibc/arch-loongarch.h | 7 ++++++- tools/include/nolibc/arch-mips.h | 8 +++++++- tools/include/nolibc/arch-riscv.h | 7 ++++++- tools/testing/selftests/nolibc/Makefile | 5 +++++ tools/testing/selftests/nolibc/nolibc-test.c | 15 +++++++++++---- 7 files changed, 47 insertions(+), 9 deletions(-) --- base-commit: e35214ea9db7477a02e67a8b412e8046534bb97c change-id: 20230408-nolibc-stackprotector-archs-42244674616e Best regards, -- Thomas Weißschuh <linux(a)weissschuh.net>

1 year, 6 months

2
7
0 0

[PATCH] kselftest/arm64: Add a smoke test for ptracing hardware break/watch points

by Mark Brown

There was a report that the hardware breakpoints and watch points weren't reporting the debug architecture version as expected, they were reporting a version of 0 which is not defined in the architecture. This happens when running in a KVM guest if the host has a debug architecture version not supported by KVM, it in turn confuses GDB which rejects any debug architecture version it does not know about. Add a test that covers that situation and while we're at it reports the debug architecture version and number of slots available to aid with figuring out problems that may arise. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/arm64/abi/ptrace.c | 32 +++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/arm64/abi/ptrace.c b/tools/testing/selftests/arm64/abi/ptrace.c index be952511af22..abe4d58d731d 100644 --- a/tools/testing/selftests/arm64/abi/ptrace.c +++ b/tools/testing/selftests/arm64/abi/ptrace.c @@ -20,7 +20,7 @@ #include "../../kselftest.h" -#define EXPECTED_TESTS 7 +#define EXPECTED_TESTS 11 #define MAX_TPIDRS 2 @@ -132,6 +132,34 @@ static void test_tpidr(pid_t child) } } +static void test_hw_debug(pid_t child, int type, const char *type_name) +{ + struct user_hwdebug_state state; + struct iovec iov; + int slots, arch, ret; + + iov.iov_len = sizeof(state); + iov.iov_base = &state; + + /* Should be able to read the values */ + ret = ptrace(PTRACE_GETREGSET, child, type, &iov); + ksft_test_result(ret == 0, "read_%s\n", type_name); + + if (ret == 0) { + /* Low 8 bits is the number of slots, next 4 bits the arch */ + slots = state.dbg_info & 0xff; + arch = (state.dbg_info >> 8) & 0xf; + + ksft_print_msg("%s version %d with %d slots\n", type_name, + arch, slots); + + /* Zero is not currently architecturally valid */ + ksft_test_result(arch, "%s_arch_set\n", type_name); + } else { + ksft_test_result_skip("%s_arch_set\n"); + } +} + static int do_child(void) { if (ptrace(PTRACE_TRACEME, -1, NULL, NULL)) @@ -207,6 +235,8 @@ static int do_parent(pid_t child) ksft_print_msg("Parent is %d, child is %d\n", getpid(), child); test_tpidr(child); + test_hw_debug(child, NT_ARM_HW_WATCH, "NT_ARM_HW_WATCH"); + test_hw_debug(child, NT_ARM_HW_BREAK, "NT_ARM_HW_BREAK"); ret = EXIT_SUCCESS; --- base-commit: e8d018dd0257f744ca50a729e3d042cf2ec9da65 change-id: 20230414-arm64-test-hw-breakpoint-83fe02f607fc Best regards, -- Mark Brown <broonie(a)kernel.org>

1 year, 6 months

1
0
0 0

Re: [PATCH v8 3/3] selftests/mm: add new selftests for KSM

by David Hildenbrand

> +/* Verify that KSM can be enabled / queried with prctl. */ > +static void test_prctl(void) > +{ > + int ret; > + > + ksft_print_msg("[RUN] %s\n", __func__); > + > + ret = prctl(PR_SET_MEMORY_MERGE, 1, 0, 0, 0); > + if (ret < 0 && errno == EINVAL) { > + ksft_test_result_skip("PR_SET_MEMORY_MERGE not supported\n"); > + return; > + } else if (ret) { > + ksft_test_result_fail("PR_SET_MEMORY_MERGE=1 failed\n"); > + } Just realized we're missing a "return;" in case of the failure here. -- Thanks, David / dhildenb

1 year, 6 months

2
3
0 0

Re: [PATCH v8 1/3] mm: add new api to enable ksm per process

by David Hildenbrand

> +static void __ksm_add_vma(struct vm_area_struct *vma) > +{ > + unsigned long vm_flags = vma->vm_flags; > + > + if (vm_flags & VM_MERGEABLE) > + return; > + > + if (vma_ksm_compatible(vma)) { > + vm_flags |= VM_MERGEABLE; > + vm_flags_reset(vma, vm_flags); > + } > +} We can do the following simplification on top: diff --git a/mm/ksm.c b/mm/ksm.c index 905c8edce5cf..26e7f585d65d 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2511,15 +2511,11 @@ static int ksm_scan_thread(void *nothing) static void __ksm_add_vma(struct vm_area_struct *vma) { - unsigned long vm_flags = vma->vm_flags; - - if (vm_flags & VM_MERGEABLE) + if (vma->vm_flags & VM_MERGEABLE) return; - if (vma_ksm_compatible(vma)) { - vm_flags |= VM_MERGEABLE; - vm_flags_reset(vma, vm_flags); - } + if (vma_ksm_compatible(vma)) + vm_flags_set(vma, VM_MERGEABLE); } /** -- 2.39.2 I have some patches based on your patch set (handling/testing unmerging whens setting PR_SET_MEMORY_MERGE=0. Will send out once you changes are queued. -- Thanks, David / dhildenb

1 year, 6 months

2
1
0 0

Re: new order

by FASTWAYBASE.US94＠consultant.com

Dea Sir. Please see attached new order and revert to us the delivery date/ FOB also inform us payment terms. Best Regards Susan Purchase Manager.

1 year, 6 months

1
0
0 0

[RFC PATCH v2 0/3] kunit: Deferred action helpers

by David Gow

This is a follow-up to the kunit_defer() parts of 'KUnit device API proposal'[1], with a number of changes suggested by Matti Vaittinen, Maxime Ripard and Benjamin Berg. Most notably, kunit_defer() has been renamed to kunit_add_action(), in order to match the equivalent devres API[2]. Likewise: kunit_defer_cancel() has become kunit_remove_action(), and kunit_defer_trigger() has become kunit_release_action(). The _token() versions of these APIs remain, for the moment, even though they're a bit more awkward and less useful, as they have two advantages: 1. They're faster, as the action doesn't need to be looked up. 2. They provide more flexibility in the ordering of actions in cases where several identical actions are interleaved with other, different actions. Similarly, the internal_gfp argument remains for now, as this is useful in implementing kunit_kalloc() and similar. The implementation now uses a single allocation for both the kunit_resource and the kunit_action_ctx (previously kunit_defer_ctx). The 'cancellation token' is now of type 'struct kunit_action_ctx', instead of void*. Tests have been added to the kunit-resource-test suite which exercise this functionality. Similarly, the kunit executor tests and kunit allocation functions have been updated to make use of this API. I'd love to hear any further thoughts! Cheers, -- David [1]: https://lore.kernel.org/linux-kselftest/20230325043104.3761770-1-davidgow@g… [2]: https://docs.kernel.org/driver-api/basics.html#c.devm_add_action David Gow (3): kunit: Add kunit_add_action() to defer a call until test exit kunit: executor_test: Use kunit_add_action() kunit: kmalloc_array: Use kunit_add_action() include/kunit/resource.h | 89 +++++++++++++++++++++++++++ lib/kunit/executor_test.c | 12 ++-- lib/kunit/kunit-test.c | 123 +++++++++++++++++++++++++++++++++++++- lib/kunit/resource.c | 99 ++++++++++++++++++++++++++++++ lib/kunit/test.c | 48 +++------------ 5 files changed, 323 insertions(+), 48 deletions(-) -- 2.40.0.348.gf938b09366-goog

1 year, 6 months

4
16
0 0

Re: [PATCH v8 3/3] selftests/mm: add new selftests for KSM

by David Hildenbrand

On 16.04.23 00:59, Stefan Roesch wrote: > This adds three new tests to the selftests for KSM. These tests use the > new prctl API's to enable and disable KSM. > > 1) add new prctl flags to prctl header file in tools dir > > This adds the new prctl flags to the include file prct.h in the > tools directory. This makes sure they are available for testing. > > 2) add KSM prctl merge test to ksm_tests > > This adds the -t option to the ksm_tests program. The -t flag > allows to specify if it should use madvise or prctl ksm merging. > > 3) add two functions for debugging merge outcome for ksm_tests > > This adds two functions to report the metrics in /proc/self/ksm_stat > and /sys/kernel/debug/mm/ksm. The debug output is enabled with the > -d option. > > 4) add KSM prctl test to ksm_functional_tests > > This adds a test to the ksm_functional_test that verifies that the > prctl system call to enable / disable KSM works. > > 5) add KSM fork test to ksm_functional_test > > Add fork test to verify that the MMF_VM_MERGE_ANY flag is inherited > by the child process. > > Signed-off-by: Stefan Roesch <shr(a)devkernel.io> > Cc: Bagas Sanjaya <bagasdotme(a)gmail.com> > Cc: David Hildenbrand <david(a)redhat.com> > Cc: Johannes Weiner <hannes(a)cmpxchg.org> > Cc: Michal Hocko <mhocko(a)suse.com> > Cc: Rik van Riel <riel(a)surriel.com> > Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> > --- Thanks! Acked-by: David Hildenbrand <david(a)redhat.com> -- Thanks, David / dhildenb

1 year, 6 months

1
0
0 0

Re: [PATCH v7 3/3] selftests/mm: add new selftests for KSM

by David Hildenbrand

Thanks for moving the functional tests. Some more feedback forksm_functional_tests change. Writing tests in the ksft testing framework can be a bit "special". I'm seeing some weird test failures due to prctl(PR_GET_MEMORY_MERGE, 0) Apparently, these go away when using prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0) to explicitly force the other values to 0. Most probably, we should do that for PR_SET_MEMORY_MERGE as well (especially if we check for the arguments as well). [...] > @@ -15,8 +15,10 @@ > #include <errno.h> > #include <fcntl.h> > #include <sys/mman.h> > +#include <sys/prctl.h> > #include <sys/syscall.h> > #include <sys/ioctl.h> > +#include <sys/wait.h> > #include <linux/userfaultfd.h> > > #include "../kselftest.h" > @@ -326,9 +328,80 @@ static void test_unmerge_uffd_wp(void) > } > #endif > > +/* Verify that KSM can be enabled / queried with prctl. */ > +static void test_ksm_prctl(void) Maybe call this "test_prctl", because after all, these are all KSM tests. > +{ > + bool ret = false; > + int is_on; > + int is_off; > + > + ksft_print_msg("[RUN] %s\n", __func__); > + > + if (prctl(PR_SET_MEMORY_MERGE, 1)) { > + perror("prctl set"); > + goto out; > + } > + > + is_on = prctl(PR_GET_MEMORY_MERGE, 0); > + if (prctl(PR_SET_MEMORY_MERGE, 0)) { > + perror("prctl set"); > + goto out; > + } > + > + is_off = prctl(PR_GET_MEMORY_MERGE, 0); > + if (is_on && is_off) > + ret = true; > + > +out: > + ksft_test_result(ret, "prctl get / set\n"); The test fails if the kernel does not support PR_SET_MEMORY_MERGE. I'd modify this test to: (1) skip if the first PR_SET_MEMORY_MERGE=1 failed with EINVAL. (2) distinguish for PR_GET_MEMORY_MERGE whether it returned an error or whether it returned a wrong value. Feel free to keep that as is, whatever you prefer. (3) exit early for all failures, you get exactly one expected skip/pass/fail for the test and use specific test failure messages. (4) Pass "0" for all other arguments of prctl. Something like: static void test_prctl(void) { int ret; ksft_print_msg("[RUN] %s\n", __func__); ret = prctl(PR_SET_MEMORY_MERGE, 1, 0, 0, 0); if (ret < 0 && errno == EINVAL){ ksft_test_result_skip("PR_SET_MEMORY_MERGE not supported\n"); return; } else if (ret) { ksft_test_result_fail("PR_SET_MEMORY_MERGE=1 failed\n"); return; } ret = prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0); if (ret < 0) { ksft_test_result_fail("PR_GET_MEMORY_MERGE failed\n"); return; } else if (ret != 1) { ksft_test_result_fail("PR_SET_MEMORY_MERGE=1 not effective\n"); return; } ret = prctl(PR_SET_MEMORY_MERGE, 0, 0, 0, 0); if (ret){ ksft_test_result_fail("PR_SET_MEMORY_MERGE=0 failed\n"); return; } ret = prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0); if (ret < 0) { ksft_test_result_fail("PR_GET_MEMORY_MERGE failed\n"); return; } else if (ret != 0) { ksft_test_result_fail("PR_SET_MEMORY_MERGE=0 not effective\n"); return; } ksft_test_result_pass("Setting/clearing PR_SET_MEMORY_MERGE works\n"); } > +} > + > +/* Verify that prctl ksm flag is inherited. */ > +static void test_ksm_fork(void) Maybe call it "test_prctl_fork" > +{ > + int status; > + bool ret = false; > + pid_t child_pid; > + > + ksft_print_msg("[RUN] %s\n", __func__); > + > + if (prctl(PR_SET_MEMORY_MERGE, 1)) { > + ksft_test_result_fail("prctl failed\n"); > + goto out; > + } > + > + child_pid = fork(); > + if (child_pid == 0) { > + int is_on = > + > + if (!is_on) > + exit(-1); > + > + exit(0); > + } > + > + if (child_pid < 0) { > + ksft_test_result_fail("child pid < 0\n"); > + goto out;> + > + if (waitpid(child_pid, &status, 0) < 0 || WEXITSTATUS(status) != 0) { > + ksft_test_result_fail("wait pid < 0\n"); > + goto out; > + } > + > + if (prctl(PR_SET_MEMORY_MERGE, 0)) > + ksft_test_result_fail("prctl 2 failed\n"); > + else > + ret = true; > + > +out: > + ksft_test_result(ret, "ksm_flag is inherited\n"); > +} Again, test fails if kernel support is not around. I'd modify this test to: (1) skip if the first PR_SET_MEMORY_MERGE=1 failed with EINVAL just as in the other test. (2) Use a simple exit(prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0)); in the child. (3) exit early for all failures, you get exactly one expected skip/pass/fail for the test and use specific test failure messages. (4) Split up the waitpid() check to test what failed. (5) Pass "0" for all other arguments of prctl. Something like: static void test_prctl_fork(void) { int ret, status; pid_t child_pid; ksft_print_msg("[RUN] %s\n", __func__); ret = prctl(PR_SET_MEMORY_MERGE, 1, 0, 0, 0); if (ret < 0 && errno == EINVAL){ ksft_test_result_skip("PR_SET_MEMORY_MERGE not supported\n"); return; } else if (ret) { ksft_test_result_fail("PR_SET_MEMORY_MERGE=1 failed\n"); return; } child_pid = fork(); if (!child_pid) { exit(prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0)); } else if (child_pid < 0) { ksft_test_result_fail("fork() failed\n"); return; } if (waitpid(child_pid, &status, 0) < 0) { ksft_test_result_fail("waitpid() failed\n"); return; } else if (WEXITSTATUS(status) != 1) { ksft_test_result_fail("unexpected PR_GET_MEMORY_MERGE result in child\n"); return; } if (prctl(PR_SET_MEMORY_MERGE, 0, 0, 0, 0)) { ksft_test_result_fail("PR_SET_MEMORY_MERGE=0 failed\n"); return; } ksft_test_result_pass("PR_SET_MEMORY_MERGE value is inherited\n"); } > + > int main(int argc, char **argv) > { > - unsigned int tests = 2; > + unsigned int tests = 6; Assuming you execute exactly one ksft_test_result_skip/fail/pass on every path of your two test, this would become "4". > int err; > > #ifdef __NR_userfaultfd > @@ -358,6 +431,8 @@ int main(int argc, char **argv) > #ifdef __NR_userfaultfd > test_unmerge_uffd_wp(); > #endif > + test_ksm_prctl(); > + test_ksm_fork(); > With above outlined changes (feel free to integrate what you consider valuable), on an older kernel I get: $ sudo ./ksm_functional_tests TAP version 13 1..5 # [RUN] test_unmerge ok 1 Pages were unmerged # [RUN] test_unmerge_discarded ok 2 Pages were unmerged # [RUN] test_unmerge_uffd_wp ok 3 Pages were unmerged # [RUN] test_prctl ok 4 # SKIP PR_SET_MEMORY_MERGE not supported # [RUN] test_prctl_fork ok 5 # SKIP PR_SET_MEMORY_MERGE not supported # Totals: pass:3 fail:0 xfail:0 xpass:0 skip:2 error:0 On a kernel with your patch #1: # ./ksm_functional_tests TAP version 13 1..5 # [RUN] test_unmerge ok 1 Pages were unmerged # [RUN] test_unmerge_discarded ok 2 Pages were unmerged # [RUN] test_unmerge_uffd_wp ok 3 Pages were unmerged # [RUN] test_prctl ok 4 Setting/clearing PR_SET_MEMORY_MERGE works # [RUN] test_prctl_fork ok 5 PR_SET_MEMORY_MERGE value is inherited # Totals: pass:5 fail:0 xfail:0 xpass:0 skip:0 error:0 > err = ksft_get_fail_cnt(); > if (err) > diff --git a/tools/testing/selftests/mm/ksm_tests.c b/tools/testing/selftests/mm/ksm_tests.c > index f9eb4d67e0dd..35b3828d44b4 100644 > --- a/tools/testing/selftests/mm/ksm_tests.c > +++ b/tools/testing/selftests/mm/ksm_tests.c > @@ -1,6 +1,8 @@ > // SPDX-License-Identifier: GPL-2.0 [...] Changes to ksm_tests mostly look good. Two comments: > - if (ksm_merge_pages(map_ptr, page_size * page_count, start_time, timeout)) > + if (ksm_merge_pages(merge_type, map_ptr, page_size * page_count, start_time, timeout)) > goto err_out; > > /* verify that the right number of pages are merged */ > if (assert_ksm_pages_count(page_count)) { > printf("OK\n"); > - munmap(map_ptr, page_size * page_count); > + if (merge_type == KSM_MERGE_MADVISE) > + munmap(map_ptr, page_size * page_count); > + else if (merge_type == KSM_MERGE_PRCTL) > + prctl(PR_SET_MEMORY_MERGE, 0); Are you sure that we don't want to unmap here? I'd assume we want to unmap in either way. [...] > + case 'd': > + debug = 1; > + break; > case 's': > size_MB = atoi(optarg); > if (size_MB <= 0) { > printf("Size must be greater than 0\n"); > return KSFT_FAIL; > } > + case 't': > + { > + int tmp = atoi(optarg); > + > + if (tmp < 0 || tmp > KSM_MERGE_LAST) { > + printf("Invalid merge type\n"); > + return KSFT_FAIL; > + } > + merge_type = atoi(optarg); You can simply reuse tmp merge_type = tmp; -- Thanks, David / dhildenb

1 year, 6 months

2
2
0 0

[PATCH net-next 0/5] mptcp: various small cleanups

by Matthieu Baerts

Patch 1 makes a function static because it is only used in one file. Patch 2 adds info about the git trees we use to help occasional devs. Patch 3 removes an unused variable. Patch 4 removes duplicated entries from the help menu of a tool used in MPTCP selftests. Patch 5 removes some ShellCheck warnings in mptcp_join.sh selftest. Only very minor improvements then. Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net> --- Geliang Tang (1): mptcp: make userspace_pm_append_new_local_addr static Matthieu Baerts (4): MAINTAINERS: add git trees for MPTCP mptcp: remove unused 'remaining' variable selftests: mptcp: remove duplicated entries in usage selftests: mptcp: join: fix ShellCheck warnings MAINTAINERS | 2 ++ net/mptcp/options.c | 7 ++----- net/mptcp/pm_userspace.c | 4 ++-- net/mptcp/protocol.h | 2 -- tools/testing/selftests/net/mptcp/mptcp_connect.c | 8 ++++---- tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++++++-- 6 files changed, 18 insertions(+), 15 deletions(-) --- base-commit: c11d2e718c792468e67389b506451eddf26c2dac change-id: 20230414-upstream-net-next-20230414-mptcp-small-cleanups-1cba986990b1 Best regards, -- Matthieu Baerts <matthieu.baerts(a)tessares.net>

1 year, 6 months

2
6
0 0

[PATCH net-next 0/3] selftests: openvswitch: add support for testing upcall interface

by Aaron Conole

The existing selftest suite for openvswitch will work for regression testing the datapath feature bits, but won't test things like adding interfaces, or the upcall interface. Here, we add some additional test facilities. First, extend the ovs-dpctl.py python module to support the OVS_FLOW and OVS_PACKET netlink families, with some associated messages. These can be extended over time, but the initial support is for more well known cases (output, userspace, and CT). Next, extend the test suite to test upcalls by adding a datapath, monitoring the upcall socket associated with the datapath, and then dumping any upcalls that are received. Compare with expected ARP upcall via arping. Aaron Conole (3): selftests: openvswitch: add interface support selftests: openvswitch: add flow dump support selftests: openvswitch: add support for upcall testing .../selftests/net/openvswitch/openvswitch.sh | 89 +- .../selftests/net/openvswitch/ovs-dpctl.py | 1276 ++++++++++++++++- 2 files changed, 1349 insertions(+), 16 deletions(-) -- 2.39.2

1 year, 6 months

2
4
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror April 2023