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

by Tiezhu Yang

v3: -- Check the definition of __BITS_PER_LONG first at the beginning of uapi/asm-generic/bitsperlong.h v2: -- Check __CHAR_BIT__ and __SIZEOF_LONG__ rather than __aarch64__, __riscv, __loongarch__, thanks Ruoyao -- Update the code comment and commit message v1: -- Rebase on 6.4-rc6 -- Only unify uapi bitsperlong.h for arm64, riscv and loongarch -- Remove uapi bitsperlong.h of hexagon and microblaze in a new patch Here is the RFC patch: https://lore.kernel.org/linux-arch/1683615903-10862-1-git-send-email-yangti… Tiezhu Yang (2): asm-generic: Unify uapi bitsperlong.h for arm64, riscv and loongarch tools arch: Remove uapi bitsperlong.h of hexagon and microblaze arch/arm64/include/uapi/asm/bitsperlong.h | 24 ------------------- arch/loongarch/include/uapi/asm/bitsperlong.h | 9 -------- arch/riscv/include/uapi/asm/bitsperlong.h | 14 ----------- include/uapi/asm-generic/bitsperlong.h | 13 ++++++++++- tools/arch/arm64/include/uapi/asm/bitsperlong.h | 24 ------------------- tools/arch/hexagon/include/uapi/asm/bitsperlong.h | 27 ---------------------- .../arch/loongarch/include/uapi/asm/bitsperlong.h | 9 -------- .../arch/microblaze/include/uapi/asm/bitsperlong.h | 2 -- tools/arch/riscv/include/uapi/asm/bitsperlong.h | 14 ----------- tools/include/uapi/asm-generic/bitsperlong.h | 14 ++++++++++- tools/include/uapi/asm/bitsperlong.h | 6 ----- 11 files changed, 25 insertions(+), 131 deletions(-) delete mode 100644 arch/arm64/include/uapi/asm/bitsperlong.h delete mode 100644 arch/loongarch/include/uapi/asm/bitsperlong.h delete mode 100644 arch/riscv/include/uapi/asm/bitsperlong.h delete mode 100644 tools/arch/arm64/include/uapi/asm/bitsperlong.h delete mode 100644 tools/arch/hexagon/include/uapi/asm/bitsperlong.h delete mode 100644 tools/arch/loongarch/include/uapi/asm/bitsperlong.h delete mode 100644 tools/arch/microblaze/include/uapi/asm/bitsperlong.h delete mode 100644 tools/arch/riscv/include/uapi/asm/bitsperlong.h -- 2.1.0

2 years, 1 month

4
14
0 0

[bug report] selftests: cgroup: add test_zswap with no kmem bypass test

by Dan Carpenter

Hello Domenico Cerasuolo, The patch 7c967f267b1d: "selftests: cgroup: add test_zswap with no kmem bypass test" from Jun 21, 2023 (linux-next), leads to the following Smatch static checker warning: ./tools/testing/selftests/cgroup/test_zswap.c:228 test_no_kmem_bypass() error: uninitialized symbol 'test_group'. ./tools/testing/selftests/cgroup/test_zswap.c 148 static int test_no_kmem_bypass(const char *root) 149 { 150 size_t min_free_kb_high, min_free_kb_low, min_free_kb_original; 151 struct no_kmem_bypass_child_args *values; 152 size_t trigger_allocation_size; 153 int wait_child_iteration = 0; 154 long stored_pages_threshold; 155 struct sysinfo sys_info; 156 int ret = KSFT_FAIL; 157 int child_status; 158 char *test_group; 159 pid_t child_pid; 160 161 /* Read sys info and compute test values accordingly */ 162 if (sysinfo(&sys_info) != 0) 163 return KSFT_FAIL; 164 if (sys_info.totalram > 5000000000) 165 return KSFT_SKIP; 166 values = mmap(0, sizeof(struct no_kmem_bypass_child_args), PROT_READ | 167 PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0); 168 if (values == MAP_FAILED) 169 return KSFT_FAIL; 170 if (read_min_free_kb(&min_free_kb_original)) 171 return KSFT_FAIL; 172 min_free_kb_high = sys_info.totalram / 2000; 173 min_free_kb_low = sys_info.totalram / 500000; 174 values->target_alloc_bytes = (sys_info.totalram - min_free_kb_high * 1000) + 175 sys_info.totalram * 5 / 100; 176 stored_pages_threshold = sys_info.totalram / 5 / 4096; 177 trigger_allocation_size = sys_info.totalram / 20; 178 179 /* Set up test memcg */ 180 if (cg_write(root, "cgroup.subtree_control", "+memory")) 181 goto out; test_group is not initialized here. Undoing stuff which hasn't been done is the canonical bug with "goto out;" labels. 182 test_group = cg_name(root, "kmem_bypass_test"); 183 if (!test_group) 184 goto out; 185 186 /* Spawn memcg child and wait for it to allocate */ 187 set_min_free_kb(min_free_kb_low); 188 if (cg_create(test_group)) test_group is allocated but not created. Is it okay to call destroy on this path? 189 goto out; 190 values->child_allocated = false; 191 child_pid = cg_run_nowait(test_group, no_kmem_bypass_child, values); 192 if (child_pid < 0) 193 goto out; 194 while (!values->child_allocated && wait_child_iteration++ < 10000) 195 usleep(1000); 196 197 /* Try to wakeup kswapd and let it push child memory to zswap */ 198 set_min_free_kb(min_free_kb_high); 199 for (int i = 0; i < 20; i++) { 200 size_t stored_pages; 201 char *trigger_allocation = malloc(trigger_allocation_size); 202 203 if (!trigger_allocation) 204 break; 205 for (int i = 0; i < trigger_allocation_size; i += 4095) 206 trigger_allocation[i] = 'b'; 207 usleep(100000); 208 free(trigger_allocation); 209 if (get_zswap_stored_pages(&stored_pages)) 210 break; 211 if (stored_pages < 0) 212 break; 213 /* If memory was pushed to zswap, verify it belongs to memcg */ 214 if (stored_pages > stored_pages_threshold) { 215 int zswapped = cg_read_key_long(test_group, "memory.stat", "zswapped "); 216 int delta = stored_pages * 4096 - zswapped; 217 int result_ok = delta < stored_pages * 4096 / 4; 218 219 ret = result_ok ? KSFT_PASS : KSFT_FAIL; 220 break; 221 } 222 } 223 224 kill(child_pid, SIGTERM); 225 waitpid(child_pid, &child_status, 0); 226 out: 227 set_min_free_kb(min_free_kb_original); --> 228 cg_destroy(test_group); 229 free(test_group); 230 return ret; 231 } regards, dan carpenter

2 years, 1 month

2
1
0 0

Re: [PATCH -next] selftests/landlock: Fix selftest ptrace_test run fail

by Mickaël Salaün

I checked and the Landlock ptrace test failed because Yama is enabled, which is expected. You can check that with /proc/sys/kernel/yama/ptrace_scope Jeff Xu sent a patch to fix this case but it is not ready yet: https://lore.kernel.org/r/20220628222941.2642917-1-jeffxu@google.com Could you please send a new patch Jeff, and add Limin in Cc? On 29/11/2022 12:26, limin wrote: > cat /proc/cmdline > BOOT_IMAGE=/vmlinuz-6.1.0-next-20221116 > root=UUID=a65b3a79-dc02-4728-8a0c-5cf24f4ae08b ro > systemd.unified_cgroup_hierarchy=1 cgroup_no_v1=all > > > config > > # > # Automatically generated file; DO NOT EDIT. > # Linux/x86 6.1.0-rc6 Kernel Configuration > # [...] > CONFIG_SECURITY_YAMA=y [...] > CONFIG_LSM="landlock,lockdown,yama,integrity,apparmor" [...] > > On 2022/11/29 19:03, Mickaël Salaün wrote: >> I tested with next-20221116 and all tests are OK. Could you share your >> kernel configuration with a link? What is the content of /proc/cmdline? >> >> On 29/11/2022 02:42, limin wrote: >>> I run test on Linux ubuntu2204 6.1.0-next-20221116 >>> >>> I did't use yama. >>> >>> you can reproduce by this step: >>> >>> cd kernel_src >>> >>> cd tools/testing/selftests/landlock/ >>> make >>> ./ptrace_test >>> >>> >>> >>> >>> On 2022/11/29 3:44, Mickaël Salaün wrote: >>>> This patch changes the test semantic and then cannot work on my test >>>> environment. On which kernel did you run test? Do you use Yama or >>>> something similar? >>>> >>>> On 28/11/2022 03:04, limin wrote: >>>>> Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent, >>>>> trace parent return -1 when child== 0 >>>>> How to reproduce warning: >>>>> $ make -C tools/testing/selftests TARGETS=landlock run_tests >>>>> >>>>> Signed-off-by: limin <limin100(a)huawei.com> >>>>> --- >>>>> tools/testing/selftests/landlock/ptrace_test.c | 5 ++--- >>>>> 1 file changed, 2 insertions(+), 3 deletions(-) >>>>> >>>>> diff --git a/tools/testing/selftests/landlock/ptrace_test.c >>>>> b/tools/testing/selftests/landlock/ptrace_test.c >>>>> index c28ef98ff3ac..88c4dc63eea0 100644 >>>>> --- a/tools/testing/selftests/landlock/ptrace_test.c >>>>> +++ b/tools/testing/selftests/landlock/ptrace_test.c >>>>> @@ -267,12 +267,11 @@ TEST_F(hierarchy, trace) >>>>> /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the >>>>> parent. */ >>>>> err_proc_read = test_ptrace_read(parent); >>>>> ret = ptrace(PTRACE_ATTACH, parent, NULL, 0); >>>>> + EXPECT_EQ(-1, ret); >>>>> + EXPECT_EQ(EPERM, errno); >>>>> if (variant->domain_child) { >>>>> - EXPECT_EQ(-1, ret); >>>>> - EXPECT_EQ(EPERM, errno); >>>>> EXPECT_EQ(EACCES, err_proc_read); >>>>> } else { >>>>> - EXPECT_EQ(0, ret); >>>>> EXPECT_EQ(0, err_proc_read); >>>>> } >>>>> if (ret == 0) {

2 years, 1 month

2
2
0 0

[PATCH] selftests/rseq: Fix unknown type name __weak for gcc 11.3.0

by Anh Tuan Phan

Add the definition of the '__weak' attribute since it is not available in GCC 11.3.0 and newer: rseq.c:41:1: error: unknown type name ‘__weak’ 41 | __weak ptrdiff_t __rseq_offset; Fixes: 3bcbc20942db ("selftests/rseq: Play nice with binaries statically linked against glibc 2.35+") Signed-off-by: Anh Tuan Phan <tuananhlfc(a)gmail.com> --- tools/testing/selftests/rseq/rseq.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/rseq/rseq.c b/tools/testing/selftests/rseq/rseq.c index a723da253244..584eec9b0930 100644 --- a/tools/testing/selftests/rseq/rseq.c +++ b/tools/testing/selftests/rseq/rseq.c @@ -34,6 +34,10 @@ #include "../kselftest.h" #include "rseq.h" +#ifndef __weak +#define __weak __attribute__((weak)) +#endif + /* * Define weak versions to play nice with binaries that are statically linked * against a libc that doesn't support registering its own rseq. -- 2.34.1

2 years, 1 month

1
0
0 0

[RFC bpf-next v5] bpf: Force to MPTCP

by Geliang Tang

As is described in the "How to use MPTCP?" section in MPTCP wiki [1]: "Your app can create sockets with IPPROTO_MPTCP as the proto: ( socket(AF_INET, SOCK_STREAM, IPPROTO_MPTCP); ). Legacy apps can be forced to create and use MPTCP sockets instead of TCP ones via the mptcpize command bundled with the mptcpd daemon." But the mptcpize (LD_PRELOAD technique) command has some limitations [2]: - it doesn't work if the application is not using libc (e.g. GoLang apps) - in some envs, it might not be easy to set env vars / change the way apps are launched, e.g. on Android - mptcpize needs to be launched with all apps that want MPTCP: we could have more control from BPF to enable MPTCP only for some apps or all the ones of a netns or a cgroup, etc. - it is not in BPF, we cannot talk about it at netdev conf. So this patchset attempts to use BPF to implement functions similer to mptcpize. The main idea is add a hook in sys_socket() to change the protocol id from IPPROTO_TCP (or 0) to IPPROTO_MPTCP. [1] https://github.com/multipath-tcp/mptcp_net-next/wiki [2] https://github.com/multipath-tcp/mptcp_net-next/issues/79 v5: - add bpf_mptcpify helper. v4: - use lsm_cgroup/socket_create v3: - patch 8: char cmd[128]; -> char cmd[256]; v2: - Fix build selftests errors reported by CI Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/79 Signed-off-by: Geliang Tang <geliang.tang(a)suse.com> --- include/linux/bpf.h | 1 + include/linux/lsm_hook_defs.h | 2 +- include/linux/security.h | 6 +- include/uapi/linux/bpf.h | 7 + kernel/bpf/bpf_lsm.c | 2 + net/mptcp/bpf.c | 20 +++ net/socket.c | 4 +- security/apparmor/lsm.c | 8 +- security/security.c | 2 +- security/selinux/hooks.c | 6 +- tools/include/uapi/linux/bpf.h | 7 + .../testing/selftests/bpf/prog_tests/mptcp.c | 128 ++++++++++++++++-- tools/testing/selftests/bpf/progs/mptcpify.c | 17 +++ 13 files changed, 187 insertions(+), 23 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/mptcpify.c diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 360433f14496..77cdbe21e5c1 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2913,6 +2913,7 @@ extern const struct bpf_func_proto bpf_skc_to_tcp_request_sock_proto; extern const struct bpf_func_proto bpf_skc_to_udp6_sock_proto; extern const struct bpf_func_proto bpf_skc_to_unix_sock_proto; extern const struct bpf_func_proto bpf_skc_to_mptcp_sock_proto; +extern const struct bpf_func_proto bpf_mptcpify_proto; extern const struct bpf_func_proto bpf_copy_from_user_proto; extern const struct bpf_func_proto bpf_snprintf_btf_proto; extern const struct bpf_func_proto bpf_snprintf_proto; diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h index 7308a1a7599b..d475e6ab20ca 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -288,7 +288,7 @@ LSM_HOOK(int, 0, watch_key, struct key *key) LSM_HOOK(int, 0, unix_stream_connect, struct sock *sock, struct sock *other, struct sock *newsk) LSM_HOOK(int, 0, unix_may_send, struct socket *sock, struct socket *other) -LSM_HOOK(int, 0, socket_create, int family, int type, int protocol, int kern) +LSM_HOOK(int, 0, socket_create, int *family, int *type, int *protocol, int kern) LSM_HOOK(int, 0, socket_post_create, struct socket *sock, int family, int type, int protocol, int kern) LSM_HOOK(int, 0, socket_socketpair, struct socket *socka, struct socket *sockb) diff --git a/include/linux/security.h b/include/linux/security.h index 32828502f09e..a683c10d4071 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1416,7 +1416,7 @@ static inline int security_watch_key(struct key *key) int security_unix_stream_connect(struct sock *sock, struct sock *other, struct sock *newsk); int security_unix_may_send(struct socket *sock, struct socket *other); -int security_socket_create(int family, int type, int protocol, int kern); +int security_socket_create(int *family, int *type, int *protocol, int kern); int security_socket_post_create(struct socket *sock, int family, int type, int protocol, int kern); int security_socket_socketpair(struct socket *socka, struct socket *sockb); @@ -1481,8 +1481,8 @@ static inline int security_unix_may_send(struct socket *sock, return 0; } -static inline int security_socket_create(int family, int type, - int protocol, int kern) +static inline int security_socket_create(int *family, int *type, + int *protocol, int kern) { return 0; } diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 600d0caebbd8..265077883f18 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -5583,6 +5583,12 @@ union bpf_attr { * 0 on success. * * **-ENOENT** if the bpf_local_storage cannot be found. + * + * int bpf_mptcpify(int *family, int *type, int *protocol) + * Description + * Dynamically mptcpify a TCP socket as an MPTCP one. + * Return + * 0 on success. */ #define ___BPF_FUNC_MAPPER(FN, ctx...) \ FN(unspec, 0, ##ctx) \ @@ -5797,6 +5803,7 @@ union bpf_attr { FN(user_ringbuf_drain, 209, ##ctx) \ FN(cgrp_storage_get, 210, ##ctx) \ FN(cgrp_storage_delete, 211, ##ctx) \ + FN(mptcpify, 212, ##ctx) \ /* */ /* backwards-compatibility macros for users of __BPF_FUNC_MAPPER that don't diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c index e14c822f8911..8cfa6a44f8f2 100644 --- a/kernel/bpf/bpf_lsm.c +++ b/kernel/bpf/bpf_lsm.c @@ -248,6 +248,8 @@ bpf_lsm_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) prog->aux->attach_btf_id)) return &bpf_unlocked_sk_getsockopt_proto; return NULL; + case BPF_FUNC_mptcpify: + return &bpf_mptcpify_proto; #endif default: return tracing_prog_func_proto(func_id, prog); diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 5a0a84ad94af..7207f60dad76 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -19,3 +19,23 @@ struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk) return NULL; } + +BPF_CALL_3(bpf_mptcpify, int *, family, int *, type, int *, protocol) +{ + if ((*family == AF_INET || *family == AF_INET6) && + *type == SOCK_STREAM && + (!*protocol || *protocol == IPPROTO_TCP)) { + *protocol = IPPROTO_MPTCP; + } + + return 0; +} + +const struct bpf_func_proto bpf_mptcpify_proto = { + .func = bpf_mptcpify, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_ANYTHING, + .arg2_type = ARG_ANYTHING, + .arg3_type = ARG_ANYTHING, +}; diff --git a/net/socket.c b/net/socket.c index 2b0e54b2405c..3957e2a865ef 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1328,7 +1328,7 @@ int sock_create_lite(int family, int type, int protocol, struct socket **res) int err; struct socket *sock = NULL; - err = security_socket_create(family, type, protocol, 1); + err = security_socket_create(&family, &type, &protocol, 1); if (err) goto out; @@ -1488,7 +1488,7 @@ int __sock_create(struct net *net, int family, int type, int protocol, family = PF_PACKET; } - err = security_socket_create(family, type, protocol, kern); + err = security_socket_create(&family, &type, &protocol, kern); if (err) return err; diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index c9463bd0307d..ae823b95d304 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -868,7 +868,7 @@ static void apparmor_sk_clone_security(const struct sock *sk, /** * apparmor_socket_create - check perms before creating a new socket */ -static int apparmor_socket_create(int family, int type, int protocol, int kern) +static int apparmor_socket_create(int *family, int *type, int *protocol, int kern) { struct aa_label *label; int error = 0; @@ -877,10 +877,10 @@ static int apparmor_socket_create(int family, int type, int protocol, int kern) label = begin_current_label_crit_section(); if (!(kern || unconfined(label))) - error = af_select(family, - create_perm(label, family, type, protocol), + error = af_select(*family, + create_perm(label, *family, *type, *protocol), aa_af_perm(label, OP_CREATE, AA_MAY_CREATE, - family, type, protocol)); + *family, *type, *protocol)); end_current_label_crit_section(label); return error; diff --git a/security/security.c b/security/security.c index b720424ca37d..bbebcddce420 100644 --- a/security/security.c +++ b/security/security.c @@ -4078,7 +4078,7 @@ EXPORT_SYMBOL(security_unix_may_send); * * Return: Returns 0 if permission is granted. */ -int security_socket_create(int family, int type, int protocol, int kern) +int security_socket_create(int *family, int *type, int *protocol, int kern) { return call_int_hook(socket_create, 0, family, type, protocol, kern); } diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d06e350fedee..8c2303f052f5 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -4512,8 +4512,8 @@ static int sock_has_perm(struct sock *sk, u32 perms) &ad); } -static int selinux_socket_create(int family, int type, - int protocol, int kern) +static int selinux_socket_create(int *family, int *type, + int *protocol, int kern) { const struct task_security_struct *tsec = selinux_cred(current_cred()); u32 newsid; @@ -4523,7 +4523,7 @@ static int selinux_socket_create(int family, int type, if (kern) return 0; - secclass = socket_type_to_security_class(family, type, protocol); + secclass = socket_type_to_security_class(*family, *type, *protocol); rc = socket_sockcreate_sid(tsec, secclass, &newsid); if (rc) return rc; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 600d0caebbd8..265077883f18 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -5583,6 +5583,12 @@ union bpf_attr { * 0 on success. * * **-ENOENT** if the bpf_local_storage cannot be found. + * + * int bpf_mptcpify(int *family, int *type, int *protocol) + * Description + * Dynamically mptcpify a TCP socket as an MPTCP one. + * Return + * 0 on success. */ #define ___BPF_FUNC_MAPPER(FN, ctx...) \ FN(unspec, 0, ##ctx) \ @@ -5797,6 +5803,7 @@ union bpf_attr { FN(user_ringbuf_drain, 209, ##ctx) \ FN(cgrp_storage_get, 210, ##ctx) \ FN(cgrp_storage_delete, 211, ##ctx) \ + FN(mptcpify, 212, ##ctx) \ /* */ /* backwards-compatibility macros for users of __BPF_FUNC_MAPPER that don't diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index cd0c42fff7c0..93767e441e17 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -6,8 +6,9 @@ #include "cgroup_helpers.h" #include "network_helpers.h" #include "mptcp_sock.skel.h" +#include "mptcpify.skel.h" -#define NS_TEST "mptcp_ns" +char NS_TEST[32]; #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -22,6 +23,26 @@ struct mptcp_storage { char ca_name[TCP_CA_NAME_MAX]; }; +static struct nstoken *create_netns(void) +{ + srand(time(NULL)); + snprintf(NS_TEST, sizeof(NS_TEST), "mptcp_ns_%d", rand()); + SYS(fail, "ip netns add %s", NS_TEST); + SYS(fail, "ip -net %s link set dev lo up", NS_TEST); + + return open_netns(NS_TEST); +fail: + return NULL; +} + +static void cleanup_netns(struct nstoken *nstoken) +{ + if (nstoken) + close_netns(nstoken); + + SYS_NOFAIL("ip netns del %s &> /dev/null", NS_TEST); +} + static int verify_tsk(int map_fd, int client_fd) { int err, cfd = client_fd; @@ -147,11 +168,8 @@ static void test_base(void) if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) return; - SYS(fail, "ip netns add %s", NS_TEST); - SYS(fail, "ip -net %s link set dev lo up", NS_TEST); - - nstoken = open_netns(NS_TEST); - if (!ASSERT_OK_PTR(nstoken, "open_netns")) + nstoken = create_netns(); + if (!ASSERT_OK_PTR(nstoken, "create_netns")) goto fail; /* without MPTCP */ @@ -174,11 +192,101 @@ static void test_base(void) close(server_fd); fail: - if (nstoken) - close_netns(nstoken); + cleanup_netns(nstoken); + + close(cgroup_fd); +} + +static void send_byte(int fd) +{ + char b = 0x55; + + ASSERT_EQ(write(fd, &b, sizeof(b)), 1, "send single byte"); +} + +static int verify_mptcpify(void) +{ + char cmd[256]; + int err = 0; + + snprintf(cmd, sizeof(cmd), + "ip netns exec %s ss -tOni | grep -q '%s'", + NS_TEST, "tcp-ulp-mptcp"); + if (!ASSERT_OK(system(cmd), "No tcp-ulp-mptcp found!")) + err++; + + snprintf(cmd, sizeof(cmd), + "ip netns exec %s nstat -asz %s | awk '%s' | grep -q '%s'", + NS_TEST, "MPTcpExtMPCapableSYNACKRX", + "NR==1 {next} {print $2}", "1"); + if (!ASSERT_OK(system(cmd), "No MPTcpExtMPCapableSYNACKRX found!")) + err++; + + return err; +} + +static int run_mptcpify(int cgroup_fd) +{ + int server_fd, client_fd, prog_fd, err = 0; + struct mptcpify *mptcpify_skel; + + mptcpify_skel = mptcpify__open_and_load(); + if (!ASSERT_OK_PTR(mptcpify_skel, "mptcpify__open_and_load")) + return -EIO; + + prog_fd = bpf_program__fd(mptcpify_skel->progs.mptcpify); + if (!ASSERT_GE(prog_fd, 0, "bpf_program__fd")) { + err = -EIO; + goto out; + } - SYS_NOFAIL("ip netns del " NS_TEST " &> /dev/null"); + err = bpf_prog_attach(prog_fd, cgroup_fd, BPF_LSM_CGROUP, 0); + if (!ASSERT_OK(err, "attach alloc_prog_fd")) { + err = -EIO; + goto out; + } + /* without MPTCP */ + server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0); + if (!ASSERT_GE(server_fd, 0, "start_server")) { + err = -EIO; + goto out; + } + + client_fd = connect_to_fd(server_fd, 0); + if (!ASSERT_GE(client_fd, 0, "connect to fd")) { + err = -EIO; + goto close_server; + } + + send_byte(client_fd); + err += verify_mptcpify(); + + close(client_fd); +close_server: + close(server_fd); +out: + mptcpify__destroy(mptcpify_skel); + return err; +} + +static void test_mptcpify(void) +{ + struct nstoken *nstoken = NULL; + int cgroup_fd; + + cgroup_fd = test__join_cgroup("/mptcpify"); + if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) + return; + + nstoken = create_netns(); + if (!ASSERT_OK_PTR(nstoken, "create_netns")) + goto fail; + + ASSERT_OK(run_mptcpify(cgroup_fd), "run_mptcpify"); + +fail: + cleanup_netns(nstoken); close(cgroup_fd); } @@ -186,4 +294,6 @@ void test_mptcp(void) { if (test__start_subtest("base")) test_base(); + if (test__start_subtest("mptcpify")) + test_mptcpify(); } diff --git a/tools/testing/selftests/bpf/progs/mptcpify.c b/tools/testing/selftests/bpf/progs/mptcpify.c new file mode 100644 index 000000000000..58be68c021da --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcpify.c @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2023, SUSE. */ + +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") = "GPL"; + +SEC("lsm_cgroup/socket_create") +int BPF_PROG(mptcpify, int *family, int *type, int *protocol, int kern) +{ + if (!kern) + bpf_mptcpify(family, type, protocol); + + return 1; +} -- 2.35.3

