net: mana: Fix TX CQE error handling

[ Upstream commit b2b000069a4c307b09548dc2243f31f3ca0eac9c ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 4f4204432aaa3f787f9f1fd84765bfed9e7c76dd..b751b03eddfb1edd08d90c981bee5791c438c540 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -1003,17 +1003,21 @@ 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);
+
                        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);
-                       return;
+                       if (net_ratelimit())
+                               netdev_err(ndev, "TX: unknown CQE type %d\n",
+                                          cqe_oob->cqe_hdr.cqe_type);
+
+                       break;
                }
 
                if (WARN_ON_ONCE(txq->gdma_txq_id != completions[i].wq_num))