netdev - Re: [PATCH v6 bpf 08/11] ice: update xdp_rxq_info::frag

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJ8uoz13xSsc2tOyFv4i7=vXh_2=7t39HNeGC4dPufAbozDR6g@mail.gmail.com>
Date: Thu, 25 Jan 2024 09:02:59 +0100
From: Magnus Karlsson <magnus.karlsson@...il.com>
To: Maciej Fijalkowski <maciej.fijalkowski@...el.com>
Cc: bpf@...r.kernel.org, ast@...nel.org, daniel@...earbox.net, 
	andrii@...nel.org, netdev@...r.kernel.org, magnus.karlsson@...el.com, 
	bjorn@...nel.org, echaudro@...hat.com, lorenzo@...nel.org, 
	martin.lau@...ux.dev, tirthendu.sarkar@...el.com, john.fastabend@...il.com, 
	horms@...nel.org, kuba@...nel.org
Subject: Re: [PATCH v6 bpf 08/11] ice: update xdp_rxq_info::frag_size for ZC
 enabled Rx queue

On Wed, 24 Jan 2024 at 20:27, Maciej Fijalkowski
<maciej.fijalkowski@...el.com> wrote:
>
> Now that ice driver correctly sets up frag_size in xdp_rxq_info, let us
> make it work for ZC multi-buffer as well. ice_rx_ring::rx_buf_len for ZC
> is being set via xsk_pool_get_rx_frame_size() and this needs to be
> propagated up to xdp_rxq_info.
>
> Use a bigger hammer and instead of unregistering only xdp_rxq_info's
> memory model, unregister it altogether and register it again and have
> xdp_rxq_info with correct frag_size value.

Acked-by: Magnus Karlsson <magnus.karlsson@...el.com>

> Fixes: 1bbc04de607b ("ice: xsk: add RX multi-buffer support")
> Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@...el.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_base.c | 37 ++++++++++++++---------
>  1 file changed, 23 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
> index 533b923cae2d..7ac847718882 100644
> --- a/drivers/net/ethernet/intel/ice/ice_base.c
> +++ b/drivers/net/ethernet/intel/ice/ice_base.c
> @@ -547,19 +547,27 @@ int ice_vsi_cfg_rxq(struct ice_rx_ring *ring)
>         ring->rx_buf_len = ring->vsi->rx_buf_len;
>
>         if (ring->vsi->type == ICE_VSI_PF) {
> -               if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))
> -                       /* coverity[check_return] */
> -                       __xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,
> -                                          ring->q_index,
> -                                          ring->q_vector->napi.napi_id,
> -                                          ring->vsi->rx_buf_len);
> +               if (!xdp_rxq_info_is_reg(&ring->xdp_rxq)) {
> +                       err = __xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,
> +                                                ring->q_index,
> +                                                ring->q_vector->napi.napi_id,
> +                                                ring->rx_buf_len);
> +                       if (err)
> +                               return err;
> +               }
>
>                 ring->xsk_pool = ice_xsk_pool(ring);
>                 if (ring->xsk_pool) {
> -                       xdp_rxq_info_unreg_mem_model(&ring->xdp_rxq);
> +                       xdp_rxq_info_unreg(&ring->xdp_rxq);
>
>                         ring->rx_buf_len =
>                                 xsk_pool_get_rx_frame_size(ring->xsk_pool);
> +                       err = __xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,
> +                                                ring->q_index,
> +                                                ring->q_vector->napi.napi_id,
> +                                                ring->rx_buf_len);
> +                       if (err)
> +                               return err;
>                         err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,
>                                                          MEM_TYPE_XSK_BUFF_POOL,
>                                                          NULL);
> @@ -571,13 +579,14 @@ int ice_vsi_cfg_rxq(struct ice_rx_ring *ring)
>                         dev_info(dev, "Registered XDP mem model MEM_TYPE_XSK_BUFF_POOL on Rx ring %d\n",
>                                  ring->q_index);
>                 } else {
> -                       if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))
> -                               /* coverity[check_return] */
> -                               __xdp_rxq_info_reg(&ring->xdp_rxq,
> -                                                  ring->netdev,
> -                                                  ring->q_index,
> -                                                  ring->q_vector->napi.napi_id,
> -                                                  ring->vsi->rx_buf_len);
> +                       if (!xdp_rxq_info_is_reg(&ring->xdp_rxq)) {
> +                               err = __xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,
> +                                                        ring->q_index,
> +                                                        ring->q_vector->napi.napi_id,
> +                                                        ring->rx_buf_len);
> +                               if (err)
> +                                       return err;
> +                       }
>
>                         err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,
>                                                          MEM_TYPE_PAGE_SHARED,
> --
> 2.34.1
>
>