Commit fb3a9a11 authored by Joshua Washington's avatar Joshua Washington Committed by Jakub Kicinski
Browse files

gve: trigger RX NAPI instead of TX NAPI in gve_xsk_wakeup 



Commit ba0925c3 ("gve: process XSK TX descriptors as part of RX NAPI")
moved XSK TX processing to be part of the RX NAPI. However, that commit
did not include triggering the RX NAPI in gve_xsk_wakeup. This is
necessary because the TX NAPI only processes TX completions, meaning
that a TX wakeup would not actually trigger XSK descriptor processing.
Also, the branch on XDP_WAKEUP_TX was supposed to have been removed, as
the NAPI should be scheduled whether the wakeup is for RX or TX.

Fixes: ba0925c3 ("gve: process XSK TX descriptors as part of RX NAPI")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJoshua Washington <joshwash@google.com>
Signed-off-by: default avatarPraveen Kaligineedi <pkaligineedi@google.com>
Link: https://patch.msgid.link/20241221032807.302244-1-pkaligineedi@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b255ef45

drivers/net/ethernet/google/gve/gve_main.c

+7 −14
Original line number Diff line number Diff line
@@ -1714,7 +1714,7 @@ static int gve_xsk_pool_disable(struct net_device *dev, 
static int gve_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags)

{

	struct gve_priv *priv = netdev_priv(dev);

	int tx_queue_id = gve_xdp_tx_queue_id(priv, queue_id);

	struct napi_struct *napi;



	if (!gve_get_napi_enabled(priv))

		return -ENETDOWN;
@@ -1722,11 +1722,7 @@ static int gve_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) 
	if (queue_id >= priv->rx_cfg.num_queues || !priv->xdp_prog)

		return -EINVAL;



	if (flags & XDP_WAKEUP_TX) {

		struct gve_tx_ring *tx = &priv->tx[tx_queue_id];

		struct napi_struct *napi =

			&priv->ntfy_blocks[tx->ntfy_id].napi;



	napi = &priv->ntfy_blocks[gve_rx_idx_to_ntfy(priv, queue_id)].napi;

	if (!napi_if_scheduled_mark_missed(napi)) {

		/* Call local_bh_enable to trigger SoftIRQ processing */

		local_bh_disable();
@@ -1734,9 +1730,6 @@ static int gve_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) 
		local_bh_enable();

	}



		tx->xdp_xsk_wakeup++;

	}



	return 0;

}