Skip to content

Commit

Permalink
selftests/bpf: Enable cpu v4 tests for arm64
Browse files Browse the repository at this point in the history 
Enable CPU v4 instruction tests for arm64. Below are the test results from
BPF test_progs selftests:

  # ./test_progs -t ldsx_insn,verifier_sdiv,verifier_movsx,verifier_ldsx,verifier_gotol,verifier_bswap
  torvalds#115/1   ldsx_insn/map_val and probed_memory:OK
  torvalds#115/2   ldsx_insn/ctx_member_sign_ext:OK
  torvalds#115/3   ldsx_insn/ctx_member_narrow_sign_ext:OK
  torvalds#115     ldsx_insn:OK
  torvalds#302/1   verifier_bswap/BSWAP, 16:OK
  torvalds#302/2   verifier_bswap/BSWAP, 16 @unpriv:OK
  torvalds#302/3   verifier_bswap/BSWAP, 32:OK
  torvalds#302/4   verifier_bswap/BSWAP, 32 @unpriv:OK
  torvalds#302/5   verifier_bswap/BSWAP, 64:OK
  torvalds#302/6   verifier_bswap/BSWAP, 64 @unpriv:OK
  torvalds#302     verifier_bswap:OK
  torvalds#316/1   verifier_gotol/gotol, small_imm:OK
  torvalds#316/2   verifier_gotol/gotol, small_imm @unpriv:OK
  torvalds#316     verifier_gotol:OK
  torvalds#324/1   verifier_ldsx/LDSX, S8:OK
  torvalds#324/2   verifier_ldsx/LDSX, S8 @unpriv:OK
  torvalds#324/3   verifier_ldsx/LDSX, S16:OK
  torvalds#324/4   verifier_ldsx/LDSX, S16 @unpriv:OK
  torvalds#324/5   verifier_ldsx/LDSX, S32:OK
  torvalds#324/6   verifier_ldsx/LDSX, S32 @unpriv:OK
  torvalds#324/7   verifier_ldsx/LDSX, S8 range checking, privileged:OK
  torvalds#324/8   verifier_ldsx/LDSX, S16 range checking:OK
  torvalds#324/9   verifier_ldsx/LDSX, S16 range checking @unpriv:OK
  torvalds#324/10  verifier_ldsx/LDSX, S32 range checking:OK
  torvalds#324/11  verifier_ldsx/LDSX, S32 range checking @unpriv:OK
  torvalds#324     verifier_ldsx:OK
  torvalds#335/1   verifier_movsx/MOV32SX, S8:OK
  torvalds#335/2   verifier_movsx/MOV32SX, S8 @unpriv:OK
  torvalds#335/3   verifier_movsx/MOV32SX, S16:OK
  torvalds#335/4   verifier_movsx/MOV32SX, S16 @unpriv:OK
  torvalds#335/5   verifier_movsx/MOV64SX, S8:OK
  torvalds#335/6   verifier_movsx/MOV64SX, S8 @unpriv:OK
  torvalds#335/7   verifier_movsx/MOV64SX, S16:OK
  torvalds#335/8   verifier_movsx/MOV64SX, S16 @unpriv:OK
  torvalds#335/9   verifier_movsx/MOV64SX, S32:OK
  torvalds#335/10  verifier_movsx/MOV64SX, S32 @unpriv:OK
  torvalds#335/11  verifier_movsx/MOV32SX, S8, range_check:OK
  torvalds#335/12  verifier_movsx/MOV32SX, S8, range_check @unpriv:OK
  torvalds#335/13  verifier_movsx/MOV32SX, S16, range_check:OK
  torvalds#335/14  verifier_movsx/MOV32SX, S16, range_check @unpriv:OK
  torvalds#335/15  verifier_movsx/MOV32SX, S16, range_check 2:OK
  torvalds#335/16  verifier_movsx/MOV32SX, S16, range_check 2 @unpriv:OK
  torvalds#335/17  verifier_movsx/MOV64SX, S8, range_check:OK
  torvalds#335/18  verifier_movsx/MOV64SX, S8, range_check @unpriv:OK
  torvalds#335/19  verifier_movsx/MOV64SX, S16, range_check:OK
  torvalds#335/20  verifier_movsx/MOV64SX, S16, range_check @unpriv:OK
  torvalds#335/21  verifier_movsx/MOV64SX, S32, range_check:OK
  torvalds#335/22  verifier_movsx/MOV64SX, S32, range_check @unpriv:OK
  torvalds#335/23  verifier_movsx/MOV64SX, S16, R10 Sign Extension:OK
  torvalds#335/24  verifier_movsx/MOV64SX, S16, R10 Sign Extension @unpriv:OK
  torvalds#335     verifier_movsx:OK
  torvalds#347/1   verifier_sdiv/SDIV32, non-zero imm divisor, check 1:OK
  torvalds#347/2   verifier_sdiv/SDIV32, non-zero imm divisor, check 1 @unpriv:OK
  torvalds#347/3   verifier_sdiv/SDIV32, non-zero imm divisor, check 2:OK
  torvalds#347/4   verifier_sdiv/SDIV32, non-zero imm divisor, check 2 @unpriv:OK
  torvalds#347/5   verifier_sdiv/SDIV32, non-zero imm divisor, check 3:OK
  torvalds#347/6   verifier_sdiv/SDIV32, non-zero imm divisor, check 3 @unpriv:OK
  torvalds#347/7   verifier_sdiv/SDIV32, non-zero imm divisor, check 4:OK
  torvalds#347/8   verifier_sdiv/SDIV32, non-zero imm divisor, check 4 @unpriv:OK
  torvalds#347/9   verifier_sdiv/SDIV32, non-zero imm divisor, check 5:OK
  torvalds#347/10  verifier_sdiv/SDIV32, non-zero imm divisor, check 5 @unpriv:OK
  torvalds#347/11  verifier_sdiv/SDIV32, non-zero imm divisor, check 6:OK
  torvalds#347/12  verifier_sdiv/SDIV32, non-zero imm divisor, check 6 @unpriv:OK
  torvalds#347/13  verifier_sdiv/SDIV32, non-zero imm divisor, check 7:OK
  torvalds#347/14  verifier_sdiv/SDIV32, non-zero imm divisor, check 7 @unpriv:OK
  torvalds#347/15  verifier_sdiv/SDIV32, non-zero imm divisor, check 8:OK
  torvalds#347/16  verifier_sdiv/SDIV32, non-zero imm divisor, check 8 @unpriv:OK
  torvalds#347/17  verifier_sdiv/SDIV32, non-zero reg divisor, check 1:OK
  torvalds#347/18  verifier_sdiv/SDIV32, non-zero reg divisor, check 1 @unpriv:OK
  torvalds#347/19  verifier_sdiv/SDIV32, non-zero reg divisor, check 2:OK
  torvalds#347/20  verifier_sdiv/SDIV32, non-zero reg divisor, check 2 @unpriv:OK
  torvalds#347/21  verifier_sdiv/SDIV32, non-zero reg divisor, check 3:OK
  torvalds#347/22  verifier_sdiv/SDIV32, non-zero reg divisor, check 3 @unpriv:OK
  torvalds#347/23  verifier_sdiv/SDIV32, non-zero reg divisor, check 4:OK
  torvalds#347/24  verifier_sdiv/SDIV32, non-zero reg divisor, check 4 @unpriv:OK
  torvalds#347/25  verifier_sdiv/SDIV32, non-zero reg divisor, check 5:OK
  torvalds#347/26  verifier_sdiv/SDIV32, non-zero reg divisor, check 5 @unpriv:OK
  torvalds#347/27  verifier_sdiv/SDIV32, non-zero reg divisor, check 6:OK
  torvalds#347/28  verifier_sdiv/SDIV32, non-zero reg divisor, check 6 @unpriv:OK
  torvalds#347/29  verifier_sdiv/SDIV32, non-zero reg divisor, check 7:OK
  torvalds#347/30  verifier_sdiv/SDIV32, non-zero reg divisor, check 7 @unpriv:OK
  torvalds#347/31  verifier_sdiv/SDIV32, non-zero reg divisor, check 8:OK
  torvalds#347/32  verifier_sdiv/SDIV32, non-zero reg divisor, check 8 @unpriv:OK
  torvalds#347/33  verifier_sdiv/SDIV64, non-zero imm divisor, check 1:OK
  torvalds#347/34  verifier_sdiv/SDIV64, non-zero imm divisor, check 1 @unpriv:OK
  torvalds#347/35  verifier_sdiv/SDIV64, non-zero imm divisor, check 2:OK
  torvalds#347/36  verifier_sdiv/SDIV64, non-zero imm divisor, check 2 @unpriv:OK
  torvalds#347/37  verifier_sdiv/SDIV64, non-zero imm divisor, check 3:OK
  torvalds#347/38  verifier_sdiv/SDIV64, non-zero imm divisor, check 3 @unpriv:OK
  torvalds#347/39  verifier_sdiv/SDIV64, non-zero imm divisor, check 4:OK
  torvalds#347/40  verifier_sdiv/SDIV64, non-zero imm divisor, check 4 @unpriv:OK
  torvalds#347/41  verifier_sdiv/SDIV64, non-zero imm divisor, check 5:OK
  torvalds#347/42  verifier_sdiv/SDIV64, non-zero imm divisor, check 5 @unpriv:OK
  torvalds#347/43  verifier_sdiv/SDIV64, non-zero imm divisor, check 6:OK
  torvalds#347/44  verifier_sdiv/SDIV64, non-zero imm divisor, check 6 @unpriv:OK
  torvalds#347/45  verifier_sdiv/SDIV64, non-zero reg divisor, check 1:OK
  torvalds#347/46  verifier_sdiv/SDIV64, non-zero reg divisor, check 1 @unpriv:OK
  torvalds#347/47  verifier_sdiv/SDIV64, non-zero reg divisor, check 2:OK
  torvalds#347/48  verifier_sdiv/SDIV64, non-zero reg divisor, check 2 @unpriv:OK
  torvalds#347/49  verifier_sdiv/SDIV64, non-zero reg divisor, check 3:OK
  torvalds#347/50  verifier_sdiv/SDIV64, non-zero reg divisor, check 3 @unpriv:OK
  torvalds#347/51  verifier_sdiv/SDIV64, non-zero reg divisor, check 4:OK
  torvalds#347/52  verifier_sdiv/SDIV64, non-zero reg divisor, check 4 @unpriv:OK
  torvalds#347/53  verifier_sdiv/SDIV64, non-zero reg divisor, check 5:OK
  torvalds#347/54  verifier_sdiv/SDIV64, non-zero reg divisor, check 5 @unpriv:OK
  torvalds#347/55  verifier_sdiv/SDIV64, non-zero reg divisor, check 6:OK
  torvalds#347/56  verifier_sdiv/SDIV64, non-zero reg divisor, check 6 @unpriv:OK
  torvalds#347/57  verifier_sdiv/SMOD32, non-zero imm divisor, check 1:OK
  torvalds#347/58  verifier_sdiv/SMOD32, non-zero imm divisor, check 1 @unpriv:OK
  torvalds#347/59  verifier_sdiv/SMOD32, non-zero imm divisor, check 2:OK
  torvalds#347/60  verifier_sdiv/SMOD32, non-zero imm divisor, check 2 @unpriv:OK
  torvalds#347/61  verifier_sdiv/SMOD32, non-zero imm divisor, check 3:OK
  torvalds#347/62  verifier_sdiv/SMOD32, non-zero imm divisor, check 3 @unpriv:OK
  torvalds#347/63  verifier_sdiv/SMOD32, non-zero imm divisor, check 4:OK
  torvalds#347/64  verifier_sdiv/SMOD32, non-zero imm divisor, check 4 @unpriv:OK
  torvalds#347/65  verifier_sdiv/SMOD32, non-zero imm divisor, check 5:OK
  torvalds#347/66  verifier_sdiv/SMOD32, non-zero imm divisor, check 5 @unpriv:OK
  torvalds#347/67  verifier_sdiv/SMOD32, non-zero imm divisor, check 6:OK
  torvalds#347/68  verifier_sdiv/SMOD32, non-zero imm divisor, check 6 @unpriv:OK
  torvalds#347/69  verifier_sdiv/SMOD32, non-zero reg divisor, check 1:OK
  torvalds#347/70  verifier_sdiv/SMOD32, non-zero reg divisor, check 1 @unpriv:OK
  torvalds#347/71  verifier_sdiv/SMOD32, non-zero reg divisor, check 2:OK
  torvalds#347/72  verifier_sdiv/SMOD32, non-zero reg divisor, check 2 @unpriv:OK
  torvalds#347/73  verifier_sdiv/SMOD32, non-zero reg divisor, check 3:OK
  torvalds#347/74  verifier_sdiv/SMOD32, non-zero reg divisor, check 3 @unpriv:OK
  torvalds#347/75  verifier_sdiv/SMOD32, non-zero reg divisor, check 4:OK
  torvalds#347/76  verifier_sdiv/SMOD32, non-zero reg divisor, check 4 @unpriv:OK
  torvalds#347/77  verifier_sdiv/SMOD32, non-zero reg divisor, check 5:OK
  torvalds#347/78  verifier_sdiv/SMOD32, non-zero reg divisor, check 5 @unpriv:OK
  torvalds#347/79  verifier_sdiv/SMOD32, non-zero reg divisor, check 6:OK
  torvalds#347/80  verifier_sdiv/SMOD32, non-zero reg divisor, check 6 @unpriv:OK
  torvalds#347/81  verifier_sdiv/SMOD64, non-zero imm divisor, check 1:OK
  torvalds#347/82  verifier_sdiv/SMOD64, non-zero imm divisor, check 1 @unpriv:OK
  torvalds#347/83  verifier_sdiv/SMOD64, non-zero imm divisor, check 2:OK
  torvalds#347/84  verifier_sdiv/SMOD64, non-zero imm divisor, check 2 @unpriv:OK
  torvalds#347/85  verifier_sdiv/SMOD64, non-zero imm divisor, check 3:OK
  torvalds#347/86  verifier_sdiv/SMOD64, non-zero imm divisor, check 3 @unpriv:OK
  torvalds#347/87  verifier_sdiv/SMOD64, non-zero imm divisor, check 4:OK
  torvalds#347/88  verifier_sdiv/SMOD64, non-zero imm divisor, check 4 @unpriv:OK
  torvalds#347/89  verifier_sdiv/SMOD64, non-zero imm divisor, check 5:OK
  torvalds#347/90  verifier_sdiv/SMOD64, non-zero imm divisor, check 5 @unpriv:OK
  torvalds#347/91  verifier_sdiv/SMOD64, non-zero imm divisor, check 6:OK
  torvalds#347/92  verifier_sdiv/SMOD64, non-zero imm divisor, check 6 @unpriv:OK
  torvalds#347/93  verifier_sdiv/SMOD64, non-zero imm divisor, check 7:OK
  torvalds#347/94  verifier_sdiv/SMOD64, non-zero imm divisor, check 7 @unpriv:OK
  torvalds#347/95  verifier_sdiv/SMOD64, non-zero imm divisor, check 8:OK
  torvalds#347/96  verifier_sdiv/SMOD64, non-zero imm divisor, check 8 @unpriv:OK
  torvalds#347/97  verifier_sdiv/SMOD64, non-zero reg divisor, check 1:OK
  torvalds#347/98  verifier_sdiv/SMOD64, non-zero reg divisor, check 1 @unpriv:OK
  torvalds#347/99  verifier_sdiv/SMOD64, non-zero reg divisor, check 2:OK
  torvalds#347/100 verifier_sdiv/SMOD64, non-zero reg divisor, check 2 @unpriv:OK
  torvalds#347/101 verifier_sdiv/SMOD64, non-zero reg divisor, check 3:OK
  torvalds#347/102 verifier_sdiv/SMOD64, non-zero reg divisor, check 3 @unpriv:OK
  torvalds#347/103 verifier_sdiv/SMOD64, non-zero reg divisor, check 4:OK
  torvalds#347/104 verifier_sdiv/SMOD64, non-zero reg divisor, check 4 @unpriv:OK
  torvalds#347/105 verifier_sdiv/SMOD64, non-zero reg divisor, check 5:OK
  torvalds#347/106 verifier_sdiv/SMOD64, non-zero reg divisor, check 5 @unpriv:OK
  torvalds#347/107 verifier_sdiv/SMOD64, non-zero reg divisor, check 6:OK
  torvalds#347/108 verifier_sdiv/SMOD64, non-zero reg divisor, check 6 @unpriv:OK
  torvalds#347/109 verifier_sdiv/SMOD64, non-zero reg divisor, check 7:OK
  torvalds#347/110 verifier_sdiv/SMOD64, non-zero reg divisor, check 7 @unpriv:OK
  torvalds#347/111 verifier_sdiv/SMOD64, non-zero reg divisor, check 8:OK
  torvalds#347/112 verifier_sdiv/SMOD64, non-zero reg divisor, check 8 @unpriv:OK
  torvalds#347/113 verifier_sdiv/SDIV32, zero divisor:OK
  torvalds#347/114 verifier_sdiv/SDIV32, zero divisor @unpriv:OK
  torvalds#347/115 verifier_sdiv/SDIV64, zero divisor:OK
  torvalds#347/116 verifier_sdiv/SDIV64, zero divisor @unpriv:OK
  torvalds#347/117 verifier_sdiv/SMOD32, zero divisor:OK
  torvalds#347/118 verifier_sdiv/SMOD32, zero divisor @unpriv:OK
  torvalds#347/119 verifier_sdiv/SMOD64, zero divisor:OK
  torvalds#347/120 verifier_sdiv/SMOD64, zero divisor @unpriv:OK
  torvalds#347     verifier_sdiv:OK
  Summary: 6/166 PASSED, 0 SKIPPED, 0 FAILED

Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Florent Revest <revest@chromium.org>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Acked-by: Florent Revest <revest@chromium.org>
Link: https://lore.kernel.org/bpf/20230815154158.717901-8-xukuohai@huaweicloud.com
  • Loading branch information
