mac80211: correct legacy rates check in ieee80211_calc_rx_airtime

[platform/kernel/linux-rpi.git] / lib / test_bpf.c

diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index 830a18e..84f5dd3 100644 (file)
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -8890,9 +8890,9 @@ static struct skb_segment_test skb_segment_tests[] __initconst = {
                .build_skb = build_test_skb_linear_no_head_frag,
                .features = NETIF_F_SG | NETIF_F_FRAGLIST |
                            NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_GSO |
-                           NETIF_F_LLTX_BIT | NETIF_F_GRO |
+                           NETIF_F_LLTX | NETIF_F_GRO |
                            NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |
-                           NETIF_F_HW_VLAN_STAG_TX_BIT
+                           NETIF_F_HW_VLAN_STAG_TX
        }
 };
 
@@ -8992,10 +8992,15 @@ static __init int test_bpf(void)
 struct tail_call_test {
        const char *descr;
        struct bpf_insn insns[MAX_INSNS];
+       int flags;
        int result;
        int stack_depth;
 };
 
+/* Flags that can be passed to tail call test cases */
+#define FLAG_NEED_STATE                BIT(0)
+#define FLAG_RESULT_IN_STATE   BIT(1)
+
 /*
  * Magic marker used in test snippets for tail calls below.
  * BPF_LD/MOV to R2 and R2 with this immediate value is replaced
@@ -9065,32 +9070,38 @@ static struct tail_call_test tail_call_tests[] = {
        {
                "Tail call error path, max count reached",
                .insns = {
-                       BPF_ALU64_IMM(BPF_ADD, R1, 1),
-                       BPF_ALU64_REG(BPF_MOV, R0, R1),
+                       BPF_LDX_MEM(BPF_W, R2, R1, 0),
+                       BPF_ALU64_IMM(BPF_ADD, R2, 1),
+                       BPF_STX_MEM(BPF_W, R1, R2, 0),
                        TAIL_CALL(0),
                        BPF_EXIT_INSN(),
                },
-               .result = MAX_TAIL_CALL_CNT + 1,
+               .flags = FLAG_NEED_STATE | FLAG_RESULT_IN_STATE,
+               .result = (MAX_TAIL_CALL_CNT + 1 + 1) * MAX_TESTRUNS,
        },
        {
                "Tail call error path, NULL target",
                .insns = {
-                       BPF_ALU64_IMM(BPF_MOV, R0, -1),
+                       BPF_LDX_MEM(BPF_W, R2, R1, 0),
+                       BPF_ALU64_IMM(BPF_ADD, R2, 1),
+                       BPF_STX_MEM(BPF_W, R1, R2, 0),
                        TAIL_CALL(TAIL_CALL_NULL),
-                       BPF_ALU64_IMM(BPF_MOV, R0, 1),
                        BPF_EXIT_INSN(),
                },
-               .result = 1,
+               .flags = FLAG_NEED_STATE | FLAG_RESULT_IN_STATE,
+               .result = MAX_TESTRUNS,
        },
        {
                "Tail call error path, index out of range",
                .insns = {
-                       BPF_ALU64_IMM(BPF_MOV, R0, -1),
+                       BPF_LDX_MEM(BPF_W, R2, R1, 0),
+                       BPF_ALU64_IMM(BPF_ADD, R2, 1),
+                       BPF_STX_MEM(BPF_W, R1, R2, 0),
                        TAIL_CALL(TAIL_CALL_INVALID),
-                       BPF_ALU64_IMM(BPF_MOV, R0, 1),
                        BPF_EXIT_INSN(),
                },
-               .result = 1,
+               .flags = FLAG_NEED_STATE | FLAG_RESULT_IN_STATE,
+               .result = MAX_TESTRUNS,
        },
 };
 
@@ -9196,6 +9207,8 @@ static __init int test_tail_calls(struct bpf_array *progs)
        for (i = 0; i < ARRAY_SIZE(tail_call_tests); i++) {
                struct tail_call_test *test = &tail_call_tests[i];
                struct bpf_prog *fp = progs->ptrs[i];
+               int *data = NULL;
+               int state = 0;
                u64 duration;
                int ret;
 
@@ -9212,7 +9225,11 @@ static __init int test_tail_calls(struct bpf_array *progs)
                if (fp->jited)
                        jit_cnt++;
 
-               ret = __run_one(fp, NULL, MAX_TESTRUNS, &duration);
+               if (test->flags & FLAG_NEED_STATE)
+                       data = &state;
+               ret = __run_one(fp, data, MAX_TESTRUNS, &duration);
+               if (test->flags & FLAG_RESULT_IN_STATE)
+                       ret = state;
                if (ret == test->result) {
                        pr_cont("%lld PASS", duration);
                        pass_cnt++;