Commit 3de38c87 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Alexei Starovoitov
Browse files

ice: update xdp_rxq_info::frag_size for ZC enabled Rx queue 



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.

Fixes: 1bbc04de ("ice: xsk: add RX multi-buffer support")
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://lore.kernel.org/r/20240124191602.566724-9-maciej.fijalkowski@intel.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 29077990

drivers/net/ethernet/intel/ice/ice_base.c

+23 −14
Original line number Diff line number Diff line
@@ -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,

		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->vsi->rx_buf_len);

						 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,

			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->vsi->rx_buf_len);

							 ring->rx_buf_len);

				if (err)

					return err;

			}



			err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,

							 MEM_TYPE_PAGE_SHARED,