From nobody Wed Jan 17 09:36:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TFLNd3Qbmz57R8Q; Wed, 17 Jan 2024 09:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TFLNd2pwzz4Sy6; Wed, 17 Jan 2024 09:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705484177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V9ELsL5/ZmVmDP071Wc+ABGnsQmYH7TdOxzxo+oQJsc=; b=BTPbm9sBHWDIoUvhwqSXwaNSMhiLMSMZjfRTQ7cKNmblwChZSbY0HGokrTh2lwTffZjEUf TzaAB2A1d1ZJ40iO6Upf0F0j5q59eun9rFPvlLZSl74v23xDT7PBHP7Xq1qAtq6n3bWo5z r3nUtGpes8dYXO8T4vEMWt0J18cWNetIcRjL5Oivn40mzP7RR4QiBPB8ARmGC+t4nYIONp 42VV5TaH1WkdHh2NHrvG3PYVI3fmu67iJPRg4W6mYhREeZCP8JXRCxJJ3e5b3zAejpZ5Ci 95YT8+6Fp9+IR6nJjR10+bX9/UCxMZ8OqcBv7hkO+1mkqJSDie4vaeDG+K3syA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705484177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V9ELsL5/ZmVmDP071Wc+ABGnsQmYH7TdOxzxo+oQJsc=; b=vSoGAMUyOtUgCAuPBUjgSdCcCZPZ4rvuOq6qRDOc+ouH7Ni4klTAjt8rcFEOaI7TVcUM21 tCDSjdFeweF4oziEUExsJ9RJfL27qXF2LE/I/YAL4RfO/spSko1H+1jcQHblqxZNT5Tg40 R3N/l5/WLySbxLNchHWyiclkOOc1zk2/v/BNE/+EAzhuAGSbuZ6MasAerDeSl5EeCmiZKg w1koJPneMGMB5ury+TvSBI+rDd0OIuYc7oO13lPAmNU1iNZnQZFJ9sGdJl/PUHlAVKKy1+ 4CMG4vBMs6QMN9w6T8bNWnYhgdSXeXDhQiqRClmSkRs9ojHDC8WVk2vZ6gghNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705484177; a=rsa-sha256; cv=none; b=Um9zLR4rbcKHiEsvcWq1Q/ZbUtTBiUNghcZ3LN85nXmgmeR+jR4q+ShoEQThOGCeadcgWI e6Jk+MaAIirvUKffmJE/oNhdDIjwZqHQ7vffc8/D1nYWq5U5CcPQvUrJpMGDEMo4e2yGDB 3jUjbpl5YQF/ZGtEVS2F5ezE8wCzfKDnrlW4h9ViZT53kZghWY3VTFi54PqSS72ADBmNPn mbycscVagXLqpLIcibtEZr1ofcBKXgJPwSJ2AgMjh0/k4vkH56m4ds4ybQbMyXC7EquV6q D/xQw8DcbFnxe7qeejpms7M85aNiaVOsvTySbdP0m+chvESgZ+jIJowIKfjjHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TFLNd1ZFWzHp8; Wed, 17 Jan 2024 09:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40H9aHZ4071451; Wed, 17 Jan 2024 09:36:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40H9aH87071448; Wed, 17 Jan 2024 09:36:17 GMT (envelope-from git) Date: Wed, 17 Jan 2024 09:36:17 GMT Message-Id: <202401170936.40H9aH87071448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 516b5059705b - main - mana: Fix TX CQE error handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 516b5059705b6b8bbba28821dbe05964c128f9a9 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=516b5059705b6b8bbba28821dbe05964c128f9a9 commit 516b5059705b6b8bbba28821dbe05964c128f9a9 Author: Wei Hu AuthorDate: 2024-01-17 09:19:35 +0000 Commit: Wei Hu CommitDate: 2024-01-17 09:25:26 +0000 mana: Fix TX CQE error handling 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 --- sys/dev/mana/mana.h | 2 ++ sys/dev/mana/mana_en.c | 14 ++++++++------ sys/dev/mana/mana_sysctl.c | 6 ++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index ab394f3203ad..906b28eb56b6 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -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 { diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 3948106f492e..0e5f86b5e105 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -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, diff --git a/sys/dev/mana/mana_sysctl.c b/sys/dev/mana/mana_sysctl.c index d03ebe44ab31..844a05040595 100644 --- a/sys/dev/mana/mana_sysctl.c +++ b/sys/dev/mana/mana_sysctl.c @@ -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,