Skip to content

Commit 6710e11

Browse files
netoptimizerdavem330
netoptimizer
authored and
davem330
committed
bpf: introduce new bpf cpu map type BPF_MAP_TYPE_CPUMAP
The 'cpumap' is primarily used as a backend map for XDP BPF helper call bpf_redirect_map() and XDP_REDIRECT action, like 'devmap'. This patch implement the main part of the map. It is not connected to the XDP redirect system yet, and no SKB allocation are done yet. The main concern in this patch is to ensure the datapath can run without any locking. This adds complexity to the setup and tear-down procedure, which assumptions are extra carefully documented in the code comments. V2: - make sure array isn't larger than NR_CPUS - make sure CPUs added is a valid possible CPU V3: fix nitpicks from Jakub Kicinski <kubakici@wp.pl> V5: - Restrict map allocation to root / CAP_SYS_ADMIN - WARN_ON_ONCE if queue is not empty on tear-down - Return -EPERM on memlock limit instead of -ENOMEM - Error code in __cpu_map_entry_alloc() also handle ptr_ring_cleanup() - Moved cpu_map_enqueue() to next patch V6: all notice by Daniel Borkmann - Fix err return code in cpu_map_alloc() introduced in V5 - Move cpu_possible() check after max_entries boundary check - Forbid usage initially in check_map_func_compatibility() V7: - Fix alloc error path spotted by Daniel Borkmann - Did stress test adding+removing CPUs from the map concurrently - Fixed refcnt issue on cpu_map_entry, kthread started too soon - Make sure packets are flushed during tear-down, involved use of rcu_barrier() and kthread_run only exit after queue is empty - Fix alloc error path in __cpu_map_entry_alloc() for ptr_ring V8: - Nitpicking comments and gramma by Edward Cree - Fix missing semi-colon introduced in V7 due to rebasing - Move struct bpf_cpu_map_entry members cpu+map_id to tracepoint patch Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 4b70c62 commit 6710e11

File tree

7 files changed

+576
-1
lines changed

7 files changed

+576
-1
lines changed

‎include/linux/bpf_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@ BPF_MAP_TYPE(BPF_MAP_TYPE_DEVMAP, dev_map_ops)
4141
#ifdef CONFIG_STREAM_PARSER
4242
BPF_MAP_TYPE(BPF_MAP_TYPE_SOCKMAP, sock_map_ops)
4343
#endif
44+
BPF_MAP_TYPE(BPF_MAP_TYPE_CPUMAP, cpu_map_ops)
4445
#endif

‎include/uapi/linux/bpf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ enum bpf_map_type {
112112
BPF_MAP_TYPE_HASH_OF_MAPS,
113113
BPF_MAP_TYPE_DEVMAP,
114114
BPF_MAP_TYPE_SOCKMAP,
115+
BPF_MAP_TYPE_CPUMAP,
115116
};
116117

117118
enum bpf_prog_type {

‎kernel/bpf/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ obj-$(CONFIG_BPF_SYSCALL) += hashtab.o arraymap.o percpu_freelist.o bpf_lru_list
55
obj-$(CONFIG_BPF_SYSCALL) += disasm.o
66
ifeq ($(CONFIG_NET),y)
77
obj-$(CONFIG_BPF_SYSCALL) += devmap.o
8+
obj-$(CONFIG_BPF_SYSCALL) += cpumap.o
89
ifeq ($(CONFIG_STREAM_PARSER),y)
910
obj-$(CONFIG_BPF_SYSCALL) += sockmap.o
1011
endif

0 commit comments

Comments
 (0)