From nobody Tue Nov 18 15:02:56 2025 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 4d9nsr4K8Sz6HHFg for ; Tue, 18 Nov 2025 15:02:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsr26YNz44j2 for ; Tue, 18 Nov 2025 15:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478176; 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=GOxe6lAO4YyWdFUY3gFuelAWaQh5HBx5ULjyyeSpVIE=; b=xbAvFgB6oxgwRaC6reorePFzu8e12ylyExRE3LLUA5fxQ+DIU0K8xSW1R7Zglsoj3uPT6K DrJcxVrmq43qbQtxPyhz95EWkHhs9/2I8v/Eb3/G/iVmCkuc4DHsSoIzh+0HMEahy647OY 5NK3Lt1ygzOT91XFKSEE//QfnpLZYvcsBRZ1or1WIzasw7RtWDXzB6+DmewY16GyfgzJcE obaALQoLOTnVyjOJ9UlfVPUaCo55q8+s5ObJORYprd2xZVWOzVEj9UnZRWU+XwPWByzNzy TnXFJ56GyTnAVuQdjO/JMzHukL/tg3vtgS7wkGEIpT+82AjKUNRJLS78RmorCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478176; 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=GOxe6lAO4YyWdFUY3gFuelAWaQh5HBx5ULjyyeSpVIE=; b=l8Wr6rHnyvGsNcki+S72XiJa4W3Xf8OjxfwdAdWwa4KNo++orpguB6cvljUyGLSeHaPT8I 5f4CdZWFhyBQ7y3L7J1TW6AgBj+BDGcq19OlJFbT9s18Y/mOxMWrx2vfmJKUQ/pc+nbNlP +N+UWdRzvF80yp3QKR/Nz1m/rabVQCJBpojNVNiI4eQIuMXPtgKXI+kXJ5kjiSKwuEVC/d EkuXmNu6L1/TIe8tTlNWiJhy9uOxV1Y9YoMYhJifWdAqtCVRSSQZYmWNgiywnEmSaxIAMO vUNoqVBgmfzGV/LKpSEESh9iM8cSYoPiaiq8WXNPH+66sEmEdQrpj9T3eqpZ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478176; a=rsa-sha256; cv=none; b=P8vcMG6Td3hIpMrUjsmiT93MNyei2dEQqw4THY4oS6Ropd3YeKXOmj9v7+w/oLAdoLruQL ciAjIEzchgKXxNFVPAXKkmsVWew+es14pjGkYrNH6gKjZV/aqblRbg4lJn+ZkFXQrJRRYk HKUqxfD94I6gzQI0i1lAg2ySDwQTiTZZ1Rvvoc2ohENaFgAMT1YuZp+5F1ugO8neYaG04h 6OM0Yz4GHU6xlSDtBfDe9BeKrH20j+LTLXlPy8Evk0AkeitbRS8q6jXbRb8Tx8vfWAY3Wb 67jNFW/8gfd6rC6FGKIvjUM7KAf/Unpc0wj7+RuBmcsgJuupEssedBnQV47lPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsr1f0wz10KG for ; Tue, 18 Nov 2025 15:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 55096ebddc15 - stable/15 - arm64/vmm: Move the vgic_max_cpu_count() check 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 55096ebddc1557b7f0e4cb294878fcc8621de37b Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:56 +0000 Message-Id: <691c8aa0.379aa.7d985f2a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=55096ebddc1557b7f0e4cb294878fcc8621de37b commit 55096ebddc1557b7f0e4cb294878fcc8621de37b Author: Mark Johnston AuthorDate: 2025-11-04 16:58:25 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:42 +0000 arm64/vmm: Move the vgic_max_cpu_count() check vm_alloc_vcpu() is called quite frequently, and we don't need to apply the vgic limit unless we're actually allocating a vcpu structure for the first time. No functional change intended. Reviewed by: andrew MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53580 (cherry picked from commit f3a7ed2047dffaebbfbb3920e993e9df424be728) --- sys/arm64/vmm/vmm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index dfaba058e205..5225b995a75d 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -394,10 +394,6 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm)) return (NULL); - /* Some interrupt controllers may have a CPU limit */ - if (vcpuid >= vgic_max_cpu_count(vm->cookie)) - return (NULL); - vcpu = (struct vcpu *) atomic_load_acq_ptr((uintptr_t *)&vm->vcpu[vcpuid]); if (__predict_true(vcpu != NULL)) @@ -406,6 +402,12 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) sx_xlock(&vm->vcpus_init_lock); vcpu = vm->vcpu[vcpuid]; if (vcpu == NULL && !vm->dying) { + /* Some interrupt controllers may have a CPU limit */ + if (vcpuid >= vgic_max_cpu_count(vm->cookie)) { + sx_xunlock(&vm->vcpus_init_lock); + return (NULL); + } + vcpu = vcpu_alloc(vm, vcpuid); vcpu_init(vcpu);