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

[PATCH 5/5] bpf: sockmap, sockhash: test looking up fds

by Lorenz Bauer

Make sure that looking up an element from the map succeeds, and that the fd is valid by using it an fcntl call. Signed-off-by: Lorenz Bauer <lmb(a)cloudflare.com> --- .../selftests/bpf/prog_tests/sockmap_listen.c | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c index 52aa468bdccd..929e1e77ecc6 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c @@ -453,7 +453,7 @@ static void test_lookup_after_delete(int family, int sotype, int mapfd) xclose(s); } -static void test_lookup_32_bit_value(int family, int sotype, int mapfd) +static void test_lookup_fd(int family, int sotype, int mapfd) { u32 key, value32; int err, s; @@ -466,7 +466,7 @@ static void test_lookup_32_bit_value(int family, int sotype, int mapfd) sizeof(value32), 1, 0); if (mapfd < 0) { FAIL_ERRNO("map_create"); - goto close; + goto close_sock; } key = 0; @@ -475,11 +475,25 @@ static void test_lookup_32_bit_value(int family, int sotype, int mapfd) errno = 0; err = bpf_map_lookup_elem(mapfd, &key, &value32); - if (!err || errno != ENOSPC) - FAIL_ERRNO("map_lookup: expected ENOSPC"); + if (err) { + FAIL_ERRNO("map_lookup"); + goto close_map; + } + if ((int)value32 == s) { + FAIL("return value is identical"); + goto close; + } + + err = fcntl(value32, F_GETFD); + if (err == -1) + FAIL_ERRNO("fcntl"); + +close: + xclose(value32); +close_map: xclose(mapfd); -close: +close_sock: xclose(s); } @@ -1456,7 +1470,7 @@ static void test_ops(struct test_sockmap_listen *skel, struct bpf_map *map, /* lookup */ TEST(test_lookup_after_insert), TEST(test_lookup_after_delete), - TEST(test_lookup_32_bit_value), + TEST(test_lookup_fd), /* update */ TEST(test_update_existing), /* races with insert/delete */ -- 2.20.1

5 years, 1 month

2
2
0 0

next-20200311 kselftest results

by ci_notify＠linaro.org

Summary ------------------------------------------------------------------------ kernel: 5.6.0-rc5 git repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git git branch: master git commit: d44a64766795839eaa0f79a9e5365e8a794a1642 git describe: next-20200311 Test details: https://qa-reports.linaro.org/lkft/linux-next-oe/build/next-20200311 Regressions (compared to build next-20200310) ------------------------------------------------------------------------ No regressions Fixes (compared to build next-20200310) ------------------------------------------------------------------------ qemu_x86_64: kselftest: * net_traceroute.sh In total: ------------------------------------------------------------------------ Ran 834 total tests in the following environments and test suites. pass 256 fail 467 xfail 0 skip 111 Environments -------------- - dragonboard-410c - arm64 - hi6220-hikey - arm64 - i386 - juno-r2 - arm64 - qemu_arm - qemu_i386 - qemu_x86_64 - x15 - arm - x86_64 Test Suites ----------- * kselftest * kselftest/drivers * kselftest/filesystems * kselftest/net * kselftest-vsyscall-mode-native * kselftest-vsyscall-mode-native/drivers * kselftest-vsyscall-mode-native/filesystems * kselftest-vsyscall-mode-native/net * kselftest-vsyscall-mode-native/networking * kselftest-vsyscall-mode-none * kselftest-vsyscall-mode-none/drivers * kselftest-vsyscall-mode-none/filesystems * kselftest-vsyscall-mode-none/net Failures ------------------------------------------------------------------------ x15: qemu_x86_64: * kselftest/bpf_get_cgroup_id_user * kselftest/bpf_test_bpftool.sh * kselftest/bpf_test_dev_cgroup * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_maps * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_progs-no_alu32 * kselftest/bpf_test_skb_cgroup_id.sh * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_socket_cookie * kselftest/bpf_test_sock_fields * kselftest/bpf_test_sockmap * kselftest/bpf_test_sysctl * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcpbpf_user * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tcpnotify_user * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_tunnel.sh * kselftest/bpf_test_xdping.sh * kselftest/bpf_test_xdp_meta.sh * kselftest/bpf_test_xdp_redirect.sh * kselftest/bpf_test_xdp_vlan_mode_generic.sh * kselftest/bpf_test_xdp_vlan_mode_native.sh * kselftest/cpufreq_main.sh * kselftest/firmware_fw_run_tests.sh * kselftest/ftrace_ftracetest * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_kvm_create_max_vcpus * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_smm_test * kselftest/kvm_state_test * kselftest/kvm_svm_vmcall_test * kselftest/kvm_sync_regs_test * kselftest/kvm_xss_msr_test * kselftest/lib_printf.sh * kselftest/lkdtm_ACCESS_NULL.sh * kselftest/lkdtm_ACCESS_USERSPACE.sh * kselftest/lkdtm_BUG.sh * kselftest/lkdtm_CFI_FORWARD_PROTO.sh * kselftest/lkdtm_CORRUPT_LIST_ADD.sh * kselftest/lkdtm_CORRUPT_LIST_DEL.sh * kselftest/lkdtm_CORRUPT_USER_DS.sh * kselftest/lkdtm_EXCEPTION.sh * kselftest/lkdtm_EXEC_DATA.sh * kselftest/lkdtm_EXEC_KMALLOC.sh * kselftest/lkdtm_EXEC_NULL.sh * kselftest/lkdtm_EXEC_RODATA.sh * kselftest/lkdtm_EXEC_STACK.sh * kselftest/lkdtm_EXEC_USERSPACE.sh * kselftest/lkdtm_EXEC_VMALLOC.sh * kselftest/lkdtm_READ_AFTER_FREE.sh * kselftest/lkdtm_READ_BUDDY_AFTER_FREE.sh * kselftest/lkdtm_REFCOUNT_ADD_NOT_ZERO_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_ADD_NOT_ZERO_SATURATED.sh * kselftest/lkdtm_REFCOUNT_ADD_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_ADD_SATURATED.sh * kselftest/lkdtm_REFCOUNT_ADD_ZERO.sh * kselftest/lkdtm_REFCOUNT_DEC_AND_TEST_NEGATIVE.sh * kselftest/lkdtm_REFCOUNT_DEC_AND_TEST_SATURATED.sh * kselftest/lkdtm_REFCOUNT_DEC_NEGATIVE.sh * kselftest/lkdtm_REFCOUNT_DEC_SATURATED.sh * kselftest/lkdtm_REFCOUNT_DEC_ZERO.sh * kselftest/lkdtm_REFCOUNT_INC_NOT_ZERO_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_INC_NOT_ZERO_SATURATED.sh * kselftest/lkdtm_REFCOUNT_INC_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_INC_SATURATED.sh * kselftest/lkdtm_REFCOUNT_INC_ZERO.sh * kselftest/lkdtm_REFCOUNT_SUB_AND_TEST_NEGATIVE.sh * kselftest/lkdtm_REFCOUNT_SUB_AND_TEST_SATURATED.sh * kselftest/lkdtm_SLAB_FREE_CROSS.sh * kselftest/lkdtm_SLAB_FREE_DOUBLE.sh * kselftest/lkdtm_SLAB_FREE_PAGE.sh * kselftest/lkdtm_STACK_GUARD_PAGE_LEADING.sh * kselftest/lkdtm_STACK_GUARD_PAGE_TRAILING.sh * kselftest/lkdtm_STACKLEAK_ERASING.sh * kselftest/lkdtm_UNALIGNED_LOAD_STORE_WRITE.sh * kselftest/lkdtm_UNSET_SMEP.sh * kselftest/lkdtm_USERCOPY_HEAP_SIZE_FROM.sh * kselftest/lkdtm_USERCOPY_HEAP_SIZE_TO.sh * kselftest/lkdtm_USERCOPY_HEAP_WHITELIST_FROM.sh * kselftest/lkdtm_USERCOPY_HEAP_WHITELIST_TO.sh * kselftest/lkdtm_USERCOPY_KERNEL_DS.sh * kselftest/lkdtm_USERCOPY_KERNEL.sh * kselftest/lkdtm_USERCOPY_STACK_BEYOND.sh * kselftest/lkdtm_USERCOPY_STACK_FRAME_FROM.sh * kselftest/lkdtm_USERCOPY_STACK_FRAME_TO.sh * kselftest/lkdtm_WARNING_MESSAGE.sh * kselftest/lkdtm_WARNING.sh * kselftest/lkdtm_WRITE_KERN.sh * kselftest/lkdtm_WRITE_RO_AFTER_INIT.sh * kselftest/lkdtm_WRITE_RO.sh * kselftest/mqueue_mq_perf_tests * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_tests.sh * kselftest/netfilter_nft_concat_range.sh * kselftest/net_ip_defrag.sh * kselftest/net_l2tp.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_run_netsocktests * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_udpgro_bench.sh * kselftest/net_udpgro.sh * kselftest/net_udpgso_bench.sh * kselftest/net_xfrm_policy.sh qemu_i386: hi6220-hikey: x86: * kselftest/bpf_get_cgroup_id_user * kselftest-vsyscall-mode-native/bpf_get_cgroup_id_user * kselftest-vsyscall-mode-none/bpf_get_cgroup_id_user * kselftest-vsyscall-mode-native/bpf_test_bpftool.sh * kselftest-vsyscall-mode-none/bpf_test_bpftool.sh * kselftest/bpf_test_bpftool.sh * kselftest-vsyscall-mode-native/bpf_test_dev_cgroup * kselftest/bpf_test_dev_cgroup * kselftest-vsyscall-mode-none/bpf_test_dev_cgroup * kselftest-vsyscall-mode-native/bpf_test_flow_dissector.sh * kselftest/bpf_test_flow_dissector.sh * kselftest-vsyscall-mode-none/bpf_test_flow_dissector.sh * kselftest-vsyscall-mode-none/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_ip_encap.sh * kselftest-vsyscall-mode-native/bpf_test_lwt_seg6local.sh * kselftest-vsyscall-mode-none/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest-vsyscall-mode-native/bpf_test_maps * kselftest-vsyscall-mode-none/bpf_test_maps * kselftest/bpf_test_maps * kselftest/bpf_test_netcnt * kselftest-vsyscall-mode-none/bpf_test_netcnt * kselftest-vsyscall-mode-native/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest-vsyscall-mode-none/bpf_test_progs * kselftest-vsyscall-mode-native/bpf_test_progs * kselftest-vsyscall-mode-none/bpf_test_progs-no_alu32 * kselftest/bpf_test_progs-no_alu32 * kselftest-vsyscall-mode-native/bpf_test_progs-no_alu32 * kselftest-vsyscall-mode-none/bpf_test_skb_cgroup_id.sh * kselftest/bpf_test_skb_cgroup_id.sh * kselftest-vsyscall-mode-native/bpf_test_skb_cgroup_id.sh * kselftest-vsyscall-mode-none/bpf_test_sock_addr.sh * kselftest/bpf_test_sock_addr.sh * kselftest-vsyscall-mode-native/bpf_test_sock_addr.sh * kselftest-vsyscall-mode-none/bpf_test_socket_cookie * kselftest-vsyscall-mode-native/bpf_test_socket_cookie * kselftest/bpf_test_socket_cookie * kselftest/bpf_test_sock_fields * kselftest-vsyscall-mode-none/bpf_test_sock_fields * kselftest-vsyscall-mode-native/bpf_test_sock_fields * kselftest-vsyscall-mode-native/bpf_test_sockmap * kselftest/bpf_test_sockmap * kselftest-vsyscall-mode-none/bpf_test_sockmap * kselftest/bpf_test_sysctl * kselftest-vsyscall-mode-native/bpf_test_sysctl * kselftest-vsyscall-mode-none/bpf_test_sysctl * kselftest-vsyscall-mode-native/bpf_test_tc_edt.sh * kselftest-vsyscall-mode-none/bpf_test_tc_edt.sh * kselftest/bpf_test_tc_edt.sh * kselftest-vsyscall-mode-native/bpf_test_tcpbpf_user * kselftest/bpf_test_tcpbpf_user * kselftest-vsyscall-mode-none/bpf_test_tcpbpf_user * kselftest-vsyscall-mode-native/bpf_test_tcp_check_syncookie.sh * kselftest-vsyscall-mode-none/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tcpnotify_user * kselftest-vsyscall-mode-none/bpf_test_tcpnotify_user * kselftest-vsyscall-mode-native/bpf_test_tcpnotify_user * kselftest/bpf_test_tc_tunnel.sh * kselftest-vsyscall-mode-none/bpf_test_tc_tunnel.sh * kselftest-vsyscall-mode-native/bpf_test_tc_tunnel.sh * kselftest-vsyscall-mode-none/bpf_test_tunnel.sh * kselftest/bpf_test_tunnel.sh * kselftest-vsyscall-mode-native/bpf_test_tunnel.sh * kselftest-vsyscall-mode-native/bpf_test_xdping.sh * kselftest/bpf_test_xdping.sh * kselftest-vsyscall-mode-none/bpf_test_xdping.sh * kselftest-vsyscall-mode-native/bpf_test_xdp_meta.sh * kselftest/bpf_test_xdp_meta.sh * kselftest-vsyscall-mode-none/bpf_test_xdp_meta.sh * kselftest/bpf_test_xdp_redirect.sh * kselftest-vsyscall-mode-native/bpf_test_xdp_redirect.sh * kselftest-vsyscall-mode-none/bpf_test_xdp_redirect.sh * kselftest-vsyscall-mode-native/bpf_test_xdp_vlan_mode_generic.sh * kselftest/bpf_test_xdp_vlan_mode_generic.sh * kselftest-vsyscall-mode-none/bpf_test_xdp_vlan_mode_generic.sh * kselftest-vsyscall-mode-native/bpf_test_xdp_vlan_mode_native.sh * kselftest-vsyscall-mode-none/bpf_test_xdp_vlan_mode_native.sh * kselftest/bpf_test_xdp_vlan_mode_native.sh * kselftest-vsyscall-mode-native/firmware_fw_run_tests.sh * kselftest-vsyscall-mode-none/firmware_fw_run_tests.sh * kselftest/firmware_fw_run_tests.sh * kselftest-vsyscall-mode-none/ftrace_ftracetest * kselftest/ftrace_ftracetest * kselftest-vsyscall-mode-native/ftrace_ftracetest * kselftest-vsyscall-mode-none/intel_pstate_run.sh * kselftest-vsyscall-mode-native/intel_pstate_run.sh * kselftest/intel_pstate_run.sh * kselftest-vsyscall-mode-none/kvm_clear_dirty_log_test * kselftest/kvm_clear_dirty_log_test * kselftest-vsyscall-mode-native/kvm_clear_dirty_log_test * kselftest-vsyscall-mode-none/kvm_cr4_cpuid_sync_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest-vsyscall-mode-native/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest-vsyscall-mode-none/kvm_dirty_log_test * kselftest-vsyscall-mode-native/kvm_dirty_log_test * kselftest-vsyscall-mode-none/kvm_evmcs_test * kselftest/kvm_evmcs_test * kselftest-vsyscall-mode-native/kvm_evmcs_test * kselftest-vsyscall-mode-native/kvm_hyperv_cpuid * kselftest/kvm_hyperv_cpuid * kselftest-vsyscall-mode-none/kvm_hyperv_cpuid * kselftest/kvm_kvm_create_max_vcpus * kselftest-vsyscall-mode-native/kvm_kvm_create_max_vcpus * kselftest-vsyscall-mode-none/kvm_kvm_create_max_vcpus * kselftest-vsyscall-mode-native/kvm_platform_info_test * kselftest-vsyscall-mode-none/kvm_platform_info_test * kselftest/kvm_platform_info_test * kselftest-vsyscall-mode-none/kvm_set_sregs_test * kselftest-vsyscall-mode-native/kvm_set_sregs_test * kselftest/kvm_set_sregs_test * kselftest/kvm_smm_test * kselftest-vsyscall-mode-native/kvm_smm_test * kselftest-vsyscall-mode-none/kvm_smm_test * kselftest-vsyscall-mode-native/kvm_state_test * kselftest/kvm_state_test * kselftest-vsyscall-mode-none/kvm_state_test * kselftest-vsyscall-mode-none/kvm_sync_regs_test * kselftest/kvm_sync_regs_test * kselftest-vsyscall-mode-native/kvm_sync_regs_test * kselftest-vsyscall-mode-none/kvm_vmx_close_while_nested_test * kselftest-vsyscall-mode-native/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_close_while_nested_test * kselftest-vsyscall-mode-native/kvm_vmx_dirty_log_test * kselftest-vsyscall-mode-none/kvm_vmx_dirty_log_test * kselftest/kvm_vmx_dirty_log_test * kselftest-vsyscall-mode-none/kvm_vmx_set_nested_state_test * kselftest-vsyscall-mode-native/kvm_vmx_set_nested_state_test * kselftest/kvm_vmx_set_nested_state_test * kselftest-vsyscall-mode-native/kvm_vmx_tsc_adjust_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest-vsyscall-mode-none/kvm_vmx_tsc_adjust_test * kselftest-vsyscall-mode-none/kvm_xss_msr_test * kselftest-vsyscall-mode-native/kvm_xss_msr_test * kselftest/kvm_xss_msr_test * kselftest/lib_printf.sh * kselftest-vsyscall-mode-none/lib_printf.sh * kselftest-vsyscall-mode-native/lib_printf.sh * kselftest-vsyscall-mode-none/lkdtm_ACCESS_NULL.sh * kselftest-vsyscall-mode-native/lkdtm_ACCESS_NULL.sh * kselftest/lkdtm_ACCESS_NULL.sh * kselftest-vsyscall-mode-native/lkdtm_ACCESS_USERSPACE.sh * kselftest-vsyscall-mode-none/lkdtm_ACCESS_USERSPACE.sh * kselftest/lkdtm_ACCESS_USERSPACE.sh * kselftest-vsyscall-mode-native/lkdtm_BUG.sh * kselftest-vsyscall-mode-none/lkdtm_BUG.sh * kselftest/lkdtm_BUG.sh * kselftest-vsyscall-mode-none/lkdtm_CFI_FORWARD_PROTO.sh * kselftest-vsyscall-mode-native/lkdtm_CFI_FORWARD_PROTO.sh * kselftest/lkdtm_CFI_FORWARD_PROTO.sh * kselftest/lkdtm_CORRUPT_LIST_ADD.sh * kselftest-vsyscall-mode-native/lkdtm_CORRUPT_LIST_ADD.sh * kselftest-vsyscall-mode-none/lkdtm_CORRUPT_LIST_ADD.sh * kselftest-vsyscall-mode-none/lkdtm_CORRUPT_LIST_DEL.sh * kselftest-vsyscall-mode-native/lkdtm_CORRUPT_LIST_DEL.sh * kselftest/lkdtm_CORRUPT_LIST_DEL.sh * kselftest/lkdtm_CORRUPT_USER_DS.sh * kselftest-vsyscall-mode-none/lkdtm_CORRUPT_USER_DS.sh * kselftest-vsyscall-mode-native/lkdtm_CORRUPT_USER_DS.sh * kselftest-vsyscall-mode-none/lkdtm_EXCEPTION.sh * kselftest-vsyscall-mode-native/lkdtm_EXCEPTION.sh * kselftest/lkdtm_EXCEPTION.sh * kselftest/lkdtm_EXEC_DATA.sh * kselftest-vsyscall-mode-none/lkdtm_EXEC_DATA.sh * kselftest-vsyscall-mode-native/lkdtm_EXEC_DATA.sh * kselftest-vsyscall-mode-native/lkdtm_EXEC_KMALLOC.sh * kselftest-vsyscall-mode-none/lkdtm_EXEC_KMALLOC.sh * kselftest/lkdtm_EXEC_KMALLOC.sh * kselftest/lkdtm_EXEC_NULL.sh * kselftest-vsyscall-mode-none/lkdtm_EXEC_NULL.sh * kselftest-vsyscall-mode-native/lkdtm_EXEC_NULL.sh * kselftest-vsyscall-mode-native/lkdtm_EXEC_RODATA.sh * kselftest-vsyscall-mode-none/lkdtm_EXEC_RODATA.sh * kselftest/lkdtm_EXEC_RODATA.sh * kselftest-vsyscall-mode-native/lkdtm_EXEC_STACK.sh * kselftest/lkdtm_EXEC_STACK.sh * kselftest-vsyscall-mode-none/lkdtm_EXEC_STACK.sh * kselftest-vsyscall-mode-native/lkdtm_EXEC_USERSPACE.sh * kselftest/lkdtm_EXEC_USERSPACE.sh * kselftest-vsyscall-mode-none/lkdtm_EXEC_USERSPACE.sh * kselftest-vsyscall-mode-none/lkdtm_EXEC_VMALLOC.sh * kselftest-vsyscall-mode-native/lkdtm_EXEC_VMALLOC.sh * kselftest/lkdtm_EXEC_VMALLOC.sh * kselftest/lkdtm_READ_AFTER_FREE.sh * kselftest-vsyscall-mode-native/lkdtm_READ_AFTER_FREE.sh * kselftest-vsyscall-mode-none/lkdtm_READ_AFTER_FREE.sh * kselftest/lkdtm_READ_BUDDY_AFTER_FREE.sh * kselftest-vsyscall-mode-none/lkdtm_READ_BUDDY_AFTER_FREE.sh * kselftest-vsyscall-mode-native/lkdtm_READ_BUDDY_AFTER_FREE.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_ADD_NOT_ZERO_OVERFLOW.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_ADD_NOT_ZERO_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_ADD_NOT_ZERO_OVERFLOW.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_ADD_NOT_ZERO_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_ADD_NOT_ZERO_SATURATED.sh * kselftest/lkdtm_REFCOUNT_ADD_NOT_ZERO_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_ADD_OVERFLOW.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_ADD_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_ADD_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_ADD_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_ADD_SATURATED.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_ADD_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_ADD_ZERO.sh * kselftest/lkdtm_REFCOUNT_ADD_ZERO.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_ADD_ZERO.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_DEC_AND_TEST_NEGATIVE.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_DEC_AND_TEST_NEGATIVE.sh * kselftest/lkdtm_REFCOUNT_DEC_AND_TEST_NEGATIVE.sh * kselftest/lkdtm_REFCOUNT_DEC_AND_TEST_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_DEC_AND_TEST_SATURATED.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_DEC_AND_TEST_SATURATED.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_DEC_NEGATIVE.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_DEC_NEGATIVE.sh * kselftest/lkdtm_REFCOUNT_DEC_NEGATIVE.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_DEC_SATURATED.sh * kselftest/lkdtm_REFCOUNT_DEC_SATURATED.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_DEC_SATURATED.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_DEC_ZERO.sh * kselftest/lkdtm_REFCOUNT_DEC_ZERO.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_DEC_ZERO.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_INC_NOT_ZERO_OVERFLOW.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_INC_NOT_ZERO_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_INC_NOT_ZERO_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_INC_NOT_ZERO_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_INC_NOT_ZERO_SATURATED.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_INC_NOT_ZERO_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_INC_OVERFLOW.sh * kselftest/lkdtm_REFCOUNT_INC_OVERFLOW.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_INC_OVERFLOW.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_INC_SATURATED.sh * kselftest/lkdtm_REFCOUNT_INC_SATURATED.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_INC_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_INC_ZERO.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_INC_ZERO.sh * kselftest/lkdtm_REFCOUNT_INC_ZERO.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_SUB_AND_TEST_NEGATIVE.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_SUB_AND_TEST_NEGATIVE.sh * kselftest/lkdtm_REFCOUNT_SUB_AND_TEST_NEGATIVE.sh * kselftest/lkdtm_REFCOUNT_SUB_AND_TEST_SATURATED.sh * kselftest-vsyscall-mode-native/lkdtm_REFCOUNT_SUB_AND_TEST_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_REFCOUNT_SUB_AND_TEST_SATURATED.sh * kselftest-vsyscall-mode-none/lkdtm_SLAB_FREE_CROSS.sh * kselftest/lkdtm_SLAB_FREE_CROSS.sh * kselftest-vsyscall-mode-native/lkdtm_SLAB_FREE_CROSS.sh * kselftest-vsyscall-mode-none/lkdtm_SLAB_FREE_DOUBLE.sh * kselftest-vsyscall-mode-native/lkdtm_SLAB_FREE_DOUBLE.sh * kselftest/lkdtm_SLAB_FREE_DOUBLE.sh * kselftest-vsyscall-mode-native/lkdtm_SLAB_FREE_PAGE.sh * kselftest/lkdtm_SLAB_FREE_PAGE.sh * kselftest-vsyscall-mode-none/lkdtm_SLAB_FREE_PAGE.sh * kselftest/lkdtm_STACK_GUARD_PAGE_LEADING.sh * kselftest-vsyscall-mode-none/lkdtm_STACK_GUARD_PAGE_LEADING.sh * kselftest-vsyscall-mode-native/lkdtm_STACK_GUARD_PAGE_LEADING.sh * kselftest/lkdtm_STACK_GUARD_PAGE_TRAILING.sh * kselftest-vsyscall-mode-native/lkdtm_STACK_GUARD_PAGE_TRAILING.sh * kselftest-vsyscall-mode-none/lkdtm_STACK_GUARD_PAGE_TRAILING.sh * kselftest-vsyscall-mode-native/lkdtm_STACKLEAK_ERASING.sh * kselftest-vsyscall-mode-none/lkdtm_STACKLEAK_ERASING.sh * kselftest/lkdtm_STACKLEAK_ERASING.sh * kselftest-vsyscall-mode-native/lkdtm_UNALIGNED_LOAD_STORE_WRITE.sh * kselftest-vsyscall-mode-none/lkdtm_UNALIGNED_LOAD_STORE_WRITE.sh * kselftest/lkdtm_UNALIGNED_LOAD_STORE_WRITE.sh * kselftest-vsyscall-mode-native/lkdtm_UNSET_SMEP.sh * kselftest-vsyscall-mode-none/lkdtm_UNSET_SMEP.sh * kselftest/lkdtm_UNSET_SMEP.sh * kselftest-vsyscall-mode-none/lkdtm_USERCOPY_HEAP_SIZE_FROM.sh * kselftest/lkdtm_USERCOPY_HEAP_SIZE_FROM.sh * kselftest-vsyscall-mode-native/lkdtm_USERCOPY_HEAP_SIZE_FROM.sh * kselftest-vsyscall-mode-native/lkdtm_USERCOPY_HEAP_SIZE_TO.sh * kselftest-vsyscall-mode-none/lkdtm_USERCOPY_HEAP_SIZE_TO.sh * kselftest/lkdtm_USERCOPY_HEAP_SIZE_TO.sh * kselftest-vsyscall-mode-native/lkdtm_USERCOPY_HEAP_WHITELIST_FROM.sh * kselftest-vsyscall-mode-none/lkdtm_USERCOPY_HEAP_WHITELIST_FROM.sh * kselftest/lkdtm_USERCOPY_HEAP_WHITELIST_FROM.sh * kselftest/lkdtm_USERCOPY_HEAP_WHITELIST_TO.sh * kselftest-vsyscall-mode-none/lkdtm_USERCOPY_HEAP_WHITELIST_TO.sh * kselftest-vsyscall-mode-native/lkdtm_USERCOPY_HEAP_WHITELIST_TO.sh * kselftest-vsyscall-mode-native/lkdtm_USERCOPY_KERNEL_DS.sh * kselftest/lkdtm_USERCOPY_KERNEL_DS.sh * kselftest-vsyscall-mode-none/lkdtm_USERCOPY_KERNEL_DS.sh * kselftest/lkdtm_USERCOPY_KERNEL.sh * kselftest-vsyscall-mode-native/lkdtm_USERCOPY_KERNEL.sh * kselftest-vsyscall-mode-none/lkdtm_USERCOPY_KERNEL.sh * kselftest-vsyscall-mode-native/lkdtm_USERCOPY_STACK_BEYOND.sh * kselftest/lkdtm_USERCOPY_STACK_BEYOND.sh * kselftest-vsyscall-mode-none/lkdtm_USERCOPY_STACK_BEYOND.sh * kselftest-vsyscall-mode-native/lkdtm_USERCOPY_STACK_FRAME_FROM.sh * kselftest/lkdtm_USERCOPY_STACK_FRAME_FROM.sh * kselftest-vsyscall-mode-none/lkdtm_USERCOPY_STACK_FRAME_FROM.sh * kselftest/lkdtm_USERCOPY_STACK_FRAME_TO.sh * kselftest-vsyscall-mode-native/lkdtm_USERCOPY_STACK_FRAME_TO.sh * kselftest-vsyscall-mode-none/lkdtm_USERCOPY_STACK_FRAME_TO.sh * kselftest-vsyscall-mode-native/lkdtm_WARNING_MESSAGE.sh * kselftest-vsyscall-mode-none/lkdtm_WARNING_MESSAGE.sh * kselftest/lkdtm_WARNING_MESSAGE.sh * kselftest/lkdtm_WARNING.sh * kselftest-vsyscall-mode-none/lkdtm_WARNING.sh * kselftest-vsyscall-mode-native/lkdtm_WARNING.sh * kselftest-vsyscall-mode-none/lkdtm_WRITE_KERN.sh * kselftest-vsyscall-mode-native/lkdtm_WRITE_KERN.sh * kselftest/lkdtm_WRITE_KERN.sh * kselftest-vsyscall-mode-none/lkdtm_WRITE_RO_AFTER_INIT.sh * kselftest/lkdtm_WRITE_RO_AFTER_INIT.sh * kselftest-vsyscall-mode-native/lkdtm_WRITE_RO_AFTER_INIT.sh * kselftest-vsyscall-mode-none/lkdtm_WRITE_RO.sh * kselftest-vsyscall-mode-native/lkdtm_WRITE_RO.sh * kselftest/lkdtm_WRITE_RO.sh * kselftest/mqueue_mq_perf_tests * kselftest-vsyscall-mode-none/mqueue_mq_perf_tests * kselftest-vsyscall-mode-native/mqueue_mq_perf_tests * kselftest-vsyscall-mode-native/net_fib-onlink-tests.sh * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_tests.sh * kselftest-vsyscall-mode-none/net_fib_tests.sh * kselftest-vsyscall-mode-native/net_fib_tests.sh * kselftest-vsyscall-mode-native/netfilter_nft_concat_range.sh * kselftest-vsyscall-mode-none/netfilter_nft_concat_range.sh * kselftest/netfilter_nft_concat_range.sh * kselftest-vsyscall-mode-native/net_ip_defrag.sh * kselftest-vsyscall-mode-none/net_ip_defrag.sh * kselftest/net_ip_defrag.sh * kselftest/net_l2tp.sh * kselftest-vsyscall-mode-native/net_l2tp.sh * kselftest-vsyscall-mode-none/net_l2tp.sh * kselftest/net_pmtu.sh * kselftest-vsyscall-mode-none/net_pmtu.sh * kselftest-vsyscall-mode-native/net_pmtu.sh * kselftest-vsyscall-mode-none/net_psock_snd.sh * kselftest/net_psock_snd.sh * kselftest-vsyscall-mode-native/net_psock_snd.sh * kselftest/net_run_netsocktests * kselftest-vsyscall-mode-none/net_run_netsocktests * kselftest-vsyscall-mode-native/net_run_netsocktests * kselftest/net_test_vxlan_under_vrf.sh * kselftest-vsyscall-mode-native/net_test_vxlan_under_vrf.sh * kselftest-vsyscall-mode-none/net_test_vxlan_under_vrf.sh * kselftest-vsyscall-mode-none/net_traceroute.sh * kselftest/net_traceroute.sh * kselftest-vsyscall-mode-native/net_traceroute.sh * kselftest-vsyscall-mode-native/net_udpgro_bench.sh * kselftest/net_udpgro_bench.sh * kselftest-vsyscall-mode-none/net_udpgro_bench.sh * kselftest-vsyscall-mode-native/net_udpgro.sh * kselftest-vsyscall-mode-none/net_udpgro.sh * kselftest/net_udpgro.sh * kselftest-vsyscall-mode-none/net_udpgso_bench.sh * kselftest/net_udpgso_bench.sh * kselftest-vsyscall-mode-native/net_udpgso_bench.sh * kselftest-vsyscall-mode-native/net_xfrm_policy.sh * kselftest/net_xfrm_policy.sh * kselftest-vsyscall-mode-none/net_xfrm_policy.sh * kselftest-vsyscall-mode-native/networking/timestamping_txtimestamp.sh qemu_arm: dragonboard-410c: juno-r2: i386: Skips ------------------------------------------------------------------------ No skips -- Linaro LKFT https://lkft.linaro.org

5 years, 1 month

1
0
0 0

[PATCH v2 2/4] selftests: Fix seccomp to support relocatable build (O=objdir)

by Shuah Khan

Fix seccomp relocatable builds. This is a simple fix to use the right lib.mk variable TEST_CUSTOM_PROGS to continue to do custom build to preserve dependency on kselftest_harness.h local header. This change applies cutom rule to seccomp_bpf seccomp_benchmark for a simpler logic. Uses $(OUTPUT) defined in lib.mk to handle build relocation. The following use-cases work with this change: In seccomp directory: make all and make clean >From top level from main Makefile: make kselftest-install O=objdir ARCH=arm64 HOSTCC=gcc \ CROSS_COMPILE=aarch64-linux-gnu- TARGETS=seccomp Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> --- tools/testing/selftests/seccomp/Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/seccomp/Makefile b/tools/testing/selftests/seccomp/Makefile index 1760b3e39730..355bcbc0394a 100644 --- a/tools/testing/selftests/seccomp/Makefile +++ b/tools/testing/selftests/seccomp/Makefile @@ -1,17 +1,16 @@ # SPDX-License-Identifier: GPL-2.0 -all: - -include ../lib.mk +CFLAGS += -Wl,-no-as-needed -Wall +LDFLAGS += -lpthread .PHONY: all clean -BINARIES := seccomp_bpf seccomp_benchmark -CFLAGS += -Wl,-no-as-needed -Wall +include ../lib.mk + +# OUTPUT set by lib.mk +TEST_CUSTOM_PROGS := $(OUTPUT)/seccomp_bpf $(OUTPUT)/seccomp_benchmark -seccomp_bpf: seccomp_bpf.c ../kselftest_harness.h - $(CC) $(CFLAGS) $(LDFLAGS) $< -lpthread -o $@ +$(TEST_CUSTOM_PROGS): ../kselftest_harness.h -TEST_PROGS += $(BINARIES) -EXTRA_CLEAN := $(BINARIES) +all: $(TEST_CUSTOM_PROGS) -all: $(BINARIES) +EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) -- 2.20.1

5 years, 1 month

2
4
0 0

[RFC PATCH 1/2] Port KASAN Tests to KUnit

by Patricia Alfonso

Transfer all previous tests for KASAN to KUnit so they can be run more easily. With proper KASAN integration into KUnit, developers can run these tests with their other KUnit tests and see "pass" or "fail" with the appropriate KASAN report instead of needing to parse each KASAN report to test KASAN functionalities. Stack tests do not work in UML so those tests are protected inside an "#if (CONFIG_KASAN_STACK == 1)" so this only runs if stack instrumentation is enabled. Signed-off-by: Patricia Alfonso <trishalfonso(a)google.com> --- The KUnit version of these tests could be in addition to the existing tests if that is preferred. lib/Kconfig.kasan | 2 +- lib/test_kasan.c | 352 +++++++++++++++++++++------------------------- 2 files changed, 161 insertions(+), 193 deletions(-) diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 5b54f3c9a741..f8cc9ed60677 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -160,7 +160,7 @@ config KASAN_VMALLOC config TEST_KASAN tristate "Module for testing KASAN for bug detection" - depends on m && KASAN + depends on KASAN && KUNIT help This is a test module doing various nasty things like out of bounds accesses, use after free. It is useful for testing diff --git a/lib/test_kasan.c b/lib/test_kasan.c index 3872d250ed2c..988650387a2a 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -23,17 +23,18 @@ #include <asm/page.h> +#include <kunit/test.h> + /* * Note: test functions are marked noinline so that their names appear in * reports. */ -static noinline void __init kmalloc_oob_right(void) +static noinline void kmalloc_oob_right(void) { char *ptr; size_t size = 123; - pr_info("out-of-bounds to right\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -44,12 +45,11 @@ static noinline void __init kmalloc_oob_right(void) kfree(ptr); } -static noinline void __init kmalloc_oob_left(void) +static noinline void kmalloc_oob_left(void) { char *ptr; size_t size = 15; - pr_info("out-of-bounds to left\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -60,12 +60,11 @@ static noinline void __init kmalloc_oob_left(void) kfree(ptr); } -static noinline void __init kmalloc_node_oob_right(void) +static noinline void kmalloc_node_oob_right(void) { char *ptr; size_t size = 4096; - pr_info("kmalloc_node(): out-of-bounds to right\n"); ptr = kmalloc_node(size, GFP_KERNEL, 0); if (!ptr) { pr_err("Allocation failed\n"); @@ -77,7 +76,7 @@ static noinline void __init kmalloc_node_oob_right(void) } #ifdef CONFIG_SLUB -static noinline void __init kmalloc_pagealloc_oob_right(void) +static noinline void kmalloc_pagealloc_oob_right(void) { char *ptr; size_t size = KMALLOC_MAX_CACHE_SIZE + 10; @@ -85,7 +84,6 @@ static noinline void __init kmalloc_pagealloc_oob_right(void) /* Allocate a chunk that does not fit into a SLUB cache to trigger * the page allocator fallback. */ - pr_info("kmalloc pagealloc allocation: out-of-bounds to right\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -96,12 +94,11 @@ static noinline void __init kmalloc_pagealloc_oob_right(void) kfree(ptr); } -static noinline void __init kmalloc_pagealloc_uaf(void) +static noinline void kmalloc_pagealloc_uaf(void) { char *ptr; size_t size = KMALLOC_MAX_CACHE_SIZE + 10; - pr_info("kmalloc pagealloc allocation: use-after-free\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -112,12 +109,11 @@ static noinline void __init kmalloc_pagealloc_uaf(void) ptr[0] = 0; } -static noinline void __init kmalloc_pagealloc_invalid_free(void) +static noinline void kmalloc_pagealloc_invalid_free(void) { char *ptr; size_t size = KMALLOC_MAX_CACHE_SIZE + 10; - pr_info("kmalloc pagealloc allocation: invalid-free\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -128,14 +124,13 @@ static noinline void __init kmalloc_pagealloc_invalid_free(void) } #endif -static noinline void __init kmalloc_large_oob_right(void) +static noinline void kmalloc_large_oob_right(void) { char *ptr; size_t size = KMALLOC_MAX_CACHE_SIZE - 256; /* Allocate a chunk that is large enough, but still fits into a slab * and does not trigger the page allocator fallback in SLUB. */ - pr_info("kmalloc large allocation: out-of-bounds to right\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -146,13 +141,12 @@ static noinline void __init kmalloc_large_oob_right(void) kfree(ptr); } -static noinline void __init kmalloc_oob_krealloc_more(void) +static noinline void kmalloc_oob_krealloc_more(void) { char *ptr1, *ptr2; size_t size1 = 17; size_t size2 = 19; - pr_info("out-of-bounds after krealloc more\n"); ptr1 = kmalloc(size1, GFP_KERNEL); ptr2 = krealloc(ptr1, size2, GFP_KERNEL); if (!ptr1 || !ptr2) { @@ -166,13 +160,12 @@ static noinline void __init kmalloc_oob_krealloc_more(void) kfree(ptr2); } -static noinline void __init kmalloc_oob_krealloc_less(void) +static noinline void kmalloc_oob_krealloc_less(void) { char *ptr1, *ptr2; size_t size1 = 17; size_t size2 = 15; - pr_info("out-of-bounds after krealloc less\n"); ptr1 = kmalloc(size1, GFP_KERNEL); ptr2 = krealloc(ptr1, size2, GFP_KERNEL); if (!ptr1 || !ptr2) { @@ -184,13 +177,12 @@ static noinline void __init kmalloc_oob_krealloc_less(void) kfree(ptr2); } -static noinline void __init kmalloc_oob_16(void) +static noinline void kmalloc_oob_16(void) { struct { u64 words[2]; } *ptr1, *ptr2; - pr_info("kmalloc out-of-bounds for 16-bytes access\n"); ptr1 = kmalloc(sizeof(*ptr1) - 3, GFP_KERNEL); ptr2 = kmalloc(sizeof(*ptr2), GFP_KERNEL); if (!ptr1 || !ptr2) { @@ -204,12 +196,11 @@ static noinline void __init kmalloc_oob_16(void) kfree(ptr2); } -static noinline void __init kmalloc_oob_memset_2(void) +static noinline void kmalloc_oob_memset_2(void) { char *ptr; size_t size = 8; - pr_info("out-of-bounds in memset2\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -220,12 +211,11 @@ static noinline void __init kmalloc_oob_memset_2(void) kfree(ptr); } -static noinline void __init kmalloc_oob_memset_4(void) +static noinline void kmalloc_oob_memset_4(void) { char *ptr; size_t size = 8; - pr_info("out-of-bounds in memset4\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -237,12 +227,11 @@ static noinline void __init kmalloc_oob_memset_4(void) } -static noinline void __init kmalloc_oob_memset_8(void) +static noinline void kmalloc_oob_memset_8(void) { char *ptr; size_t size = 8; - pr_info("out-of-bounds in memset8\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -253,12 +242,11 @@ static noinline void __init kmalloc_oob_memset_8(void) kfree(ptr); } -static noinline void __init kmalloc_oob_memset_16(void) +static noinline void kmalloc_oob_memset_16(void) { char *ptr; size_t size = 16; - pr_info("out-of-bounds in memset16\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -269,12 +257,11 @@ static noinline void __init kmalloc_oob_memset_16(void) kfree(ptr); } -static noinline void __init kmalloc_oob_in_memset(void) +static noinline void kmalloc_oob_in_memset(void) { char *ptr; size_t size = 666; - pr_info("out-of-bounds in memset\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -285,12 +272,11 @@ static noinline void __init kmalloc_oob_in_memset(void) kfree(ptr); } -static noinline void __init kmalloc_uaf(void) +static noinline void kmalloc_uaf(void) { char *ptr; size_t size = 10; - pr_info("use-after-free\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -301,12 +287,11 @@ static noinline void __init kmalloc_uaf(void) *(ptr + 8) = 'x'; } -static noinline void __init kmalloc_uaf_memset(void) +static noinline void kmalloc_uaf_memset(void) { char *ptr; size_t size = 33; - pr_info("use-after-free in memset\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -317,12 +302,11 @@ static noinline void __init kmalloc_uaf_memset(void) memset(ptr, 0, size); } -static noinline void __init kmalloc_uaf2(void) +static noinline void kmalloc_uaf2(void) { char *ptr1, *ptr2; size_t size = 43; - pr_info("use-after-free after another kmalloc\n"); ptr1 = kmalloc(size, GFP_KERNEL); if (!ptr1) { pr_err("Allocation failed\n"); @@ -342,14 +326,13 @@ static noinline void __init kmalloc_uaf2(void) kfree(ptr2); } -static noinline void __init kfree_via_page(void) +static noinline void kfree_via_page(void) { char *ptr; size_t size = 8; struct page *page; unsigned long offset; - pr_info("invalid-free false positive (via page)\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -361,13 +344,12 @@ static noinline void __init kfree_via_page(void) kfree(page_address(page) + offset); } -static noinline void __init kfree_via_phys(void) +static noinline void kfree_via_phys(void) { char *ptr; size_t size = 8; phys_addr_t phys; - pr_info("invalid-free false positive (via phys)\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -378,7 +360,7 @@ static noinline void __init kfree_via_phys(void) kfree(phys_to_virt(phys)); } -static noinline void __init kmem_cache_oob(void) +static noinline void kmem_cache_oob(void) { char *p; size_t size = 200; @@ -389,7 +371,6 @@ static noinline void __init kmem_cache_oob(void) pr_err("Cache allocation failed\n"); return; } - pr_info("out-of-bounds in kmem_cache_alloc\n"); p = kmem_cache_alloc(cache, GFP_KERNEL); if (!p) { pr_err("Allocation failed\n"); @@ -402,7 +383,7 @@ static noinline void __init kmem_cache_oob(void) kmem_cache_destroy(cache); } -static noinline void __init memcg_accounted_kmem_cache(void) +static noinline void memcg_accounted_kmem_cache(void) { int i; char *p; @@ -415,7 +396,6 @@ static noinline void __init memcg_accounted_kmem_cache(void) return; } - pr_info("allocate memcg accounted object\n"); /* * Several allocations with a delay to allow for lazy per memcg kmem * cache creation. @@ -435,31 +415,19 @@ static noinline void __init memcg_accounted_kmem_cache(void) static char global_array[10]; -static noinline void __init kasan_global_oob(void) +static noinline void kasan_global_oob(void) { volatile int i = 3; char *p = &global_array[ARRAY_SIZE(global_array) + i]; - pr_info("out-of-bounds global variable\n"); - *(volatile char *)p; -} - -static noinline void __init kasan_stack_oob(void) -{ - char stack_array[10]; - volatile int i = 0; - char *p = &stack_array[ARRAY_SIZE(stack_array) + i]; - - pr_info("out-of-bounds on stack\n"); *(volatile char *)p; } -static noinline void __init ksize_unpoisons_memory(void) +static noinline void ksize_unpoisons_memory(void) { char *ptr; size_t size = 123, real_size; - pr_info("ksize() unpoisons the whole allocated chunk\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -473,72 +441,36 @@ static noinline void __init ksize_unpoisons_memory(void) kfree(ptr); } -static noinline void __init copy_user_test(void) +#if (CONFIG_KASAN_STACK == 1) +static noinline void kasan_stack_oob(void) { - char *kmem; - char __user *usermem; - size_t size = 10; - int unused; - - kmem = kmalloc(size, GFP_KERNEL); - if (!kmem) - return; - - usermem = (char __user *)vm_mmap(NULL, 0, PAGE_SIZE, - PROT_READ | PROT_WRITE | PROT_EXEC, - MAP_ANONYMOUS | MAP_PRIVATE, 0); - if (IS_ERR(usermem)) { - pr_err("Failed to allocate user memory\n"); - kfree(kmem); - return; - } - - pr_info("out-of-bounds in copy_from_user()\n"); - unused = copy_from_user(kmem, usermem, size + 1); - - pr_info("out-of-bounds in copy_to_user()\n"); - unused = copy_to_user(usermem, kmem, size + 1); - - pr_info("out-of-bounds in __copy_from_user()\n"); - unused = __copy_from_user(kmem, usermem, size + 1); - - pr_info("out-of-bounds in __copy_to_user()\n"); - unused = __copy_to_user(usermem, kmem, size + 1); - - pr_info("out-of-bounds in __copy_from_user_inatomic()\n"); - unused = __copy_from_user_inatomic(kmem, usermem, size + 1); - - pr_info("out-of-bounds in __copy_to_user_inatomic()\n"); - unused = __copy_to_user_inatomic(usermem, kmem, size + 1); - - pr_info("out-of-bounds in strncpy_from_user()\n"); - unused = strncpy_from_user(kmem, usermem, size + 1); + char stack_array[10]; + volatile int i = 0; + char *p = &stack_array[ARRAY_SIZE(stack_array) + i]; - vm_munmap((unsigned long)usermem, PAGE_SIZE); - kfree(kmem); + *(volatile char *)p; } -static noinline void __init kasan_alloca_oob_left(void) +static noinline void kasan_alloca_oob_left(void) { volatile int i = 10; char alloca_array[i]; char *p = alloca_array - 1; - pr_info("out-of-bounds to left on alloca\n"); *(volatile char *)p; } -static noinline void __init kasan_alloca_oob_right(void) +static noinline void kasan_alloca_oob_right(void) { volatile int i = 10; char alloca_array[i]; char *p = alloca_array + i; - pr_info("out-of-bounds to right on alloca\n"); *(volatile char *)p; } +#endif /* CONFIG_KASAN_STACK */ -static noinline void __init kmem_cache_double_free(void) +static noinline void kmem_cache_double_free(void) { char *p; size_t size = 200; @@ -549,7 +481,6 @@ static noinline void __init kmem_cache_double_free(void) pr_err("Cache allocation failed\n"); return; } - pr_info("double-free on heap object\n"); p = kmem_cache_alloc(cache, GFP_KERNEL); if (!p) { pr_err("Allocation failed\n"); @@ -562,7 +493,7 @@ static noinline void __init kmem_cache_double_free(void) kmem_cache_destroy(cache); } -static noinline void __init kmem_cache_invalid_free(void) +static noinline void kmem_cache_invalid_free(void) { char *p; size_t size = 200; @@ -574,7 +505,6 @@ static noinline void __init kmem_cache_invalid_free(void) pr_err("Cache allocation failed\n"); return; } - pr_info("invalid-free of heap object\n"); p = kmem_cache_alloc(cache, GFP_KERNEL); if (!p) { pr_err("Allocation failed\n"); @@ -594,12 +524,11 @@ static noinline void __init kmem_cache_invalid_free(void) kmem_cache_destroy(cache); } -static noinline void __init kasan_memchr(void) +static noinline void kasan_memchr(void) { char *ptr; size_t size = 24; - pr_info("out-of-bounds in memchr\n"); ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO); if (!ptr) return; @@ -608,13 +537,12 @@ static noinline void __init kasan_memchr(void) kfree(ptr); } -static noinline void __init kasan_memcmp(void) +static noinline void kasan_memcmp(void) { char *ptr; size_t size = 24; int arr[9]; - pr_info("out-of-bounds in memcmp\n"); ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO); if (!ptr) return; @@ -624,12 +552,11 @@ static noinline void __init kasan_memcmp(void) kfree(ptr); } -static noinline void __init kasan_strings(void) +static noinline void kasan_strings(void) { char *ptr; size_t size = 24; - pr_info("use-after-free in strchr\n"); ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO); if (!ptr) return; @@ -645,23 +572,18 @@ static noinline void __init kasan_strings(void) ptr += 16; strchr(ptr, '1'); - pr_info("use-after-free in strrchr\n"); strrchr(ptr, '1'); - pr_info("use-after-free in strcmp\n"); strcmp(ptr, "2"); - pr_info("use-after-free in strncmp\n"); strncmp(ptr, "2", 1); - pr_info("use-after-free in strlen\n"); strlen(ptr); - pr_info("use-after-free in strnlen\n"); strnlen(ptr, 1); } -static noinline void __init kasan_bitops(void) +static noinline void kasan_bitops(void) { /* * Allocate 1 more byte, which causes kzalloc to round up to 16-bytes; @@ -676,70 +598,52 @@ static noinline void __init kasan_bitops(void) * below accesses are still out-of-bounds, since bitops are defined to * operate on the whole long the bit is in. */ - pr_info("out-of-bounds in set_bit\n"); set_bit(BITS_PER_LONG, bits); - pr_info("out-of-bounds in __set_bit\n"); __set_bit(BITS_PER_LONG, bits); - pr_info("out-of-bounds in clear_bit\n"); clear_bit(BITS_PER_LONG, bits); - pr_info("out-of-bounds in __clear_bit\n"); __clear_bit(BITS_PER_LONG, bits); - pr_info("out-of-bounds in clear_bit_unlock\n"); clear_bit_unlock(BITS_PER_LONG, bits); - pr_info("out-of-bounds in __clear_bit_unlock\n"); __clear_bit_unlock(BITS_PER_LONG, bits); - pr_info("out-of-bounds in change_bit\n"); change_bit(BITS_PER_LONG, bits); - pr_info("out-of-bounds in __change_bit\n"); __change_bit(BITS_PER_LONG, bits); /* * Below calls try to access bit beyond allocated memory. */ - pr_info("out-of-bounds in test_and_set_bit\n"); test_and_set_bit(BITS_PER_LONG + BITS_PER_BYTE, bits); - pr_info("out-of-bounds in __test_and_set_bit\n"); __test_and_set_bit(BITS_PER_LONG + BITS_PER_BYTE, bits); - pr_info("out-of-bounds in test_and_set_bit_lock\n"); test_and_set_bit_lock(BITS_PER_LONG + BITS_PER_BYTE, bits); - pr_info("out-of-bounds in test_and_clear_bit\n"); test_and_clear_bit(BITS_PER_LONG + BITS_PER_BYTE, bits); - pr_info("out-of-bounds in __test_and_clear_bit\n"); __test_and_clear_bit(BITS_PER_LONG + BITS_PER_BYTE, bits); - pr_info("out-of-bounds in test_and_change_bit\n"); test_and_change_bit(BITS_PER_LONG + BITS_PER_BYTE, bits); - pr_info("out-of-bounds in __test_and_change_bit\n"); __test_and_change_bit(BITS_PER_LONG + BITS_PER_BYTE, bits); - pr_info("out-of-bounds in test_bit\n"); (void)test_bit(BITS_PER_LONG + BITS_PER_BYTE, bits); #if defined(clear_bit_unlock_is_negative_byte) - pr_info("out-of-bounds in clear_bit_unlock_is_negative_byte\n"); clear_bit_unlock_is_negative_byte(BITS_PER_LONG + BITS_PER_BYTE, bits); #endif kfree(bits); } -static noinline void __init kmalloc_double_kzfree(void) +static noinline void kmalloc_double_kzfree(void) { char *ptr; size_t size = 16; - pr_info("double-free (kzfree)\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { pr_err("Allocation failed\n"); @@ -750,29 +654,130 @@ static noinline void __init kmalloc_double_kzfree(void) kzfree(ptr); } -#ifdef CONFIG_KASAN_VMALLOC -static noinline void __init vmalloc_oob(void) +static void kunit_test_oob(struct kunit *test) +{ + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_right()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_left()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_node_oob_right()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_large_oob_right()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_krealloc_more()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_krealloc_less()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_16()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_in_memset()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_memset_2()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_memset_4()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_memset_8()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_oob_memset_16()); + KUNIT_EXPECT_KASAN_FAIL(test, kmem_cache_oob()); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_global_oob()); + KUNIT_EXPECT_KASAN_FAIL(test, ksize_unpoisons_memory()); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_memchr()); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_memcmp()); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_strings()); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_bitops()); +#ifdef CONFIG_SLUB + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_pagealloc_oob_right()); +#endif /* CONFIG_SLUB */ + +#if (CONFIG_KASAN_STACK == 1) + KUNIT_EXPECT_KASAN_FAIL(test, kasan_stack_oob()); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_alloca_oob_right()); + KUNIT_EXPECT_KASAN_FAIL(test, kasan_alloca_oob_left()); +#endif /*CONFIG_KASAN_STACK*/ +} + +static void kunit_test_uaf(struct kunit *test) +{ +#ifdef CONFIG_SLUB + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_pagealloc_uaf()); +#endif + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_uaf()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_uaf_memset()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_uaf2()); +} + +static void kunit_test_invalid_free(struct kunit *test) { - void *area; +#ifdef CONFIG_SLUB + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_pagealloc_invalid_free()); +#endif + KUNIT_EXPECT_KASAN_FAIL(test, kmem_cache_invalid_free()); + KUNIT_EXPECT_KASAN_FAIL(test, kmem_cache_double_free()); + KUNIT_EXPECT_KASAN_FAIL(test, kmalloc_double_kzfree()); +} - pr_info("vmalloc out-of-bounds\n"); +static void kunit_test_false_positives(struct kunit *test) +{ + kfree_via_page(); + kfree_via_phys(); +} - /* - * We have to be careful not to hit the guard page. - * The MMU will catch that and crash us. - */ - area = vmalloc(3000); - if (!area) { - pr_err("Allocation failed\n"); +static void kunit_test_memcg(struct kunit *test) +{ + memcg_accounted_kmem_cache(); +} + +static struct kunit_case kasan_kunit_test_cases[] = { + KUNIT_CASE(kunit_test_oob), + KUNIT_CASE(kunit_test_uaf), + KUNIT_CASE(kunit_test_invalid_free), + KUNIT_CASE(kunit_test_false_positives), + KUNIT_CASE(kunit_test_memcg), + {} +}; + +static struct kunit_suite kasan_kunit_test_suite = { + .name = "kasan_kunit_test", + .test_cases = kasan_kunit_test_cases, +}; + +kunit_test_suite(kasan_kunit_test_suite); + +#if IS_MODULE(CONFIG_TEST_KASAN) +static noinline void __init copy_user_test(void) +{ + char *kmem; + char __user *usermem; + size_t size = 10; + int unused; + + kmem = kmalloc(size, GFP_KERNEL); + if (!kmem) + return; + + usermem = (char __user *)vm_mmap(NULL, 0, PAGE_SIZE, + PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_ANONYMOUS | MAP_PRIVATE, 0); + if (IS_ERR(usermem)) { + pr_err("Failed to allocate user memory\n"); + kfree(kmem); return; } - ((volatile char *)area)[3100]; - vfree(area); + pr_info("out-of-bounds in copy_from_user()\n"); + unused = copy_from_user(kmem, usermem, size + 1); + + pr_info("out-of-bounds in copy_to_user()\n"); + unused = copy_to_user(usermem, kmem, size + 1); + + pr_info("out-of-bounds in __copy_from_user()\n"); + unused = __copy_from_user(kmem, usermem, size + 1); + + pr_info("out-of-bounds in __copy_to_user()\n"); + unused = __copy_to_user(usermem, kmem, size + 1); + + pr_info("out-of-bounds in __copy_from_user_inatomic()\n"); + unused = __copy_from_user_inatomic(kmem, usermem, size + 1); + + pr_info("out-of-bounds in __copy_to_user_inatomic()\n"); + unused = __copy_to_user_inatomic(usermem, kmem, size + 1); + + pr_info("out-of-bounds in strncpy_from_user()\n"); + unused = strncpy_from_user(kmem, usermem, size + 1); + + vm_munmap((unsigned long)usermem, PAGE_SIZE); + kfree(kmem); } -#else -static void __init vmalloc_oob(void) {} -#endif static int __init kmalloc_tests_init(void) { @@ -782,44 +787,7 @@ static int __init kmalloc_tests_init(void) */ bool multishot = kasan_save_enable_multi_shot(); - kmalloc_oob_right(); - kmalloc_oob_left(); - kmalloc_node_oob_right(); -#ifdef CONFIG_SLUB - kmalloc_pagealloc_oob_right(); - kmalloc_pagealloc_uaf(); - kmalloc_pagealloc_invalid_free(); -#endif - kmalloc_large_oob_right(); - kmalloc_oob_krealloc_more(); - kmalloc_oob_krealloc_less(); - kmalloc_oob_16(); - kmalloc_oob_in_memset(); - kmalloc_oob_memset_2(); - kmalloc_oob_memset_4(); - kmalloc_oob_memset_8(); - kmalloc_oob_memset_16(); - kmalloc_uaf(); - kmalloc_uaf_memset(); - kmalloc_uaf2(); - kfree_via_page(); - kfree_via_phys(); - kmem_cache_oob(); - memcg_accounted_kmem_cache(); - kasan_stack_oob(); - kasan_global_oob(); - kasan_alloca_oob_left(); - kasan_alloca_oob_right(); - ksize_unpoisons_memory(); copy_user_test(); - kmem_cache_double_free(); - kmem_cache_invalid_free(); - kasan_memchr(); - kasan_memcmp(); - kasan_strings(); - kasan_bitops(); - kmalloc_double_kzfree(); - vmalloc_oob(); kasan_restore_multi_shot(multishot); @@ -827,4 +795,4 @@ static int __init kmalloc_tests_init(void) } module_init(kmalloc_tests_init); -MODULE_LICENSE("GPL"); +#endif /* IS_MODULE(CONFIG_TEST_KASAN) */ -- 2.25.0.265.gbab2e86ba0-goog

5 years, 1 month

6
30
0 0

[PATCH bpf-next v4 11/12] selftests: bpf: enable UDP sockmap reuseport tests

by Lorenz Bauer

Remove the guard that disables UDP tests now that sockmap has support for them. Signed-off-by: Lorenz Bauer <lmb(a)cloudflare.com> Reviewed-by: Jakub Sitnicki <jakub(a)cloudflare.com> Acked-by: John Fastabend <john.fastabend(a)gmail.com> --- tools/testing/selftests/bpf/prog_tests/select_reuseport.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c index a1dd13b34d4b..821b4146b7b6 100644 --- a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c +++ b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c @@ -805,12 +805,6 @@ static void test_config(int sotype, sa_family_t family, bool inany) char s[MAX_TEST_NAME]; const struct test *t; - /* SOCKMAP/SOCKHASH don't support UDP yet */ - if (sotype == SOCK_DGRAM && - (inner_map_type == BPF_MAP_TYPE_SOCKMAP || - inner_map_type == BPF_MAP_TYPE_SOCKHASH)) - return; - for (t = tests; t < tests + ARRAY_SIZE(tests); t++) { if (t->need_sotype && t->need_sotype != sotype) continue; /* test not compatible with socket type */ -- 2.20.1

5 years, 1 month

1
0
0 0

[PATCH bpf-next v4 10/12] selftests: bpf: add tests for UDP sockets in sockmap

by Lorenz Bauer

Expand the TCP sockmap test suite to also check UDP sockets. Signed-off-by: Jakub Sitnicki <jakub(a)cloudflare.com> Signed-off-by: Lorenz Bauer <lmb(a)cloudflare.com> Acked-by: John Fastabend <john.fastabend(a)gmail.com> --- .../selftests/bpf/prog_tests/sockmap_listen.c | 157 ++++++++++++++---- 1 file changed, 127 insertions(+), 30 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c index 4ba41dd26d6b..52aa468bdccd 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c @@ -108,6 +108,22 @@ __ret; \ }) +#define xsend(fd, buf, len, flags) \ + ({ \ + ssize_t __ret = send((fd), (buf), (len), (flags)); \ + if (__ret == -1) \ + FAIL_ERRNO("send"); \ + __ret; \ + }) + +#define xrecv(fd, buf, len, flags) \ + ({ \ + ssize_t __ret = recv((fd), (buf), (len), (flags)); \ + if (__ret == -1) \ + FAIL_ERRNO("recv"); \ + __ret; \ + }) + #define xsocket(family, sotype, flags) \ ({ \ int __ret = socket(family, sotype, flags); \ @@ -330,7 +346,7 @@ static void test_insert_bound(int family, int sotype, int mapfd) xclose(s); } -static void test_insert_listening(int family, int sotype, int mapfd) +static void test_insert(int family, int sotype, int mapfd) { u64 value; u32 key; @@ -467,7 +483,7 @@ static void test_lookup_32_bit_value(int family, int sotype, int mapfd) xclose(s); } -static void test_update_listening(int family, int sotype, int mapfd) +static void test_update_existing(int family, int sotype, int mapfd) { int s1, s2; u64 value; @@ -1116,7 +1132,7 @@ static void test_reuseport_select_listening(int family, int sotype, { struct sockaddr_storage addr; unsigned int pass; - int s, c, p, err; + int s, c, err; socklen_t len; u64 value; u32 key; @@ -1145,19 +1161,33 @@ static void test_reuseport_select_listening(int family, int sotype, if (err) goto close_cli; - p = xaccept(s, NULL, NULL); - if (p < 0) - goto close_cli; + if (sotype == SOCK_STREAM) { + int p; + + p = xaccept(s, NULL, NULL); + if (p < 0) + goto close_cli; + xclose(p); + } else { + char b = 'a'; + ssize_t n; + + n = xsend(c, &b, sizeof(b), 0); + if (n == -1) + goto close_cli; + + n = xrecv(s, &b, sizeof(b), 0); + if (n == -1) + goto close_cli; + } key = SK_PASS; err = xbpf_map_lookup_elem(verd_map, &key, &pass); if (err) - goto close_peer; + goto close_cli; if (pass != 1) FAIL("want pass count 1, have %d", pass); -close_peer: - xclose(p); close_cli: xclose(c); close_srv: @@ -1201,9 +1231,24 @@ static void test_reuseport_select_connected(int family, int sotype, if (err) goto close_cli0; - p0 = xaccept(s, NULL, NULL); - if (err) - goto close_cli0; + if (sotype == SOCK_STREAM) { + p0 = xaccept(s, NULL, NULL); + if (p0 < 0) + goto close_cli0; + } else { + p0 = xsocket(family, sotype, 0); + if (p0 < 0) + goto close_cli0; + + len = sizeof(addr); + err = xgetsockname(c0, sockaddr(&addr), &len); + if (err) + goto close_cli0; + + err = xconnect(p0, sockaddr(&addr), len); + if (err) + goto close_cli0; + } /* Update sock_map[0] to redirect to a connected socket */ key = 0; @@ -1216,8 +1261,24 @@ static void test_reuseport_select_connected(int family, int sotype, if (c1 < 0) goto close_peer0; + len = sizeof(addr); + err = xgetsockname(s, sockaddr(&addr), &len); + if (err) + goto close_srv; + errno = 0; err = connect(c1, sockaddr(&addr), len); + if (sotype == SOCK_DGRAM) { + char b = 'a'; + ssize_t n; + + n = xsend(c1, &b, sizeof(b), 0); + if (n == -1) + goto close_cli1; + + n = recv(c1, &b, sizeof(b), 0); + err = n == -1; + } if (!err || errno != ECONNREFUSED) FAIL_ERRNO("connect: expected ECONNREFUSED"); @@ -1281,7 +1342,18 @@ static void test_reuseport_mixed_groups(int family, int sotype, int sock_map, goto close_srv2; err = connect(c, sockaddr(&addr), len); - if (err && errno != ECONNREFUSED) { + if (sotype == SOCK_DGRAM) { + char b = 'a'; + ssize_t n; + + n = xsend(c, &b, sizeof(b), 0); + if (n == -1) + goto close_cli; + + n = recv(c, &b, sizeof(b), 0); + err = n == -1; + } + if (!err || errno != ECONNREFUSED) { FAIL_ERRNO("connect: expected ECONNREFUSED"); goto close_cli; } @@ -1302,9 +1374,9 @@ static void test_reuseport_mixed_groups(int family, int sotype, int sock_map, xclose(s1); } -#define TEST(fn) \ +#define TEST(fn, ...) \ { \ - fn, #fn \ + fn, #fn, __VA_ARGS__ \ } static void test_ops_cleanup(const struct bpf_map *map) @@ -1353,18 +1425,31 @@ static const char *map_type_str(const struct bpf_map *map) } } +static const char *sotype_str(int sotype) +{ + switch (sotype) { + case SOCK_DGRAM: + return "UDP"; + case SOCK_STREAM: + return "TCP"; + default: + return "unknown"; + } +} + static void test_ops(struct test_sockmap_listen *skel, struct bpf_map *map, int family, int sotype) { const struct op_test { void (*fn)(int family, int sotype, int mapfd); const char *name; + int sotype; } tests[] = { /* insert */ TEST(test_insert_invalid), TEST(test_insert_opened), - TEST(test_insert_bound), - TEST(test_insert_listening), + TEST(test_insert_bound, SOCK_STREAM), + TEST(test_insert), /* delete */ TEST(test_delete_after_insert), TEST(test_delete_after_close), @@ -1373,28 +1458,32 @@ static void test_ops(struct test_sockmap_listen *skel, struct bpf_map *map, TEST(test_lookup_after_delete), TEST(test_lookup_32_bit_value), /* update */ - TEST(test_update_listening), + TEST(test_update_existing), /* races with insert/delete */ - TEST(test_destroy_orphan_child), - TEST(test_syn_recv_insert_delete), - TEST(test_race_insert_listen), + TEST(test_destroy_orphan_child, SOCK_STREAM), + TEST(test_syn_recv_insert_delete, SOCK_STREAM), + TEST(test_race_insert_listen, SOCK_STREAM), /* child clone */ - TEST(test_clone_after_delete), - TEST(test_accept_after_delete), - TEST(test_accept_before_delete), + TEST(test_clone_after_delete, SOCK_STREAM), + TEST(test_accept_after_delete, SOCK_STREAM), + TEST(test_accept_before_delete, SOCK_STREAM), }; - const char *family_name, *map_name; + const char *family_name, *map_name, *sotype_name; const struct op_test *t; char s[MAX_TEST_NAME]; int map_fd; family_name = family_str(family); map_name = map_type_str(map); + sotype_name = sotype_str(sotype); map_fd = bpf_map__fd(map); for (t = tests; t < tests + ARRAY_SIZE(tests); t++) { - snprintf(s, sizeof(s), "%s %s %s", map_name, family_name, - t->name); + snprintf(s, sizeof(s), "%s %s %s %s", map_name, family_name, + sotype_name, t->name); + + if (t->sotype != 0 && t->sotype != sotype) + continue; if (!test__start_subtest(s)) continue; @@ -1427,6 +1516,7 @@ static void test_redir(struct test_sockmap_listen *skel, struct bpf_map *map, for (t = tests; t < tests + ARRAY_SIZE(tests); t++) { snprintf(s, sizeof(s), "%s %s %s", map_name, family_name, t->name); + if (!test__start_subtest(s)) continue; @@ -1441,26 +1531,31 @@ static void test_reuseport(struct test_sockmap_listen *skel, void (*fn)(int family, int sotype, int socket_map, int verdict_map, int reuseport_prog); const char *name; + int sotype; } tests[] = { TEST(test_reuseport_select_listening), TEST(test_reuseport_select_connected), TEST(test_reuseport_mixed_groups), }; int socket_map, verdict_map, reuseport_prog; - const char *family_name, *map_name; + const char *family_name, *map_name, *sotype_name; const struct reuseport_test *t; char s[MAX_TEST_NAME]; family_name = family_str(family); map_name = map_type_str(map); + sotype_name = sotype_str(sotype); socket_map = bpf_map__fd(map); verdict_map = bpf_map__fd(skel->maps.verdict_map); reuseport_prog = bpf_program__fd(skel->progs.prog_reuseport); for (t = tests; t < tests + ARRAY_SIZE(tests); t++) { - snprintf(s, sizeof(s), "%s %s %s", map_name, family_name, - t->name); + snprintf(s, sizeof(s), "%s %s %s %s", map_name, family_name, + sotype_name, t->name); + + if (t->sotype != 0 && t->sotype != sotype) + continue; if (!test__start_subtest(s)) continue; @@ -1473,8 +1568,10 @@ static void run_tests(struct test_sockmap_listen *skel, struct bpf_map *map, int family) { test_ops(skel, map, family, SOCK_STREAM); + test_ops(skel, map, family, SOCK_DGRAM); test_redir(skel, map, family, SOCK_STREAM); test_reuseport(skel, map, family, SOCK_STREAM); + test_reuseport(skel, map, family, SOCK_DGRAM); } void test_sockmap_listen(void) -- 2.20.1

