selftests/bpf: rename verifier/wide_store.c to verifier/wide_access.c

Move the file and rename internal BPF_SOCK_ADDR define to
BPF_SOCK_ADDR_STORE. This selftest will be extended in the next commit
with the wide loads.

Cc: Yonghong Song <yhs@fb.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/tools/testing/selftests/bpf/verifier/wide_access.c b/tools/testing/selftests/bpf/verifier/wide_access.c
new file mode 100644 (file)
index 0000000..3ac9732
--- /dev/null
+++ b/tools/testing/selftests/bpf/verifier/wide_access.c
@@ -0,0 +1,36 @@
+#define BPF_SOCK_ADDR_STORE(field, off, res, err) \
+{ \
+       "wide store to bpf_sock_addr." #field "[" #off "]", \
+       .insns = { \
+       BPF_MOV64_IMM(BPF_REG_0, 1), \
+       BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, \
+                   offsetof(struct bpf_sock_addr, field[off])), \
+       BPF_EXIT_INSN(), \
+       }, \
+       .result = res, \
+       .prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR, \
+       .expected_attach_type = BPF_CGROUP_UDP6_SENDMSG, \
+       .errstr = err, \
+}
+
+/* user_ip6[0] is u64 aligned */
+BPF_SOCK_ADDR_STORE(user_ip6, 0, ACCEPT,
+                   NULL),
+BPF_SOCK_ADDR_STORE(user_ip6, 1, REJECT,
+                   "invalid bpf_context access off=12 size=8"),
+BPF_SOCK_ADDR_STORE(user_ip6, 2, ACCEPT,
+                   NULL),
+BPF_SOCK_ADDR_STORE(user_ip6, 3, REJECT,
+                   "invalid bpf_context access off=20 size=8"),
+
+/* msg_src_ip6[0] is _not_ u64 aligned */
+BPF_SOCK_ADDR_STORE(msg_src_ip6, 0, REJECT,
+                   "invalid bpf_context access off=44 size=8"),
+BPF_SOCK_ADDR_STORE(msg_src_ip6, 1, ACCEPT,
+                   NULL),
+BPF_SOCK_ADDR_STORE(msg_src_ip6, 2, REJECT,
+                   "invalid bpf_context access off=52 size=8"),
+BPF_SOCK_ADDR_STORE(msg_src_ip6, 3, REJECT,
+                   "invalid bpf_context access off=56 size=8"),
+
+#undef BPF_SOCK_ADDR_STORE

diff --git a/tools/testing/selftests/bpf/verifier/wide_store.c b/tools/testing/selftests/bpf/verifier/wide_store.c
deleted file mode 100644 (file)
index 8fe9960..0000000
--- a/tools/testing/selftests/bpf/verifier/wide_store.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#define BPF_SOCK_ADDR(field, off, res, err) \
-{ \
-       "wide store to bpf_sock_addr." #field "[" #off "]", \
-       .insns = { \
-       BPF_MOV64_IMM(BPF_REG_0, 1), \
-       BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, \
-                   offsetof(struct bpf_sock_addr, field[off])), \
-       BPF_EXIT_INSN(), \
-       }, \
-       .result = res, \
-       .prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR, \
-       .expected_attach_type = BPF_CGROUP_UDP6_SENDMSG, \
-       .errstr = err, \
-}
-
-/* user_ip6[0] is u64 aligned */
-BPF_SOCK_ADDR(user_ip6, 0, ACCEPT,
-             NULL),
-BPF_SOCK_ADDR(user_ip6, 1, REJECT,
-             "invalid bpf_context access off=12 size=8"),
-BPF_SOCK_ADDR(user_ip6, 2, ACCEPT,
-             NULL),
-BPF_SOCK_ADDR(user_ip6, 3, REJECT,
-             "invalid bpf_context access off=20 size=8"),
-
-/* msg_src_ip6[0] is _not_ u64 aligned */
-BPF_SOCK_ADDR(msg_src_ip6, 0, REJECT,
-             "invalid bpf_context access off=44 size=8"),
-BPF_SOCK_ADDR(msg_src_ip6, 1, ACCEPT,
-             NULL),
-BPF_SOCK_ADDR(msg_src_ip6, 2, REJECT,
-             "invalid bpf_context access off=52 size=8"),
-BPF_SOCK_ADDR(msg_src_ip6, 3, REJECT,
-             "invalid bpf_context access off=56 size=8"),
-
-#undef BPF_SOCK_ADDR