From nobody Mon Jan 03 23:42:16 2022 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 22810193F207; Mon, 3 Jan 2022 23:42:18 +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 4JSXN86n1Xz4jbf; Mon, 3 Jan 2022 23:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BF5E4693C; Mon, 3 Jan 2022 23:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 203NgGng051827; Mon, 3 Jan 2022 23:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203NgGDK051826; Mon, 3 Jan 2022 23:42:16 GMT (envelope-from git) Date: Mon, 3 Jan 2022 23:42:16 GMT Message-Id: <202201032342.203NgGDK051826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: bbab9ab57960 - main - cxgbe(4): Fix stats collection for ports with port_id != tx_chan 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbab9ab5796028e6ef9d765bfd307936bde14e89 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641253337; 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=eqxGvx7IOCBDFWLoooaBuSizieQI7cKYLM+RvIfKMb4=; b=meMz4yUMs6IWx1SLKLEyIn5k1MQfOdm5X/3hZJ+Kj/rSfAetWDx1YsEitMllqPibfhrNcq q8u4/lCkRHJO8P/GF23zM/N/M9upy56MlgWW2HuXK1vxQ+4E0Jhlr+Qep3CSdOJXzV8Fll 0thCoXF1TdJwdzOot0cWG1+JNPwetNaVAX5I9t8bq9kBafSfu4c6MQ0ut+4CSvA+kEvEqe bB9ws667HXT0zJG2RiIrFrJqVgASAZ1hnlMKzuMA3tyhPCeG6wYbeBsP3eIXhTekmNoW8H VMh3akOmgblhmORqctT7ulxfP49c477fnOVXs0J8CEWcKYnIy1EPI7Abv6+gOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641253337; a=rsa-sha256; cv=none; b=VqL8gMrdEbGblmFX1hy2BL4Z5g5iWpRYZv4pDitW+ZU6zXYRJuZAqF6QLzZfLr0w2v05/0 b4IS+LYXqaPsd5gTGYxT7vshfPzim+7Yn9oXVlHdglmkDvnl61W4p+gBnWbR97I9/49/Qv IeyGxiH5Krqv2bULYKICjkuZCwN8gLs1TQfRViGpfDnk2gf23U+G+CjaD4QMDZiwy351vm gJL21uAGoq4DC76SFPi1ZUKksuohjogHosGAcMCGemPBqXHXLz0fDNhNWH/Wk6sHjUIZSq /UDvb8MvNeOy3RUsnpwJEn0CrwBO00HeKg9wfsKWOZKXPpt1+soO4UPRb6/XrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=bbab9ab5796028e6ef9d765bfd307936bde14e89 commit bbab9ab5796028e6ef9d765bfd307936bde14e89 Author: Navdeep Parhar AuthorDate: 2022-01-03 21:31:46 +0000 Commit: Navdeep Parhar CommitDate: 2022-01-03 23:24:34 +0000 cxgbe(4): Fix stats collection for ports with port_id != tx_chan This fixes a driver panic during stats collection when a port's id does not match its tx channel. The bug affected only the T580 card running with a non-default VPD. Reported by: Suhas Lokesha @ Chelsio MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/common/t4_hw.c | 4 ++-- sys/dev/cxgbe/t4_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c index 26ffddaa98f4..d65d69075e88 100644 --- a/sys/dev/cxgbe/common/t4_hw.c +++ b/sys/dev/cxgbe/common/t4_hw.c @@ -6927,8 +6927,8 @@ void t4_get_port_stats(struct adapter *adap, int idx, struct port_stats *p) #define GET_STAT(name) \ t4_read_reg64(adap, \ - (is_t4(adap) ? PORT_REG(idx, A_MPS_PORT_STAT_##name##_L) : \ - T5_PORT_REG(idx, A_MPS_PORT_STAT_##name##_L))) + (is_t4(adap) ? PORT_REG(pi->tx_chan, A_MPS_PORT_STAT_##name##_L) : \ + T5_PORT_REG(pi->tx_chan, A_MPS_PORT_STAT_##name##_L))) #define GET_STAT_COM(name) t4_read_reg64(adap, A_MPS_STAT_##name##_L) p->tx_pause = GET_STAT(TX_PORT_PAUSE); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index f30e8c14ecb4..fe0be9ab9ff0 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -7072,7 +7072,7 @@ cxgbe_refresh_stats(struct vi_info *vi) pi = vi->pi; sc = vi->adapter; tnl_cong_drops = 0; - t4_get_port_stats(sc, pi->tx_chan, &pi->stats); + t4_get_port_stats(sc, pi->port_id, &pi->stats); chan_map = pi->rx_e_chan_map; while (chan_map) { i = ffs(chan_map) - 1;