Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9116e5e2 authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Daniel Borkmann
Browse files

xsk: replace ndo_xsk_async_xmit with ndo_xsk_wakeup 



This commit replaces ndo_xsk_async_xmit with ndo_xsk_wakeup. This new
ndo provides the same functionality as before but with the addition of
a new flags field that is used to specifiy if Rx, Tx or both should be
woken up. The previous ndo only woke up Tx, as implied by the
name. The i40e and ixgbe drivers (which are all the supported ones)
are updated with this new interface.

This new ndo will be used by the new need_wakeup functionality of XDP
sockets that need to be able to wake up both Rx and Tx driver
processing.

Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Acked-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent e0325006

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −2
Original line number Diff line number Diff line
@@ -12570,7 +12570,8 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi, 
	if (need_reset && prog)

		for (i = 0; i < vsi->num_queue_pairs; i++)

			if (vsi->xdp_rings[i]->xsk_umem)

				(void)i40e_xsk_async_xmit(vsi->netdev, i);

				(void)i40e_xsk_wakeup(vsi->netdev, i,

						      XDP_WAKEUP_RX);



	return 0;

}
@@ -12892,7 +12893,7 @@ static const struct net_device_ops i40e_netdev_ops = { 
	.ndo_bridge_setlink	= i40e_ndo_bridge_setlink,

	.ndo_bpf		= i40e_xdp,

	.ndo_xdp_xmit		= i40e_xdp_xmit,

	.ndo_xsk_async_xmit	= i40e_xsk_async_xmit,

	.ndo_xsk_wakeup	        = i40e_xsk_wakeup,

	.ndo_dfwd_add_station	= i40e_fwd_add,

	.ndo_dfwd_del_station	= i40e_fwd_del,

};

drivers/net/ethernet/intel/i40e/i40e_xsk.c

+4 −3
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem, 
			return err;



		/* Kick start the NAPI context so that receiving will start */

		err = i40e_xsk_async_xmit(vsi->netdev, qid);

		err = i40e_xsk_wakeup(vsi->netdev, qid, XDP_WAKEUP_RX);

		if (err)

			return err;

	}
@@ -765,13 +765,14 @@ bool i40e_clean_xdp_tx_irq(struct i40e_vsi *vsi, 
}



/**

 * i40e_xsk_async_xmit - Implements the ndo_xsk_async_xmit

 * i40e_xsk_wakeup - Implements the ndo_xsk_wakeup

 * @dev: the netdevice

 * @queue_id: queue id to wake up

 * @flags: ignored in our case since we have Rx and Tx in the same NAPI.

 *

 * Returns <0 for errors, 0 otherwise.

 **/

int i40e_xsk_async_xmit(struct net_device *dev, u32 queue_id)

int i40e_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags)

{

	struct i40e_netdev_priv *np = netdev_priv(dev);

	struct i40e_vsi *vsi = np->vsi;

drivers/net/ethernet/intel/i40e/i40e_xsk.h

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget); 


bool i40e_clean_xdp_tx_irq(struct i40e_vsi *vsi,

			   struct i40e_ring *tx_ring, int napi_budget);

int i40e_xsk_async_xmit(struct net_device *dev, u32 queue_id);

int i40e_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags);



#endif /* _I40E_XSK_H_ */

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −2
Original line number Diff line number Diff line
@@ -10263,7 +10263,8 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog) 
	if (need_reset && prog)

		for (i = 0; i < adapter->num_rx_queues; i++)

			if (adapter->xdp_ring[i]->xsk_umem)

				(void)ixgbe_xsk_async_xmit(adapter->netdev, i);

				(void)ixgbe_xsk_wakeup(adapter->netdev, i,

						       XDP_WAKEUP_RX);



	return 0;

}
@@ -10382,7 +10383,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { 
	.ndo_features_check	= ixgbe_features_check,

	.ndo_bpf		= ixgbe_xdp,

	.ndo_xdp_xmit		= ixgbe_xdp_xmit,

	.ndo_xsk_async_xmit	= ixgbe_xsk_async_xmit,

	.ndo_xsk_wakeup         = ixgbe_xsk_wakeup,

};



static void ixgbe_disable_txr_hw(struct ixgbe_adapter *adapter,

drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int ixgbe_clean_rx_irq_zc(struct ixgbe_q_vector *q_vector, 
void ixgbe_xsk_clean_rx_ring(struct ixgbe_ring *rx_ring);

bool ixgbe_clean_xdp_tx_irq(struct ixgbe_q_vector *q_vector,

			    struct ixgbe_ring *tx_ring, int napi_budget);

int ixgbe_xsk_async_xmit(struct net_device *dev, u32 queue_id);

int ixgbe_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags);

void ixgbe_xsk_clean_tx_ring(struct ixgbe_ring *tx_ring);



#endif /* #define _IXGBE_TXRX_COMMON_H_ */