From nobody Mon Feb 28 06:55:45 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 D369719D2C93; Mon, 28 Feb 2022 06:55:46 +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 4K6WNy1t04z4RXC; Mon, 28 Feb 2022 06:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646031346; 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=pL/QhmJiHCpr09KF1a0YsGA7MHBZ+ZwjGHEJeKidBkQ=; b=LAZO97oW3kNq1HGtkgOm4QT2DRsP98QbpYHu2wkqxXSofdW/7Ire2gC8a13VBsqgQMCmHf mdqYhtTlukEDFqdxkA1INK4vNmU2E3OKn9NIlYhjh3ZjJi0sPPNxxU4M4wncKE18+LFKWh 4WCFRtwHouXx2Tm+WbmnHYNI90/vLr/qq5Tim2oKoSAd/lMOuZpta0L8mSdpA10gwb/1TV uoG2a8V2qO9VjhFgGaTrpeBH4UHzxjbCWsoOBJB7zxDFjT6sNST7BSgL9f031F0SxoxsYT nUMeMgf1LXR1jqZduH9cu8DaCQ5WgGVbbu3LbngSkikZUqFIyO3hxcUHrGxXOw== 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 B32381657F; Mon, 28 Feb 2022 06:55:45 +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 21S6tjC6077839; Mon, 28 Feb 2022 06:55:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21S6tjro077838; Mon, 28 Feb 2022 06:55:45 GMT (envelope-from git) Date: Mon, 28 Feb 2022 06:55:45 GMT Message-Id: <202202280655.21S6tjro077838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: cfe1193f5f9d - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: cfe1193f5f9d53c3f98c4d8f44df35ff58972dfe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646031346; 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=pL/QhmJiHCpr09KF1a0YsGA7MHBZ+ZwjGHEJeKidBkQ=; b=DsJIw7jQe+bLGpKpUEID3Omc/agWUQw8dP3NvgTGECPeTYcN+dU/Y30+wA9s7ItJxcaFLG VNGZYH+GVgymROANM6GVjlJbjO+xJOzAAkmod5u4/WTi9kOREZ5yCcPcGapcPzpFdNMmMo lnSEZPoD2RWFFhtMTTmKwoMblfrtzcN1N+8+Y6juoY6Hbx5NMyvlgH95RbYkyGV+o4/k4T 4S1mtAMVdyATPLkwAXeIZxemUL5nxK5F4uXxjQMH005FMsJSsfukr9TTj6UXV9WKpWqVTl kVqqV1Pt4npRxZwl2PH/ZZiuGguoEOcacs3fK1edJh4qQjhAdiDiLHcJEl7YWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646031346; a=rsa-sha256; cv=none; b=x5bgliLtIzmb4dlstEEuhrgRuopShLW5fOyXXbCqhlvKoQEOWjASXBXMwUAu5BNlPt7KJc qrK8L3kew7AvzxnqA3dAGzj+3+y8+mzf31tGVjSkdtA3qyLKnvzr+VGjfGiK9sSkga2VkN /qSeB0Z8grWlIo+EIH7uMcgSE5NE7Dij2dNyxqKFykyL3+1asply+qoulylscljt20ZFkt O3KHxNwhyVq4YJNwQLBBl19E26erRLN//wczJCT7kux7c7d/E0O0V4mgPODuoijHkZKS8u oiJQjetX8N5sBIAaUO6NuGcv/jrOONBkSaHyTcYjr0SbhlwJMdY9hIUTOwhrRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=cfe1193f5f9d53c3f98c4d8f44df35ff58972dfe commit cfe1193f5f9d53c3f98c4d8f44df35ff58972dfe Author: Navdeep Parhar AuthorDate: 2022-01-03 21:31:46 +0000 Commit: Navdeep Parhar CommitDate: 2022-02-28 06:47:42 +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 Sponsored by: Chelsio Communications (cherry picked from commit bbab9ab5796028e6ef9d765bfd307936bde14e89) --- 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 2a026d3c90c9..b45f910afe88 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -7131,7 +7131,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;