Commit b2b00006 authored by Haiyang Zhang's avatar Haiyang Zhang Committed by Paolo Abeni

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: ca9c54d2 ("net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)")
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarShradha Gupta <shradhagupta@linux.microsoft.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent d0f95894
...@@ -1317,19 +1317,23 @@ static void mana_poll_tx_cq(struct mana_cq *cq) ...@@ -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_IDX_OUT_OF_RANGE:
case CQE_TX_VPORT_DISABLED: case CQE_TX_VPORT_DISABLED:
case CQE_TX_VLAN_TAGGING_VIOLATION: case CQE_TX_VLAN_TAGGING_VIOLATION:
WARN_ONCE(1, "TX: CQE error %d: ignored.\n", if (net_ratelimit())
cqe_oob->cqe_hdr.cqe_type); netdev_err(ndev, "TX: CQE error %d\n",
cqe_oob->cqe_hdr.cqe_type);
apc->eth_stats.tx_cqe_err++; apc->eth_stats.tx_cqe_err++;
break; break;
default: default:
/* If the CQE type is unexpected, log an error, assert, /* If the CQE type is unknown, log an error,
* and go through the error path. * and still free the SKB, update tail, etc.
*/ */
WARN_ONCE(1, "TX: Unexpected CQE type %d: HW BUG?\n", if (net_ratelimit())
cqe_oob->cqe_hdr.cqe_type); netdev_err(ndev, "TX: unknown CQE type %d\n",
cqe_oob->cqe_hdr.cqe_type);
apc->eth_stats.tx_cqe_unknown_type++; apc->eth_stats.tx_cqe_unknown_type++;
return; break;
} }
if (WARN_ON_ONCE(txq->gdma_txq_id != completions[i].wq_num)) if (WARN_ON_ONCE(txq->gdma_txq_id != completions[i].wq_num))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment