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

[PATCH bpf-next v2] selftests/bpf: Fix build of task_pt_regs test for arm64

by Jean-Philippe Brucker

struct pt_regs is not exported to userspace on all archs. arm64 and s390 export "user_pt_regs" instead, which causes build failure at the moment: progs/test_task_pt_regs.c:8:16: error: variable has incomplete type 'struct pt_regs' struct pt_regs current_regs = {}; Instead of using pt_regs from ptrace.h, use the larger kernel struct from vmlinux.h directly. Since the test runner task_pt_regs.c does not have access to the kernel struct definition, copy it into a char array. Fixes: 576d47bb1a92 ("bpf: selftests: Add bpf_task_pt_regs() selftest") Suggested-by: Andrii Nakryiko <andrii.nakryiko(a)gmail.com> Signed-off-by: Jean-Philippe Brucker <jean-philippe(a)linaro.org> --- v2: Work on struct pt_regs from vmlinux.h v1: https://lore.kernel.org/bpf/20210902090925.2010528-1-jean-philippe@linaro.o… --- .../selftests/bpf/prog_tests/task_pt_regs.c | 1 - .../selftests/bpf/progs/test_task_pt_regs.c | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c b/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c index 53f0e0fa1a53..37c20b5ffa70 100644 --- a/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c +++ b/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #define _GNU_SOURCE #include <test_progs.h> -#include <linux/ptrace.h> #include "test_task_pt_regs.skel.h" void test_task_pt_regs(void) diff --git a/tools/testing/selftests/bpf/progs/test_task_pt_regs.c b/tools/testing/selftests/bpf/progs/test_task_pt_regs.c index 6c059f1cfa1b..e6cb09259408 100644 --- a/tools/testing/selftests/bpf/progs/test_task_pt_regs.c +++ b/tools/testing/selftests/bpf/progs/test_task_pt_regs.c @@ -1,12 +1,17 @@ // SPDX-License-Identifier: GPL-2.0 -#include <linux/ptrace.h> -#include <linux/bpf.h> +#include "vmlinux.h" #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> -struct pt_regs current_regs = {}; -struct pt_regs ctx_regs = {}; +#define PT_REGS_SIZE sizeof(struct pt_regs) + +/* + * The kernel struct pt_regs isn't exported in its entirety to userspace. + * Pass it as an array to task_pt_regs.c + */ +char current_regs[PT_REGS_SIZE] = {}; +char ctx_regs[PT_REGS_SIZE] = {}; int uprobe_res = 0; SEC("uprobe/trigger_func") @@ -17,8 +22,10 @@ int handle_uprobe(struct pt_regs *ctx) current = bpf_get_current_task_btf(); regs = (struct pt_regs *) bpf_task_pt_regs(current); - __builtin_memcpy(&current_regs, regs, sizeof(*regs)); - __builtin_memcpy(&ctx_regs, ctx, sizeof(*ctx)); + if (bpf_probe_read_kernel(current_regs, PT_REGS_SIZE, regs)) + return 0; + if (bpf_probe_read_kernel(ctx_regs, PT_REGS_SIZE, ctx)) + return 0; /* Prove that uprobe was run */ uprobe_res = 1; -- 2.33.0

3 years, 6 months

3
2
0 0

[REGRESSION] lkft kselftest for next-20210907

by lkft＠linaro.org