5 years, 1 month

1
0
0 0

[PATCH bpf-next v4 09/12] selftests: bpf: don't listen() on UDP sockets

by Lorenz Bauer

Most tests for TCP sockmap can be adapted to UDP sockmap if the listen call is skipped. Rename listen_loopback, etc. to socket_loopback and skip listen() for SOCK_DGRAM. Signed-off-by: Lorenz Bauer <lmb(a)cloudflare.com> Reviewed-by: Jakub Sitnicki <jakub(a)cloudflare.com> Acked-by: John Fastabend <john.fastabend(a)gmail.com> --- .../selftests/bpf/prog_tests/sockmap_listen.c | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c index b1b2acea0638..4ba41dd26d6b 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c @@ -230,7 +230,7 @@ static int enable_reuseport(int s, int progfd) return 0; } -static int listen_loopback_reuseport(int family, int sotype, int progfd) +static int socket_loopback_reuseport(int family, int sotype, int progfd) { struct sockaddr_storage addr; socklen_t len; @@ -249,6 +249,9 @@ static int listen_loopback_reuseport(int family, int sotype, int progfd) if (err) goto close; + if (sotype == SOCK_DGRAM) + return s; + err = xlisten(s, SOMAXCONN); if (err) goto close; @@ -259,9 +262,9 @@ static int listen_loopback_reuseport(int family, int sotype, int progfd) return -1; } -static int listen_loopback(int family, int sotype) +static int socket_loopback(int family, int sotype) { - return listen_loopback_reuseport(family, sotype, -1); + return socket_loopback_reuseport(family, sotype, -1); } static void test_insert_invalid(int family, int sotype, int mapfd) @@ -333,7 +336,7 @@ static void test_insert_listening(int family, int sotype, int mapfd) u32 key; int s; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -349,7 +352,7 @@ static void test_delete_after_insert(int family, int sotype, int mapfd) u32 key; int s; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -366,7 +369,7 @@ static void test_delete_after_close(int family, int sotype, int mapfd) u64 value; u32 key; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -390,7 +393,7 @@ static void test_lookup_after_insert(int family, int sotype, int mapfd) u32 key; int s; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -417,7 +420,7 @@ static void test_lookup_after_delete(int family, int sotype, int mapfd) u64 value; u32 key; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -439,7 +442,7 @@ static void test_lookup_32_bit_value(int family, int sotype, int mapfd) u32 key, value32; int err, s; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -470,11 +473,11 @@ static void test_update_listening(int family, int sotype, int mapfd) u64 value; u32 key; - s1 = listen_loopback(family, sotype); + s1 = socket_loopback(family, sotype); if (s1 < 0) return; - s2 = listen_loopback(family, sotype); + s2 = socket_loopback(family, sotype); if (s2 < 0) goto close_s1; @@ -500,7 +503,7 @@ static void test_destroy_orphan_child(int family, int sotype, int mapfd) u64 value; u32 key; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -534,7 +537,7 @@ static void test_clone_after_delete(int family, int sotype, int mapfd) u64 value; u32 key; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -570,7 +573,7 @@ static void test_accept_after_delete(int family, int sotype, int mapfd) socklen_t len; u64 value; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s == -1) return; @@ -624,7 +627,7 @@ static void test_accept_before_delete(int family, int sotype, int mapfd) socklen_t len; u64 value; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s == -1) return; @@ -735,7 +738,7 @@ static void test_syn_recv_insert_delete(int family, int sotype, int mapfd) int err, s; u64 value; - s = listen_loopback(family, sotype | SOCK_NONBLOCK); + s = socket_loopback(family, sotype | SOCK_NONBLOCK); if (s < 0) return; @@ -877,7 +880,7 @@ static void redir_to_connected(int family, int sotype, int sock_mapfd, zero_verdict_count(verd_mapfd); - s = listen_loopback(family, sotype | SOCK_NONBLOCK); + s = socket_loopback(family, sotype | SOCK_NONBLOCK); if (s < 0) return; @@ -1009,7 +1012,7 @@ static void redir_to_listening(int family, int sotype, int sock_mapfd, zero_verdict_count(verd_mapfd); - s = listen_loopback(family, sotype | SOCK_NONBLOCK); + s = socket_loopback(family, sotype | SOCK_NONBLOCK); if (s < 0) return; @@ -1120,7 +1123,7 @@ static void test_reuseport_select_listening(int family, int sotype, zero_verdict_count(verd_map); - s = listen_loopback_reuseport(family, sotype, reuseport_prog); + s = socket_loopback_reuseport(family, sotype, reuseport_prog); if (s < 0) return; @@ -1174,7 +1177,7 @@ static void test_reuseport_select_connected(int family, int sotype, zero_verdict_count(verd_map); - s = listen_loopback_reuseport(family, sotype, reuseport_prog); + s = socket_loopback_reuseport(family, sotype, reuseport_prog); if (s < 0) return; @@ -1249,11 +1252,11 @@ static void test_reuseport_mixed_groups(int family, int sotype, int sock_map, zero_verdict_count(verd_map); /* Create two listeners, each in its own reuseport group */ - s1 = listen_loopback_reuseport(family, sotype, reuseport_prog); + s1 = socket_loopback_reuseport(family, sotype, reuseport_prog); if (s1 < 0) return; - s2 = listen_loopback_reuseport(family, sotype, reuseport_prog); + s2 = socket_loopback_reuseport(family, sotype, reuseport_prog); if (s2 < 0) goto close_srv1; -- 2.20.1

5 years, 1 month

1
0
0 0

[PATCH 0/3] riscv: add support for restartable sequence

by Vincent Chen

Add RSEQ, restartable sequence, support and related selftest to RISCV. The Kconfig option HAVE_REGS_AND_STACK_ACCESS_API is also required by RSEQ because RSEQ will modify the content of pt_regs.sepc through instruction_pointer_set() during the fixup procedure. In order to select the config HAVE_REGS_AND_STACK_ACCESS_API, the missing APIs for accessing pt_regs are also added in this patch set. The relevant RSEQ tests in kselftest require the Binutils patch "RISC-V: Fix linker problems with TLS copy relocs" to avoid placing PREINIT_ARRAY and TLS variable of librseq.so at the same address. https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=3e7bd7f… A segmental fault will happen if the Binutils misses this patch. Vincent Chen (3): riscv: add required functions to enable HAVE_REGS_AND_STACK_ACCESS_API riscv: Add support for restartable sequence rseq/selftests: Add support for riscv arch/riscv/Kconfig | 2 + arch/riscv/include/asm/ptrace.h | 29 +- arch/riscv/kernel/entry.S | 4 + arch/riscv/kernel/ptrace.c | 99 +++++ arch/riscv/kernel/signal.c | 3 + tools/testing/selftests/rseq/param_test.c | 23 ++ tools/testing/selftests/rseq/rseq-riscv.h | 622 ++++++++++++++++++++++++++++++ tools/testing/selftests/rseq/rseq.h | 2 + 8 files changed, 783 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/rseq/rseq-riscv.h -- 2.7.4

5 years, 1 month

3
8
0 0

kselftest selftest issues and clarifications

by Bird, Tim

> -----Original Message----- > From: Shuah Khan > > On 2/28/20 10:50 AM, Bird, Tim wrote: > > > > > >> -----Original Message----- > >> From: Shuah Khan > >> > >> Integrating Kselftest into Kernel CI rings depends on Kselftest build > >> and install framework to support Kernel CI use-cases. I am kicking off > >> an effort to support Kselftest runs in Kernel CI rings. Running these > >> tests in Kernel CI rings will help quality of kernel releases, both > >> stable and mainline. > >> > >> What is required for full support? > >> > >> 1. Cross-compilation & relocatable build support > >> 2. Generates objects in objdir/kselftest without cluttering main objdir > >> 3. Leave source directory clean > >> 4. Installs correctly in objdir/kselftest/kselftest_install and adds > >> itself to run_kselftest.sh script generated during install. > >> > >> Note that install step is necessary for all files to be installed for > >> run time support. > >> > >> I looked into the current status and identified problems. The work is > >> minimal to add full support. Out of 80+ tests, 7 fail to cross-build > >> and 1 fails to install correctly. > >> > >> List is below: > >> > >> Tests fails to build: bpf, capabilities, kvm, memfd, mqueue, timens, vm > >> Tests fail to install: android (partial failure) > >> Leaves source directory dirty: bpf, seccomp > >> > >> I have patches ready for the following issues: > >> > >> Kselftest objects (test dirs) clutter top level object directory. > >> seccomp_bpf generates objects in the source directory. > >> > >> I created a topic branch to collect all the patches: > >> > >> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/?… > >> > >> I am going to start working on build problems. If anybody is > >> interested in helping me with this effort, don't hesitate to > >> contact me. I first priority is fixing build and install and > >> then look into tests that leave the source directory dirty. > > > > I'm interested in this. I'd like the same cleanups in order to run > > kselftest in Fuego, and I can try it with additional toolchains > > and boards. Unfortunately, in terms of running tests, almost all > > the boards in my lab are running old kernels. So the tests results > > aren't useful for upstream work. But I can still test > > compilation and install issues, for the kselftest tests themselves. > > > > Testing compilation and install issues is very valuable. This is one > area that hasn't been test coverage compared to running tests. So it > great if you can help with build/install on linux-next to catch > problems in new tests. I am finding that older tests have been stable > and as new tests come in, we tend to miss catching these types of > problems. > > Especially cross-builds and installs on arm64 and others. OK. I've got 2 different arm64 compilers, with wildly different SDK setups, so hopefully this will be useful. > >> > >> Detailed report can be found here: > >> > >> https://drive.google.com/file/d/11nnWOKIzzOrE4EiucZBn423lzSU_eNNv/view?usp=… > > > > Is there anything you'd like me to look at specifically? Do you want me to start > > at the bottom of the list and work up? I could look at 'vm' or 'timens'. > > > > Yes you can start with vm and timens. I wrote a test for Fuego and ran into a few interesting issues. Also, I have a question about the best place to start, and your preference for reporting results. Your feedback on any of this would be appreciated: Here are some issues and questions I ran into: 1) overwriting of CC in lib.mk This line in tools/testing/selftests/lib.mk caused me some grief: CC := $(CROSS_COMPILE)gcc One of my toolchains pre-defines CC with a bunch of extra flags, so this didn't work for that tolchain. I'm still debugging this. I'm not sure why the weird definition of CC works for the rest of the kernel but not with kselftest. But I may submit some kind of patch to make this CC assignment conditional (that is, only do the assignment if it's not already defined) Let me know what you think. 2) ability to get list of targets would be nice It would be nice if there were a mechanism to get the list of default targets from kselftest. I added the following for my own tests, so that I don't have to hard-code my loop over the individual selftests: diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 63430e2..9955e71 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -246,4 +246,7 @@ clean: $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\ done; +show_targets: + @echo $(TARGETS) + .PHONY: khdr all run_tests hotplug run_hotplug clean_hotplug run_pstore_crash install clean This is pretty simple. I can submit this as a proper patch, if you're willing to take something like it, and we can discuss details if you'd rather see this done another way. 3) different ways to invoke kselftest There are a number of different ways to invoke kselftest. I'm currently using the '-C' method for both building and installing. make ARCH=$ARCHITECTURE TARGETS="$target" -C tools/testing/selftests make ARCH=$ARCHITECTURE TARGETS="$target" -C tools/testing/selftests install I think, there there are now targets for kselftest in the top-level Makefile. Do you have a preferred method you'd like me to test? Or would you like me to run my tests with multiple methods? And I'm using a KBUILD_OUTPUT environment variable, rather than O=. Let me know if you'd like me to build a matrix of these different build methods. 4) what tree(s) would you like me to test? I think you mentioned that you'd like to see the tests against 'linux-next'. Right now I've been doing tests against the 'torvalds' mainline tree, and the 'linux-kselftest' tree, master branch. Let me know if there are other branches or trees you like me to test. 5) where would you like test results? In the short term, I'm testing the compile and install of the tests and working on the ones that fail for me (I'm getting 17 or 18 failures, depending on the toolchain I'm using, for some of my boards). However, I'm still debugging my setup, I hope I can drop that down to the same one's you are seeing shortly. Longer-term I plan to set up a CI loop for these tests for Fuego, and publish some kind of matrix results and reports on my own server (https://birdcloud.org/) I'm generating HTML tables now that work with Fuego's Jenkins configuration, but I could send the data elsewhere if desired. This is still under construction. Would you like me to publish results also to kcidb, or some other repository? I might be able to publish my results to Kernelci, but I'll end up with a customized report for kselftest, that will allow drilling down to see output for individual compile or install failures. I'm not sure how much of that would be supported in the KernelCI interface. But I recognize you'd probably not like to have to go to multiple places to see results. Also, in terms of periodic results do you want any e-mails sent to the Linux-kselftest list? I thought I'd hold off for now, and wait for the compile/install fixes to settle down, so that future e-mails would only report regressions or issues with new tests. We can discuss this later, as I don't plan to do this quite yet (and would only do an e-mail after checking with you anyway). Thanks for any feedback you can provide. -- Tim P.S. Also, please let me know who is working on this on the KernelCI side (if it's not Kevin), so I can CC them on future discussions.

5 years, 1 month

3
3
0 0

[GIT PULL] Kselftest kunit update for Linux 5.6-rc5

by Shuah Khan

Hi Linus, Please pull the following Keselftest update for Linux 5.6-rc5. This Kselftest update for Linux 5.6-rc5 consists of a cleanup patch to undo changes to global .gitignore that added selftests/lkdtm objects and add them to a local selftests/lkdtm/.gitignore. Summary of Linus's comments on local vs. global gitignore scope: - Keep local gitignore patterns in local files. - Put only global gitignore patterns in the top-level gitignore file. Local scope keeps things much better separated. It also incidentally means that if a directory gets renamed, the gitignore file continues to work unless in the case of renaming the actual files themselves that are named in the gitignore. Diff is attached. I took the liberty to include summary of your comments on local vs global gitignore scope in the commit message. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit ef89d0545132d685f73da6f58b7e7fe002536f91: selftests/rseq: Fix out-of-tree compilation (2020-02-20 08:57:12 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.6-rc5 for you to fetch changes up to f3a60268f5cec7dae0e9713f5fc65aecc3734c09: selftest/lkdtm: Use local .gitignore (2020-03-02 08:39:39 -0700) ---------------------------------------------------------------- linux-kselftest-5.6-rc5 This Kselftest update for Linux 5.6-rc5 consists of a cleanup patch to undo changes to global .gitignore that added selftests/lkdtm objects and add them to a local selftests/lkdtm/.gitignore. Summary of Linus's comments on local vs. global gitignore scope: - Keep local gitignore patterns in local files. - Put only global gitignore patterns in the top-level gitignore file. Local scope keeps things much better separated. It also incidentally means that if a directory gets renamed, the gitignore file continues to work unless in the case of renaming the actual files themselves that are named in the gitignore. ---------------------------------------------------------------- Christophe Leroy (1): selftest/lkdtm: Use local .gitignore .gitignore | 4 ---- tools/testing/selftests/lkdtm/.gitignore | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 tools/testing/selftests/lkdtm/.gitignore ----------------------------------------------------------------

5 years, 1 month

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror