On Fri, Sep 15, 2023 at 1:45 AM Larysa Zaremba <larysa.zaremba@xxxxxxxxx> wrote: > > There is no fundamental reason, why multi-buffer XDP and XDP kfunc RX hints > cannot coexist in a single program. > > Allow those features to be used together by modifying the flags condition > for dev-bound-only programs, segments are still prohibited for fully > offloaded programs, hence additional check. > > Suggested-by: Stanislav Fomichev <sdf@xxxxxxxxxx> > Link: https://lore.kernel.org/bpf/CAKH8qBuzgtJj=OKMdsxEkyML36VsAuZpcrsXcyqjdKXSJCBq=Q@xxxxxxxxxxxxxx/ > Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@xxxxxxxxx> > Signed-off-by: Larysa Zaremba <larysa.zaremba@xxxxxxxxx> Acked-by: Stanislav Fomichev <sdf@xxxxxxxxxx> Thank you! > --- > kernel/bpf/offload.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c > index ee35f33a96d1..9d8e508c9b86 100644 > --- a/kernel/bpf/offload.c > +++ b/kernel/bpf/offload.c > @@ -232,7 +232,14 @@ int bpf_prog_dev_bound_init(struct bpf_prog *prog, union bpf_attr *attr) > attr->prog_type != BPF_PROG_TYPE_XDP) > return -EINVAL; > > - if (attr->prog_flags & ~BPF_F_XDP_DEV_BOUND_ONLY) > + if (attr->prog_flags & ~(BPF_F_XDP_DEV_BOUND_ONLY | BPF_F_XDP_HAS_FRAGS)) > + return -EINVAL; > + > + /* Frags are allowed only if program is dev-bound-only, but not > + * if it is requesting bpf offload. > + */ > + if (attr->prog_flags & BPF_F_XDP_HAS_FRAGS && > + !(attr->prog_flags & BPF_F_XDP_DEV_BOUND_ONLY)) > return -EINVAL; > > if (attr->prog_type == BPF_PROG_TYPE_SCHED_CLS && > -- > 2.41.0 >