## Build * kernel: 5.14.0 * git: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next * git branch: master * git commit: b2bb710d34d5965358777d5b3b17764fa7bc2a8a * git describe: next-20210907 * test details: https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20210907 ## Regressions (compared to next-20210903) * hi6220-hikey, kselftest-rtc - rtc.rtctest * qemu-arm64-gic-version2, kselftest-cgroup - cgroup.test_freezer - cgroup.test_freezer.test_cgfreezer_ptrace * qemu-arm64-gic-version3, kselftest-cgroup - cgroup.test_freezer - cgroup.test_freezer.test_cgfreezer_ptrace * qemu_arm, kselftest-rtc - rtc.rtctest * x15, kselftest-cgroup - cgroup.test_freezer - cgroup.test_freezer.test_cgfreezer_ptrace Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> ## Fixes (compared to next-20210903) No fixes found. ## Test result summary total: 3480, pass: 1813, fail: 272, skip: 1395, xfail: 0 ## Build Summary ## Test suites summary * kselftest-android * kselftest-arm64 * kselftest-arm64/arm64.btitest.bti_c_func * kselftest-arm64/arm64.btitest.bti_j_func * kselftest-arm64/arm64.btitest.bti_jc_func * kselftest-arm64/arm64.btitest.bti_none_func * kselftest-arm64/arm64.btitest.nohint_func * kselftest-arm64/arm64.btitest.paciasp_func * kselftest-arm64/arm64.nobtitest.bti_c_func * kselftest-arm64/arm64.nobtitest.bti_j_func * kselftest-arm64/arm64.nobtitest.bti_jc_func * kselftest-arm64/arm64.nobtitest.bti_none_func * kselftest-arm64/arm64.nobtitest.nohint_func * kselftest-arm64/arm64.nobtitest.paciasp_func * kselftest-breakpoints * kselftest-capabilities * kselftest-cgroup * kselftest-clone3 * kselftest-core * kselftest-cpu-hotplug * kselftest-cpufreq * kselftest-drivers * kselftest-efivarfs * kselftest-filesystems * kselftest-firmware * kselftest-fpu * kselftest-futex * kselftest-gpio * kselftest-intel_pstate * kselftest-ipc * kselftest-ir * kselftest-kcmp * kselftest-kvm * kselftest-lib * kselftest-livepatch * kselftest-membarrier * kselftest-memfd * kselftest-memory-hotplug * kselftest-mincore * kselftest-mount * kselftest-mqueue * kselftest-net * kselftest-netfilter * kselftest-nsfs * kselftest-openat2 * kselftest-pid_namespace * kselftest-pidfd * kselftest-proc * kselftest-pstore * kselftest-ptrace * kselftest-rseq * kselftest-rtc * kselftest-seccomp * kselftest-sigaltstack * kselftest-size * kselftest-splice * kselftest-static_keys * kselftest-sync * kselftest-sysctl * kselftest-timens * kselftest-timers * kselftest-tmpfs * kselftest-tpm2 * kselftest-user * kselftest-vm * kselftest-x86 * kselftest-zram -- Linaro LKFT https://lkft.linaro.org

3 years, 6 months

1
0
0 0

Fixing up at least some fallout from '-Werror'

by Linus Torvalds

