From nobody Thu Feb 2 07:39:24 2023 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 4P6rJr6Kjdz3c8g8; Thu, 2 Feb 2023 07:39:24 +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 4P6rJr2WF6z4Qcf; Thu, 2 Feb 2023 07:39:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675323564; 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=ehqoTOWqwRl1AjiMJpt4aSaJ2J9GbssYI5sakiNT3Bk=; b=wzatsQbIW182V5uluXuYwjR6HvCcMqmpBkkjDgaIQMwEJ04QtyHjpn1JfjzNMEwBMXBqVJ /JvHJ3VmN4grEJBLFOobpskRDOufSs8reYPb8t+swjkXc/wb7wgtK+qgbZfGAJGhZCBeKc mGe5BIHBdLQvrEdp92cIzpynC1IpnHrZZANave1fgsBpTsibbi0TgjJ0/YphEhUtpIhK4n ThDkt1/m04yae/TMGGJRCd29PCMIhsdlaLm4DCe6vd07jdFOZGXpIm2B7XvxAWXTVIlLsv clrK6NSYxPG/ljiv65ztWcY0VkMtDyhm8nl7ibB0h/e50HEnvg3zXBWldrLzVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675323564; 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=ehqoTOWqwRl1AjiMJpt4aSaJ2J9GbssYI5sakiNT3Bk=; b=NnweNH1aUzMdsDRpeOQM6obf0GThmcsNS2EomCOSXi3FUZteJZ/vims+DUocxLuccwya0o FHqNXw3TxBv4aWFUPsORnjvvaK0fh1EH5GkDqIWlp3fRNixlpsGWpiwj5ap68fizHdRLxt 2xTIdYZzfYbU3j6uUcA2tkVZ8SLi5fxLyF0W5QLOwZypL+os9OsvzDtZ3tpZRjXOtFF0yD 4Kd1IcjfC9uqqhcx+sruCZDD7q0bKeKCJysh+YIC5Q0WZ5VbByl59kZv3pyrVHEd+bU1LG n+6poIQk8yh3zZkCER1QG77moA4xpvDASNiexbsN7rJRz8qc9QCVi0Y8d4/8NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323564; a=rsa-sha256; cv=none; b=pIjoyfQh8be9Jp2UkgwdStx6+I96YoR/TC1lk0hevCYkGXxHbBfQ/P+5rGMaF9H72N6F2D WD6tV84/3E6CKf3ZyIWYf9dSlOHd1YCdk5Bfc3635csflhSSksYaxc8SWyrT6+yZo6fSWT S0ciLy8S0xOa2QuJYfi/xpdCEcDHQhpHsdr7emWLXiub3kI9SNfAa4AZ/M2pk6JGX5Jn9K PDyBC8arHOnc+J2YTNbDHSgkFAu0gjc+j3ZOeZkZaYyUpQnivOMOEbj3YKrFmvuFEYyjgF CbvxNuCqFt9WCrpDcJobQ8H55VurPJQjbw65/v1m0kRbR8zdR5UGUJZo/QBWhw== 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 4P6rJr1ZJzzmVH; Thu, 2 Feb 2023 07:39:24 +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 3127dO71061852; Thu, 2 Feb 2023 07:39:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dOrd061851; Thu, 2 Feb 2023 07:39:24 GMT (envelope-from git) Date: Thu, 2 Feb 2023 07:39:24 GMT Message-Id: <202302020739.3127dOrd061851@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: 6d187cf93b04 - stable/13 - cxgbe(4): meminfo should get the TLS region's limits from the hardware. 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: 6d187cf93b04f819b0cbcc789dd115196db9e4ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=6d187cf93b04f819b0cbcc789dd115196db9e4ce commit 6d187cf93b04f819b0cbcc789dd115196db9e4ce Author: Navdeep Parhar AuthorDate: 2022-04-05 21:54:11 +0000 Commit: Navdeep Parhar CommitDate: 2023-02-02 07:10:41 +0000 cxgbe(4): meminfo should get the TLS region's limits from the hardware. meminfo is meant for debugging and it should read hardware configuration directly when possible instead of relying on values queried from the firmware. Rename the region to "TLSKey region" to match other drivers while here. Sponsored by: Chelsio Communications (cherry picked from commit f88b31885c4fd1f80bed2c3b3f2eb05f98367f31) --- sys/dev/cxgbe/t4_main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 309f719d504f..32348d3c4b8c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -9861,8 +9861,8 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS) "Tx payload:", "Rx payload:", "LE hash:", "iSCSI region:", "TDDP region:", "TPT region:", "STAG region:", "RQ region:", "RQUDP region:", "PBL region:", "TXPBL region:", - "DBVFIFO region:", "ULPRX state:", "ULPTX state:", - "On-chip queues:", "TLS keys:", + "TLSKey region:", "DBVFIFO region:", "ULPRX state:", + "ULPTX state:", "On-chip queues:", }; struct mem_desc avail[4]; struct mem_desc mem[nitems(region) + 3]; /* up to 3 holes */ @@ -9977,6 +9977,8 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS) ulp_region(RX_RQUDP); ulp_region(RX_PBL); ulp_region(TX_PBL); + if (sc->cryptocaps & FW_CAPS_CONFIG_TLSKEYS) + ulp_region(RX_TLS_KEY); #undef ulp_region md->base = 0; @@ -10015,13 +10017,6 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS) md->idx = nitems(region); /* hide it */ md++; - md->base = sc->vres.key.start; - if (sc->vres.key.size) - md->limit = md->base + sc->vres.key.size - 1; - else - md->idx = nitems(region); /* hide it */ - md++; - /* add any address-space holes, there can be up to 3 */ for (n = 0; n < i - 1; n++) if (avail[n].limit < avail[n + 1].base) @@ -10030,6 +10025,7 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS) (md++)->base = avail[n].limit; n = md - mem; + MPASS(n <= nitems(mem)); qsort(mem, n, sizeof(struct mem_desc), mem_desc_cmp); for (lo = 0; lo < i; lo++)