2 years, 1 month

4
6
0 0

[PATCH v3 00/11] drm: kunit: Switch to kunit actions

by Maxime Ripard

Hi, Since v6.5-rc1, kunit gained a devm/drmm-like mechanism that makes tests resources much easier to cleanup. This series converts the existing tests to use those new actions where relevant. Let me know what you think, Maxime Signed-off-by: Maxime Ripard <mripard(a)kernel.org> --- Changes in v3: - Fixed the build cast warnings by switching to wrapper functions - Link to v2: https://lore.kernel.org/r/20230720-kms-kunit-actions-rework-v2-0-175017bd56… Changes in v2: - Fix some typos - Use plaltform_device_del instead of removing the call to platform_device_put after calling platform_device_add - Link to v1: https://lore.kernel.org/r/20230710-kms-kunit-actions-rework-v1-0-722c58d72c… --- Maxime Ripard (11): drm/tests: helpers: Switch to kunit actions drm/tests: client-modeset: Remove call to drm_kunit_helper_free_device() drm/tests: modes: Remove call to drm_kunit_helper_free_device() drm/tests: probe-helper: Remove call to drm_kunit_helper_free_device() drm/tests: helpers: Create a helper to allocate a locking ctx drm/tests: helpers: Create a helper to allocate an atomic state drm/vc4: tests: pv-muxing: Remove call to drm_kunit_helper_free_device() drm/vc4: tests: mock: Use a kunit action to unregister DRM device drm/vc4: tests: pv-muxing: Switch to managed locking init drm/vc4: tests: Switch to atomic state allocation helper drm/vc4: tests: pv-muxing: Document test scenario drivers/gpu/drm/tests/drm_client_modeset_test.c | 8 -- drivers/gpu/drm/tests/drm_kunit_helpers.c | 141 +++++++++++++++++++++++- drivers/gpu/drm/tests/drm_modes_test.c | 8 -- drivers/gpu/drm/tests/drm_probe_helper_test.c | 8 -- drivers/gpu/drm/vc4/tests/vc4_mock.c | 12 ++ drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 115 +++++++------------ include/drm/drm_kunit_helpers.h | 7 ++ 7 files changed, 198 insertions(+), 101 deletions(-) --- base-commit: d7b3af5a77e8d8da28f435f313e069aea5bcf172 change-id: 20230710-kms-kunit-actions-rework-5d163762c93b Best regards, -- Maxime Ripard <mripard(a)kernel.org>

