]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
gve: unlink old napi only if page pool exists
authorHarshitha Ramamurthy <hramamurthy@google.com>
Mon, 17 Mar 2025 21:41:41 +0000 (21:41 +0000)
committerJakub Kicinski <kuba@kernel.org>
Mon, 24 Mar 2025 19:04:50 +0000 (12:04 -0700)
Commit de70981f295e ("gve: unlink old napi when stopping a queue using
queue API") unlinks the old napi when stopping a queue. But this breaks
QPL mode of the driver which does not use page pool. Fix this by checking
that there's a page pool associated with the ring.

Cc: stable@vger.kernel.org
Fixes: de70981f295e ("gve: unlink old napi when stopping a queue using queue API")
Reviewed-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Harshitha Ramamurthy <hramamurthy@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250317214141.286854-1-hramamurthy@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/google/gve/gve_rx_dqo.c

index f0674a4435670851feb64e5f3e407ccc87dd3be1..b5be2c18858a0ccdaa93959d68f3b58d5bb595a8 100644 (file)
@@ -114,7 +114,8 @@ void gve_rx_stop_ring_dqo(struct gve_priv *priv, int idx)
        if (!gve_rx_was_added_to_block(priv, idx))
                return;
 
-       page_pool_disable_direct_recycling(rx->dqo.page_pool);
+       if (rx->dqo.page_pool)
+               page_pool_disable_direct_recycling(rx->dqo.page_pool);
        gve_remove_napi(priv, ntfy_idx);
        gve_rx_remove_from_block(priv, idx);
        gve_rx_reset_ring_dqo(priv, idx);