From 3926f4a07da13ef0adcd330b2d8d8b21eac2fa19 Mon Sep 17 00:00:00 2001 From: Eugene Syromyatnikov Date: Sun, 19 Aug 2018 15:39:54 +0200 Subject: [PATCH] xlat: update bpf_map_types.in * xlat/bpf_map_types.in (BPF_MAP_TYPE_CGROUP_STORAGE): New constant, introduced by Linux commit v4.19-rc1~140^2~108^2~3^2~12. (BPF_MAP_TYPE_REUSEPORT_SOCKARRAY): New constant, introduced by Linux commit v4.19-rc1~140^2~24^2~2^2~6. * tests/bpf.c: Update expected output. --- tests/bpf.c | 8 ++++---- xlat/bpf_map_types.in | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/bpf.c b/tests/bpf.c index dd40bf56..55e0ff67 100644 --- a/tests/bpf.c +++ b/tests/bpf.c @@ -276,7 +276,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { }, { /* 1 */ .data = { .BPF_MAP_CREATE_data = { - .map_type = 18, + .map_type = 20, .key_size = 4, .value_size = 8, .max_entries = 256, @@ -286,7 +286,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { .map_name = "0123456789abcde", } }, .size = offsetof(struct BPF_MAP_CREATE_struct, map_name) + 8, - .str = "map_type=BPF_MAP_TYPE_SOCKHASH, key_size=4" + .str = "map_type=BPF_MAP_TYPE_REUSEPORT_SOCKARRAY, key_size=4" ", value_size=8, max_entries=256" ", map_flags=BPF_F_NO_PREALLOC|BPF_F_NO_COMMON_LRU" "|BPF_F_NUMA_NODE|BPF_F_RDONLY|BPF_F_WRONLY" @@ -298,7 +298,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { }, { /* 2 */ .data = { .BPF_MAP_CREATE_data = { - .map_type = 19, + .map_type = 21, .key_size = 0xface1e55, .value_size = 0xbadc0ded, .max_entries = 0xbeefcafe, @@ -309,7 +309,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { .map_ifindex = 3141592653, } }, .size = offsetofend(struct BPF_MAP_CREATE_struct, map_ifindex), - .str = "map_type=0x13 /* BPF_MAP_TYPE_??? */" + .str = "map_type=0x15 /* BPF_MAP_TYPE_??? */" ", key_size=4207812181, value_size=3134983661" ", max_entries=3203386110" ", map_flags=0xffffffc0 /* BPF_F_??? */" diff --git a/xlat/bpf_map_types.in b/xlat/bpf_map_types.in index 24c2fe97..e2273823 100644 --- a/xlat/bpf_map_types.in +++ b/xlat/bpf_map_types.in @@ -18,3 +18,5 @@ BPF_MAP_TYPE_SOCKMAP 15 BPF_MAP_TYPE_CPUMAP 16 BPF_MAP_TYPE_XSKMAP 17 BPF_MAP_TYPE_SOCKHASH 18 +BPF_MAP_TYPE_CGROUP_STORAGE 19 +BPF_MAP_TYPE_REUSEPORT_SOCKARRAY 20 -- 2.40.0