* [Patch bpf-next 0/2] bpf: two trivial cleanup patches @ 2023-01-17 6:02 Cong Wang 2023-01-17 6:02 ` [Patch bpf-next 1/2] bpf: remove a redundant parameter of bpf_map_free_id() Cong Wang 2023-01-17 6:02 ` [Patch bpf-next 2/2] bpf: remove a redundant parameter of bpf_prog_free_id() Cong Wang 0 siblings, 2 replies; 4+ messages in thread From: Cong Wang @ 2023-01-17 6:02 UTC (permalink / raw) To: netdev; +Cc: bpf, Cong Wang From: Cong Wang <cong.wang@bytedance.com> This patchset contains two trivial cleanup patches, please check each patch for more details. --- Cong Wang (2): bpf: remove a redundant parameter of bpf_map_free_id() bpf: remove a redundant parameter of bpf_prog_free_id() include/linux/bpf.h | 4 ++-- kernel/bpf/offload.c | 4 ++-- kernel/bpf/syscall.c | 46 ++++++++++---------------------------------- 3 files changed, 14 insertions(+), 40 deletions(-) -- 2.34.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Patch bpf-next 1/2] bpf: remove a redundant parameter of bpf_map_free_id() 2023-01-17 6:02 [Patch bpf-next 0/2] bpf: two trivial cleanup patches Cong Wang @ 2023-01-17 6:02 ` Cong Wang 2023-01-17 6:02 ` [Patch bpf-next 2/2] bpf: remove a redundant parameter of bpf_prog_free_id() Cong Wang 1 sibling, 0 replies; 4+ messages in thread From: Cong Wang @ 2023-01-17 6:02 UTC (permalink / raw) To: netdev; +Cc: bpf, Cong Wang, Alexei Starovoitov, Daniel Borkmann, John Fastabend From: Cong Wang <cong.wang@bytedance.com> The second parameter of bpf_map_free_id() is always true, hence can be just eliminated. Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: John Fastabend <john.fastabend@gmail.com> Signed-off-by: Cong Wang <cong.wang@bytedance.com> --- include/linux/bpf.h | 2 +- kernel/bpf/offload.c | 2 +- kernel/bpf/syscall.c | 23 +++++------------------ 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index ae7771c7d750..3558c192871c 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1833,7 +1833,7 @@ struct bpf_prog * __must_check bpf_prog_inc_not_zero(struct bpf_prog *prog); void bpf_prog_put(struct bpf_prog *prog); void bpf_prog_free_id(struct bpf_prog *prog, bool do_idr_lock); -void bpf_map_free_id(struct bpf_map *map, bool do_idr_lock); +void bpf_map_free_id(struct bpf_map *map); struct btf_field *btf_record_find(const struct btf_record *rec, u32 offset, enum btf_field_type type); diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index 13e4efc971e6..ae6d5a5c0798 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -412,7 +412,7 @@ static void __bpf_map_offload_destroy(struct bpf_offloaded_map *offmap) { WARN_ON(bpf_map_offload_ndo(offmap, BPF_OFFLOAD_MAP_FREE)); /* Make sure BPF_MAP_GET_NEXT_ID can't find this dead map */ - bpf_map_free_id(&offmap->map, true); + bpf_map_free_id(&offmap->map); list_del_init(&offmap->offloads); offmap->netdev = NULL; } diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 35ffd808f281..1eaa1a18aef7 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -390,7 +390,7 @@ static int bpf_map_alloc_id(struct bpf_map *map) return id > 0 ? 0 : id; } -void bpf_map_free_id(struct bpf_map *map, bool do_idr_lock) +void bpf_map_free_id(struct bpf_map *map) { unsigned long flags; @@ -402,18 +402,10 @@ void bpf_map_free_id(struct bpf_map *map, bool do_idr_lock) if (!map->id) return; - if (do_idr_lock) - spin_lock_irqsave(&map_idr_lock, flags); - else - __acquire(&map_idr_lock); - + spin_lock_irqsave(&map_idr_lock, flags); idr_remove(&map_idr, map->id); map->id = 0; - - if (do_idr_lock) - spin_unlock_irqrestore(&map_idr_lock, flags); - else - __release(&map_idr_lock); + spin_unlock_irqrestore(&map_idr_lock, flags); } #ifdef CONFIG_MEMCG_KMEM @@ -708,11 +700,11 @@ static void bpf_map_put_uref(struct bpf_map *map) /* decrement map refcnt and schedule it for freeing via workqueue * (unrelying map implementation ops->map_free() might sleep) */ -static void __bpf_map_put(struct bpf_map *map, bool do_idr_lock) +void bpf_map_put(struct bpf_map *map) { if (atomic64_dec_and_test(&map->refcnt)) { /* bpf_map_free_id() must be called first */ - bpf_map_free_id(map, do_idr_lock); + bpf_map_free_id(map); btf_put(map->btf); INIT_WORK(&map->work, bpf_map_free_deferred); /* Avoid spawning kworkers, since they all might contend @@ -721,11 +713,6 @@ static void __bpf_map_put(struct bpf_map *map, bool do_idr_lock) queue_work(system_unbound_wq, &map->work); } } - -void bpf_map_put(struct bpf_map *map) -{ - __bpf_map_put(map, true); -} EXPORT_SYMBOL_GPL(bpf_map_put); void bpf_map_put_with_uref(struct bpf_map *map) -- 2.34.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Patch bpf-next 2/2] bpf: remove a redundant parameter of bpf_prog_free_id() 2023-01-17 6:02 [Patch bpf-next 0/2] bpf: two trivial cleanup patches Cong Wang 2023-01-17 6:02 ` [Patch bpf-next 1/2] bpf: remove a redundant parameter of bpf_map_free_id() Cong Wang @ 2023-01-17 6:02 ` Cong Wang 2023-01-17 9:40 ` Jiri Olsa 1 sibling, 1 reply; 4+ messages in thread From: Cong Wang @ 2023-01-17 6:02 UTC (permalink / raw) To: netdev; +Cc: bpf, Cong Wang, Alexei Starovoitov, Daniel Borkmann, John Fastabend From: Cong Wang <cong.wang@bytedance.com> The second parameter of bpf_prog_free_id() is always true, hence can be just eliminated. Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: John Fastabend <john.fastabend@gmail.com> Signed-off-by: Cong Wang <cong.wang@bytedance.com> --- include/linux/bpf.h | 2 +- kernel/bpf/offload.c | 2 +- kernel/bpf/syscall.c | 23 +++++------------------ 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 3558c192871c..2c0d2383cea0 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1832,7 +1832,7 @@ void bpf_prog_inc(struct bpf_prog *prog); struct bpf_prog * __must_check bpf_prog_inc_not_zero(struct bpf_prog *prog); void bpf_prog_put(struct bpf_prog *prog); -void bpf_prog_free_id(struct bpf_prog *prog, bool do_idr_lock); +void bpf_prog_free_id(struct bpf_prog *prog); void bpf_map_free_id(struct bpf_map *map); struct btf_field *btf_record_find(const struct btf_record *rec, diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index ae6d5a5c0798..658032e294ed 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -217,7 +217,7 @@ static void __bpf_prog_offload_destroy(struct bpf_prog *prog) offload->offdev->ops->destroy(prog); /* Make sure BPF_PROG_GET_NEXT_ID can't find this dead program */ - bpf_prog_free_id(prog, true); + bpf_prog_free_id(prog); list_del_init(&offload->offloads); kfree(offload); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 1eaa1a18aef7..b56f65328d9c 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1988,7 +1988,7 @@ static int bpf_prog_alloc_id(struct bpf_prog *prog) return id > 0 ? 0 : id; } -void bpf_prog_free_id(struct bpf_prog *prog, bool do_idr_lock) +void bpf_prog_free_id(struct bpf_prog *prog) { unsigned long flags; @@ -2000,18 +2000,10 @@ void bpf_prog_free_id(struct bpf_prog *prog, bool do_idr_lock) if (!prog->aux->id) return; - if (do_idr_lock) - spin_lock_irqsave(&prog_idr_lock, flags); - else - __acquire(&prog_idr_lock); - + spin_lock_irqsave(&prog_idr_lock, flags); idr_remove(&prog_idr, prog->aux->id); prog->aux->id = 0; - - if (do_idr_lock) - spin_unlock_irqrestore(&prog_idr_lock, flags); - else - __release(&prog_idr_lock); + spin_unlock_irqrestore(&prog_idr_lock, flags); } static void __bpf_prog_put_rcu(struct rcu_head *rcu) @@ -2057,13 +2049,13 @@ static void bpf_prog_put_deferred(struct work_struct *work) __bpf_prog_put_noref(prog, true); } -static void __bpf_prog_put(struct bpf_prog *prog, bool do_idr_lock) +void bpf_prog_put(struct bpf_prog *prog) { struct bpf_prog_aux *aux = prog->aux; if (atomic64_dec_and_test(&aux->refcnt)) { /* bpf_prog_free_id() must be called first */ - bpf_prog_free_id(prog, do_idr_lock); + bpf_prog_free_id(prog); if (in_irq() || irqs_disabled()) { INIT_WORK(&aux->work, bpf_prog_put_deferred); @@ -2073,11 +2065,6 @@ static void __bpf_prog_put(struct bpf_prog *prog, bool do_idr_lock) } } } - -void bpf_prog_put(struct bpf_prog *prog) -{ - __bpf_prog_put(prog, true); -} EXPORT_SYMBOL_GPL(bpf_prog_put); static int bpf_prog_release(struct inode *inode, struct file *filp) -- 2.34.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Patch bpf-next 2/2] bpf: remove a redundant parameter of bpf_prog_free_id() 2023-01-17 6:02 ` [Patch bpf-next 2/2] bpf: remove a redundant parameter of bpf_prog_free_id() Cong Wang @ 2023-01-17 9:40 ` Jiri Olsa 0 siblings, 0 replies; 4+ messages in thread From: Jiri Olsa @ 2023-01-17 9:40 UTC (permalink / raw) To: Cong Wang Cc: netdev, bpf, Cong Wang, Alexei Starovoitov, Daniel Borkmann, John Fastabend, Paul Moore On Mon, Jan 16, 2023 at 10:02:49PM -0800, Cong Wang wrote: > From: Cong Wang <cong.wang@bytedance.com> > > The second parameter of bpf_prog_free_id() is always true, > hence can be just eliminated. hi, Paul did this already: https://lore.kernel.org/bpf/20230106154400.74211-2-paul@paul-moore.com/ it's in bpf/master now bpf_map_free_id change lgtm, but might be better to sync with bpf/master first jirka > > Cc: Alexei Starovoitov <ast@kernel.org> > Cc: Daniel Borkmann <daniel@iogearbox.net> > Cc: John Fastabend <john.fastabend@gmail.com> > Signed-off-by: Cong Wang <cong.wang@bytedance.com> > --- > include/linux/bpf.h | 2 +- > kernel/bpf/offload.c | 2 +- > kernel/bpf/syscall.c | 23 +++++------------------ > 3 files changed, 7 insertions(+), 20 deletions(-) > > diff --git a/include/linux/bpf.h b/include/linux/bpf.h > index 3558c192871c..2c0d2383cea0 100644 > --- a/include/linux/bpf.h > +++ b/include/linux/bpf.h > @@ -1832,7 +1832,7 @@ void bpf_prog_inc(struct bpf_prog *prog); > struct bpf_prog * __must_check bpf_prog_inc_not_zero(struct bpf_prog *prog); > void bpf_prog_put(struct bpf_prog *prog); > > -void bpf_prog_free_id(struct bpf_prog *prog, bool do_idr_lock); > +void bpf_prog_free_id(struct bpf_prog *prog); > void bpf_map_free_id(struct bpf_map *map); > > struct btf_field *btf_record_find(const struct btf_record *rec, > diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c > index ae6d5a5c0798..658032e294ed 100644 > --- a/kernel/bpf/offload.c > +++ b/kernel/bpf/offload.c > @@ -217,7 +217,7 @@ static void __bpf_prog_offload_destroy(struct bpf_prog *prog) > offload->offdev->ops->destroy(prog); > > /* Make sure BPF_PROG_GET_NEXT_ID can't find this dead program */ > - bpf_prog_free_id(prog, true); > + bpf_prog_free_id(prog); > > list_del_init(&offload->offloads); > kfree(offload); > diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c > index 1eaa1a18aef7..b56f65328d9c 100644 > --- a/kernel/bpf/syscall.c > +++ b/kernel/bpf/syscall.c > @@ -1988,7 +1988,7 @@ static int bpf_prog_alloc_id(struct bpf_prog *prog) > return id > 0 ? 0 : id; > } > > -void bpf_prog_free_id(struct bpf_prog *prog, bool do_idr_lock) > +void bpf_prog_free_id(struct bpf_prog *prog) > { > unsigned long flags; > > @@ -2000,18 +2000,10 @@ void bpf_prog_free_id(struct bpf_prog *prog, bool do_idr_lock) > if (!prog->aux->id) > return; > > - if (do_idr_lock) > - spin_lock_irqsave(&prog_idr_lock, flags); > - else > - __acquire(&prog_idr_lock); > - > + spin_lock_irqsave(&prog_idr_lock, flags); > idr_remove(&prog_idr, prog->aux->id); > prog->aux->id = 0; > - > - if (do_idr_lock) > - spin_unlock_irqrestore(&prog_idr_lock, flags); > - else > - __release(&prog_idr_lock); > + spin_unlock_irqrestore(&prog_idr_lock, flags); > } > > static void __bpf_prog_put_rcu(struct rcu_head *rcu) > @@ -2057,13 +2049,13 @@ static void bpf_prog_put_deferred(struct work_struct *work) > __bpf_prog_put_noref(prog, true); > } > > -static void __bpf_prog_put(struct bpf_prog *prog, bool do_idr_lock) > +void bpf_prog_put(struct bpf_prog *prog) > { > struct bpf_prog_aux *aux = prog->aux; > > if (atomic64_dec_and_test(&aux->refcnt)) { > /* bpf_prog_free_id() must be called first */ > - bpf_prog_free_id(prog, do_idr_lock); > + bpf_prog_free_id(prog); > > if (in_irq() || irqs_disabled()) { > INIT_WORK(&aux->work, bpf_prog_put_deferred); > @@ -2073,11 +2065,6 @@ static void __bpf_prog_put(struct bpf_prog *prog, bool do_idr_lock) > } > } > } > - > -void bpf_prog_put(struct bpf_prog *prog) > -{ > - __bpf_prog_put(prog, true); > -} > EXPORT_SYMBOL_GPL(bpf_prog_put); > > static int bpf_prog_release(struct inode *inode, struct file *filp) > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-17 9:42 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-01-17 6:02 [Patch bpf-next 0/2] bpf: two trivial cleanup patches Cong Wang 2023-01-17 6:02 ` [Patch bpf-next 1/2] bpf: remove a redundant parameter of bpf_map_free_id() Cong Wang 2023-01-17 6:02 ` [Patch bpf-next 2/2] bpf: remove a redundant parameter of bpf_prog_free_id() Cong Wang 2023-01-17 9:40 ` Jiri Olsa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).