Commit 296f13ff authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Daniel Borkmann
Browse files

ice: xsk: Force rings to be sized to power of 2 



With the upcoming introduction of batching to XSK data path,
performance wise it will be the best to have the ring descriptor count
to be aligned to power of 2.

Check if ring sizes that user is going to attach the XSK socket fulfill
the condition above. For Tx side, although check is being done against
the Tx queue and in the end the socket will be attached to the XDP
queue, it is fine since XDP queues get the ring->count setting from Tx
queues.

Suggested-by: default avatarAlexander Lobakin <alexandr.lobakin@intel.com>
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarAlexander Lobakin <alexandr.lobakin@intel.com>
Acked-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/bpf/20220125160446.78976-3-maciej.fijalkowski@intel.com
parent a4e18669

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

+8 −0
Original line number Diff line number Diff line
@@ -327,6 +327,13 @@ int ice_xsk_pool_setup(struct ice_vsi *vsi, struct xsk_buff_pool *pool, u16 qid) 
	bool if_running, pool_present = !!pool;

	int ret = 0, pool_failure = 0;



	if (!is_power_of_2(vsi->rx_rings[qid]->count) ||

	    !is_power_of_2(vsi->tx_rings[qid]->count)) {

		netdev_err(vsi->netdev, "Please align ring sizes to power of 2\n");

		pool_failure = -EINVAL;

		goto failure;

	}



	if_running = netif_running(vsi->netdev) && ice_is_xdp_ena_vsi(vsi);



	if (if_running) {
@@ -349,6 +356,7 @@ int ice_xsk_pool_setup(struct ice_vsi *vsi, struct xsk_buff_pool *pool, u16 qid) 
			netdev_err(vsi->netdev, "ice_qp_ena error = %d\n", ret);

	}



failure:

	if (pool_failure) {

		netdev_err(vsi->netdev, "Could not %sable buffer pool, error = %d\n",

			   pool_present ? "en" : "dis", pool_failure);