Linux-kselftest-mirror August 2023

linux-kselftest-mirror@lists.linaro.org

192 participants
317 discussions

[PATCH v3 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 Documentation/dev-tools/kunit/run_wrapper.rst | 12 + .../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 | 418 ++++++++++++++++++ lib/kunit/executor.c | 114 ++++- 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 +- 17 files changed, 1062 insertions(+), 76 deletions(-) create mode 100644 include/kunit/attributes.h create mode 100644 lib/kunit/attributes.c base-commit: 64bd4641310c41a1ecf07c13c67bc0ed61045dfd -- 2.41.0.487.g6d72f3e995-goog

2 years, 4 months

[RFC v2 0/2] CPU-Idle latency selftest framework

by Aboorva Devarajan

Changelog: v1 -> v2 * Rebased on v6.5-rc6 * Moved the test directory to powerpc debugfs * Minimal code refactoring RFC v1: https://lore.kernel.org/all/20210611124154.56427-1-psampat@linux.ibm.com/ Other related RFC: https://lore.kernel.org/all/20210430082804.38018-1-psampat@linux.ibm.com/ Userspace selftest: https://lkml.org/lkml/2020/9/2/356 ---- A kernel module + userspace driver to estimate the wakeup latency caused by going into stop states. The motivation behind this program is to find significant deviations behind advertised latency and residency values. The patchset measures latencies for two kinds of events. IPIs and Timers As this is a software-only mechanism, there will be additional latencies of the kernel-firmware-hardware interactions. To account for that, the program also measures a baseline latency on a 100 percent loaded CPU and the latencies achieved must be in view relative to that. To achieve this, we introduce a kernel module and expose its control knobs through the debugfs interface that the selftests can engage with. The kernel module provides the following interfaces within /sys/kernel/debug/powerpc/latency_test/ for, IPI test: ipi_cpu_dest = Destination CPU for the IPI ipi_cpu_src = Origin of the IPI ipi_latency_ns = Measured latency time in ns Timeout test: timeout_cpu_src = CPU on which the timer to be queued timeout_expected_ns = Timer duration timeout_diff_ns = Difference of actual duration vs expected timer Sample output is as follows: # --IPI Latency Test--- # Baseline Avg IPI latency(ns): 2720 # Observed Avg IPI latency(ns) - State snooze: 2565 # Observed Avg IPI latency(ns) - State stop0_lite: 3856 # Observed Avg IPI latency(ns) - State stop0: 3670 # Observed Avg IPI latency(ns) - State stop1: 3872 # Observed Avg IPI latency(ns) - State stop2: 17421 # Observed Avg IPI latency(ns) - State stop4: 1003922 # Observed Avg IPI latency(ns) - State stop5: 1058870 # # --Timeout Latency Test-- # Baseline Avg timeout diff(ns): 1435 # Observed Avg timeout diff(ns) - State snooze: 1709 # Observed Avg timeout diff(ns) - State stop0_lite: 2028 # Observed Avg timeout diff(ns) - State stop0: 1954 # Observed Avg timeout diff(ns) - State stop1: 1895 # Observed Avg timeout diff(ns) - State stop2: 14556 # Observed Avg timeout diff(ns) - State stop4: 873988 # Observed Avg timeout diff(ns) - State stop5: 959137 Aboorva Devarajan (2): powerpc/cpuidle: cpuidle wakeup latency based on IPI and timer events powerpc/selftest: Add support for cpuidle latency measurement arch/powerpc/Kconfig.debug | 10 + arch/powerpc/kernel/Makefile | 1 + arch/powerpc/kernel/test_cpuidle_latency.c | 156 ++++++ tools/testing/selftests/powerpc/Makefile | 1 + .../powerpc/cpuidle_latency/.gitignore | 2 + .../powerpc/cpuidle_latency/Makefile | 6 + .../cpuidle_latency/cpuidle_latency.sh | 443 ++++++++++++++++++ .../powerpc/cpuidle_latency/settings | 1 + 8 files changed, 620 insertions(+) create mode 100644 arch/powerpc/kernel/test_cpuidle_latency.c create mode 100644 tools/testing/selftests/powerpc/cpuidle_latency/.gitignore create mode 100644 tools/testing/selftests/powerpc/cpuidle_latency/Makefile create mode 100755 tools/testing/selftests/powerpc/cpuidle_latency/cpuidle_latency.sh create mode 100644 tools/testing/selftests/powerpc/cpuidle_latency/settings -- 2.25.1

2 years, 4 months

selftests: net: pmtu.sh: Unable to handle kernel paging request at virtual address

by Naresh Kamboju

The selftests: net: pmtu.sh running on Linux next got this kernel panic on qemu-arm64. logs: ==== [ 0.000000] Linux version 6.5.0 (tuxmake@tuxmake) (Debian clang version 18.0.0 (++20230822112105+841c4dc7e51e-1~exp1~20230822112223.851), Debian LLD 18.0.0) #1 SMP PREEMPT @1693176139 ... # selftests: net: pmtu.sh # TEST: ipv4: PMTU exceptions [ OK ] # TEST: ipv4: PMTU exceptions - nexthop objects [ OK ] # TEST: ipv6: PMTU exceptions [ OK ] # TEST: ipv6: PMTU exceptions - nexthop objects [ OK ] ... # TEST: vti4: PMTU exceptions, routed (ESP-in-UDP) [FAIL] # PMTU exception wasn't created after exceeding PMTU (IP payload length 1438) # ./pmtu.sh: 938: kill: No such process # # ./pmtu.sh: 938: kill: No such process # <47>[ 366.411270] systemd-journald[84]: Sent WATCHDOG=1 notification. # TEST: vti4: default MTU assignment [ OK ] # TEST: vti6: default MTU assignment [ OK ] # TEST: vti4: MTU setting on link creation [ OK ] # TEST: vti6: MTU setting on link creation [ OK ] # TEST: vti6: MTU changes on link changes [ OK ] # TEST: ipv4: cleanup of cached exceptions [ OK ] # TEST: ipv4: cleanup of cached exceptions - nexthop objects [ OK ] # TEST: ipv6: cleanup of cached exceptions [ OK ] # TEST: ipv6: cleanup of cached exceptions - nexthop objects [ OK ] <1>[ 398.987591] Unable to handle kernel paging request at virtual address ffff5dbb8189f000 <1>[ 398.988469] Mem abort info: <1>[ 398.988712] ESR = 0x0000000097b58004 <1>[ 398.989264] EC = 0x25: DABT (current EL), IL = 32 bits <1>[ 398.989893] SET = 0, FnV = 0 <1>[ 398.990312] EA = 0, S1PTW = 0 <1>[ 398.990768] FSC = 0x04: level 0 translation fault <1>[ 398.992330] Data abort info: <1>[ 398.992591] Access size = 4 byte(s) <1>[ 398.992811] SSE = 1, SRT = 21 <1>[ 398.993008] SF = 1, AR = 0 <1>[ 398.993243] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 <1>[ 398.993601] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 <1>[ 398.994094] swapper pgtable: 4k pages, 48-bit VAs, pgdp=0000000041d49000 <1>[ 398.994603] [ffff5dbb8189f000] pgd=0000000000000000, p4d=0000000000000000 <0>[ 398.995464] Internal error: Oops: 0000000097b58004 [#1] PREEMPT SMP <4>[ 398.996177] Modules linked in: fou6 sit fou bridge stp llc vxlan ip6_udp_tunnel udp_tunnel act_csum libcrc32c act_pedit cls_flower sch_prio veth vrf macvtap macvlan tap crct10dif_ce sm3_ce sm3 sha3_ce sha512_ce sha512_arm64 fuse drm dm_mod ip_tables x_tables [last unloaded: test_blackhole_dev] <4>[ 398.999384] CPU: 1 PID: 132 Comm: kworker/u4:3 Not tainted 6.5.0 #1 <4>[ 399.000045] Hardware name: linux,dummy-virt (DT) <4>[ 399.001079] Workqueue: netns cleanup_net <4>[ 399.002441] pstate: 824000c9 (Nzcv daIF +PAN -UAO +TCO -DIT -SSBS BTYPE=--) <4>[ 399.003881] pc : percpu_counter_add_batch+0x28/0xd0 <4>[ 399.004637] lr : dst_destroy+0x44/0x1e4 <4>[ 399.004904] sp : ffff80008000be70 <4>[ 399.005864] x29: ffff80008000be70 x28: ffffa2457df6ea40 x27: ffffa2457df24008 <4>[ 399.006586] x26: ffffa2457dffa000 x25: 000000000000000a x24: 0000000000000002 <4>[ 399.007360] x23: 0000000000000000 x22: 000000000000000a x21: ffff0000c0e90ec0 <4>[ 399.008276] x20: 0000000000000000 x19: ffff0000c4f83440 x18: 0000000000000000 <4>[ 399.009327] x17: ffff5dbb8189f000 x16: ffff800080008000 x15: 0000000000000010 <4>[ 399.009653] x14: 0000000000000010 x13: 0000000000000004 x12: 0000000000000701 <4>[ 399.010159] x11: 0000000000000001 x10: fffffc00030c7260 x9 : ffff5dbb8189f000 <4>[ 399.010742] x8 : 0000000000000000 x7 : 7f7f7f7f7f7f7f7f x6 : fefefefefefefeff <4>[ 399.012056] x5 : 000000000010000e x4 : fffffc00030c7260 x3 : 000000000010000e <4>[ 399.013082] x2 : 0000000000000020 x1 : ffffffffffffffff x0 : ffff0000c4f83440 <4>[ 399.014716] Call trace: <4>[ 399.015702] percpu_counter_add_batch+0x28/0xd0 <4>[ 399.016399] dst_destroy+0x44/0x1e4 <4>[ 399.016681] dst_destroy_rcu+0x14/0x20 <4>[ 399.017009] rcu_core+0x2d0/0x5e0 <4>[ 399.017311] rcu_core_si+0x10/0x1c <4>[ 399.017609] __do_softirq+0xd4/0x23c <4>[ 399.017991] ____do_softirq+0x10/0x1c <4>[ 399.018320] call_on_irq_stack+0x24/0x4c <4>[ 399.018723] do_softirq_own_stack+0x1c/0x28 <4>[ 399.022639] __irq_exit_rcu+0x6c/0xcc <4>[ 399.023434] irq_exit_rcu+0x10/0x1c <4>[ 399.023962] el1_interrupt+0x8c/0xc0 <4>[ 399.024810] el1h_64_irq_handler+0x18/0x24 <4>[ 399.025324] el1h_64_irq+0x64/0x68 <4>[ 399.025612] _raw_spin_lock_bh+0x0/0x6c <4>[ 399.026102] cleanup_net+0x280/0x45c <4>[ 399.026403] process_one_work+0x1d4/0x310 <4>[ 399.027140] worker_thread+0x248/0x470 <4>[ 399.027621] kthread+0xfc/0x184 <4>[ 399.028068] ret_from_fork+0x10/0x20 <0>[ 399.029333] Code: d50343df aa0003f3 f9401008 d53cd049 (b8a86935) <4>[ 399.030578] ---[ end trace 0000000000000000 ]--- <0>[ 399.031422] Kernel panic - not syncing: Oops: Fatal exception in interrupt <2>[ 399.032320] SMP: stopping secondary CPUs <0>[ 399.033487] Kernel Offset: 0x2244fc200000 from 0xffff800080000000 <0>[ 399.033819] PHYS_OFFSET: 0x40000000 <0>[ 399.034096] CPU features: 0x00000000,68f167a1,ccc6773f <0>[ 399.034779] Memory Limit: none <0>[ 399.035768] ---[ end Kernel panic - not syncing: Oops: Fatal exception in interrupt ]--- Links: - https://qa-reports.linaro.org/lkft/linux-mainline-master/build/v6.5/testrun… - https://qa-reports.linaro.org/lkft/linux-mainline-master/build/v6.5/testrun… - https://storage.tuxsuite.com/public/linaro/lkft/builds/2UaRggcJ0lNsDMIbbFai… Steps to reproduce: =================== # # To install tuxrun to your home directory at ~/.local/bin: # pip3 install -U --user tuxrun==0.48.0 # # Or install a deb/rpm depending on the running distribution # See https://tuxmake.org/install-deb/ or # https://tuxmake.org/install-rpm/ # # See https://tuxrun.org/ for complete documentation. # # Please follow the additional instructions if the tests are related to FVP: # https://tuxrun.org/run-fvp/ # tuxrun --runtime podman --device qemu-arm64 --boot-args rw --kernel https://storage.tuxsuite.com/public/linaro/lkft/builds/2UaRggcJ0lNsDMIbbFai… --modules https://storage.tuxsuite.com/public/linaro/lkft/builds/2UaRggcJ0lNsDMIbbFai… --rootfs https://storage.tuxboot.com/debian/bookworm/arm64/rootfs.ext4.xz --parameters SHARD_INDEX=1 --parameters SKIPFILE=skipfile-lkft.yaml --parameters SHARD_NUMBER=5 --parameters KSELFTEST=https://storage.tuxsuite.com/public/linaro/lkft/builds/2UaRggcJ0l… --image docker.io/linaro/tuxrun-dispatcher:v0.48.0 --tests kselftest-net --timeouts boot=30 kselftest-net=30 -- Linaro LKFT https://lkft.linaro.org

2 years, 4 months

Słowa kluczowe do wypozycjonowania

by Adam Charachuta

Dzień dobry, zapoznałem się z Państwa ofertą i z przyjemnością przyznaję, że przyciąga uwagę i zachęca do dalszych rozmów. Pomyślałem, że może mógłbym mieć swój wkład w Państwa rozwój i pomóc dotrzeć z tą ofertą do większego grona odbiorców. Pozycjonuję strony www, dzięki czemu generują świetny ruch w sieci. Możemy porozmawiać w najbliższym czasie? Pozdrawiam serdecznie Adam Charachuta

2 years, 4 months

[PATCH 0/4] RISCV: Add kvm Sstc timer selftest

by Haibo Xu

The sstc_timer selftest is used to validate Sstc timer functionality in a guest, which sets up periodic timer interrupts and check the basic interrupt status upon its receipt. This KVM selftest was ported from aarch64 arch_timer and tested with Linux v6.5-rc3 on a Qemu riscv64 virt machine. Haibo Xu (4): tools: riscv: Add header file csr.h KVM: riscv: selftests: Add exception handling support KVM: riscv: selftests: Add guest helper to get vcpu id KVM: riscv: selftests: Add sstc_timer test tools/arch/riscv/include/asm/csr.h | 127 ++++++ tools/testing/selftests/kvm/Makefile | 2 + .../selftests/kvm/include/riscv/processor.h | 76 ++++ .../selftests/kvm/include/riscv/sstc_timer.h | 70 ++++ .../selftests/kvm/lib/riscv/handlers.S | 101 +++++ .../selftests/kvm/lib/riscv/processor.c | 74 ++++ .../testing/selftests/kvm/riscv/sstc_timer.c | 382 ++++++++++++++++++ 7 files changed, 832 insertions(+) create mode 100644 tools/arch/riscv/include/asm/csr.h create mode 100644 tools/testing/selftests/kvm/include/riscv/sstc_timer.h create mode 100644 tools/testing/selftests/kvm/lib/riscv/handlers.S create mode 100644 tools/testing/selftests/kvm/riscv/sstc_timer.c -- 2.34.1

2 years, 4 months

Re: [GIT PULL] KUnit next update for Linux 6.6-rc1

by pr-tracker-bot＠kernel.org

The pull request you sent on Mon, 28 Aug 2023 10:21:36 -0600: > git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-kunit-6.6-rc1 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/815c24a085dd8ab9bb7381e455afdb3f9c260e38 Thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html

2 years, 4 months

Re: [GIT PULL] nolibc changes for Linux 6.6-rc1

by pr-tracker-bot＠kernel.org

The pull request you sent on Mon, 28 Aug 2023 12:32:58 -0600: > git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-nolibc-6.6-rc1 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/1c59d383390f970b891b503b7f79b63a02db2ec5 Thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html

2 years, 4 months

[GIT PULL] Kselftest update for Linux 6.6-rc1

by Shuah Khan

Hi Linus, Please pull the following Kselftest update for Linux 6.6-rc1. This Kselftest update for Linux 6.6-rc1 consists of a mix of fixes, enhancements, and new tests. Bulk of the changes enhance and fix rseq and resctrl tests. In addition, user_events, dmabuf-heaps and perf_events are added to default kselftest build and test coverage. A futex test fix, enhance prctl test coverage, and minor fixes are included in this update. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 6eaae198076080886b9e7d57f4ae06fa782f90ef: Linux 6.5-rc3 (2023-07-23 15:24:10 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-next-6.6-rc1 for you to fetch changes up to 9b1db732866bee060b9bca9493e5ebf5e8874c48: selftests: cachestat: use proper syscall number macro (2023-08-16 11:12:44 -0600) ---------------------------------------------------------------- linux-kselftest-next-6.6-rc1 This Kselftest update for Linux 6.6-rc1 consists of a mix of fixes, enhancements, and new tests. Bulk of the changes enhance and fix rseq and resctrl tests. In addition, user_events, dmabuf-heaps and perf_events are added to default kselftest build and test coverage. A futex test fix, enhance prctl test coverage, and minor fixes are included in this update. ---------------------------------------------------------------- Andre Przywara (2): selftests: cachestat: properly link in librt selftests: cachestat: use proper syscall number macro Hui Min Mina Chou (1): selftests/filesystems: Add six consecutive 'x' characters to mktemp Ilpo Järvinen (19): selftests/resctrl: Add resctrl.h into build deps selftests/resctrl: Don't leak buffer in fill_cache() selftests/resctrl: Unmount resctrl FS if child fails to run benchmark selftests/resctrl: Close perf value read fd on errors selftests/resctrl: Unmount resctrl FS before starting the first test selftests/resctrl: Move resctrl FS mount/umount to higher level selftests/resctrl: Refactor remount_resctrl(bool mum_resctrlfs) to mount_resctrl() selftests/resctrl: Remove mum_resctrlfs from struct resctrl_val_param selftests/resctrl: Convert span to size_t selftests/resctrl: Express span internally in bytes selftests/resctrl: Remove duplicated preparation for span arg selftests/resctrl: Remove "malloc_and_init_memory" param from run_fill_buf() selftests/resctrl: Remove unnecessary startptr global from fill_buf selftests/resctrl: Improve parameter consistency in fill_buf selftests/resctrl: Don't pass test name to fill_buf selftests/resctrl: Don't use variable argument list for ->setup() selftests/resctrl: Move CAT/CMT test global vars to function they are used in selftests/resctrl: Pass the real number of tests to show_cache_info() selftests/resctrl: Remove test type checks from cat_val() Mark Brown (2): selftests/user_events: Reenable build selftests: Hook more tests into the build infrastructure Mathieu Desnoyers (4): selftests/rseq: Fix CID_ID typo in Makefile selftests/rseq: Implement rseq_unqual_scalar_typeof selftests/rseq: Fix arm64 buggy load-acquire/store-release macros selftests/rseq: Use rseq_unqual_scalar_typeof in macros Nysal Jan K.A (1): selftests/futex: Order calls to futex_lock_pi Osama Muhammad (1): selftests: prctl: Add new prctl test for PR_SET_NAME Shuah Khan (2): selftests:prctl: Fix make clean override warning selftests:prctl: add set-process-name to .gitignore tools/testing/selftests/Makefile | 4 + tools/testing/selftests/cachestat/Makefile | 2 +- tools/testing/selftests/cachestat/test_cachestat.c | 7 +- .../selftests/filesystems/fat/run_fat_tests.sh | 2 +- .../futex/functional/futex_wait_timeout.c | 7 ++ tools/testing/selftests/prctl/.gitignore | 1 + tools/testing/selftests/prctl/Makefile | 4 +- tools/testing/selftests/prctl/set-process-name.c | 62 +++++++++++++++ tools/testing/selftests/resctrl/Makefile | 2 +- tools/testing/selftests/resctrl/cache.c | 66 ++++++++-------- tools/testing/selftests/resctrl/cat_test.c | 28 ++----- tools/testing/selftests/resctrl/cmt_test.c | 29 ++------ tools/testing/selftests/resctrl/fill_buf.c | 87 ++++++++-------------- tools/testing/selftests/resctrl/mba_test.c | 9 +-- tools/testing/selftests/resctrl/mbm_test.c | 17 ++--- tools/testing/selftests/resctrl/resctrl.h | 17 ++--- tools/testing/selftests/resctrl/resctrl_tests.c | 83 ++++++++++++++------- tools/testing/selftests/resctrl/resctrl_val.c | 7 +- tools/testing/selftests/resctrl/resctrlfs.c | 64 ++++++++-------- tools/testing/selftests/rseq/Makefile | 2 +- tools/testing/selftests/rseq/compiler.h | 26 +++++++ tools/testing/selftests/rseq/rseq-arm.h | 4 +- tools/testing/selftests/rseq/rseq-arm64.h | 58 ++++++++------- tools/testing/selftests/rseq/rseq-mips.h | 4 +- tools/testing/selftests/rseq/rseq-ppc.h | 4 +- tools/testing/selftests/rseq/rseq-riscv.h | 6 +- tools/testing/selftests/rseq/rseq-s390.h | 4 +- tools/testing/selftests/rseq/rseq-x86.h | 4 +- tools/testing/selftests/user_events/Makefile | 8 -- 29 files changed, 328 insertions(+), 290 deletions(-) create mode 100644 tools/testing/selftests/prctl/set-process-name.c ----------------------------------------------------------------

2 years, 4 months

[PATCH bpf-next v8] selftests/bpf: trace_helpers.c: optimize kallsyms cache

by Rong Tao

From: Rong Tao <rongtao(a)cestc.cn> Static ksyms often have problems because the number of symbols exceeds the MAX_SYMS limit. Like changing the MAX_SYMS from 300000 to 400000 in commit e76a014334a6("selftests/bpf: Bump and validate MAX_SYMS") solves the problem somewhat, but it's not the perfect way. This commit uses dynamic memory allocation, which completely solves the problem caused by the limitation of the number of kallsyms. Acked-by: Stanislav Fomichev <sdf(a)google.com> Signed-off-by: Rong Tao <rongtao(a)cestc.cn> --- v8: Resolves inter-thread contention for ksyms global variables. v7: https://lore.kernel.org/lkml/tencent_BD6E19C00BF565CD5C36A9A0BD828CFA210A@q… Fix __must_check macro. v6: https://lore.kernel.org/lkml/tencent_4A09A36F883A06EA428A593497642AF8AF08@q… Apply libbpf_ensure_mem() v5: https://lore.kernel.org/lkml/tencent_0E9E1A1C0981678D5E7EA9E4BDBA8EE2200A@q… Release the allocated memory once the load_kallsyms_refresh() upon error given it's dynamically allocated. v4: https://lore.kernel.org/lkml/tencent_59C74613113F0C728524B2A82FE5540A5E09@q… Make sure most cases we don't need the realloc() path to begin with, and check strdup() return value. v3: https://lore.kernel.org/lkml/tencent_50B4B2622FE7546A5FF9464310650C008509@q… Do not use structs and judge ksyms__add_symbol function return value. v2: https://lore.kernel.org/lkml/tencent_B655EE5E5D463110D70CD2846AB3262EED09@q… Do the usual len/capacity scheme here to amortize the cost of realloc, and don't free symbols. v1: https://lore.kernel.org/lkml/tencent_AB461510B10CD484E0B2F62E3754165F2909@q… --- samples/bpf/Makefile | 4 + samples/bpf/offwaketime_user.c | 7 +- samples/bpf/sampleip_user.c | 9 +- samples/bpf/spintest_user.c | 7 +- samples/bpf/task_fd_query_user.c | 13 +- samples/bpf/trace_event_user.c | 7 +- .../selftests/bpf/prog_tests/bpf_cookie.c | 7 +- .../selftests/bpf/prog_tests/fill_link_info.c | 9 +- .../bpf/prog_tests/get_stack_raw_tp.c | 10 +- .../bpf/prog_tests/kprobe_multi_test.c | 13 +- .../prog_tests/kprobe_multi_testmod_test.c | 13 +- tools/testing/selftests/bpf/trace_helpers.c | 116 ++++++++++++------ tools/testing/selftests/bpf/trace_helpers.h | 10 +- 13 files changed, 154 insertions(+), 71 deletions(-) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 4ccf4236031c..6c707ebcebb9 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -175,6 +175,7 @@ TPROGS_CFLAGS += -I$(srctree)/tools/testing/selftests/bpf/ TPROGS_CFLAGS += -I$(LIBBPF_INCLUDE) TPROGS_CFLAGS += -I$(srctree)/tools/include TPROGS_CFLAGS += -I$(srctree)/tools/perf +TPROGS_CFLAGS += -I$(srctree)/tools/lib TPROGS_CFLAGS += -DHAVE_ATTR_TEST=0 ifdef SYSROOT @@ -314,6 +315,9 @@ XDP_SAMPLE_CFLAGS += -Wall -O2 \ $(obj)/$(XDP_SAMPLE): TPROGS_CFLAGS = $(XDP_SAMPLE_CFLAGS) $(obj)/$(XDP_SAMPLE): $(src)/xdp_sample_user.h $(src)/xdp_sample_shared.h +# Override includes for trace_helpers.o because __must_check won't be defined +# in our include path. +$(obj)/$(TRACE_HELPERS): TPROGS_CFLAGS := $(TPROGS_CFLAGS) -D__must_check= -include $(BPF_SAMPLES_PATH)/Makefile.target diff --git a/samples/bpf/offwaketime_user.c b/samples/bpf/offwaketime_user.c index 5557b5393642..53c1a6b4ec44 100644 --- a/samples/bpf/offwaketime_user.c +++ b/samples/bpf/offwaketime_user.c @@ -16,6 +16,7 @@ /* counts, stackmap */ static int map_fd[2]; +struct ksyms *ksyms; static void print_ksym(__u64 addr) { @@ -23,7 +24,7 @@ static void print_ksym(__u64 addr) if (!addr) return; - sym = ksym_search(addr); + sym = ksym_search(ksyms, addr); if (!sym) { printf("ksym not found. Is kallsyms loaded?\n"); return; @@ -100,7 +101,8 @@ int main(int argc, char **argv) int delay = 1, i = 0; char filename[256]; - if (load_kallsyms()) { + ksyms = load_kallsyms(); + if (!ksyms) { printf("failed to process /proc/kallsyms\n"); return 2; } @@ -149,5 +151,6 @@ int main(int argc, char **argv) bpf_link__destroy(links[i]); bpf_object__close(obj); + free_kallsyms(ksyms); return 0; } diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c index 9283f47844fb..aec3d557aa6b 100644 --- a/samples/bpf/sampleip_user.c +++ b/samples/bpf/sampleip_user.c @@ -25,6 +25,7 @@ static int map_fd; static int nr_cpus; static long _text_addr; +struct ksyms *ksyms; static void usage(void) { @@ -109,7 +110,7 @@ static void print_ip_map(int fd) qsort(counts, max, sizeof(struct ipcount), count_cmp); for (i = 0; i < max; i++) { if (counts[i].ip > _text_addr) { - sym = ksym_search(counts[i].ip); + sym = ksym_search(ksyms, counts[i].ip); if (!sym) { printf("ksym not found. Is kallsyms loaded?\n"); continue; @@ -164,13 +165,14 @@ int main(int argc, char **argv) } /* initialize kernel symbol translation */ - if (load_kallsyms()) { + ksyms = load_kallsyms(); + if (!ksyms) { fprintf(stderr, "ERROR: loading /proc/kallsyms\n"); return 2; } /* used to determine whether the address is kernel space */ - _text_addr = ksym_get_addr("_text"); + _text_addr = ksym_get_addr(ksyms, "_text"); if (!_text_addr) { fprintf(stderr, "ERROR: no '_text' in /proc/kallsyms\n"); return 3; @@ -230,5 +232,6 @@ int main(int argc, char **argv) free(links); bpf_object__close(obj); + free_kallsyms(ksyms); return error; } diff --git a/samples/bpf/spintest_user.c b/samples/bpf/spintest_user.c index 55971edb1088..db6a3c6d5329 100644 --- a/samples/bpf/spintest_user.c +++ b/samples/bpf/spintest_user.c @@ -16,8 +16,10 @@ int main(int ac, char **argv) int map_fd, i, j = 0; char filename[256]; struct ksym *sym; + struct ksyms *ksyms; - if (load_kallsyms()) { + ksyms = load_kallsyms(); + if (!ksyms) { printf("failed to process /proc/kallsyms\n"); return 2; } @@ -58,7 +60,7 @@ int main(int ac, char **argv) while (bpf_map_get_next_key(map_fd, &key, &next_key) == 0) { bpf_map_lookup_elem(map_fd, &next_key, &value); assert(next_key == value); - sym = ksym_search(value); + sym = ksym_search(ksyms, value); key = next_key; if (!sym) { printf("ksym not found. Is kallsyms loaded?\n"); @@ -80,5 +82,6 @@ int main(int ac, char **argv) bpf_link__destroy(links[j]); bpf_object__close(obj); + free_kallsyms(ksyms); return 0; } diff --git a/samples/bpf/task_fd_query_user.c b/samples/bpf/task_fd_query_user.c index 1e61f2180470..6e7710a4a96f 100644 --- a/samples/bpf/task_fd_query_user.c +++ b/samples/bpf/task_fd_query_user.c @@ -315,8 +315,10 @@ int main(int argc, char **argv) struct bpf_program *prog; struct bpf_object *obj; int i = 0, err = -1; + struct ksyms *ksyms; - if (load_kallsyms()) { + ksyms = load_kallsyms(); + if (!ksyms) { printf("failed to process /proc/kallsyms\n"); return err; } @@ -368,22 +370,22 @@ int main(int argc, char **argv) BPF_FD_TYPE_KRETPROBE, buf, sizeof(buf))); CHECK_AND_RET(test_nondebug_fs_probe("kprobe", NULL, 0x0, - ksym_get_addr("bpf_check"), false, + ksym_get_addr(ksyms, "bpf_check"), false, BPF_FD_TYPE_KPROBE, BPF_FD_TYPE_KRETPROBE, buf, sizeof(buf))); CHECK_AND_RET(test_nondebug_fs_probe("kprobe", NULL, 0x0, - ksym_get_addr("bpf_check"), false, + ksym_get_addr(ksyms, "bpf_check"), false, BPF_FD_TYPE_KPROBE, BPF_FD_TYPE_KRETPROBE, NULL, 0)); CHECK_AND_RET(test_nondebug_fs_probe("kprobe", NULL, 0x0, - ksym_get_addr("bpf_check"), true, + ksym_get_addr(ksyms, "bpf_check"), true, BPF_FD_TYPE_KPROBE, BPF_FD_TYPE_KRETPROBE, buf, sizeof(buf))); CHECK_AND_RET(test_nondebug_fs_probe("kprobe", NULL, 0x0, - ksym_get_addr("bpf_check"), true, + ksym_get_addr(ksyms, "bpf_check"), true, BPF_FD_TYPE_KPROBE, BPF_FD_TYPE_KRETPROBE, 0, 0)); @@ -419,5 +421,6 @@ int main(int argc, char **argv) bpf_link__destroy(links[i]); bpf_object__close(obj); + free_kallsyms(ksyms); return err; } diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c index 9664749bf618..b4822166182f 100644 --- a/samples/bpf/trace_event_user.c +++ b/samples/bpf/trace_event_user.c @@ -23,6 +23,7 @@ static int pid; static int map_fd[2]; struct bpf_program *prog; static bool sys_read_seen, sys_write_seen; +struct ksyms *ksyms; static void print_ksym(__u64 addr) { @@ -30,7 +31,7 @@ static void print_ksym(__u64 addr) if (!addr) return; - sym = ksym_search(addr); + sym = ksym_search(ksyms, addr); if (!sym) { printf("ksym not found. Is kallsyms loaded?\n"); return; @@ -303,7 +304,8 @@ int main(int argc, char **argv) signal(SIGINT, err_exit); signal(SIGTERM, err_exit); - if (load_kallsyms()) { + ksyms = load_kallsyms(); + if (!ksyms) { printf("failed to process /proc/kallsyms\n"); goto cleanup; } @@ -348,5 +350,6 @@ int main(int argc, char **argv) cleanup: bpf_object__close(obj); + free_kallsyms(ksyms); err_exit(error); } diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c index 1454cebc262b..26bf1f33b8d5 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c @@ -104,8 +104,10 @@ static void kprobe_multi_link_api_subtest(void) LIBBPF_OPTS(bpf_link_create_opts, opts); unsigned long long addrs[8]; __u64 cookies[8]; + struct ksyms *ksyms; - if (!ASSERT_OK(load_kallsyms(), "load_kallsyms")) + ksyms = load_kallsyms(); + if (!ASSERT_OK(ksyms != NULL, "load_kallsyms")) goto cleanup; skel = kprobe_multi__open_and_load(); @@ -116,7 +118,7 @@ static void kprobe_multi_link_api_subtest(void) skel->bss->test_cookie = true; #define GET_ADDR(__sym, __addr) ({ \ - __addr = ksym_get_addr(__sym); \ + __addr = ksym_get_addr(ksyms, __sym); \ if (!ASSERT_NEQ(__addr, 0, "ksym_get_addr " #__sym)) \ goto cleanup; \ }) @@ -171,6 +173,7 @@ static void kprobe_multi_link_api_subtest(void) cleanup: close(link1_fd); close(link2_fd); + free_kallsyms(ksyms); kprobe_multi__destroy(skel); } diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c index 9d768e083714..a134eda17446 100644 --- a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c +++ b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c @@ -302,16 +302,18 @@ void test_fill_link_info(void) { struct test_fill_link_info *skel; int i; + struct ksyms *ksyms; skel = test_fill_link_info__open_and_load(); if (!ASSERT_OK_PTR(skel, "skel_open")) return; /* load kallsyms to compare the addr */ - if (!ASSERT_OK(load_kallsyms_refresh(), "load_kallsyms_refresh")) + ksyms = load_kallsyms_refresh(NULL); + if (!ASSERT_OK(ksyms != NULL, "load_kallsyms_refresh")) goto cleanup; - kprobe_addr = ksym_get_addr(KPROBE_FUNC); + kprobe_addr = ksym_get_addr(ksyms, KPROBE_FUNC); if (test__start_subtest("kprobe_link_info")) test_kprobe_fill_link_info(skel, BPF_PERF_EVENT_KPROBE, false); if (test__start_subtest("kretprobe_link_info")) @@ -329,7 +331,7 @@ void test_fill_link_info(void) qsort(kmulti_syms, KMULTI_CNT, sizeof(kmulti_syms[0]), symbols_cmp_r); for (i = 0; i < KMULTI_CNT; i++) - kmulti_addrs[i] = ksym_get_addr(kmulti_syms[i]); + kmulti_addrs[i] = ksym_get_addr(ksyms, kmulti_syms[i]); if (test__start_subtest("kprobe_multi_link_info")) test_kprobe_multi_fill_link_info(skel, false, false); if (test__start_subtest("kretprobe_multi_link_info")) @@ -339,4 +341,5 @@ void test_fill_link_info(void) cleanup: test_fill_link_info__destroy(skel); + free_kallsyms(ksyms); } diff --git a/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c b/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c index 858e0575f502..7a5e7741da14 100644 --- a/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c +++ b/tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c @@ -9,6 +9,7 @@ #define MAX_STACK_RAWTP 100 static int duration = 0; +static struct ksyms *ksyms; struct get_stack_trace_t { int pid; @@ -48,7 +49,7 @@ static void get_stack_print_output(void *ctx, int cpu, void *data, __u32 size) found = num_stack > 0; } else { for (i = 0; i < num_stack; i++) { - ks = ksym_search(raw_data[i]); + ks = ksym_search(ksyms, raw_data[i]); if (ks && (strcmp(ks->name, nonjit_func) == 0)) { found = true; break; @@ -65,7 +66,7 @@ static void get_stack_print_output(void *ctx, int cpu, void *data, __u32 size) good_kern_stack = num_stack > 0; } else { for (i = 0; i < num_stack; i++) { - ks = ksym_search(e.kern_stack[i]); + ks = ksym_search(ksyms, e.kern_stack[i]); if (ks && (strcmp(ks->name, nonjit_func) == 0)) { good_kern_stack = true; break; @@ -112,8 +113,8 @@ void test_get_stack_raw_tp(void) if (CHECK(!map, "bpf_find_map", "not found\n")) goto close_prog; - err = load_kallsyms(); - if (CHECK(err < 0, "load_kallsyms", "err %d errno %d\n", err, errno)) + ksyms = load_kallsyms(); + if (CHECK(!ksyms, "load_kallsyms", "err %d errno %d\n", err, errno)) goto close_prog; CPU_ZERO(&cpu_set); @@ -146,4 +147,5 @@ void test_get_stack_raw_tp(void) bpf_link__destroy(link); perf_buffer__free(pb); bpf_object__close(obj); + free_kallsyms(ksyms); } diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c index 179fe300534f..e902ea50de57 100644 --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c @@ -6,6 +6,8 @@ #include "bpf/libbpf_internal.h" #include "bpf/hashmap.h" +static struct ksyms *ksyms; + static void kprobe_multi_test_run(struct kprobe_multi *skel, bool test_return) { LIBBPF_OPTS(bpf_test_run_opts, topts); @@ -89,7 +91,7 @@ static void test_link_api(struct bpf_link_create_opts *opts) } #define GET_ADDR(__sym, __addr) ({ \ - __addr = ksym_get_addr(__sym); \ + __addr = ksym_get_addr(ksyms, __sym); \ if (!ASSERT_NEQ(__addr, 0, "kallsyms load failed for " #__sym)) \ return; \ }) @@ -222,8 +224,8 @@ static void test_attach_api_fails(void) }; __u64 cookies[2]; - addrs[0] = ksym_get_addr("bpf_fentry_test1"); - addrs[1] = ksym_get_addr("bpf_fentry_test2"); + addrs[0] = ksym_get_addr(ksyms, "bpf_fentry_test1"); + addrs[1] = ksym_get_addr(ksyms, "bpf_fentry_test2"); if (!ASSERT_FALSE(!addrs[0] || !addrs[1], "ksym_get_addr")) goto cleanup; @@ -463,7 +465,8 @@ void serial_test_kprobe_multi_bench_attach(void) void test_kprobe_multi_test(void) { - if (!ASSERT_OK(load_kallsyms(), "load_kallsyms")) + ksyms = load_kallsyms(); + if (!ASSERT_OK(ksyms != NULL, "load_kallsyms")) return; if (test__start_subtest("skel_api")) @@ -480,4 +483,6 @@ void test_kprobe_multi_test(void) test_attach_api_syms(); if (test__start_subtest("attach_api_fails")) test_attach_api_fails(); + + free_kallsyms(ksyms); } diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_testmod_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_testmod_test.c index 1fbe7e4ac00a..69de53db63fd 100644 --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_testmod_test.c +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_testmod_test.c @@ -4,6 +4,8 @@ #include "trace_helpers.h" #include "bpf/libbpf_internal.h" +static struct ksyms *ksyms; + static void kprobe_multi_testmod_check(struct kprobe_multi *skel) { ASSERT_EQ(skel->bss->kprobe_testmod_test1_result, 1, "kprobe_test1_result"); @@ -50,11 +52,11 @@ static void test_testmod_attach_api_addrs(void) LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); unsigned long long addrs[3]; - addrs[0] = ksym_get_addr("bpf_testmod_fentry_test1"); + addrs[0] = ksym_get_addr(ksyms, "bpf_testmod_fentry_test1"); ASSERT_NEQ(addrs[0], 0, "ksym_get_addr"); - addrs[1] = ksym_get_addr("bpf_testmod_fentry_test2"); + addrs[1] = ksym_get_addr(ksyms, "bpf_testmod_fentry_test2"); ASSERT_NEQ(addrs[1], 0, "ksym_get_addr"); - addrs[2] = ksym_get_addr("bpf_testmod_fentry_test3"); + addrs[2] = ksym_get_addr(ksyms, "bpf_testmod_fentry_test3"); ASSERT_NEQ(addrs[2], 0, "ksym_get_addr"); opts.addrs = (const unsigned long *) addrs; @@ -79,11 +81,14 @@ static void test_testmod_attach_api_syms(void) void serial_test_kprobe_multi_testmod_test(void) { - if (!ASSERT_OK(load_kallsyms_refresh(), "load_kallsyms_refresh")) + ksyms = load_kallsyms_refresh(NULL); + if (!ASSERT_OK(ksyms != NULL, "load_kallsyms_refresh")) return; if (test__start_subtest("testmod_attach_api_syms")) test_testmod_attach_api_syms(); if (test__start_subtest("testmod_attach_api_addrs")) test_testmod_attach_api_addrs(); + + free_kallsyms(ksyms); } diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c index f83d9f65c65b..048522d2ac6e 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -14,99 +14,143 @@ #include <linux/limits.h> #include <libelf.h> #include <gelf.h> +#include "bpf/libbpf_internal.h" #define TRACEFS_PIPE "/sys/kernel/tracing/trace_pipe" #define DEBUGFS_PIPE "/sys/kernel/debug/tracing/trace_pipe" -#define MAX_SYMS 400000 -static struct ksym syms[MAX_SYMS]; -static int sym_cnt; +struct ksyms { + struct ksym *syms; + size_t sym_cap; + size_t sym_cnt; +}; + +static int ksyms__add_symbol(struct ksyms *ksyms, const char *name, + unsigned long addr) +{ + void *tmp; + + tmp = strdup(name); + if (!tmp) + return -ENOMEM; + ksyms->syms[ksyms->sym_cnt].addr = addr; + ksyms->syms[ksyms->sym_cnt].name = tmp; + + ksyms->sym_cnt++; + + return 0; +} + +void free_kallsyms(struct ksyms *ksyms) +{ + unsigned int i; + + if (!ksyms) + return; + + if (!ksyms->syms) { + free(ksyms); + return; + } + + for (i = 0; i < ksyms->sym_cnt; i++) + free(ksyms->syms[i].name); + free(ksyms->syms); + free(ksyms); +} static int ksym_cmp(const void *p1, const void *p2) { return ((struct ksym *)p1)->addr - ((struct ksym *)p2)->addr; } -int load_kallsyms_refresh(void) +struct ksyms *load_kallsyms_refresh(struct ksyms *ksyms) { FILE *f; char func[256], buf[256]; char symbol; void *addr; - int i = 0; + int ret; - sym_cnt = 0; + /* flush kallsyms, free the previously allocated dynamic memory */ + free_kallsyms(ksyms); f = fopen("/proc/kallsyms", "r"); if (!f) - return -ENOENT; + return NULL; + + ksyms = calloc(1, sizeof(struct ksyms)); + if (!ksyms) + return NULL; while (fgets(buf, sizeof(buf), f)) { if (sscanf(buf, "%p %c %s", &addr, &symbol, func) != 3) break; if (!addr) continue; - if (i >= MAX_SYMS) - return -EFBIG; - syms[i].addr = (long) addr; - syms[i].name = strdup(func); - i++; + ret = libbpf_ensure_mem((void **) &ksyms->syms, &ksyms->sym_cap, + sizeof(struct ksym), ksyms->sym_cnt + 1); + if (ret) + goto error; + ret = ksyms__add_symbol(ksyms, func, (unsigned long)addr); + if (ret) + goto error; } fclose(f); - sym_cnt = i; - qsort(syms, sym_cnt, sizeof(struct ksym), ksym_cmp); - return 0; + qsort(ksyms->syms, ksyms->sym_cnt, sizeof(struct ksym), ksym_cmp); + return ksyms; + +error: + free_kallsyms(ksyms); + return NULL; } -int load_kallsyms(void) +struct ksyms *load_kallsyms(void) { - /* - * This is called/used from multiplace places, - * load symbols just once. - */ - if (sym_cnt) - return 0; - return load_kallsyms_refresh(); + return load_kallsyms_refresh(NULL); } -struct ksym *ksym_search(long key) +struct ksym *ksym_search(struct ksyms *ksyms, long key) { - int start = 0, end = sym_cnt; + int start = 0, end = ksyms->sym_cnt; int result; + if (!ksyms) + return NULL; + /* kallsyms not loaded. return NULL */ - if (sym_cnt <= 0) + if (ksyms->sym_cnt <= 0) return NULL; while (start < end) { size_t mid = start + (end - start) / 2; - result = key - syms[mid].addr; + result = key - ksyms->syms[mid].addr; if (result < 0) end = mid; else if (result > 0) start = mid + 1; else - return &syms[mid]; + return &ksyms->syms[mid]; } - if (start >= 1 && syms[start - 1].addr < key && - key < syms[start].addr) + if (start >= 1 && ksyms->syms[start - 1].addr < key && + key < ksyms->syms[start].addr) /* valid ksym */ - return &syms[start - 1]; + return &ksyms->syms[start - 1]; /* out of range. return _stext */ - return &syms[0]; + return &ksyms->syms[0]; } -long ksym_get_addr(const char *name) +long ksym_get_addr(struct ksyms *ksyms, const char *name) { int i; - for (i = 0; i < sym_cnt; i++) { - if (strcmp(syms[i].name, name) == 0) - return syms[i].addr; + for (i = 0; i < ksyms->sym_cnt; i++) { + if (strcmp(ksyms->syms[i].name, name) == 0) + return ksyms->syms[i].addr; } return 0; diff --git a/tools/testing/selftests/bpf/trace_helpers.h b/tools/testing/selftests/bpf/trace_helpers.h index 876f3e711df6..6be64f44dd76 100644 --- a/tools/testing/selftests/bpf/trace_helpers.h +++ b/tools/testing/selftests/bpf/trace_helpers.h @@ -11,12 +11,14 @@ struct ksym { long addr; char *name; }; +struct ksyms; -int load_kallsyms(void); -int load_kallsyms_refresh(void); +struct ksyms *load_kallsyms(void); +struct ksyms *load_kallsyms_refresh(struct ksyms *ksyms); +void free_kallsyms(struct ksyms *ksyms); -struct ksym *ksym_search(long key); -long ksym_get_addr(const char *name); +struct ksym *ksym_search(struct ksyms *ksyms, long key); +long ksym_get_addr(struct ksyms *ksyms, const char *name); /* open kallsyms and find addresses on the fly, faster than load + search. */ int kallsyms_find(const char *sym, unsigned long long *addr); -- 2.41.0

2 years, 4 months

[GIT PULL] scftorture changes for v6.4

by Paul E. McKenney

Hello, Linus, Once the merge window opens, please pull these scftorture changes: git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git tags/scftorture.2023.08.15a # HEAD: 3f68f9c822ebe208f961ab0402e49a10465278ca: scftorture: Add CONFIG_PREEMPT_DYNAMIC=n to NOPREEMPT scenario (2023-07-14 15:02:57 -0700) ---------------------------------------------------------------- smp_call_function torture-test updates for v6.6 This pull request prevents some memory-exhaustion false-postitive failures in scftorture testing. ---------------------------------------------------------------- Paul E. McKenney (4): torture: Scale scftorture memory based on number of CPUs scftorture: Forgive memory-allocation failure if KASAN scftorture: Pause testing after memory-allocation failure scftorture: Add CONFIG_PREEMPT_DYNAMIC=n to NOPREEMPT scenario kernel/scftorture.c | 12 +++++++++--- tools/testing/selftests/rcutorture/bin/torture.sh | 4 +++- tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-)

2 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
32
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror August 2023