The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x b2b000069a4c307b09548dc2243f31f3ca0eac9c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023100710-robbing-boned-49d7@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
b2b000069a4c ("net: mana: Fix TX CQE error handling") bd7fc6e1957c ("net: mana: Add new MANA VF performance counters for easier troubleshooting") 068c38ad88cc ("net: Remove the obsolte u64_stats_fetch_*_irq() users (drivers).") cb45a8bf4693 ("net: axienet: Switch to 64-bit RX/TX statistics") 84b9cd389036 ("net: ethernet: mtk_eth_soc: add support for page_pool_get_stats") 23233e577ef9 ("net: ethernet: mtk_eth_soc: rely on page_pool for single page buffers") 67dffd3db985 ("net: hinic: fix bug that ethtool get wrong stats") 7c2c57263af4 ("hinic: Use the bitmap API when applicable") 7a8938cd024d ("net: mana: Add support of XDP_REDIRECT action") 9ec321aba2ea ("team: adopt u64_stats_t") 5665f48ef309 ("ipvlan: adopt u64_stats_t") 09cca53c1656 ("vlan: adopt u64_stats_t") a98a62e456e2 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From b2b000069a4c307b09548dc2243f31f3ca0eac9c Mon Sep 17 00:00:00 2001 From: Haiyang Zhang haiyangz@microsoft.com Date: Fri, 29 Sep 2023 13:42:25 -0700 Subject: [PATCH] net: mana: Fix TX CQE error handling
For an unknown TX CQE error type (probably from a newer hardware), still free the SKB, update the queue tail, etc., otherwise the accounting will be wrong.
Also, TX errors can be triggered by injecting corrupted packets, so replace the WARN_ONCE to ratelimited error logging.
Cc: stable@vger.kernel.org Fixes: ca9c54d2d6a5 ("net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)") Signed-off-by: Haiyang Zhang haiyangz@microsoft.com Reviewed-by: Simon Horman horms@kernel.org Reviewed-by: Shradha Gupta shradhagupta@linux.microsoft.com Signed-off-by: Paolo Abeni pabeni@redhat.com
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 4a16ebff3d1d..5cdcf7561b38 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1317,19 +1317,23 @@ static void mana_poll_tx_cq(struct mana_cq *cq) case CQE_TX_VPORT_IDX_OUT_OF_RANGE: case CQE_TX_VPORT_DISABLED: case CQE_TX_VLAN_TAGGING_VIOLATION: - WARN_ONCE(1, "TX: CQE error %d: ignored.\n", - cqe_oob->cqe_hdr.cqe_type); + if (net_ratelimit()) + netdev_err(ndev, "TX: CQE error %d\n", + cqe_oob->cqe_hdr.cqe_type); + apc->eth_stats.tx_cqe_err++; break;
default: - /* If the CQE type is unexpected, log an error, assert, - * and go through the error path. + /* If the CQE type is unknown, log an error, + * and still free the SKB, update tail, etc. */ - WARN_ONCE(1, "TX: Unexpected CQE type %d: HW BUG?\n", - cqe_oob->cqe_hdr.cqe_type); + if (net_ratelimit()) + netdev_err(ndev, "TX: unknown CQE type %d\n", + cqe_oob->cqe_hdr.cqe_type); + apc->eth_stats.tx_cqe_unknown_type++; - return; + break; }
if (WARN_ON_ONCE(txq->gdma_txq_id != completions[i].wq_num))