From nobody Fri Oct 31 14:19:34 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 4cyjm70C1fz6FtBw; Fri, 31 Oct 2025 14:19:35 +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 4cyjm66jZHz3NMX; Fri, 31 Oct 2025 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761920374; 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=ykysdxZSBxWC1qqDTDATL2ykm4rWIYWM5eA/aYu5Paw=; b=XfBQ3PhXDicjquJ0CwAqaQ+hmz0JGc6xOc9VwEE0ls/YEd4PtZ8tePpfzqzTJ3Lng6xvwA MX5nY7sOLAp0cj5Wc0UIr2uNjEGP8tyJlDAYsQ3qHC/myCh87plErNZs/M5HBlfK4dUhY/ tlXJbQr6FUceFLpYq+IbdVxQRHxEcPL/3u0fQJqa2orfEGl6sKm2ufx/kgPtZ3d7dfw51m koVMGLeEH0Mmsw3Dd/xEi/pIUsZbvg2rLe5FfC+vPwNW6600Td0jqy8LDbPHeZgjSjD8At Akq7O8TYJo0AUL0wRXrRCP1Yju+UoJwyJtlrbpRACNtNvtAlS4a1hINZtBezxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761920374; 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=ykysdxZSBxWC1qqDTDATL2ykm4rWIYWM5eA/aYu5Paw=; b=uewsgFS8y+KNSs0lKmaAmQGip6Cpe2RtFD7M5u8xW91McROGsoTASY/R/800+U4wYAN9nF joJN6VfDhGgPmv95SIQGlqUYj5TnLHxTpNrw3iXr5gA/c7teyNKpCJUvBskk/9NX1aiQya CEXYgXO2HzVs6G5e/vbT8vpqZZyToVkjqEq4zELdTucaApJ/m8B8NUGHhaoDc8AfbHhGm/ ZKo5KpW/foyE2hQFYJBlwurYn82OxTxiduySYp5RyWiZTpBo4+V1JoMjhnhHA1nUC5dhgG b+o/qR9HldMKQvYsTPeyFCC/9vGY1rVmsCa9nrCTgcIxHeZGYbnR99ADvAD/RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761920374; a=rsa-sha256; cv=none; b=HslEBHph0DGNhvuHmBGLA5OsYgUHvo+oXlj02wcezI4IlodKurCLZXsZXWszU8u9CXBhKb har/ta8J/CaJCPIMHnaQmoKDbvK+ywPEiyoFmB5YXxvSQGEHFU6n9t7HpRlmMMSiWlOq3i i2fw1fQqPzO/ySdWmf/sTwNvM5pnx3I2U0HiU1uOaBE9Y8PPRaEURD1stOdY3yboou5rRU 5D75+dfTBAeCJeNTeaNpHv8jhlxzSqDegYBWwybprGb98fZB5TUyBSN2EQIYBvkxpPhe19 GV/a5XdRQN/ofw9Ig6rN7BZza8t3jbbRJxmFTJ+TUDKMKX+NagPrXHAutrI2KQ== 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 4cyjm660l1z1BDT; Fri, 31 Oct 2025 14:19:34 +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 59VEJYtV014170; Fri, 31 Oct 2025 14:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VEJYdv014167; Fri, 31 Oct 2025 14:19:34 GMT (envelope-from git) Date: Fri, 31 Oct 2025 14:19:34 GMT Message-Id: <202510311419.59VEJYdv014167@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: 5baa83cfcbd8 - main - riscv/vmm: Remove a redundant maxcpu check in vm_alloc_vcpu() 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: 5baa83cfcbd87109dc8a61fbb2e183998cc2d5c5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5baa83cfcbd87109dc8a61fbb2e183998cc2d5c5 commit 5baa83cfcbd87109dc8a61fbb2e183998cc2d5c5 Author: Mark Johnston AuthorDate: 2025-10-31 14:08:45 +0000 Commit: Mark Johnston CommitDate: 2025-10-31 14:08:45 +0000 riscv/vmm: Remove a redundant maxcpu check in vm_alloc_vcpu() aplic_max_cpu_count() just returns the VM's max vCPU count, and vm_alloc_vcpu() already checks that. Just remove this check so that it's easier to merge vm_alloc_vcpu() into MI code. If the APLIC really does require us to lower the limit, we should instead adjust vm->maxcpu in vm_create(). No functional change intended. Reviewed by: br MFC after: 1 week Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53496 --- sys/riscv/vmm/vmm.c | 4 ---- sys/riscv/vmm/vmm_aplic.c | 10 ---------- sys/riscv/vmm/vmm_aplic.h | 1 - 3 files changed, 15 deletions(-) diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index 24b4be89af48..a9eb9d144336 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -319,10 +319,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 >= aplic_max_cpu_count(vm->cookie)) - return (NULL); - vcpu = (struct vcpu *) atomic_load_acq_ptr((uintptr_t *)&vm->vcpu[vcpuid]); if (__predict_true(vcpu != NULL)) diff --git a/sys/riscv/vmm/vmm_aplic.c b/sys/riscv/vmm/vmm_aplic.c index 4df41f2de1a5..74cb4fef4273 100644 --- a/sys/riscv/vmm/vmm_aplic.c +++ b/sys/riscv/vmm/vmm_aplic.c @@ -577,13 +577,3 @@ aplic_sync_hwstate(struct hypctx *hypctx) { } - -int -aplic_max_cpu_count(struct hyp *hyp) -{ - int16_t max_count; - - max_count = vm_get_maxcpus(hyp->vm); - - return (max_count); -} diff --git a/sys/riscv/vmm/vmm_aplic.h b/sys/riscv/vmm/vmm_aplic.h index 49510221b419..96018fe9adda 100644 --- a/sys/riscv/vmm/vmm_aplic.h +++ b/sys/riscv/vmm/vmm_aplic.h @@ -49,6 +49,5 @@ void aplic_cpuinit(struct hypctx *hypctx); void aplic_cpucleanup(struct hypctx *hypctx); void aplic_flush_hwstate(struct hypctx *hypctx); void aplic_sync_hwstate(struct hypctx *hypctx); -int aplic_max_cpu_count(struct hyp *hyp); #endif /* !_VMM_APLIC_H_ */