Commit 11108652 authored by Martin KaFai Lau's avatar Martin KaFai Lau
Browse files

Merge branch 'Remove unused fields in cpumap & devmap' 

Hou Tao says:

====================
Patchset "Simplify xdp_do_redirect_map()/xdp_do_flush_map() and XDP
maps" [0] changed per-map flush list to global per-cpu flush list
for cpumap, devmap and xskmap, but it forgot to remove these unused
fields from cpumap and devmap. So just remove these unused fields.

Comments and suggestions are always welcome.

[0]: https://lore.kernel.org/bpf/20191219061006.21980-1-bjorn.topel@gmail.com


====================

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

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);

kernel/bpf/devmap.c

+0 −2
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ struct xdp_dev_bulk_queue { 
struct bpf_dtab_netdev {

	struct net_device *dev; /* must be first member, due to tracepoint */

	struct hlist_node index_hlist;

	struct bpf_dtab *dtab;

	struct bpf_prog *xdp_prog;

	struct rcu_head rcu;

	unsigned int idx;
@@ -874,7 +873,6 @@ static struct bpf_dtab_netdev *__dev_map_alloc_node(struct net *net, 
	}



	dev->idx = idx;

	dev->dtab = dtab;

	if (prog) {

		dev->xdp_prog = prog;

		dev->val.bpf_prog.id = prog->aux->id;