So I just committed these three fixes: 4b93c544e90e ("thunderbolt: test: split up test cases in tb_test_credit_alloc_all") ba7b1f861086 ("lib/test_scanf: split up number parsing test routines") 1476ff21abb4 ("iwl: fix debug printf format strings") for the fallout from -Werror that I could easily check (mainly i386 'allyesconfig' - a situation I don't normally test). The printk format string one was trivial and I hopefully didn't screw anything up, but I'd ask people to look at and verify the two other ones. I tried to be very careful, and organizing the code movement in such a way that 'git diff' shows that it's doing the same thing before and after, but hey, mistakes happen. I found those two test-based ones somewhat annoying, because they both showed how little the test infrastructure tries to follow kernel rules. I bet those warnings have been showing up for a long long time, and people went "that's not a relevant configuration" or had some other reason to ignore them. No, the test cases may not be relevant in most situations, but it's not a good thing when something that is supposed to verify kernel behavior then violates some very fundamental and core kernel rules. And maybe it was simply missed. The one thing that was clear when I did that thunderbolt thing in particular is how easy it is to create variations of those 'struct some-assertion-struct' things on stack as part of the KUNIT infrastructure. That's unfortunate. It is possible that the solution to the kernel stack usage might have been to make those structures static instead, but I didn't check whether the description structs really can be. It would be even nicer if they were 'static const'. Being fully initialized instead of generating not only code that uses up stack, but also the code to dynamically initialize them on the stack is all kinds of nasty. I took one look at the generated code, and ran away screaming. Anyway, I'm adding the Kunit maintainer and lists here too, just to see if maybe it could be possible to make those 'struct kunit_assert' things and friends be static and const, but at least for the cases that caused problems for i386, those three commits should make the build pass. The test_scanf case didn't actually use the Kunit infrastructure, the stack use explosion is because gcc doesn't seem to combine stack allocations in many situations. I know gcc *sometimes* does that stack allocation combining, but not here. I suspect it might be related to type aliasing, and only merging stack slots when they have the same types, and thus triggered by the different result buffer sizes. Maybe. Linus

3 years, 6 months

4
3
0 0

[REGRESSION] lkft kselftest for next-20210906

by lkft＠linaro.org

## Build * kernel: 5.14.0 * git: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next * git branch: master * git commit: 7800ca95d0ed11b492962dc3abc2181c9d5f7f82 * git describe: next-20210906 * test details: https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20210906 ## Regressions (compared to next-20210903) * hi6220-hikey, kselftest-rtc - rtc.rtctest * hi6220-hikey, kselftest-timers - timers.nsleep-lat - timers.set-timer-lat * qemu-arm64-gic-version2, kselftest-cgroup - cgroup.test_freezer - cgroup.test_freezer.test_cgfreezer_ptrace * qemu-arm64-mte, kselftest-timers - timers.rtcpie * qemu_arm, kselftest-rtc - rtc.rtctest Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> ## Fixes (compared to next-20210903) * qemu-arm64-gic-version2, kselftest-timers - timers.rtcpie * qemu_arm64, kselftest-cgroup - cgroup.test_freezer - cgroup.test_freezer.test_cgfreezer_ptrace * qemu_arm64, kselftest-timers - timers.rtcpie ## Test result summary total: 3570, pass: 1917, fail: 288, skip: 1365, xfail: 0 ## Build Summary ## Test suites summary * kselftest-android * kselftest-arm64 * kselftest-arm64/arm64.btitest.bti_c_func * kselftest-arm64/arm64.btitest.bti_j_func * kselftest-arm64/arm64.btitest.bti_jc_func * kselftest-arm64/arm64.btitest.bti_none_func * kselftest-arm64/arm64.btitest.nohint_func * kselftest-arm64/arm64.btitest.paciasp_func * kselftest-arm64/arm64.nobtitest.bti_c_func * kselftest-arm64/arm64.nobtitest.bti_j_func * kselftest-arm64/arm64.nobtitest.bti_jc_func * kselftest-arm64/arm64.nobtitest.bti_none_func * kselftest-arm64/arm64.nobtitest.nohint_func * kselftest-arm64/arm64.nobtitest.paciasp_func * kselftest-breakpoints * kselftest-capabilities * kselftest-cgroup * kselftest-clone3 * kselftest-core * kselftest-cpu-hotplug * kselftest-cpufreq * kselftest-drivers * kselftest-efivarfs * kselftest-filesystems * kselftest-firmware * kselftest-fpu * kselftest-futex * kselftest-gpio * kselftest-intel_pstate * kselftest-ipc * kselftest-ir * kselftest-kcmp * kselftest-kvm * kselftest-lib * kselftest-livepatch * kselftest-membarrier * kselftest-memfd * kselftest-memory-hotplug * kselftest-mincore * kselftest-mount * kselftest-mqueue * kselftest-net * kselftest-netfilter * kselftest-nsfs * kselftest-openat2 * kselftest-pid_namespace * kselftest-pidfd * kselftest-proc * kselftest-pstore * kselftest-ptrace * kselftest-rseq * kselftest-rtc * kselftest-seccomp * kselftest-sigaltstack * kselftest-size * kselftest-splice * kselftest-static_keys * kselftest-sync * kselftest-sysctl * kselftest-timens * kselftest-timers * kselftest-tmpfs * kselftest-tpm2 * kselftest-user * kselftest-vm * kselftest-x86 * kselftest-zram -- Linaro LKFT https://lkft.linaro.org

3 years, 6 months

1
0
0 0

[PATCH 0/6] test_hash.c: refactor into KUnit

by Isabella Basso

We refactored the lib/test_hash.c file into KUnit as part of the student group LKCAMP [1] introductory hackathon for kernel development. This test was pointed to our group by Daniel Latypov [2], so its full conversion into a pure KUnit test was our goal in this patch series, but we ran into many problems relating to it not being split as unit tests, which complicated matters a bit, as the reasoning behind the original tests is quite cryptic for those unfamiliar with hash implementations. Some interesting developments we'd like to highlight are: - In patch 1/6 we noticed that there was an unused define directive that could be removed. - In patch 5/6 we noticed how stringhash and hash tests are all under the lib/test_hash.c file, which might cause some confusion, and we also broke those kernel config entries up. Overall KUnit developments have been made in the other patches in this series: In patches 2/6 through 4/6 and 6/6 we refactored the lib/test_hash.c file so as to make it more compatible with the KUnit style, whilst preserving the original idea of the maintainer who designed it (i.e. George Spelvin), which might be undesirable for unit tests, but we assume it is enough for a first patch. This is our first patch series so we hope our contributions are interesting and also hope to get some useful criticism from the community :) [1] - https://lkcamp.dev/ [2] - https://lore.kernel.org/linux-kselftest/CAGS_qxojszgM19u=3HLwFgKX5bm5Khywvs… Isabella Basso (6): hash.h: remove unused define directive test_hash.c: move common definitions to top of file test_hash.c: split test_int_hash into arch-specific functions test_hash.c: split test_hash_init lib/Kconfig.debug: properly split hash test kernel entries test_hash.c: refactor into kunit include/linux/hash.h | 5 +- lib/Kconfig.debug | 28 ++++- lib/Makefile | 3 +- lib/test_hash.c | 249 ++++++++++++++++--------------------- tools/include/linux/hash.h | 5 +- 5 files changed, 136 insertions(+), 154 deletions(-) -- 2.33.0

3 years, 6 months

6
17
0 0

proc-pid-vm.c:214:19: warning: 'str_vsyscall' defined but not used

by Naresh Kamboju

Following build warnings noticed while building stable-rc Linux 5.14.1-rc1 with gcc-11 for arm64 architecture. aarch64-linux-gnu-gcc -Wall -O2 -Wno-unused-function -D_GNU_SOURCE proc-pid-vm.c -o kselftest/proc/proc-pid-vm proc-pid-vm.c:214:19: warning: 'str_vsyscall' defined but not used [-Wunused-const-variable=] 214 | static const char str_vsyscall[] = | ^~~~~~~~~~~~ proc-pid-vm.c:212:13: warning: 'g_vsyscall' defined but not used [-Wunused-variable] 212 | static bool g_vsyscall = false; | ^~~~~~~~~~ Build config: https://builds.tuxbuild.com/1xXcUtI2INra8KaHjOXXQMOyAD0/config Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> meta data: ----------- git_describe: v5.14-rc6-389-g95dc72bb9c03, git_repo: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc, git_sha: 95dc72bb9c032093e79e628a98c927b3db73a6c3, git_short_log: 95dc72bb9c03 (\Linux 5.14.1-rc1\), kconfig: [ defconfig, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, CONFIG_ARM64_MODULE_PLTS=y ], kernel_version: 5.14.1-rc1, target_arch: arm64, targets: [ dtbs, dtbs-legacy, headers, kernel, kselftest, kselftest-merge, modules ], toolchain: gcc-11, steps to reproduce: https://builds.tuxbuild.com/1xXcUtI2INra8KaHjOXXQMOyAD0/tuxmake_reproducer.… -- Linaro LKFT https://lkft.linaro.org

3 years, 6 months

1
0
0 0

udmabuf.c:30:17: warning: implicit declaration of function 'open'

by Naresh Kamboju

Following build warnings noticed while building stable-rc Linux 5.14.1-rc1 with gcc-11 for arm64 architecture. aarch64-linux-gnu-gcc -I../../../../../usr/include/ udmabuf.c -o kselftest/drivers/dma-buf/udmabuf udmabuf.c: In function 'main': udmabuf.c:30:17: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] 30 | devfd = open(/dev/udmabuf, O_RDWR); | ^~~~ | popen udmabuf.c:42:15: warning: implicit declaration of function 'fcntl' [-Wimplicit-function-declaration] 42 | ret = fcntl(memfd, F_ADD_SEALS, F_SEAL_SHRINK); | ^~~~~ make[3]: Leaving directory '/builds/linux/tools/testing/selftests/drivers/dma-buf' Build config: https://builds.tuxbuild.com/1xXcUtI2INra8KaHjOXXQMOyAD0/config Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> meta data: ----------- git_describe: v5.14-rc6-389-g95dc72bb9c03, git_repo: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc, git_sha: 95dc72bb9c032093e79e628a98c927b3db73a6c3, git_short_log: 95dc72bb9c03 (\Linux 5.14.1-rc1\), kconfig: [ defconfig, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linu…, CONFIG_ARM64_MODULE_PLTS=y ], kernel_version: 5.14.1-rc1, target_arch: arm64, targets: [ dtbs, dtbs-legacy, headers, kernel, kselftest, kselftest-merge, modules ], toolchain: gcc-11, steps to reproduce: https://builds.tuxbuild.com/1xXcUtI2INra8KaHjOXXQMOyAD0/tuxmake_reproducer.… -- Linaro LKFT https://lkft.linaro.org

