From nobody Wed Apr 6 20:18:01 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 04A211A8BB72; Wed, 6 Apr 2022 20:18:02 +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 4KYbRY4zS2z4Y97; Wed, 6 Apr 2022 20:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649276281; 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=nswDeYCqViqI+mWxuKoJfL3DdFec56yfGcqrQhT9+Sg=; b=E3CyGy5SIr3bbVp+3gVAuv+wOVAkzcj/s0iefnX6JSHNaO6zNP3nQae3qv0PQxjPOk/0G2 mWSRx6yzUZ2vBe6mv2zzTHvCm2uncxSRungFUHH+N2hi7QbUC0Yxb8+tVsHqWbxR7xC5wx LEiJ/1XQa4cyZ6JjZdPavq8iD4kaJ1UqCy9MqE15ObocjKI6CG4JNy0XpipAKtijNiPNiX ytDQUz46qv+EZ6k+RUYxSBbwSw/2EGG1e3hkHwMNA6rnBy9kmbkoREKIcEpJBKprojBXY2 NtiylaiQERi+P8jOv6+ZrO9Ji2dtQhqY2Z3GIbt3Mqr1ZVtzRkouG4dGUxmy3g== 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 75EAE21F82; Wed, 6 Apr 2022 20:18:01 +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 236KI1jg025082; Wed, 6 Apr 2022 20:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236KI1pT025081; Wed, 6 Apr 2022 20:18:01 GMT (envelope-from git) Date: Wed, 6 Apr 2022 20:18:01 GMT Message-Id: <202204062018.236KI1pT025081@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: c5a7885c8026 - main - cxgbe(4): Display the number of free PM pages and p-structs in meminfo. 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: c5a7885c80260f5eccb616ecbc77d7e919ce2614 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649276281; 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=nswDeYCqViqI+mWxuKoJfL3DdFec56yfGcqrQhT9+Sg=; b=xC3islrHmrB23//Al8C8Z/DQRbcI6HBrYQR2D0TJ+SncOGHzx33mT9+Z83RSU2mFyW900K 1jj7Qn2fBmmZrhXwZhWntbWdVN1fm2vT7qqwFT9FrxHmhXGZPdRXPY3w1IMeb5IedAxF8P Ks5OcPlpqGGNkXDXKyUpuKFihV3i2W2KvBzrggK2NXUK7tPz+U1tt1DbldezaN7tJu9wZT iSqCjU298kMlDodJukhhwFnSPtkbRnyg4VBNxGm4WNvN+2MlAlms6v82XXmCVzJrnJzm88 SblI2XXbSs4bhLWXoRHgsHyquOIcCA3YPRstpt/BGMXSQ1NO7129NFpWKJBjjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649276281; a=rsa-sha256; cv=none; b=wxFbYgPPDM/FOwvnZlqe5uShaFMjq7+JyMJJ0yBU8ZBINbAckTMe2z/S9Lk5giCIFKMQSt tY6cST8oiRA46tnXHl+7BbfyW5qtCIumaNhvEx/1TzRgDkaQTNmC+RcDJXsjX36Fcf+6/j OwG4HYAwwCSMoor4Gv98J61x15UC2xkcGCB49ojM7DTz8AWMzpFlvRX5DVzQN1zYcs8O4Z ObyVNvekDtK/hleHex/Qt8g7UW688mO9x18sWPgSruUoFAOY/luj5zgFQdyQg4i7lP+WMA l0GPnRoLJSCPAc416cNmfSH8DXFRJvOYUIMZlnHdJHMoMpS00GNEN1vIottwtw== 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=c5a7885c80260f5eccb616ecbc77d7e919ce2614 commit c5a7885c80260f5eccb616ecbc77d7e919ce2614 Author: Navdeep Parhar AuthorDate: 2022-04-06 00:15:31 +0000 Commit: Navdeep Parhar CommitDate: 2022-04-06 20:15:26 +0000 cxgbe(4): Display the number of free PM pages and p-structs in meminfo. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 3b6b884f1077..eba79deeced3 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -9698,7 +9698,7 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS) struct adapter *sc = arg1; struct sbuf *sb; int rc, i, n; - uint32_t lo, hi, used, alloc; + uint32_t lo, hi, used, free, alloc; static const char *memory[] = { "EDC0:", "EDC1:", "MC:", "MC0:", "MC1:", "HMA:" }; @@ -9899,19 +9899,24 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS) mem_region_show(sb, "uP Extmem2:", lo, hi); lo = t4_read_reg(sc, A_TP_PMM_RX_MAX_PAGE); - sbuf_printf(sb, "\n%u Rx pages of size %uKiB for %u channels\n", - G_PMRXMAXPAGE(lo), + for (i = 0, free = 0; i < 2; i++) + free += G_FREERXPAGECOUNT(t4_read_reg(sc, A_TP_FLM_FREE_RX_CNT)); + sbuf_printf(sb, "\n%u Rx pages (%u free) of size %uKiB for %u channels\n", + G_PMRXMAXPAGE(lo), free, t4_read_reg(sc, A_TP_PMM_RX_PAGE_SIZE) >> 10, (lo & F_PMRXNUMCHN) ? 2 : 1); lo = t4_read_reg(sc, A_TP_PMM_TX_MAX_PAGE); hi = t4_read_reg(sc, A_TP_PMM_TX_PAGE_SIZE); - sbuf_printf(sb, "%u Tx pages of size %u%ciB for %u channels\n", - G_PMTXMAXPAGE(lo), + for (i = 0, free = 0; i < 4; i++) + free += G_FREETXPAGECOUNT(t4_read_reg(sc, A_TP_FLM_FREE_TX_CNT)); + sbuf_printf(sb, "%u Tx pages (%u free) of size %u%ciB for %u channels\n", + G_PMTXMAXPAGE(lo), free, hi >= (1 << 20) ? (hi >> 20) : (hi >> 10), hi >= (1 << 20) ? 'M' : 'K', 1 << G_PMTXNUMCHN(lo)); - sbuf_printf(sb, "%u p-structs\n", - t4_read_reg(sc, A_TP_CMM_MM_MAX_PSTRUCT)); + sbuf_printf(sb, "%u p-structs (%u free)\n", + t4_read_reg(sc, A_TP_CMM_MM_MAX_PSTRUCT), + G_FREEPSTRUCTCOUNT(t4_read_reg(sc, A_TP_FLM_FREE_PS_CNT))); for (i = 0; i < 4; i++) { if (chip_id(sc) > CHELSIO_T5)