2 years, 1 month

1
12
0 0

[PATCH v2 00/11] drm: kunit: Switch to kunit actions

by Maxime Ripard

Hi, Since v6.5-rc1, kunit gained a devm/drmm-like mechanism that makes tests resources much easier to cleanup. This series converts the existing tests to use those new actions where relevant. Let me know what you think, Maxime Signed-off-by: Maxime Ripard <mripard(a)kernel.org> --- Changes in v2: - Fix some typos - Use plaltform_device_del instead of removing the call to platform_device_put after calling platform_device_add - Link to v1: https://lore.kernel.org/r/20230710-kms-kunit-actions-rework-v1-0-722c58d72c… --- Maxime Ripard (11): drm/tests: helpers: Switch to kunit actions drm/tests: client-modeset: Remove call to drm_kunit_helper_free_device() drm/tests: modes: Remove call to drm_kunit_helper_free_device() drm/tests: probe-helper: Remove call to drm_kunit_helper_free_device() drm/tests: helpers: Create a helper to allocate a locking ctx drm/tests: helpers: Create a helper to allocate an atomic state drm/vc4: tests: pv-muxing: Remove call to drm_kunit_helper_free_device() drm/vc4: tests: mock: Use a kunit action to unregister DRM device drm/vc4: tests: pv-muxing: Switch to managed locking init drm/vc4: tests: Switch to atomic state allocation helper drm/vc4: tests: pv-muxing: Document test scenario drivers/gpu/drm/tests/drm_client_modeset_test.c | 8 -- drivers/gpu/drm/tests/drm_kunit_helpers.c | 108 +++++++++++++++++++++- drivers/gpu/drm/tests/drm_modes_test.c | 8 -- drivers/gpu/drm/tests/drm_probe_helper_test.c | 8 -- drivers/gpu/drm/vc4/tests/vc4_mock.c | 5 ++ drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 115 +++++++++--------------- include/drm/drm_kunit_helpers.h | 7 ++ 7 files changed, 158 insertions(+), 101 deletions(-) --- base-commit: c58c49dd89324b18a812762a2bfa5a0458e4f252 change-id: 20230710-kms-kunit-actions-rework-5d163762c93b Best regards, -- Maxime Ripard <mripard(a)kernel.org>

2 years, 1 month

3
17
0 0

[PATCH v5 0/9] drm: selftest: Convert to KUnit

by Maíra Canal

Hi everyone, Here is the v5 of the conversion of selftests to KUnit. Since the v4, the only fix was checking the checkpatch warnings and checks (Thank you Javier). Thanks for your attention and any feedback is welcomed! Best Regards, - Maíra Canal v1 -> v2: https://lore.kernel.org/dri-devel/20220615135824.15522-1-maira.canal@usp.br… - The suites not longer end in _tests (David Gow). - Remove the TODO entry involving the conversion of selftests to KUnit (Javier Martinez Canillas). - Change the filenames to match the documentation: use *_test.c (Javier Martinez Canillas). - Add MODULE_LICENSE to all tests (kernel test robot). - Make use of a generic symbol to group all tests - DRM_KUNIT_TEST (Javier Martinez Canillas). - Add .kunitconfig on the first patch (it was on the second patch of the series). - Straightforward conversion of the drm_cmdline_parser tests without functional changes (Shuah Khan) - Add David's Tested-by tags. v2 -> v3: https://lore.kernel.org/dri-devel/20220621200926.257002-1-maira.canal@usp.b… - Rebase it on top of the drm-misc-next with drm_format_helper KUnit tests. - Change KUNIT_EXPECT_FALSE to KUNIT_EXPECT_EQ on drm_format_test (Daniel Latypov). - Add Daniel's Acked-by tag. v3 -> v4: https://lore.kernel.org/dri-devel/9185aadb-e459-00fe-70be-3675f6f3ef4c@redh… - Add blank line after #include <kunit/test.h> (Javier Martinez Canillas). - Make the order of the tags chronological (Javier Martinez Canillas). - Add Copywrite to the tests (Javier Martinez Canillas). - Add Javier Martinez Canillas's Reviewed-By tag. v4 -> v5: https://lore.kernel.org/dri-devel/20220702131116.457444-1-maira.canal@usp.b… - Fix checkpatch warnings and checks (Javier Martinez Canillas). Arthur Grillo (1): drm: selftest: convert drm_mm selftest to KUnit Maíra Canal (8): drm: selftest: convert drm_damage_helper selftest to KUnit drm: selftest: convert drm_cmdline_parser selftest to KUnit drm: selftest: convert drm_rect selftest to KUnit drm: selftest: convert drm_format selftest to KUnit drm: selftest: convert drm_plane_helper selftest to KUnit drm: selftest: convert drm_dp_mst_helper selftest to KUnit drm: selftest: convert drm_framebuffer selftest to KUnit drm: selftest: convert drm_buddy selftest to KUnit Documentation/gpu/todo.rst | 11 - drivers/gpu/drm/Kconfig | 20 +- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/selftests/Makefile | 8 - .../gpu/drm/selftests/drm_buddy_selftests.h | 15 - .../gpu/drm/selftests/drm_cmdline_selftests.h | 68 - drivers/gpu/drm/selftests/drm_mm_selftests.h | 28 - .../gpu/drm/selftests/drm_modeset_selftests.h | 40 - drivers/gpu/drm/selftests/drm_selftest.c | 109 -- drivers/gpu/drm/selftests/drm_selftest.h | 41 - drivers/gpu/drm/selftests/test-drm_buddy.c | 994 ------------- .../drm/selftests/test-drm_cmdline_parser.c | 1141 --------------- .../drm/selftests/test-drm_damage_helper.c | 668 --------- drivers/gpu/drm/selftests/test-drm_format.c | 280 ---- .../drm/selftests/test-drm_modeset_common.c | 32 - .../drm/selftests/test-drm_modeset_common.h | 52 - drivers/gpu/drm/selftests/test-drm_rect.c | 223 --- drivers/gpu/drm/tests/Makefile | 4 +- drivers/gpu/drm/tests/drm_buddy_test.c | 756 ++++++++++ .../gpu/drm/tests/drm_cmdline_parser_test.c | 1078 ++++++++++++++ .../gpu/drm/tests/drm_damage_helper_test.c | 634 +++++++++ .../drm_dp_mst_helper_test.c} | 89 +- drivers/gpu/drm/tests/drm_format_test.c | 287 ++++ .../drm_framebuffer_test.c} | 77 +- .../test-drm_mm.c => tests/drm_mm_test.c} | 1248 +++++++---------- .../drm_plane_helper_test.c} | 122 +- drivers/gpu/drm/tests/drm_rect_test.c | 214 +++ 27 files changed, 3652 insertions(+), 4588 deletions(-) delete mode 100644 drivers/gpu/drm/selftests/Makefile delete mode 100644 drivers/gpu/drm/selftests/drm_buddy_selftests.h delete mode 100644 drivers/gpu/drm/selftests/drm_cmdline_selftests.h delete mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h delete mode 100644 drivers/gpu/drm/selftests/drm_modeset_selftests.h delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.c delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.h delete mode 100644 drivers/gpu/drm/selftests/test-drm_buddy.c delete mode 100644 drivers/gpu/drm/selftests/test-drm_cmdline_parser.c delete mode 100644 drivers/gpu/drm/selftests/test-drm_damage_helper.c delete mode 100644 drivers/gpu/drm/selftests/test-drm_format.c delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.c delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.h delete mode 100644 drivers/gpu/drm/selftests/test-drm_rect.c create mode 100644 drivers/gpu/drm/tests/drm_buddy_test.c create mode 100644 drivers/gpu/drm/tests/drm_cmdline_parser_test.c create mode 100644 drivers/gpu/drm/tests/drm_damage_helper_test.c rename drivers/gpu/drm/{selftests/test-drm_dp_mst_helper.c => tests/drm_dp_mst_helper_test.c} (72%) create mode 100644 drivers/gpu/drm/tests/drm_format_test.c rename drivers/gpu/drm/{selftests/test-drm_framebuffer.c => tests/drm_framebuffer_test.c} (86%) rename drivers/gpu/drm/{selftests/test-drm_mm.c => tests/drm_mm_test.c} (55%) rename drivers/gpu/drm/{selftests/test-drm_plane_helper.c => tests/drm_plane_helper_test.c} (57%) create mode 100644 drivers/gpu/drm/tests/drm_rect_test.c -- 2.35.3

2 years, 1 month

10
25
0 0

[PATCH v2 0/3] kunit: Expose some built-in features to modules

by Janusz Krzysztofik

Submit the top-level headers also from the kunit test module notifier initialization callback, so external tools that are parsing dmesg for kunit test output are able to tell how many test suites should be expected and whether to continue parsing after complete output from the first test suite is collected. Extend kunit module notifier initialization callback with a processing path for only listing the tests provided by a module if the kunit action parameter is set to "list", so external tools can obtain a list of test cases to be executed in advance and can make a better job on assigning kernel messages interleaved with kunit output to specific tests. Use test filtering functions in kunit module notifier callback functions, so external tools are able to execute individual test cases from kunit test modules in order to still better isolate their potential impact on kernel messages that appear interleaved with output from other tests. v2: Fix new name of a structure moved to kunit namespace not updated across all uses. Janusz Krzysztofik (3): kunit: Report the count of test suites in a module kunit: Make 'list' action available to kunit test modules kunit: Allow kunit test modules to use test filtering include/kunit/test.h | 14 +++++++++++ lib/kunit/executor.c | 57 +++++++++++++++++++++++++------------------- lib/kunit/test.c | 57 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 103 insertions(+), 25 deletions(-) -- 2.41.0

2 years, 1 month

