ixgbe: xsk: change !netif_carrier_ok() handling in ixgbe_xmit_zc()
authorMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Wed, 2 Mar 2022 17:59:27 +0000 (09:59 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 3 Mar 2022 16:26:55 +0000 (08:26 -0800)
Commit c685c69fba71 ("ixgbe: don't do any AF_XDP zero-copy transmit if
netif is not OK") addressed the ring transient state when
MEM_TYPE_XSK_BUFF_POOL was being configured which in turn caused the
interface to through down/up. Maurice reported that when carrier is not
ok and xsk_pool is present on ring pair, ksoftirqd will consume 100% CPU
cycles due to the constant NAPI rescheduling as ixgbe_poll() states that
there is still some work to be done.

To fix this, do not set work_done to false for a !netif_carrier_ok().

Fixes: c685c69fba71 ("ixgbe: don't do any AF_XDP zero-copy transmit if netif is not OK")
Reported-by: Maurice Baijens <maurice.baijens@ellips.com>
Tested-by: Maurice Baijens <maurice.baijens@ellips.com>
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: Sandeep Penigalapati <sandeep.penigalapati@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c

index b3fd8e5cd85b4f3b47b643d1895eac049f20c1b8..6a5e9cf6b5dac4d1b887d05068f9fa1effe49754 100644 (file)
@@ -390,12 +390,14 @@ static bool ixgbe_xmit_zc(struct ixgbe_ring *xdp_ring, unsigned int budget)
        u32 cmd_type;
 
        while (budget-- > 0) {
-               if (unlikely(!ixgbe_desc_unused(xdp_ring)) ||
-                   !netif_carrier_ok(xdp_ring->netdev)) {
+               if (unlikely(!ixgbe_desc_unused(xdp_ring))) {
                        work_done = false;
                        break;
                }
 
+               if (!netif_carrier_ok(xdp_ring->netdev))
+                       break;
+
                if (!xsk_tx_peek_desc(pool, &desc))
                        break;