upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mana: Fix TX CQE error handling

Browse source 
For an unknown TX CQE error type (probably from a newer hardware),
still free the mbuf, update the queue tail, etc., otherwise the
accounting will be wrong.

Also, TX errors can be triggered by injecting corrupted packets, so
replace the mana_err to mana_dbg logging.

Reported by:	NetApp
MFC after:	1 week
Sponsored by:	Microsoft

(cherry picked from commit 516b5059705b6b8bbba28821dbe05964c128f9a9)
This commit is contained in:
Wei Hu 2024-01-17 09:19:35 +00:00
parent dd5dabe284
commit 33cd621105
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/dev/mana/mana.h
View file

@ -137,6 +137,8 @@ struct mana_stats {
counter_u64_t mbuf_alloc_fail; /* rx */
counter_u64_t alt_chg; /* tx */
counter_u64_t alt_reset; /* tx */
counter_u64_t cqe_err; /* tx */
counter_u64_t cqe_unknown_type; /* tx */
};
struct mana_txq {

14
sys/dev/mana/mana_en.c
View file

@ -1487,21 +1487,23 @@ mana_poll_tx_cq(struct mana_cq *cq)
case CQE_TX_VPORT_DISABLED:
case CQE_TX_VLAN_TAGGING_VIOLATION:
sa_drop ++;
mana_err(NULL,
mana_dbg(NULL,
"TX: txq %d CQE error %d, ntc = %d, "
"pending sends = %d: err ignored.\n",
txq_idx, cqe_oob->cqe_hdr.cqe_type,
next_to_complete, txq->pending_sends);
counter_u64_add(txq->stats.cqe_err, 1);
break;
default:
/* If the CQE type is unexpected, log an error,
* and go through the error path.
/* If the CQE type is unknown, log a debug msg,
* and still free the mbuf, etc.
*/
mana_err(NULL,
"ERROR: TX: Unexpected CQE type %d: HW BUG?\n",
mana_dbg(NULL,
"ERROR: TX: Unknown CQE type %d\n",
cqe_oob->cqe_hdr.cqe_type);
return;
counter_u64_add(txq->stats.cqe_unknown_type, 1);
break;
}
if (txq->gdma_txq_id != completions[i].wq_num) {
mana_dbg(NULL,

6
sys/dev/mana/mana_sysctl.c
View file

@ -292,6 +292,12 @@ mana_sysctl_add_queues(struct mana_port_context *apc)
SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
"alt_reset", CTLFLAG_RD,
&tx_stats->alt_reset, "Reset to self txq");
SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
"cqe_err", CTLFLAG_RD,
&tx_stats->cqe_err, "Error CQE count");
SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO,
"cqe_unknown_type", CTLFLAG_RD,
&tx_stats->cqe_unknown_type, "Unknown CQE count");
/* RX stats */
rx_node = SYSCTL_ADD_NODE(ctx, queue_list, OID_AUTO,