2
5
0 0

[PATCH v3 00/12] selftests/nolibc: add minimal kernel config support - part1

by Zhangjin Wu

Hi, Willy Most of the suggestions of v2 [1] have been applied in this v3 revision, except the local menuconfig and mrproper targets, as explained in [2]. A fresh run with tinyconfig for ppc, ppc64 and ppc64le: $ for arch in ppc ppc64 ppc64le; do \ mkdir -p $PWD/kernel-$arch; time make defconfig run DEFCONFIG=tinyconfig ARCH=$arch O=$PWD/kernel-$arch RUN_OUT=$PWD/run.$arch.out; done rerun for ppc, ppc64 and ppc64le: $ for arch in ppc ppc64 ppc64le; do \ make rerun ARCH=$arch O=$PWD/kernel-$arch RUN_OUT=$PWD/run.$arch.out; done Running /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/kernel-ppc/vmlinux on qemu-system-ppc >> [ppc] Kernel command line: console=ttyS0 panic=-1 printk: console [ttyS0] enabled Run /init as init process Running test 'startup' Running test 'syscall' Running test 'stdlib' Running test 'vfprintf' Running test 'protection' Leaving init with final status: 0 reboot: Power down powered off, test finish qemu-system-ppc: terminating on signal 15 from pid 190248 () 165 test(s): 156 passed, 9 skipped, 0 failed => status: warning See all results in /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/run.ppc.out Running /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/kernel-ppc64/vmlinux on qemu-system-ppc64 Linux version 6.4.0+ (ubuntu@linux-lab) (powerpc64le-linux-gnu-gcc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #2 SMP Fri Jul 28 01:40:55 CST 2023 Kernel command line: console=hvc0 panic=-1 printk: console [hvc0] enabled printk: console [hvc0] enabled Run /init as init process Running test 'startup' Running test 'syscall' Running test 'stdlib' Running test 'vfprintf' Running test 'protection' Leaving init with final status: 0 reboot: Power down powered off, test finish 165 test(s): 156 passed, 9 skipped, 0 failed => status: warning See all results in /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/run.ppc64.out Running /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/kernel-ppc64le/arch/powerpc/boot/zImage on qemu-system-ppc64le Linux version 6.4.0+ (ubuntu@linux-lab) (powerpc64le-linux-gnu-gcc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #2 SMP Fri Jul 28 01:41:12 CST 2023 Kernel command line: console=hvc0 panic=-1 Run /init as init process Running test 'startup' Running test 'syscall' Running test 'stdlib' Running test 'vfprintf' Running test 'protection' Leaving init with final status: 0 reboot: Power down powered off, test finish 165 test(s): 156 passed, 9 skipped, 0 failed => status: warning See all results in /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/run.ppc64le.out A fast report on existing test logs: $ for arch in ppc ppc64 ppc64le; do \ make report ARCH=$arch RUN_OUT=$PWD/run.$arch.out | grep status; \ done 165 test(s): 156 passed, 9 skipped, 0 failed => status: warning 165 test(s): 156 passed, 9 skipped, 0 failed => status: warning 165 test(s): 156 passed, 9 skipped, 0 failed => status: warning Changes from v2 --> v3: * selftests/nolibc: allow report with existing test log selftests/nolibc: fix up O= option support selftests/nolibc: allow customize CROSS_COMPILE by architecture selftests/nolibc: customize CROSS_COMPILE for 32/64-bit powerpc selftests/nolibc: tinyconfig: add extra common options No Change. * selftests/nolibc: add macros to reduce duplicated changes Remove REPORT_RUN_OUT and LOG_OUT. * selftests/nolibc: string the core targets Removed extconfig target from our v3 powerpc patchset [3], the operations have been merged into the defconfig target. Let kernel depends on $(KERNEL_CONFIG) instead of the removed extconfig. * selftests/nolibc: add menuconfig and mrproper for development like the other local nolibc targets, still require local menuconfig and mrproper targets for consistent usage with the same ARCH and no -C /path/to/srctree Merge them together to reduce duplicated entries. * selftests/nolibc: allow quit qemu-system when poweroff fails Enhance timeout logic with more expected strings print and detection about the booting of bios, kernel, init and test. Add a default 10 seconds of QEMU_TIMEOUT for every architecture to detect all of the potential boog hang or failed poweroff. * selftests/nolibc: customize QEMU_TIMEOUT for ppc64/ppc64le Reduce QEMU_TIMEOUT from 60 seconds to a more normal 15 and 20 seconds for ppc64 and ppc64le respectively. the main time cost is the slow bios used. * selftests/nolibc: tinyconfig: add support for 32/64-bit powerpc Rename the file names to shorter ones as suggestions from the powerpc patchset. * selftests/nolibc: speed up some targets with multiple jobs New to speed up with -j<N> by default. Best regards, Zhangjin --- [1]: https://lore.kernel.org/lkml/cover.1689759351.git.falcon@tinylab.org/ [2]: https://lore.kernel.org/lkml/20230727132418.117924-1-falcon@tinylab.org/ [3]: https://lore.kernel.org/lkml/8e9e5ac6283c6ec2ecf10a70ce55b219028497c1.16904… Zhangjin Wu (12): selftests/nolibc: allow report with existing test log selftests/nolibc: add macros to reduce duplicated changes selftests/nolibc: fix up O= option support selftests/nolibc: string the core targets selftests/nolibc: allow customize CROSS_COMPILE by architecture selftests/nolibc: customize CROSS_COMPILE for 32/64-bit powerpc selftests/nolibc: add menuconfig and mrproper for development selftests/nolibc: allow quit qemu-system when poweroff fails selftests/nolibc: customize QEMU_TIMEOUT for ppc64/ppc64le selftests/nolibc: tinyconfig: add extra common options selftests/nolibc: tinyconfig: add support for 32/64-bit powerpc selftests/nolibc: speed up some targets with multiple jobs tools/testing/selftests/nolibc/Makefile | 102 ++++++++++++++---- .../selftests/nolibc/configs/common.config | 4 + .../selftests/nolibc/configs/ppc.config | 3 + .../selftests/nolibc/configs/ppc64.config | 3 + .../selftests/nolibc/configs/ppc64le.config | 4 + 5 files changed, 98 insertions(+), 18 deletions(-) create mode 100644 tools/testing/selftests/nolibc/configs/common.config create mode 100644 tools/testing/selftests/nolibc/configs/ppc64.config create mode 100644 tools/testing/selftests/nolibc/configs/ppc64le.config -- 2.25.1

2 years, 1 month

3
25
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror