On Tue, May 12, 2020 at 8:56 AM Yonghong Song <yhs@xxxxxx> wrote: > > Currently bpf_iter_reg_target takes parameters from target > and allocates memory to save them. This is really not > necessary, esp. in the future we may grow information > passed from targets to bpf_iter manager. > > The patch refactors the code so target reg_info > becomes static and bpf_iter manager can just take > a reference to it. > > Signed-off-by: Yonghong Song <yhs@xxxxxx> > --- > kernel/bpf/bpf_iter.c | 29 +++++++++++------------------ > kernel/bpf/map_iter.c | 18 +++++++++--------- > kernel/bpf/task_iter.c | 30 ++++++++++++++++-------------- > net/ipv6/route.c | 18 +++++++++--------- > net/netlink/af_netlink.c | 18 +++++++++--------- > 5 files changed, 54 insertions(+), 59 deletions(-) > > diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c > index b0c8b3bdf3b0..1d203dc7afe2 100644 > --- a/kernel/bpf/bpf_iter.c > +++ b/kernel/bpf/bpf_iter.c > @@ -8,11 +8,7 @@ > > struct bpf_iter_target_info { > struct list_head list; > - const char *target; > - const struct seq_operations *seq_ops; > - bpf_iter_init_seq_priv_t init_seq_private; > - bpf_iter_fini_seq_priv_t fini_seq_private; > - u32 seq_priv_size; > + struct bpf_iter_reg *reg_info; > u32 btf_id; /* cached value */ > }; > > @@ -224,8 +220,8 @@ static int iter_release(struct inode *inode, struct file *file) > iter_priv = container_of(seq->private, struct bpf_iter_priv_data, > target_private); > > - if (iter_priv->tinfo->fini_seq_private) > - iter_priv->tinfo->fini_seq_private(seq->private); > + if (iter_priv->tinfo->reg_info->fini_seq_private) > + iter_priv->tinfo->reg_info->fini_seq_private(seq->private); > > bpf_prog_put(iter_priv->prog); > seq->private = iter_priv; > @@ -248,11 +244,7 @@ int bpf_iter_reg_target(struct bpf_iter_reg *reg_info) const struct bpf_iter_reg *? Can you please also add a comment that passed struct is supposed to be static variable and live forever (so not a dynamically allocated nor a stack variable)? Also all the static struct bpf_iter_reg below should be marked const? [...]