@borkmann
Xu Kuohai authored and borkmann committed Aug 18, 2023
1 parent 68b1819 commit 5f6395f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/progs/test_ldsx_insn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h>

#if defined(__TARGET_ARCH_x86) && __clang_major__ >= 18
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86)) && __clang_major__ >= 18
const volatile int skip = 0;
#else
const volatile int skip = 1;
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/progs/verifier_bswap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

#if defined(__TARGET_ARCH_x86) && __clang_major__ >= 18
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86)) && __clang_major__ >= 18

SEC("socket")
__description("BSWAP, 16")
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/progs/verifier_gotol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

#if defined(__TARGET_ARCH_x86) && __clang_major__ >= 18
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86)) && __clang_major__ >= 18

SEC("socket")
__description("gotol, small_imm")
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/progs/verifier_ldsx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

#if defined(__TARGET_ARCH_x86) && __clang_major__ >= 18
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86)) && __clang_major__ >= 18

SEC("socket")
__description("LDSX, S8")
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/progs/verifier_movsx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

#if defined(__TARGET_ARCH_x86) && __clang_major__ >= 18
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86)) && __clang_major__ >= 18

SEC("socket")
__description("MOV32SX, S8")
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/progs/verifier_sdiv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

#if defined(__TARGET_ARCH_x86) && __clang_major__ >= 18
#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86)) && __clang_major__ >= 18

SEC("socket")
__description("SDIV32, non-zero imm divisor, check 1")
Expand Down

0 comments on commit 5f6395f

Please sign in to comment.