xlat: add BPF_PROG_TYPE_SK_MSG

* xlat/bpf_prog_types.in (BPF_PROG_TYPE_SK_MSG): New constant,
introduced by Linux commit v4.17-rc1~148^2~156^2~1^2~13.
* tests/bpf.c (BPF_PROG_LOAD_checks): Update expected output.

diff --git a/tests/bpf.c b/tests/bpf.c
index 72d0b4a87719ac7237ecfdf1d4cb72fa1a84a7bb..df63b38ad83173cc160ce8ed0648cfc1c1deba87 100644 (file)
--- a/tests/bpf.c
+++ b/tests/bpf.c
@@ -523,7 +523,7 @@ static struct bpf_attr_check BPF_PROG_LOAD_checks[] = {
        },
        { /* 1 */
                .data = { .BPF_PROG_LOAD_data = {
-                       .prog_type = 16,
+                       .prog_type = 17,
                        .insn_cnt = 0xbadc0ded,
                        .insns = 0,
                        .license = 0,
@@ -534,7 +534,7 @@ static struct bpf_attr_check BPF_PROG_LOAD_checks[] = {
                        .prog_flags = 0,
                } },
                .size = offsetofend(struct BPF_PROG_LOAD_struct, prog_flags),
-               .str = "prog_type=0x10 /* BPF_PROG_TYPE_??? */"
+               .str = "prog_type=0x11 /* BPF_PROG_TYPE_??? */"
                       ", insn_cnt=3134983661, insns=NULL, license=NULL"
                       ", log_level=42, log_size=3141592653, log_buf=NULL"
                       ", kern_version=KERNEL_VERSION(51966, 240, 13)"
@@ -542,7 +542,7 @@ static struct bpf_attr_check BPF_PROG_LOAD_checks[] = {
        },
        { /* 2 */
                .data = { .BPF_PROG_LOAD_data = {
-                       .prog_type = 15,
+                       .prog_type = 16,
                        .insn_cnt = 0xbadc0ded,
                        .insns = 0xffffffff00000000,
                        .license = 0xffffffff00000000,
@@ -554,7 +554,7 @@ static struct bpf_attr_check BPF_PROG_LOAD_checks[] = {
                        .prog_name = "fedcba987654321",
                } },
                .size = offsetofend(struct BPF_PROG_LOAD_struct, prog_name),
-               .str = "prog_type=BPF_PROG_TYPE_CGROUP_DEVICE"
+               .str = "prog_type=BPF_PROG_TYPE_SK_MSG"
                       ", insn_cnt=3134983661, insns=0xffffffff00000000"
 #if defined MPERS_IS_m32 || SIZEOF_KERNEL_LONG_T > 4
                       ", license=0xffffffff00000000"

diff --git a/xlat/bpf_prog_types.in b/xlat/bpf_prog_types.in
index f57a6993f5705c0fc0fb1ed0417aea2d06fd45b6..d6918ea48c4b41d6ae6ee8baa29a8710fbb246df 100644 (file)
--- a/xlat/bpf_prog_types.in
+++ b/xlat/bpf_prog_types.in
@@ -15,3 +15,4 @@ BPF_PROG_TYPE_LWT_XMIT 12
 BPF_PROG_TYPE_SOCK_OPS 13
 BPF_PROG_TYPE_SK_SKB 14
 BPF_PROG_TYPE_CGROUP_DEVICE 15
+BPF_PROG_TYPE_SK_MSG 16