3 years, 6 months

1
0
0 0

[REGRESSION] lkft kselftest for next-20210903

by lkft＠linaro.org

## Build * kernel: 5.14.0 * git: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next * git branch: master * git commit: 14c6345e6e6ca0570f3897214f24748ef6009761 * git describe: next-20210903 * test details: https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20210903 ## Regressions (compared to next-20210902) * i386, kselftest-net - net.ip_defrag.sh * i386, kselftest-rtc - rtc.rtctest * qemu_arm64, kselftest-timers - timers.rtcpie * qemu_x86_64, kselftest-rtc - rtc.rtctest Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> ## Fixes (compared to next-20210902) * i386, kselftest-net - net.so_txtime.sh * qemu-arm64-gic-version2, kselftest-cgroup - cgroup.test_freezer - cgroup.test_freezer.test_cgfreezer_ptrace * qemu-arm64-gic-version3, kselftest-cgroup - cgroup.test_freezer - cgroup.test_freezer.test_cgfreezer_ptrace * qemu-arm64-mte, kselftest-timers - timers.rtcpie * qemu_arm, kselftest-cgroup - cgroup.test_freezer - cgroup.test_freezer.test_cgfreezer_migrate * qemu_arm, kselftest-rtc - rtc.rtctest * qemu_x86_64, kselftest-timers - timers.rtcpie ## Test result summary total: 5548, pass: 3276, fail: 566, skip: 1706, xfail: 0 ## Build Summary ## Test suites summary * kselftest- * kselftest-android * kselftest-arm64 * kselftest-arm64/arm64.btitest.bti_c_func * kselftest-arm64/arm64.btitest.bti_j_func * kselftest-arm64/arm64.btitest.bti_jc_func * kselftest-arm64/arm64.btitest.bti_none_func * kselftest-arm64/arm64.btitest.nohint_func * kselftest-arm64/arm64.btitest.paciasp_func * kselftest-arm64/arm64.nobtitest.bti_c_func * kselftest-arm64/arm64.nobtitest.bti_j_func * kselftest-arm64/arm64.nobtitest.bti_jc_func * kselftest-arm64/arm64.nobtitest.bti_none_func * kselftest-arm64/arm64.nobtitest.nohint_func * kselftest-arm64/arm64.nobtitest.paciasp_func * kselftest-bpf * kselftest-breakpoints * kselftest-capabilities * kselftest-cgroup * kselftest-clone3 * kselftest-core * kselftest-cpu-hotplug * kselftest-cpufreq * kselftest-drivers * kselftest-efivarfs * kselftest-filesystems * kselftest-firmware * kselftest-fpu * kselftest-futex * kselftest-gpio * kselftest-intel_pstate * kselftest-ipc * kselftest-ir * kselftest-kcmp * kselftest-kexec * kselftest-kvm * kselftest-lib * kselftest-livepatch * kselftest-lkdtm * kselftest-membarrier * kselftest-memfd * kselftest-memory-hotplug * kselftest-mincore * kselftest-mount * kselftest-mqueue * kselftest-net * kselftest-netfilter * kselftest-nsfs * kselftest-openat2 * kselftest-pid_namespace * kselftest-pidfd * kselftest-proc * kselftest-pstore * kselftest-ptrace * kselftest-rseq * kselftest-rtc * kselftest-seccomp * kselftest-sigaltstack * kselftest-size * kselftest-splice * kselftest-static_keys * kselftest-sync * kselftest-sysctl * kselftest-tc-testing * kselftest-timens * kselftest-timers * kselftest-tmpfs * kselftest-tpm2 * kselftest-user * kselftest-vm * kselftest-x86 * kselftest-zram -- Linaro LKFT https://lkft.linaro.org

