Commit 2d20bfc3 authored by Hou Tao's avatar Hou Tao Committed by Martin KaFai Lau
Browse files

bpf, cpumap: Remove unused cmap field from bpf_cpu_map_entry 



Since commit cdfafe98 ("xdp: Make cpumap flush_list common for all
map instances"), cmap is no longer used, so just remove it.

Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Acked-by: default avatarJesper Dangaard Brouer <hawk@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/r/20230728014942.892272-2-houtao@huaweicloud.com


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 81584c23

kernel/bpf/cpumap.c

+0 −3
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ struct bpf_cpu_map_entry { 
	/* XDP can run multiple RX-ring queues, need __percpu enqueue store */

	struct xdp_bulk_queue __percpu *bulkq;



	struct bpf_cpu_map *cmap;



	/* Queue with potential multi-producers, and single-consumer kthread */

	struct ptr_ring *queue;

	struct task_struct *kthread;
@@ -588,7 +586,6 @@ static long cpu_map_update_elem(struct bpf_map *map, void *key, void *value, 
		rcpu = __cpu_map_entry_alloc(map, &cpumap_value, key_cpu);

		if (!rcpu)

			return -ENOMEM;

		rcpu->cmap = cmap;

	}

	rcu_read_lock();

	__cpu_map_entry_replace(cmap, key_cpu, rcpu);