selftests/bpf: verifier/cgroup_storage.c converted to inline assembly

Test verifier/cgroup_storage.c automatically converted to use inline assembly.

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20230325025524.144043-15-eddyz87@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/verifier.c b/tools/testing/selftests/bpf/prog_tests/verifier.c
index 53e41af..3b47620 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@ -11,6 +11,7 @@
 #include "verifier_cfg.skel.h"
 #include "verifier_cgroup_inv_retcode.skel.h"
 #include "verifier_cgroup_skb.skel.h"
+#include "verifier_cgroup_storage.skel.h"
 
 __maybe_unused
 static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -44,3 +45,4 @@ void test_verifier_bounds_mix_sign_unsign(void) { RUN(verifier_bounds_mix_sign_u
 void test_verifier_cfg(void)                  { RUN(verifier_cfg); }
 void test_verifier_cgroup_inv_retcode(void)   { RUN(verifier_cgroup_inv_retcode); }
 void test_verifier_cgroup_skb(void)           { RUN(verifier_cgroup_skb); }
+void test_verifier_cgroup_storage(void)       { RUN(verifier_cgroup_storage); }

diff --git a/tools/testing/selftests/bpf/progs/verifier_cgroup_storage.c b/tools/testing/selftests/bpf/progs/verifier_cgroup_storage.c
new file mode 100644 (file)
index 0000000..9a13f5c
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/verifier_cgroup_storage.c
@@ -0,0 +1,308 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Converted from tools/testing/selftests/bpf/verifier/cgroup_storage.c */
+
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include "../../../include/linux/filter.h"
+#include "bpf_misc.h"
+
+struct {
+       __uint(type, BPF_MAP_TYPE_CGROUP_STORAGE);
+       __uint(max_entries, 0);
+       __type(key, struct bpf_cgroup_storage_key);
+       __type(value, char[TEST_DATA_LEN]);
+} cgroup_storage SEC(".maps");
+
+struct {
+       __uint(type, BPF_MAP_TYPE_HASH);
+       __uint(max_entries, 1);
+       __type(key, long long);
+       __type(value, long long);
+} map_hash_8b SEC(".maps");
+
+struct {
+       __uint(type, BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE);
+       __uint(max_entries, 0);
+       __type(key, struct bpf_cgroup_storage_key);
+       __type(value, char[64]);
+} percpu_cgroup_storage SEC(".maps");
+
+SEC("cgroup/skb")
+__description("valid cgroup storage access")
+__success __success_unpriv __retval(0)
+__naked void valid_cgroup_storage_access(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       r1 = %[cgroup_storage] ll;                      \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 0);                           \
+       r0 = r1;                                        \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(cgroup_storage)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid cgroup storage access 1")
+__failure __msg("cannot pass map_type 1 into func bpf_get_local_storage")
+__failure_unpriv
+__naked void invalid_cgroup_storage_access_1(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       r1 = %[map_hash_8b] ll;                         \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 0);                           \
+       r0 = r1;                                        \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(map_hash_8b)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid cgroup storage access 2")
+__failure __msg("fd 1 is not pointing to valid bpf_map")
+__failure_unpriv
+__naked void invalid_cgroup_storage_access_2(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       .8byte %[ld_map_fd];                            \
+       .8byte 0;                                       \
+       call %[bpf_get_local_storage];                  \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_insn(ld_map_fd, BPF_RAW_INSN(BPF_LD | BPF_DW | BPF_IMM, BPF_REG_1, BPF_PSEUDO_MAP_FD, 0, 1))
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid cgroup storage access 3")
+__failure __msg("invalid access to map value, value_size=64 off=256 size=4")
+__failure_unpriv
+__naked void invalid_cgroup_storage_access_3(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       r1 = %[cgroup_storage] ll;                      \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 256);                         \
+       r1 += 1;                                        \
+       r0 = 0;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(cgroup_storage)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid cgroup storage access 4")
+__failure __msg("invalid access to map value, value_size=64 off=-2 size=4")
+__failure_unpriv
+__flag(BPF_F_ANY_ALIGNMENT)
+__naked void invalid_cgroup_storage_access_4(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       r1 = %[cgroup_storage] ll;                      \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 - 2);                           \
+       r0 = r1;                                        \
+       r1 += 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(cgroup_storage)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid cgroup storage access 5")
+__failure __msg("get_local_storage() doesn't support non-zero flags")
+__failure_unpriv
+__naked void invalid_cgroup_storage_access_5(void)
+{
+       asm volatile ("                                 \
+       r2 = 7;                                         \
+       r1 = %[cgroup_storage] ll;                      \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 0);                           \
+       r0 = r1;                                        \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(cgroup_storage)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid cgroup storage access 6")
+__failure __msg("get_local_storage() doesn't support non-zero flags")
+__msg_unpriv("R2 leaks addr into helper function")
+__naked void invalid_cgroup_storage_access_6(void)
+{
+       asm volatile ("                                 \
+       r2 = r1;                                        \
+       r1 = %[cgroup_storage] ll;                      \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 0);                           \
+       r0 = r1;                                        \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(cgroup_storage)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("valid per-cpu cgroup storage access")
+__success __success_unpriv __retval(0)
+__naked void per_cpu_cgroup_storage_access(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       r1 = %[percpu_cgroup_storage] ll;               \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 0);                           \
+       r0 = r1;                                        \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(percpu_cgroup_storage)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid per-cpu cgroup storage access 1")
+__failure __msg("cannot pass map_type 1 into func bpf_get_local_storage")
+__failure_unpriv
+__naked void cpu_cgroup_storage_access_1(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       r1 = %[map_hash_8b] ll;                         \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 0);                           \
+       r0 = r1;                                        \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(map_hash_8b)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid per-cpu cgroup storage access 2")
+__failure __msg("fd 1 is not pointing to valid bpf_map")
+__failure_unpriv
+__naked void cpu_cgroup_storage_access_2(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       .8byte %[ld_map_fd];                            \
+       .8byte 0;                                       \
+       call %[bpf_get_local_storage];                  \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_insn(ld_map_fd, BPF_RAW_INSN(BPF_LD | BPF_DW | BPF_IMM, BPF_REG_1, BPF_PSEUDO_MAP_FD, 0, 1))
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid per-cpu cgroup storage access 3")
+__failure __msg("invalid access to map value, value_size=64 off=256 size=4")
+__failure_unpriv
+__naked void cpu_cgroup_storage_access_3(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       r1 = %[percpu_cgroup_storage] ll;               \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 256);                         \
+       r1 += 1;                                        \
+       r0 = 0;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(percpu_cgroup_storage)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid per-cpu cgroup storage access 4")
+__failure __msg("invalid access to map value, value_size=64 off=-2 size=4")
+__failure_unpriv
+__flag(BPF_F_ANY_ALIGNMENT)
+__naked void cpu_cgroup_storage_access_4(void)
+{
+       asm volatile ("                                 \
+       r2 = 0;                                         \
+       r1 = %[cgroup_storage] ll;                      \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 - 2);                           \
+       r0 = r1;                                        \
+       r1 += 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(cgroup_storage)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid per-cpu cgroup storage access 5")
+__failure __msg("get_local_storage() doesn't support non-zero flags")
+__failure_unpriv
+__naked void cpu_cgroup_storage_access_5(void)
+{
+       asm volatile ("                                 \
+       r2 = 7;                                         \
+       r1 = %[percpu_cgroup_storage] ll;               \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 0);                           \
+       r0 = r1;                                        \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(percpu_cgroup_storage)
+       : __clobber_all);
+}
+
+SEC("cgroup/skb")
+__description("invalid per-cpu cgroup storage access 6")
+__failure __msg("get_local_storage() doesn't support non-zero flags")
+__msg_unpriv("R2 leaks addr into helper function")
+__naked void cpu_cgroup_storage_access_6(void)
+{
+       asm volatile ("                                 \
+       r2 = r1;                                        \
+       r1 = %[percpu_cgroup_storage] ll;               \
+       call %[bpf_get_local_storage];                  \
+       r1 = *(u32*)(r0 + 0);                           \
+       r0 = r1;                                        \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_local_storage),
+         __imm_addr(percpu_cgroup_storage)
+       : __clobber_all);
+}
+
+char _license[] SEC("license") = "GPL";

diff --git a/tools/testing/selftests/bpf/verifier/cgroup_storage.c b/tools/testing/selftests/bpf/verifier/cgroup_storage.c
deleted file mode 100644 (file)
index 97057c0..0000000
--- a/tools/testing/selftests/bpf/verifier/cgroup_storage.c
+++ /dev/null
@@ -1,220 +0,0 @@
-{
-       "valid cgroup storage access",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_cgroup_storage = { 1 },
-       .result = ACCEPT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid cgroup storage access 1",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_map_hash_8b = { 1 },
-       .result = REJECT,
-       .errstr = "cannot pass map_type 1 into func bpf_get_local_storage",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid cgroup storage access 2",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 1),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .result = REJECT,
-       .errstr = "fd 1 is not pointing to valid bpf_map",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid cgroup storage access 3",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 256),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 1),
-       BPF_MOV64_IMM(BPF_REG_0, 0),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_cgroup_storage = { 1 },
-       .result = REJECT,
-       .errstr = "invalid access to map value, value_size=64 off=256 size=4",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid cgroup storage access 4",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, -2),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_cgroup_storage = { 1 },
-       .result = REJECT,
-       .errstr = "invalid access to map value, value_size=64 off=-2 size=4",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
-},
-{
-       "invalid cgroup storage access 5",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 7),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_cgroup_storage = { 1 },
-       .result = REJECT,
-       .errstr = "get_local_storage() doesn't support non-zero flags",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid cgroup storage access 6",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_1),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_cgroup_storage = { 1 },
-       .result = REJECT,
-       .errstr = "get_local_storage() doesn't support non-zero flags",
-       .errstr_unpriv = "R2 leaks addr into helper function",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "valid per-cpu cgroup storage access",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_percpu_cgroup_storage = { 1 },
-       .result = ACCEPT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid per-cpu cgroup storage access 1",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_map_hash_8b = { 1 },
-       .result = REJECT,
-       .errstr = "cannot pass map_type 1 into func bpf_get_local_storage",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid per-cpu cgroup storage access 2",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 1),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .result = REJECT,
-       .errstr = "fd 1 is not pointing to valid bpf_map",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid per-cpu cgroup storage access 3",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 256),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 1),
-       BPF_MOV64_IMM(BPF_REG_0, 0),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_percpu_cgroup_storage = { 1 },
-       .result = REJECT,
-       .errstr = "invalid access to map value, value_size=64 off=256 size=4",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid per-cpu cgroup storage access 4",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, -2),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_cgroup_storage = { 1 },
-       .result = REJECT,
-       .errstr = "invalid access to map value, value_size=64 off=-2 size=4",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
-},
-{
-       "invalid per-cpu cgroup storage access 5",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_2, 7),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_percpu_cgroup_storage = { 1 },
-       .result = REJECT,
-       .errstr = "get_local_storage() doesn't support non-zero flags",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},
-{
-       "invalid per-cpu cgroup storage access 6",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_1),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_local_storage),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_percpu_cgroup_storage = { 1 },
-       .result = REJECT,
-       .errstr = "get_local_storage() doesn't support non-zero flags",
-       .errstr_unpriv = "R2 leaks addr into helper function",
-       .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
-},