Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
MIME-Version: 1.0
References: <20230915083914.65538-1-larysa.zaremba@intel.com>
In-Reply-To: <20230915083914.65538-1-larysa.zaremba@intel.com>
From:   Stanislav Fomichev <sdf@google.com>
Date:   Fri, 15 Sep 2023 09:21:51 -0700
Message-ID: <CAKH8qBut66YcXeGypSH=MTos97Ljwv95VkzZw1uABYF8i4Rz1A@mail.gmail.com>
Subject: Re: [PATCH bpf-next v2] bpf: Allow to use kfunc XDP hints and frags together
To:     Larysa Zaremba <larysa.zaremba@intel.com>
Cc:     bpf@vger.kernel.org, Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>,
        Yonghong Song <yonghong.song@linux.dev>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>, Hao Luo <haoluo@google.com>,
        Jiri Olsa <jolsa@kernel.org>, linux-kernel@vger.kernel.org,
        Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Sep 15, 2023 at 1:45=E2=80=AFAM Larysa Zaremba <larysa.zaremba@inte=
l.com> wrote:
>
> There is no fundamental reason, why multi-buffer XDP and XDP kfunc RX hin=
ts
> 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@google.com>
> Link: https://lore.kernel.org/bpf/CAKH8qBuzgtJj=3DOKMdsxEkyML36VsAuZpcrsX=
cyqjdKXSJCBq=3DQ@mail.gmail.com/
> Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
> Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>

Acked-by: Stanislav Fomichev <sdf@google.com>

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, u=
nion bpf_attr *attr)
>             attr->prog_type !=3D 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 =3D=3D BPF_PROG_TYPE_SCHED_CLS &&
> --
> 2.41.0
>