From nobody Thu Jan 26 22:12:05 2023 X-Original-To: dev-commits-src-branches@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 4P2w113vQHz3c8dr; Thu, 26 Jan 2023 22:12:05 +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 4P2w1139jjz3wYG; Thu, 26 Jan 2023 22:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771125; 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=BGKDPwdynwWVaGjjaTVqssUOE8gDilqF+j4ap9ELeXU=; b=Z8VHVsBn4Y5u7/fn9Jm4Vkbg/8EB6188A+bWHR5zEJiORPPANXKmoeIO1bbBf0RMcpXVCJ Eo8tzro13uCS7+vIyumidQYCRyOoEd8TgR4bGQeeBYpBkHPcO4gNxLsEUCo2+7jDd7gnrJ SXXNjlypf+1vmIWyT/yT8RsyPEKXI7HSYdKZtGIM/W41cA+yIJuPtlAdUiDetihERpq+GL KCPVUv7bAXCLfHMAKtHJ6cZzuGgcyhvtXB4v4CZn43w94iR8r/cAc33jfeQn6zA9ouJYW3 WhrKs/nzo1B5PVWnTPhxcp8cpfeg/eLRvu5Fza1JF2lBZT4kYGBfD0qWrg+E0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771125; 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=BGKDPwdynwWVaGjjaTVqssUOE8gDilqF+j4ap9ELeXU=; b=Yj2Uc+bGhuo7qy7GubXs3AbcOxg1yWJsABOoBkMYFZP7E1JngZm7SsWcUunpYuhoF3vg0r f0rmDtRowxU1QJK4hQrFxBUhU6A+1yKboZZcR5vVxsdjLo8180MjtLPF6LISbouaaSuX8s dPFI8jScEBLKD/7OHFEWF921OA93Je1+lyZ0NyX5wpI1pyQYkg+cGRbJXzJHW/Ej8FSVPh CasbXar+4Gauj+TmZUK2ak3QzUtp4TFke68+j1CYnKqhEThp3t8T4qZTpPz0+aPhnqYqOw FzVDTjo4rk8vFg8Jt4C7KMq6FOvb/BG3/Qfuo513HR/k6Lw/hMoQFu8SzQVZ0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771125; a=rsa-sha256; cv=none; b=jngZ8ZbSuFVDAyG1MWqii/4RfbsXG7z2nn2/n0QgdgRna/jrHeWOPSYrl34C97GH/5CZCh LvXUaT5ADbykT5+Z5rLU+yflFSB2OQGpOixV4RsAo58YbADJX4Qk1D37iaG5Nxg0k8LLOL HTzEfzl/4gmvNnIX1izpS6xcbxW1K4wLCd8PFU4CAqrhVJlreZ8sw9eXtBGxNbZ6AMJTgJ P72W16QxFULo7sBYayLCJ4zm1ol+Fzn7IrRrWu1GNcTQQ8aAXNmPI59/CxJAGllR6nb9P7 yjkQ5PP+g6AmgGI8m9yFtSoPTEW8X+MUUmfK8soSiszdj6sqSsciUdWRV8naTQ== 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 4P2w1125DHzlhB; Thu, 26 Jan 2023 22:12:05 +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 30QMC5PE022211; Thu, 26 Jan 2023 22:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMC5V9022210; Thu, 26 Jan 2023 22:12:05 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:12:05 GMT Message-Id: <202301262212.30QMC5V9022210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 85ccfcb79fee - stable/13 - vmm stat: Add a special nelems constant for arrays sized by vCPU count. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 85ccfcb79fee1c6b607e7a5c911894032a25a015 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=85ccfcb79fee1c6b607e7a5c911894032a25a015 commit 85ccfcb79fee1c6b607e7a5c911894032a25a015 Author: John Baldwin AuthorDate: 2022-11-18 18:04:23 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:04:41 +0000 vmm stat: Add a special nelems constant for arrays sized by vCPU count. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37170 (cherry picked from commit d5118d0fc4599f69116ec8de59052606e36e6306) --- sys/amd64/vmm/io/vlapic.c | 2 +- sys/amd64/vmm/vmm_stat.c | 3 +++ sys/amd64/vmm/vmm_stat.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index bcfe6b498721..9c61726e77d7 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -905,7 +905,7 @@ vlapic_calcdest(struct vm *vm, cpuset_t *dmask, uint32_t dest, bool phys, } } -static VMM_STAT_ARRAY(IPIS_SENT, VM_MAXCPU, "ipis sent to vcpu"); +static VMM_STAT_ARRAY(IPIS_SENT, VMM_STAT_NELEMS_VCPU, "ipis sent to vcpu"); static void vlapic_set_tpr(struct vlapic *vlapic, uint8_t val) diff --git a/sys/amd64/vmm/vmm_stat.c b/sys/amd64/vmm/vmm_stat.c index 2df4423bc60f..168a380b221b 100644 --- a/sys/amd64/vmm/vmm_stat.c +++ b/sys/amd64/vmm/vmm_stat.c @@ -70,6 +70,9 @@ vmm_stat_register(void *arg) if (vst->scope == VMM_STAT_SCOPE_AMD && !vmm_is_svm()) return; + if (vst->nelems == VMM_STAT_NELEMS_VCPU) + vst->nelems = VM_MAXCPU; + if (vst_num_elems + vst->nelems >= MAX_VMM_STAT_ELEMS) { printf("Cannot accommodate vmm stat type \"%s\"!\n", vst->desc); return; diff --git a/sys/amd64/vmm/vmm_stat.h b/sys/amd64/vmm/vmm_stat.h index e40a960ec82a..050d3c13dda1 100644 --- a/sys/amd64/vmm/vmm_stat.h +++ b/sys/amd64/vmm/vmm_stat.h @@ -58,6 +58,8 @@ struct vmm_stat_type { void vmm_stat_register(void *arg); +#define VMM_STAT_NELEMS_VCPU (-1) + #define VMM_STAT_FDEFINE(type, nelems, desc, func, scope) \ struct vmm_stat_type type[1] = { \ { -1, nelems, desc, func, scope } \