| Message ID | 20230728014942.892272-2-houtao@huaweicloud.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2d20bfc315eb62172f78423044eaac1fe75617d4 |
| Delegated to: | BPF |
| Headers | show |
| Series | Remove unused fields in cpumap & devmap | expand |
On 28/07/2023 03.49, Hou Tao wrote: > From: Hou Tao <houtao1@huawei.com> > > Since commit cdfafe98cabe ("xdp: Make cpumap flush_list common for all > map instances"), cmap is no longer used, so just remove it. > > Signed-off-by: Hou Tao <houtao1@huawei.com> > --- LGTM Acked-by: Jesper Dangaard Brouer <hawk@kernel.org> > kernel/bpf/cpumap.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c > index 6ae02be7a48e..0a16e30b16ef 100644 > --- a/kernel/bpf/cpumap.c > +++ b/kernel/bpf/cpumap.c > @@ -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);
On Fri, Jul 28, 2023 at 09:49:41AM +0800, Hou Tao wrote: > From: Hou Tao <houtao1@huawei.com> > > Since commit cdfafe98cabe ("xdp: Make cpumap flush_list common for all > map instances"), cmap is no longer used, so just remove it. nit, should it have Fixes: cdfafe98cabe ? same for the other patch, other than that for the patchset: Acked-by: Jiri Olsa <jolsa@kernel.org> jirka > > Signed-off-by: Hou Tao <houtao1@huawei.com> > --- > kernel/bpf/cpumap.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c > index 6ae02be7a48e..0a16e30b16ef 100644 > --- a/kernel/bpf/cpumap.c > +++ b/kernel/bpf/cpumap.c > @@ -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); > -- > 2.29.2 >
On Fri, 28 Jul 2023 14:04:28 +0200 Jiri Olsa wrote:
> nit, should it have Fixes: cdfafe98cabe ?
I don't think so, Fixes is for people backporting fixes.
diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c index 6ae02be7a48e..0a16e30b16ef 100644 --- a/kernel/bpf/cpumap.c +++ b/kernel/bpf/cpumap.c @@ -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);