3 years, 7 months

1
0
0 0

[GIT PULL] Kselftest update for Linux 5.15-rc1

by Shuah Khan

Hi Linus, Please pull the following Kselftest update for Linux 5.15-rc1. This Kselftest update for Linux 5.15-rc1 consists of fixes to build and test failures. -- openat2 test failure for O_LARGEFILE flag on ARM64 -- x86 test build failures related to glibc 2.34 adding support for variable sized MINSIGSTKSZ and SIGSTKSZ -- removing obsolete configs in sync and cpufreq config files -- minor spelling and duplicate header include cleanups diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 2734d6c1b1a089fb593ef6a23d4b70903526fe0c: Linux 5.14-rc2 (2021-07-18 14:13:49 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-next-5.15-rc1 for you to fetch changes up to 67d6d80d90fb27b3cc7659f464fa3b87fd67bc14: selftests/cpufreq: Rename DEBUG_PI_LIST to DEBUG_PLIST (2021-08-31 11:00:02 -0600) ---------------------------------------------------------------- linux-kselftest-next-5.15-rc1 This Kselftest update for Linux 5.15-rc1 consists of fixes to build and test failures. -- openat2 test failure for O_LARGEFILE flag on ARM64 -- x86 test build failures related to glibc 2.34 adding support for variable sized MINSIGSTKSZ and SIGSTKSZ -- removing obsolete configs in sync and cpufreq config files -- minor spelling and duplicate header include cleanups ---------------------------------------------------------------- Baolin Wang (1): selftests: openat2: Fix testing failure for O_LARGEFILE flag Changcheng Deng (1): kselftest:sched: remove duplicate include in cs_prctl_test.c Colin Ian King (1): selftests: safesetid: Fix spelling mistake "cant" -> "can't" Jun Miao (1): selftests/x86: Fix error: variably modified 'altstack_data' at file scope Li Zhijian (2): selftests/sync: Remove the deprecated config SYNC selftests/cpufreq: Rename DEBUG_PI_LIST to DEBUG_PLIST tools/testing/selftests/cpufreq/config | 2 +- tools/testing/selftests/openat2/openat2_test.c | 4 ++++ tools/testing/selftests/safesetid/safesetid-test.c | 2 +- tools/testing/selftests/sched/cs_prctl_test.c | 2 -- tools/testing/selftests/sync/config | 1 - tools/testing/selftests/x86/mov_ss_trap.c | 4 ++-- tools/testing/selftests/x86/sigreturn.c | 7 +++---- tools/testing/selftests/x86/single_step_syscall.c | 4 ++-- tools/testing/selftests/x86/syscall_arg_fault.c | 7 +++---- 9 files changed, 16 insertions(+), 17 deletions(-) ----------------------------------------------------------------

3 years, 7 months

2
1
0 0

[PATCH bpf-next] selftests/bpf: Fix build of task_pt_regs tests for arm64

by Jean-Philippe Brucker

struct pt_regs is not exported to userspace on all archs. arm64 and s390 export "user_pt_regs" instead, which causes build failure at the moment: progs/test_task_pt_regs.c:8:16: error: variable has incomplete type 'struct pt_regs' struct pt_regs current_regs = {}; Use the multi-arch macros defined by tools/lib/bpf/bpf_tracing.h to copy the pt_regs into a locally-defined struct. Copying the user_pt_regs struct on arm64 wouldn't work because the struct is too large and the compiler complains about using too much stack. Fixes: 576d47bb1a92 ("bpf: selftests: Add bpf_task_pt_regs() selftest") Signed-off-by: Jean-Philippe Brucker <jean-philippe(a)linaro.org> --- .../selftests/bpf/bpf_pt_regs_helpers.h | 30 +++++++++++++++++++ .../selftests/bpf/prog_tests/task_pt_regs.c | 1 + .../selftests/bpf/progs/test_task_pt_regs.c | 10 ++++--- 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 tools/testing/selftests/bpf/bpf_pt_regs_helpers.h diff --git a/tools/testing/selftests/bpf/bpf_pt_regs_helpers.h b/tools/testing/selftests/bpf/bpf_pt_regs_helpers.h new file mode 100644 index 000000000000..7531f4824ead --- /dev/null +++ b/tools/testing/selftests/bpf/bpf_pt_regs_helpers.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __BPF_PT_REGS_HELPERS +#define __BPF_PT_REGS_HELPERS + +#include <bpf/bpf_tracing.h> + +struct bpf_pt_regs { + unsigned long long parm[5]; + unsigned long long ret; + unsigned long long fp; + unsigned long long rc; + unsigned long long sp; + unsigned long long ip; +}; + +static inline void bpf_copy_pt_regs(struct bpf_pt_regs *dest, struct pt_regs *src) +{ + dest->parm[0] = PT_REGS_PARM1(src); + dest->parm[1] = PT_REGS_PARM2(src); + dest->parm[2] = PT_REGS_PARM3(src); + dest->parm[3] = PT_REGS_PARM4(src); + dest->parm[4] = PT_REGS_PARM5(src); + dest->ret = PT_REGS_RET(src); + dest->fp = PT_REGS_FP(src); + dest->rc = PT_REGS_RC(src); + dest->sp = PT_REGS_SP(src); + dest->ip = PT_REGS_IP(src); +} + +#endif /* __BPF_PT_REGS_HELPERS */ diff --git a/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c b/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c index 53f0e0fa1a53..196453b75937 100644 --- a/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c +++ b/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c @@ -2,6 +2,7 @@ #define _GNU_SOURCE #include <test_progs.h> #include <linux/ptrace.h> +#include "bpf_pt_regs_helpers.h" #include "test_task_pt_regs.skel.h" void test_task_pt_regs(void) diff --git a/tools/testing/selftests/bpf/progs/test_task_pt_regs.c b/tools/testing/selftests/bpf/progs/test_task_pt_regs.c index 6c059f1cfa1b..348da3509093 100644 --- a/tools/testing/selftests/bpf/progs/test_task_pt_regs.c +++ b/tools/testing/selftests/bpf/progs/test_task_pt_regs.c @@ -5,8 +5,10 @@ #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> -struct pt_regs current_regs = {}; -struct pt_regs ctx_regs = {}; +#include "bpf_pt_regs_helpers.h" + +struct bpf_pt_regs current_regs = {}; +struct bpf_pt_regs ctx_regs = {}; int uprobe_res = 0; SEC("uprobe/trigger_func") @@ -17,8 +19,8 @@ int handle_uprobe(struct pt_regs *ctx) current = bpf_get_current_task_btf(); regs = (struct pt_regs *) bpf_task_pt_regs(current); - __builtin_memcpy(&current_regs, regs, sizeof(*regs)); - __builtin_memcpy(&ctx_regs, ctx, sizeof(*ctx)); + bpf_copy_pt_regs(&current_regs, regs); + bpf_copy_pt_regs(&ctx_regs, ctx); /* Prove that uprobe was run */ uprobe_res = 1; -- 2.33.0

3 years, 7 months

4
4
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror