gve: trigger RX NAPI instead of TX NAPI in gve_xsk_wakeup

Commit ba0925c34e0f ("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: ba0925c34e0f ("gve: process XSK TX descriptors as part of RX NAPI")
Cc: stable@vger.kernel.org
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Praveen Kaligineedi <pkaligineedi@google.com>
Link: https://patch.msgid.link/20241221032807.302244-1-pkaligineedi@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
index 09fb7f16f73e27925642b214507789a307556936..8a8f6ab12a980293ceccd79f56668d6730074cf8 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_main.c
+++ b/drivers/net/ethernet/google/gve/gve_main.c
@@ -1714,7 +1714,7 @@ done:
 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,19 +1722,12 @@ 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;
-
-               if (!napi_if_scheduled_mark_missed(napi)) {
-                       /* Call local_bh_enable to trigger SoftIRQ processing */
-                       local_bh_disable();
-                       napi_schedule(napi);
-                       local_bh_enable();
-               }
-
-               tx->xdp_xsk_wakeup++;
+       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();
+               napi_schedule(napi);
+               local_bh_enable();
        }
 
        return 0;