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

[PATCH bpf-next v2 0/2] bpf: Fix a umin > umax reg bound error

by Xu Kuohai

From: Xu Kuohai <xukuohai(a)huawei.com> This patchset fixes a umin > umax reg bound error and adds cases for it. v2: 1. add bound check to avoid min > max 2. update 32-bit reg min/max when 64-bit reg value is a constant 3. add Fixes tag v1: https://lore.kernel.org/bpf/20230307220449.2933650-1-xukuohai@huaweicloud.c… Xu Kuohai (2): bpf: Fix a umin > umax reg bound error selftests/bpf: check bounds not in the 32-bit range kernel/bpf/verifier.c | 143 ++++++++++++------ tools/testing/selftests/bpf/verifier/bounds.c | 121 +++++++++++++++ 2 files changed, 214 insertions(+), 50 deletions(-) -- 2.30.2

2 years, 5 months

2
6
0 0

[PATCH v2 0/5] Add Intel VT-d nested translation

by Yi Liu

This is to add Intel VT-d nested translation based on IOMMUFD nesting infrastructure. As the iommufd nesting infrastructure series[1], iommu core supports new ops to report iommu hardware information, allocate domains with user data and sync stage-1 IOTLB. The data required in the three paths are vendor-specific, so 1) IOMMU_HW_INFO_TYPE_INTEL_VTD and struct iommu_device_info_vtd are defined to report iommu hardware information for Intel VT-d . 2) IOMMU_HWPT_DATA_VTD_S1 is defined for the Intel VT-d stage-1 page table, it will be used in the stage-1 domain allocation and IOTLB syncing path. struct iommu_hwpt_intel_vtd is defined to pass user_data for the Intel VT-d stage-1 domain allocation. struct iommu_hwpt_invalidate_intel_vtd is defined to pass the data for the Intel VT-d stage-1 IOTLB invalidation. With above IOMMUFD extensions, the intel iommu driver implements the three callbacks to support nested translation. Complete code can be found in [2], QEMU could can be found in [3]. base-commit: f01f1c95684dd18c15dd0e51b4fd6e796a0a2c0e [1] https://lore.kernel.org/linux-iommu/20230309080910.607396-1-yi.l.liu@intel.… [2] https://github.com/yiliu1765/iommufd/tree/iommufd_nesting [3] https://github.com/yiliu1765/qemu/tree/wip/iommufd_rfcv3%2Bnesting Change log: v2: - The iommufd infrastructure is split to be separate series. v1: https://lore.kernel.org/linux-iommu/20230209043153.14964-1-yi.l.liu@intel.c… Regards, Yi Liu Lu Baolu (4): iommu/vt-d: Implement hw_info for iommu capability query iommu/vt-d: Extend dmar_domain to support nested domain iommu/vt-d: Add helper to setup pasid nested translation iommu/vt-d: Add nested domain support Yi Liu (1): iommufd: Add nesting related data structures for Intel VT-d drivers/iommu/intel/Makefile | 2 +- drivers/iommu/intel/iommu.c | 57 ++++++++--- drivers/iommu/intel/iommu.h | 51 ++++++++-- drivers/iommu/intel/nested.c | 143 +++++++++++++++++++++++++++ drivers/iommu/intel/pasid.c | 142 ++++++++++++++++++++++++++ drivers/iommu/intel/pasid.h | 2 + drivers/iommu/iommufd/hw_pagetable.c | 7 +- drivers/iommu/iommufd/main.c | 5 + include/uapi/linux/iommufd.h | 136 +++++++++++++++++++++++++ 9 files changed, 522 insertions(+), 23 deletions(-) create mode 100644 drivers/iommu/intel/nested.c -- 2.34.1

2 years, 5 months

5
12
0 0

[PATCH] selftests: sigaltstack: fix -Wuninitialized

by Nick Desaulniers

