From nobody Tue Nov 04 17:03:25 2025 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 4d1FCK2QpJz651CD; Tue, 04 Nov 2025 17:03:25 +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 4d1FCK1f53z3jqP; Tue, 04 Nov 2025 17:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762275805; 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=6nMi0iwmPgOWlP71iLeEO/8sgV2h0hlE7z6JT+SbLgI=; b=AU9ENnN4IrQ5IdVsaLD8zx4MvaUMcYX/l4knTUQr31Malg9c+pWpZ2s76Q8YFrVjLT2zuY dUaoVGSLJnR2rQIEPhenfWrQ+fJ/jxTrfF4GcUvH5kXEVx4i+j3dujskKQ6jBdDc0KTX2n t3HnKzc9dq5YqdTl7tm3elgR85eHfjwRiRs25Njp4PwdRSWAYws5y8FKh88JzusEXRRzJ8 fzm3OHw0Bptyf8BUq0Gj9p7QENY6CMbobRbp4HM7ISG8uN1+hXBnkGhrJBt14uY2lzadGS oV/S/ycOatX15FLtIeWHTmdCVvPxCrUedbkA7+5eTj1mAa4zWhs0eT2KrXG0Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762275805; 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=6nMi0iwmPgOWlP71iLeEO/8sgV2h0hlE7z6JT+SbLgI=; b=cQl2NkAC8jIWfBhcswohHTX3UBP9Yoks3q1mBPSP43Uu4aDKCcNeYBoQPEgk9CN1aToz2U z22eyfNskVibkgenki30dopNGSxyCeDh66ecbVYDCsEWMDlRsVylGlF2OKlC3kRA2+smo8 NDTeV+oT3XMUYe/jYcFVsPSMwO8HrKreQPVzdDbxn1pD1VWgEA9sx+AigU7uIBsOSvWsM3 d8MVnqI9Mw7Avjn9zDLNdqhdnpzoVTnk9YFuXrkHBubhIhddBkmD/zgoU1IuEs9xh2IWwd qUmJt2wDp1j+j3kqCXqtPTRfQXLdGqjDZt9ZHmGogBQTOfZmPMOovJaAfkmWhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762275805; a=rsa-sha256; cv=none; b=y1dwVacKW9emcLk+2e8/68aBZ0CHl++2BSd/OhHY+zguoh89l/cQVyAnADg2e6TAsk3Zy3 mDWXssbgws+9dunXDaPROX93EKgO//Dm8Sw4UmgOxpQfEz9+qDrXFseyDzboAEVzisvYQy Lhcrkz1J6ZJLUivy32KmH2+lgEHs81RVZpVBWDF3ui89WZJgNsyIgIWCmXtqsu89lOsxB7 yvMpVgFKQA9gfnSHVUSj3vTYhd2DtuByGVv5tkxRunNnBzu93nt1/QMMwdMKplEneF3BPs UQTZo3gJRbdyyDMWaCTPkYqQdg079BtAw4EzHZUdRJ6yEmZLTamRjHIzMqAg9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d1FCK15SSz15fS; Tue, 04 Nov 2025 17:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4H3PRP087794; Tue, 4 Nov 2025 17:03:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4H3P6F087791; Tue, 4 Nov 2025 17:03:25 GMT (envelope-from git) Date: Tue, 4 Nov 2025 17:03:25 GMT Message-Id: <202511041703.5A4H3P6F087791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f3a7ed2047df - main - arm64/vmm: Move the vgic_max_cpu_count() check 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: f3a7ed2047dffaebbfbb3920e993e9df424be728 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f3a7ed2047dffaebbfbb3920e993e9df424be728 commit f3a7ed2047dffaebbfbb3920e993e9df424be728 Author: Mark Johnston AuthorDate: 2025-11-04 16:58:25 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 16:58:25 +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 --- 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 1304a68b80f8..31d2fb3f516b 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -373,10 +373,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)) @@ -385,6 +381,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);