Commit 4609ffb9 authored by Andre Guedes's avatar Andre Guedes Committed by Tony Nguyen
Browse files

igc: Refactor XDP rxq info registration 



Refactor XDP rxq info registration code, preparing the driver for AF_XDP
zero-copy support which is added by upcoming patches.

Currently, xdp_rxq and memory model are both registered during RX
resource setup time by igc_xdp_register_rxq_info() helper. With AF_XDP,
we want to register the memory model later on while configuring the ring
because we will know which memory model type to register
(MEM_TYPE_PAGE_SHARED or MEM_TYPE_XSK_BUFF_POOL).

The helpers igc_xdp_register_rxq_info() and igc_xdp_unregister_rxq_
info() are not useful anymore so they are removed.

Signed-off-by: default avatarAndre Guedes <andre.guedes@intel.com>
Signed-off-by: default avatarVedang Patel <vedang.patel@intel.com>
Signed-off-by: default avatarJithu Joseph <jithu.joseph@intel.com>
Reviewed-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: default avatarDvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent f4851648

drivers/net/ethernet/intel/igc/igc_main.c

+12 −4
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ void igc_free_rx_resources(struct igc_ring *rx_ring) 
{

	igc_clean_rx_ring(rx_ring);



	igc_xdp_unregister_rxq_info(rx_ring);

	xdp_rxq_info_unreg(&rx_ring->xdp_rxq);



	vfree(rx_ring->rx_buffer_info);

	rx_ring->rx_buffer_info = NULL;
@@ -458,11 +458,16 @@ int igc_setup_rx_resources(struct igc_ring *rx_ring) 
{

	struct net_device *ndev = rx_ring->netdev;

	struct device *dev = rx_ring->dev;

	u8 index = rx_ring->queue_index;

	int size, desc_len, res;



	res = igc_xdp_register_rxq_info(rx_ring);

	if (res < 0)

	res = xdp_rxq_info_reg(&rx_ring->xdp_rxq, ndev, index,

			       rx_ring->q_vector->napi.napi_id);

	if (res < 0) {

		netdev_err(ndev, "Failed to register xdp_rxq index %u\n",

			   index);

		return res;

	}



	size = sizeof(struct igc_rx_buffer) * rx_ring->count;

	rx_ring->rx_buffer_info = vzalloc(size);
@@ -488,7 +493,7 @@ int igc_setup_rx_resources(struct igc_ring *rx_ring) 
	return 0;



err:

	igc_xdp_unregister_rxq_info(rx_ring);

	xdp_rxq_info_unreg(&rx_ring->xdp_rxq);

	vfree(rx_ring->rx_buffer_info);

	rx_ring->rx_buffer_info = NULL;

	netdev_err(ndev, "Unable to allocate memory for Rx descriptor ring\n");
@@ -536,6 +541,9 @@ static void igc_configure_rx_ring(struct igc_adapter *adapter, 
	u32 srrctl = 0, rxdctl = 0;

	u64 rdba = ring->dma;



	WARN_ON(xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,

					   MEM_TYPE_PAGE_SHARED, NULL));



	if (igc_xdp_is_enabled(adapter))

		set_ring_uses_large_buffer(ring);

drivers/net/ethernet/intel/igc/igc_xdp.c

+0 −27
Original line number Diff line number Diff line
@@ -31,30 +31,3 @@ int igc_xdp_set_prog(struct igc_adapter *adapter, struct bpf_prog *prog, 


	return 0;

}
 


int igc_xdp_register_rxq_info(struct igc_ring *ring)

{

	struct net_device *dev = ring->netdev;

	int err;



	err = xdp_rxq_info_reg(&ring->xdp_rxq, dev, ring->queue_index, 0);

	if (err) {

		netdev_err(dev, "Failed to register xdp rxq info\n");

		return err;

	}



	err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq, MEM_TYPE_PAGE_SHARED,

					 NULL);

	if (err) {

		netdev_err(dev, "Failed to register xdp rxq mem model\n");

		xdp_rxq_info_unreg(&ring->xdp_rxq);

		return err;

	}



	return 0;

}



void igc_xdp_unregister_rxq_info(struct igc_ring *ring)

{

	xdp_rxq_info_unreg(&ring->xdp_rxq);

}

drivers/net/ethernet/intel/igc/igc_xdp.h

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ 
int igc_xdp_set_prog(struct igc_adapter *adapter, struct bpf_prog *prog,

		     struct netlink_ext_ack *extack);



int igc_xdp_register_rxq_info(struct igc_ring *ring);

void igc_xdp_unregister_rxq_info(struct igc_ring *ring);



static inline bool igc_xdp_is_enabled(struct igc_adapter *adapter)

{

	return !!adapter->xdp_prog;