]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: stmmac: ensure tx function is not running in stmmac_xdp_release()
authorMohd Faizal Abdul Rahim <faizal.abdul.rahim@intel.com>
Thu, 10 Nov 2022 06:45:52 +0000 (14:45 +0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 12 Nov 2022 03:59:36 +0000 (19:59 -0800)
When stmmac_xdp_release() is called, there is a possibility that tx
function is still running on other queues which will lead to tx queue
timed out and reset adapter.

This commit ensure that tx function is not running xdp before release
flow continue to run.

Fixes: ac746c8520d9 ("net: stmmac: enhance XDP ZC driver level switching performance")
Signed-off-by: Song Yoong Siang <yoong.siang.song@intel.com>
Signed-off-by: Mohd Faizal Abdul Rahim <faizal.abdul.rahim@intel.com>
Signed-off-by: Noor Azura Ahmad Tarmizi <noor.azura.ahmad.tarmizi@intel.com>
Link: https://lore.kernel.org/r/20221110064552.22504-1-noor.azura.ahmad.tarmizi@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index 8273e6a175c8472632f6965ccfb510fabc23435f..6b43da78cdf0f94f844bd14f2524f5c788ff3ff8 100644 (file)
@@ -6548,6 +6548,9 @@ void stmmac_xdp_release(struct net_device *dev)
        struct stmmac_priv *priv = netdev_priv(dev);
        u32 chan;
 
+       /* Ensure tx function is not running */
+       netif_tx_disable(dev);
+
        /* Disable NAPI process */
        stmmac_disable_all_queues(priv);