Building sigaltstack with clang via: $ ARCH=x86 make LLVM=1 -C tools/testing/selftests/sigaltstack/ produces the following warning: warning: variable 'sp' is uninitialized when used here [-Wuninitialized] if (sp < (unsigned long)sstack || ^~ Clang expects these to be declared at global scope; we've fixed this in the kernel proper by using the macro `current_stack_pointer`. This is defined in different headers for different target architectures, so just create a new header that defines the arch-specific register names for the stack pointer register, and define it for more targets (at least the ones that support current_stack_pointer/ARCH_HAS_CURRENT_STACK_POINTER). Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> Link: https://lore.kernel.org/lkml/CA+G9fYsi3OOu7yCsMutpzKDnBMAzJBCPimBp86LhGBa0e… Signed-off-by: Nick Desaulniers <ndesaulniers(a)google.com> --- Cc: Naresh Kamboju <naresh.kamboju(a)linaro.org> Cc: KERNEL SELFTEST FRAMEWORK <linux-kselftest(a)vger.kernel.org> Cc: linux-api(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: lkft-triage(a)lists.linaro.org Cc: Shuah Khan <shuah(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: "Chang S. Bae" <chang.seok.bae(a)intel.com> Cc: Len Brown <len.brown(a)intel.com> Cc: Borislav Petkov <bp(a)suse.de> Cc: Stas Sergeev <stsp(a)list.ru> Cc: Arnd Bergmann <arnd(a)arndb.de> Cc: Anders Roxell <anders.roxell(a)linaro.org> Cc: Andy Lutomirski <luto(a)kernel.org> Cc: Kees Cook <keescook(a)chromium.org> Cc: Nathan Chancellor <nathan(a)kernel.org> Cc: llvm(a)lists.linux.dev --- .../sigaltstack/current_stack_pointer.h | 23 +++++++++++++++++++ tools/testing/selftests/sigaltstack/sas.c | 7 +----- 2 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 tools/testing/selftests/sigaltstack/current_stack_pointer.h diff --git a/tools/testing/selftests/sigaltstack/current_stack_pointer.h b/tools/testing/selftests/sigaltstack/current_stack_pointer.h new file mode 100644 index 000000000000..ea9bdf3a90b1 --- /dev/null +++ b/tools/testing/selftests/sigaltstack/current_stack_pointer.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#if __alpha__ +register unsigned long sp asm("$30"); +#elif __arm__ || __aarch64__ || __csky__ || __m68k__ || __mips__ || __riscv +register unsigned long sp asm("sp"); +#elif __i386__ +register unsigned long sp asm("esp"); +#elif __loongarch64 +register unsigned long sp asm("$sp"); +#elif __ppc__ +register unsigned long sp asm("r1"); +#elif __s390x__ +register unsigned long sp asm("%15"); +#elif __sh__ +register unsigned long sp asm("r15"); +#elif __x86_64__ +register unsigned long sp asm("rsp"); +#elif __XTENSA__ +register unsigned long sp asm("a1"); +#else +#error "implement current_stack_pointer equivalent" +#endif diff --git a/tools/testing/selftests/sigaltstack/sas.c b/tools/testing/selftests/sigaltstack/sas.c index c53b070755b6..98d37cb744fb 100644 --- a/tools/testing/selftests/sigaltstack/sas.c +++ b/tools/testing/selftests/sigaltstack/sas.c @@ -20,6 +20,7 @@ #include <sys/auxv.h> #include "../kselftest.h" +#include "current_stack_pointer.h" #ifndef SS_AUTODISARM #define SS_AUTODISARM (1U << 31) @@ -46,12 +47,6 @@ void my_usr1(int sig, siginfo_t *si, void *u) stack_t stk; struct stk_data *p; -#if __s390x__ - register unsigned long sp asm("%15"); -#else - register unsigned long sp asm("sp"); -#endif - if (sp < (unsigned long)sstack || sp >= (unsigned long)sstack + stack_size) { ksft_exit_fail_msg("SP is not on sigaltstack\n"); -- 2.40.0.rc0.216.gc4246ad0f0-goog

2 years, 5 months

4
4
0 0

[PATCH rcu 0/7] RCU-related lockdep changes for v6.4

by Boqun Feng

Hi, This series enables deadlock detection for srcu_read_lock() vs synchronize_srcu(). Again, my first time helping prepare PR, so please take a careful look and yell at me if there is something wrong. Thanks a lot! You will also be able to find the series at: https://github/fbq/linux rcu/lockdep.2023.03.12a top commit is: 24390de55773 List of changes: Boqun Feng (4): locking/lockdep: Introduce lock_sync() rcu: Annotate SRCU's update-side lockdep dependencies locking: Reduce the number of locks in ww_mutex stress tests locking/lockdep: Improve the deadlock scenario print for sync and read lock Paul E. McKenney (3): rcutorture: Add SRCU deadlock scenarios rcutorture: Add RCU Tasks Trace and SRCU deadlock scenarios rcutorture: Add srcu_lockdep.sh include/linux/lockdep.h | 8 +- include/linux/srcu.h | 34 +++- kernel/locking/lockdep.c | 64 +++++- kernel/locking/test-ww_mutex.c | 2 +- kernel/rcu/rcutorture.c | 185 ++++++++++++++++++ kernel/rcu/srcutiny.c | 2 + kernel/rcu/srcutree.c | 2 + .../selftests/rcutorture/bin/srcu_lockdep.sh | 73 +++++++ 8 files changed, 359 insertions(+), 11 deletions(-) create mode 100755 tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh -- 2.39.2

2 years, 5 months

4
19
0 0

selftests: arm64: list of test failures

by Naresh Kamboju

selftests: arm64 below list of test cases fails on Linux next and Linux mainline builds with clang-16 and gcc-12 kernel booted on recently configured tuxrun qemu-arm64 (v7.2) enabled with MTE=on. Am I missing anything on test configs / environment ? List of selftests: arm64 test failures, - not ok 38 selftests: arm64: check_buffer_fill # exit=1 - not ok 39 selftests: arm64: check_child_memory # exit=1 - not ok 41 selftests: arm64: check_ksm_options # exit=1 - not ok 42 selftests: arm64: check_mmap_options # exit=1 - not ok 44 selftests: arm64: check_tags_inclusion # exit=1 Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> Test log: -------- [ 0.000000] Linux version 6.3.0-rc3-next-20230320 (tuxmake@tuxmake) (Debian clang version 16.0.0 (++20230314094206+fce3e75e01ba-1~exp1~20230314094258.55), Debian LLD 16.0.0) #1 SMP PREEMPT @1679285968 .. [ 0.000000] CPU features: detected: Memory Tagging Extension .. # selftests: arm64: check_buffer_fill # 1..20 # not ok 1 Check buffer correctness by byte with sync err mode and mmap memory # not ok 2 Check buffer correctness by byte with async err mode and mmap memory # not ok 3 Check buffer correctness by byte with sync err mode and mmap/mprotect memory # not ok 4 Check buffer correctness by byte with async err mode and mmap/mprotect memory # not ok 5 Check buffer write underflow by byte with sync mode and mmap memory # not ok 6 Check buffer write underflow by byte with async mode and mmap memory # ok 7 Check buffer write underflow by byte with tag check fault ignore and mmap memory # ok 8 Check buffer write underflow by byte with sync mode and mmap memory # ok 9 Check buffer write underflow by byte with async mode and mmap memory # ok 10 Check buffer write underflow by byte with tag check fault ignore and mmap memory # not ok 11 Check buffer write overflow by byte with sync mode and mmap memory # not ok 12 Check buffer write overflow by byte with async mode and mmap memory # ok 13 Check buffer write overflow by byte with tag fault ignore mode and mmap memory # not ok 14 Check buffer write correctness by block with sync mode and mmap memory # not ok 15 Check buffer write correctness by block with async mode and mmap memory # ok 16 Check buffer write correctness by block with tag fault ignore and mmap memory # ok 17 Check initial tags with private mapping, sync error mode and mmap memory # ok 18 Check initial tags with private mapping, sync error mode and mmap/mprotect memory # ok 19 Check initial tags with shared mapping, sync error mode and mmap memory # ok 20 Check initial tags with shared mapping, sync error mode and mmap/mprotect memory # # Totals: pass:10 fail:10 xfail:0 xpass:0 skip:0 error:0 not ok 38 selftests: arm64: check_buffer_fill # exit=1 # selftests: arm64: check_child_memory # 1..12 # not ok 1 Check child anonymous memory with private mapping, precise mode and mmap memory # not ok 2 Check child anonymous memory with shared mapping, precise mode and mmap memory # not ok 3 Check child anonymous memory with private mapping, imprecise mode and mmap memory # not ok 4 Check child anonymous memory with shared mapping, imprecise mode and mmap memory # not ok 5 Check child anonymous memory with private mapping, precise mode and mmap/mprotect memory # not ok 6 Check child anonymous memory with shared mapping, precise mode and mmap/mprotect memory # not ok 7 Check child file memory with private mapping, precise mode and mmap memory # not ok 8 Check child file memory with shared mapping, precise mode and mmap memory # not ok 9 Check child file memory with private mapping, imprecise mode and mmap memory # not ok 10 Check child file memory with shared mapping, imprecise mode and mmap memory # not ok 11 Check child file memory with private mapping, precise mode and mmap/mprotect memory # not ok 12 Check child file memory with shared mapping, precise mode and mmap/mprotect memory # # Totals: pass:0 fail:12 xfail:0 xpass:0 skip:0 error:0 not ok 39 selftests: arm64: check_child_memory # exit=1 # selftests: arm64: check_ksm_options # 1..4 # # Invalid MTE synchronous exception caught! not ok 41 selftests: arm64: check_ksm_options # exit=1 # selftests: arm64: check_mmap_options # 1..22 # ok 1 Check anonymous memory with private mapping, sync error mode, mmap memory and tag check off # ok 2 Check file memory with private mapping, sync error mode, mmap/mprotect memory and tag check off # ok 3 Check anonymous memory with private mapping, no error mode, mmap memory and tag check off # ok 4 Check file memory with private mapping, no error mode, mmap/mprotect memory and tag check off # not ok 5 Check anonymous memory with private mapping, sync error mode, mmap memory and tag check on # not ok 6 Check anonymous memory with private mapping, sync error mode, mmap/mprotect memory and tag check on # not ok 7 Check anonymous memory with shared mapping, sync error mode, mmap memory and tag check on # not ok 8 Check anonymous memory with shared mapping, sync error mode, mmap/mprotect memory and tag check on # not ok 9 Check anonymous memory with private mapping, async error mode, mmap memory and tag check on # not ok 10 Check anonymous memory with private mapping, async error mode, mmap/mprotect memory and tag check on # not ok 11 Check anonymous memory with shared mapping, async error mode, mmap memory and tag check on # not ok 12 Check anonymous memory with shared mapping, async error mode, mmap/mprotect memory and tag check on # not ok 13 Check file memory with private mapping, sync error mode, mmap memory and tag check on # not ok 14 Check file memory with private mapping, sync error mode, mmap/mprotect memory and tag check on # not ok 15 Check file memory with shared mapping, sync error mode, mmap memory and tag check on # not ok 16 Check file memory with shared mapping, sync error mode, mmap/mprotect memory and tag check on # not ok 17 Check file memory with private mapping, async error mode, mmap memory and tag check on # not ok 18 Check file memory with private mapping, async error mode, mmap/mprotect memory and tag check on # not ok 19 Check file memory with shared mapping, async error mode, mmap memory and tag check on # not ok 20 Check file memory with shared mapping, async error mode, mmap/mprotect memory and tag check on # not ok 21 Check clear PROT_MTE flags with private mapping, sync error mode and mmap memory # not ok 22 Check clear PROT_MTE flags with private mapping and sync error mode and mmap/mprotect memory # # Totals: pass:4 fail:18 xfail:0 xpass:0 skip:0 error:0 not ok 42 selftests: arm64: check_mmap_options # exit=1 # selftests: arm64: check_tags_inclusion # 1..4 # # Unexpected fault recorded for 0xb00ffff97724000-0xb00ffff97724050 in mode 1 # not ok 1 Check an included tag value with sync mode # # Unexpected fault recorded for 0xc00ffff97724000-0xc00ffff97724050 in mode 1 # not ok 2 Check different included tags value with sync mode # ok 3 Check none included tags value with sync mode # # Unexpected fault recorded for 0xc00ffff97724000-0xc00ffff97724050 in mode 1 # not ok 4 Check all included tags value with sync mode # # Totals: pass:1 fail:3 xfail:0 xpass:0 skip:0 error:0 not ok 44 selftests: arm64: check_tags_inclusion # exit=1 steps to reproduce: ------- # To install tuxrun on your system globally: # sudo pip3 install -U tuxrun==0.38.1 # # See https://tuxrun.org/ for complete documentation. tuxrun \ --runtime podman \ --device qemu-arm64 \ --boot-args rw \ --kernel https://storage.tuxsuite.com/public/linaro/lkft/builds/2NGM7Z86D9eB4UfDbhPF… \ --modules https://storage.tuxsuite.com/public/linaro/lkft/builds/2NGM7Z86D9eB4UfDbhPF… \ --rootfs https://storage.tuxboot.com/debian/bookworm/arm64/rootfs.ext4.xz \ --parameters SKIPFILE=skipfile-lkft.yaml \ --parameters KSELFTEST=https://storage.tuxsuite.com/public/linaro/lkft/builds/2NGM7Z86D9… \ --image docker.io/lavasoftware/lava-dispatcher:2023.01.0020.gc1598238f \ --tests kselftest-arm64 \ --timeouts boot=30 kselftest-arm64=60 Boot command: ...... /usr/bin/qemu-system-aarch64 \ -cpu max,pauth-impdef=on \ -machine virt,gic-version=3,mte=on \ -nographic \ -nic none \ -m 4G \ -monitor none \ -no-reboot \ -smp 2 \ -kernel Image \ -append \"console=ttyAMA0,115200 rootwait root=/dev/vda debug verbose console_msg_format=syslog rw earlycon\" \ -drive file=/debian_bookworm_arm64_rootfs.ext4,if=none,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 Test log links, Linux next: https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20230320/te… https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20230320/te… https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20230320/te… https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20230320/te… mainline: https://qa-reports.linaro.org/lkft/linux-mainline-master/build/v6.3-rc3/tes… https://qa-reports.linaro.org/lkft/linux-mainline-master/build/v6.3-rc3/tes… -- Linaro LKFT https://lkft.linaro.org

2 years, 5 months

2
1
0 0

[PATCH 0/3] selftests: Fix virtual address range for arm64

by Chaitanya S Prakash

When the virtual address range selftest is run on arm64 and x86 platforms, it is observed that both the low and high VA range iterations are skipped when the MAP_CHUNK_SIZE is set to 16GB. The MAP_CHUNK_SIZE is changed to 1GB to resolve this issue, following which support for arm64 platform is added by changing the NR_CHUNKS_HIGH for aarch64 to accommodate up to 4PB of virtual address space allocation requests. Dynamic memory allocation of array holding addresses is introduced to prevent overflow of the stack. Finally, the overcommit_policy is set as OVERCOMMIT_ALWAYS to prevent the kernel from denying a memory allocation request based on a platform's physical memory availability. This series has been tested on 6.3.0-rc1 mainline kernel, both on arm64 and x86 platforms. Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Shuah Khan <shuah(a)kernel.org> Cc: linux-mm(a)kvack.org Cc: linux-kselftest(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Chaitanya S Prakash (3): selftests: Change MAP_CHUNK_SIZE selftests: Change NR_CHUNKS_HIGH for aarch64 selftests: Set overcommit_policy as OVERCOMMIT_ALWAYS tools/testing/selftests/mm/run_vmtests.sh | 8 +++++++ .../selftests/mm/virtual_address_range.c | 24 +++++++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) -- 2.30.2

2 years, 5 months

2
5
0 0

[PATCH AUTOSEL 5.4 05/12] selftests/bpf: check that modifier resolves after pointer

by Sasha Levin

From: Lorenz Bauer <lorenz.bauer(a)isovalent.com> [ Upstream commit dfdd608c3b365f0fd49d7e13911ebcde06b9865b ] Add a regression test that ensures that a VAR pointing at a modifier which follows a PTR (or STRUCT or ARRAY) is resolved correctly by the datasec validator. Signed-off-by: Lorenz Bauer <lmb(a)isovalent.com> Link: https://lore.kernel.org/r/20230306112138.155352-3-lmb@isovalent.com Signed-off-by: Martin KaFai Lau <martin.lau(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/test_btf.c | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tools/testing/selftests/bpf/test_btf.c b/tools/testing/selftests/bpf/test_btf.c index 996eca57bc977..f641eb292a885 100644 --- a/tools/testing/selftests/bpf/test_btf.c +++ b/tools/testing/selftests/bpf/test_btf.c @@ -920,6 +920,34 @@ static struct btf_raw_test raw_tests[] = { .btf_load_err = true, .err_str = "Invalid elem", }, +{ + .descr = "var after datasec, ptr followed by modifier", + .raw_types = { + /* .bss section */ /* [1] */ + BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 2), + sizeof(void*)+4), + BTF_VAR_SECINFO_ENC(4, 0, sizeof(void*)), + BTF_VAR_SECINFO_ENC(6, sizeof(void*), 4), + /* int */ /* [2] */ + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), + /* int* */ /* [3] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 3, 0), /* [4] */ + /* const int */ /* [5] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 5, 0), /* [6] */ + BTF_END_RAW, + }, + .str_sec = "\0a\0b\0c\0", + .str_sec_size = sizeof("\0a\0b\0c\0"), + .map_type = BPF_MAP_TYPE_ARRAY, + .map_name = ".bss", + .key_size = sizeof(int), + .value_size = sizeof(void*)+4, + .key_type_id = 0, + .value_type_id = 1, + .max_entries = 1, +}, /* Test member exceeds the size of struct. * * struct A { -- 2.39.2

2 years, 5 months

1
0
0 0

[PATCH AUTOSEL 5.10 06/15] selftests/bpf: check that modifier resolves after pointer

by Sasha Levin

From: Lorenz Bauer <lorenz.bauer(a)isovalent.com> [ Upstream commit dfdd608c3b365f0fd49d7e13911ebcde06b9865b ] Add a regression test that ensures that a VAR pointing at a modifier which follows a PTR (or STRUCT or ARRAY) is resolved correctly by the datasec validator. Signed-off-by: Lorenz Bauer <lmb(a)isovalent.com> Link: https://lore.kernel.org/r/20230306112138.155352-3-lmb@isovalent.com Signed-off-by: Martin KaFai Lau <martin.lau(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/prog_tests/btf.c | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c index 48b01150e703f..28d22265b8253 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf.c +++ b/tools/testing/selftests/bpf/prog_tests/btf.c @@ -882,6 +882,34 @@ static struct btf_raw_test raw_tests[] = { .btf_load_err = true, .err_str = "Invalid elem", }, +{ + .descr = "var after datasec, ptr followed by modifier", + .raw_types = { + /* .bss section */ /* [1] */ + BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 2), + sizeof(void*)+4), + BTF_VAR_SECINFO_ENC(4, 0, sizeof(void*)), + BTF_VAR_SECINFO_ENC(6, sizeof(void*), 4), + /* int */ /* [2] */ + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), + /* int* */ /* [3] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 3, 0), /* [4] */ + /* const int */ /* [5] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 5, 0), /* [6] */ + BTF_END_RAW, + }, + .str_sec = "\0a\0b\0c\0", + .str_sec_size = sizeof("\0a\0b\0c\0"), + .map_type = BPF_MAP_TYPE_ARRAY, + .map_name = ".bss", + .key_size = sizeof(int), + .value_size = sizeof(void*)+4, + .key_type_id = 0, + .value_type_id = 1, + .max_entries = 1, +}, /* Test member exceeds the size of struct. * * struct A { -- 2.39.2

2 years, 5 months

1
0
0 0

[PATCH AUTOSEL 5.15 07/17] selftests/bpf: check that modifier resolves after pointer

by Sasha Levin

From: Lorenz Bauer <lorenz.bauer(a)isovalent.com> [ Upstream commit dfdd608c3b365f0fd49d7e13911ebcde06b9865b ] Add a regression test that ensures that a VAR pointing at a modifier which follows a PTR (or STRUCT or ARRAY) is resolved correctly by the datasec validator. Signed-off-by: Lorenz Bauer <lmb(a)isovalent.com> Link: https://lore.kernel.org/r/20230306112138.155352-3-lmb@isovalent.com Signed-off-by: Martin KaFai Lau <martin.lau(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/prog_tests/btf.c | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c index 50afa75bd45b1..2a04dbec510de 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf.c +++ b/tools/testing/selftests/bpf/prog_tests/btf.c @@ -882,6 +882,34 @@ static struct btf_raw_test raw_tests[] = { .btf_load_err = true, .err_str = "Invalid elem", }, +{ + .descr = "var after datasec, ptr followed by modifier", + .raw_types = { + /* .bss section */ /* [1] */ + BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 2), + sizeof(void*)+4), + BTF_VAR_SECINFO_ENC(4, 0, sizeof(void*)), + BTF_VAR_SECINFO_ENC(6, sizeof(void*), 4), + /* int */ /* [2] */ + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), + /* int* */ /* [3] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 3, 0), /* [4] */ + /* const int */ /* [5] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 5, 0), /* [6] */ + BTF_END_RAW, + }, + .str_sec = "\0a\0b\0c\0", + .str_sec_size = sizeof("\0a\0b\0c\0"), + .map_type = BPF_MAP_TYPE_ARRAY, + .map_name = ".bss", + .key_size = sizeof(int), + .value_size = sizeof(void*)+4, + .key_type_id = 0, + .value_type_id = 1, + .max_entries = 1, +}, /* Test member exceeds the size of struct. * * struct A { -- 2.39.2

2 years, 5 months

1
0
0 0

[PATCH AUTOSEL 6.1 08/29] selftests/bpf: check that modifier resolves after pointer

by Sasha Levin

From: Lorenz Bauer <lorenz.bauer(a)isovalent.com> [ Upstream commit dfdd608c3b365f0fd49d7e13911ebcde06b9865b ] Add a regression test that ensures that a VAR pointing at a modifier which follows a PTR (or STRUCT or ARRAY) is resolved correctly by the datasec validator. Signed-off-by: Lorenz Bauer <lmb(a)isovalent.com> Link: https://lore.kernel.org/r/20230306112138.155352-3-lmb@isovalent.com Signed-off-by: Martin KaFai Lau <martin.lau(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/prog_tests/btf.c | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c index 24dd6214394e0..d711f4bea98ea 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf.c +++ b/tools/testing/selftests/bpf/prog_tests/btf.c @@ -879,6 +879,34 @@ static struct btf_raw_test raw_tests[] = { .btf_load_err = true, .err_str = "Invalid elem", }, +{ + .descr = "var after datasec, ptr followed by modifier", + .raw_types = { + /* .bss section */ /* [1] */ + BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 2), + sizeof(void*)+4), + BTF_VAR_SECINFO_ENC(4, 0, sizeof(void*)), + BTF_VAR_SECINFO_ENC(6, sizeof(void*), 4), + /* int */ /* [2] */ + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), + /* int* */ /* [3] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 3, 0), /* [4] */ + /* const int */ /* [5] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 5, 0), /* [6] */ + BTF_END_RAW, + }, + .str_sec = "\0a\0b\0c\0", + .str_sec_size = sizeof("\0a\0b\0c\0"), + .map_type = BPF_MAP_TYPE_ARRAY, + .map_name = ".bss", + .key_size = sizeof(int), + .value_size = sizeof(void*)+4, + .key_type_id = 0, + .value_type_id = 1, + .max_entries = 1, +}, /* Test member exceeds the size of struct. * * struct A { -- 2.39.2

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror