]> granicus.if.org Git - strace/commitdiff
xlat: add BPF_F_TEST_STATE_FREQ to bpf_prog_flags
authorEugene Syromyatnikov <evgsyr@gmail.com>
Sun, 20 Oct 2019 16:43:43 +0000 (18:43 +0200)
committerDmitry V. Levin <ldv@altlinux.org>
Sun, 20 Oct 2019 18:12:30 +0000 (18:12 +0000)
* xlat/bpf_prog_flags.in (BPF_F_TEST_STATE_FREQ): New constant,
introduced by Linux commit v5.4-rc1~131^2~62^2~17^2~3.
* tests/bpf.c: Update expected output.

tests/bpf.c
xlat/bpf_prog_flags.in

index 5b5df8f19cf12caef58c1dc6b960e3656e1d6891..f7fcb9801ac0b63e1c5e9b7e7d87b55ab56e2fa4 100644 (file)
@@ -564,7 +564,7 @@ print_BPF_PROG_LOAD_attr3(const struct bpf_attr_check *check, unsigned long addr
               ", insns=" INSNS_FMT ", license=\"%s\", log_level=2718281828"
               ", log_size=%u, log_buf=%p"
               ", kern_version=KERNEL_VERSION(51966, 240, 13)"
-              ", prog_flags=0x8 /* BPF_F_??? */"
+              ", prog_flags=0x10 /* BPF_F_??? */"
               ", prog_name=\"0123456789abcde\"..., prog_ifindex=3203399405",
               (unsigned int) ARRAY_SIZE(insns), INSNS_ARG, license,
               log_buf_size, get_log_buf_tail());
@@ -591,7 +591,7 @@ print_BPF_PROG_LOAD_attr4(const struct bpf_attr_check *check, unsigned long addr
               ", log_buf=\"log \"..."
               ", kern_version=KERNEL_VERSION(51966, 240, 13)"
               ", prog_flags=BPF_F_STRICT_ALIGNMENT|BPF_F_ANY_ALIGNMENT"
-              "|BPF_F_TEST_RND_HI32|0x8"
+              "|BPF_F_TEST_RND_HI32|BPF_F_TEST_STATE_FREQ|0x10"
               ", prog_name=\"0123456789abcde\"..., prog_ifindex=%s"
               ", expected_attach_type=BPF_CGROUP_INET6_BIND",
               (unsigned int) ARRAY_SIZE(insns), INSNS_ARG,
@@ -655,7 +655,7 @@ static struct bpf_attr_check BPF_PROG_LOAD_checks[] = {
                        .log_level = 2718281828U,
                        .log_size = log_buf_size,
                        .kern_version = 0xcafef00d,
-                       .prog_flags = 8,
+                       .prog_flags = 16,
                        .prog_name = "0123456789abcdef",
                        .prog_ifindex = 0xbeeffeed,
                } },
@@ -670,7 +670,7 @@ static struct bpf_attr_check BPF_PROG_LOAD_checks[] = {
                        .log_level = 2718281828U,
                        .log_size = 4,
                        .kern_version = 0xcafef00d,
-                       .prog_flags = 0xf,
+                       .prog_flags = 0x1f,
                        .prog_name = "0123456789abcdef",
                        .expected_attach_type = 9,
                } },
index 4637f8c0376f17f6e616b98c2aa3787772c8d0df..74c28972084581945c30f7877e5df9a0ba637442 100644 (file)
@@ -1,3 +1,4 @@
 BPF_F_STRICT_ALIGNMENT 1U
 BPF_F_ANY_ALIGNMENT    (1U << 1)
 BPF_F_TEST_RND_HI32    (1U << 2)
+BPF_F_TEST_STATE_FREQ  (1U << 3)