From 6192f443049fdcf63e69b4ed219ba4c36bb3b27a Mon Sep 17 00:00:00 2001 From: Eugene Syromyatnikov Date: Sun, 20 Oct 2019 19:07:24 +0200 Subject: [PATCH] xlat: add BPF_F_CLONE to bpf_map_flags * xlat/bpf_map_flags.in (BPF_F_CLONE): New flag, introduced by Linux commit v5.4-rc1~131^2~62^2~34^2~2. * tests/bpf.c: Update expected output. --- tests/bpf.c | 14 +++++++------- xlat/bpf_map_flags.in | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/bpf.c b/tests/bpf.c index f7fcb980..21b2b470 100644 --- a/tests/bpf.c +++ b/tests/bpf.c @@ -285,7 +285,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { .key_size = 0xface1e55, .value_size = 0xbadc0ded, .max_entries = 0xbeefcafe, - .map_flags = 0xfffffe00, + .map_flags = 0xfffffc00, .inner_map_fd = 2718281828, .numa_node = -1, .map_name = "", @@ -295,7 +295,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { .str = "map_type=0x19 /* BPF_MAP_TYPE_??? */" ", key_size=4207812181, value_size=3134983661" ", max_entries=3203386110" - ", map_flags=0xfffffe00 /* BPF_F_??? */" + ", map_flags=0xfffffc00 /* BPF_F_??? */" ", inner_map_fd=-1576685468" ", map_name=\"\", map_ifindex=3141592653", @@ -316,7 +316,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { ", max_entries=3203386110" ", map_flags=BPF_F_NO_PREALLOC|BPF_F_NUMA_NODE" "|BPF_F_RDONLY|BPF_F_STACK_BUILD_ID" - "|BPF_F_RDONLY_PROG|0xc0dede00", + "|BPF_F_RDONLY_PROG|BPF_F_CLONE|0xc0dedc00", }, { /* 4 */ .data = { .BPF_MAP_CREATE_data = { @@ -334,7 +334,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { ", max_entries=3203386110" ", map_flags=BPF_F_NO_PREALLOC|BPF_F_NUMA_NODE" "|BPF_F_RDONLY|BPF_F_STACK_BUILD_ID" - "|BPF_F_RDONLY_PROG|0xc0dede00" + "|BPF_F_RDONLY_PROG|BPF_F_CLONE|0xc0dedc00" ", inner_map_fd=-1576685468", }, { /* 5 */ @@ -353,7 +353,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { ", max_entries=3203386110" ", map_flags=BPF_F_NO_PREALLOC|BPF_F_NUMA_NODE" "|BPF_F_RDONLY|BPF_F_STACK_BUILD_ID" - "|BPF_F_RDONLY_PROG|0xc0dede00" + "|BPF_F_RDONLY_PROG|BPF_F_CLONE|0xc0dedc00" ", inner_map_fd=-1576685468" ", numa_node=4294967295 /* NUMA_NO_NODE */", }, @@ -374,7 +374,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { ", max_entries=3203386110" ", map_flags=BPF_F_NO_PREALLOC|BPF_F_NUMA_NODE" "|BPF_F_RDONLY|BPF_F_STACK_BUILD_ID" - "|BPF_F_RDONLY_PROG|0xc0dede00" + "|BPF_F_RDONLY_PROG|BPF_F_CLONE|0xc0dedc00" ", inner_map_fd=-1576685468" ", numa_node=4294967295 /* NUMA_NO_NODE */" ", map_name=\"fedcba987654321\"...", @@ -396,7 +396,7 @@ static struct bpf_attr_check BPF_MAP_CREATE_checks[] = { ", max_entries=3203386110" ", map_flags=BPF_F_NO_PREALLOC|BPF_F_NUMA_NODE" "|BPF_F_RDONLY|BPF_F_STACK_BUILD_ID" - "|BPF_F_RDONLY_PROG|0xc0dede00" + "|BPF_F_RDONLY_PROG|BPF_F_CLONE|0xc0dedc00" ", inner_map_fd=-1576685468" ", numa_node=4294967295 /* NUMA_NO_NODE */" ", map_name=\"0123456789abcde\"" diff --git a/xlat/bpf_map_flags.in b/xlat/bpf_map_flags.in index 69e4f40a..d4e5ab5a 100644 --- a/xlat/bpf_map_flags.in +++ b/xlat/bpf_map_flags.in @@ -7,3 +7,4 @@ BPF_F_STACK_BUILD_ID (1U << 5) BPF_F_ZERO_SEED (1U << 6) BPF_F_RDONLY_PROG (1U << 7) BPF_F_WRONLY_PROG (1U << 8) +BPF_F_CLONE (1U << 9) -- 2.40.0