From nobody Fri Nov 06 19:54:59 2026 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 4jLqdv5qLYz6yf3N for ; Fri, 06 Nov 2026 19:54:59 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jLqdv2mK5z4FRN for ; Fri, 06 Nov 2026 19:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793994899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bybjBxHNqM7z6/ThGRfLqV50wn4GjM3LN9Bzev6ch3M=; b=kFltSTO1o//rL3C5NAC3sIuJrM5UyKec3JwcZBhZ2TXGr913NjSdzDxg7QAL6Iq13biPtG VRj/qzO3sB7MDFKq4ieB4nQFQfYYIfGwJdceNdT0GjO51kLEVW1K8vHzXn9NA2Iq6H2MaL dnEzxsjOG60kuCk4mUs5TdkTGWwTLRFcC2l/JYajhimqfNu6PmHNleqBpBJ/x3FfrVG6op g5FuZD8imwBGOkc5csadtD3SSvt+3iKHvviw2vZHOuZ0XsdpURFazxZykJy3aB89q+Dh6q BTa/l1wQdaWS/V1eWaPx68FVpXQWNtzY+/llcunGvyNzzG1/B4vn0551sC1vMg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793994899; b=mvgwyufTmbRxamhDvOdoCllKx/H/cTfNQUsr36EuRYGmgVawm3yKX51ofPNgdzpGuYBx4C 53JvrFaP5MVLKGfQEbvIhr2KCRhdslYLkfbURIVI57/VLBGRgIqAWKxF1anZxeFQHiYB3B TFeMkpD0TQPhOSHqQNkUe7HXt19aaaTKqvBfs8XmodiujbP+f5rYYxrDitL337O47TbQtX 2qU5lkAXVEpWi0D9BuFFCm5HHzAPooUCrZL0PqOF0HEQy2O7+VMK2R1EILZcFhUCNfCboI esx92E4KjhxsR0QvcYGDjh8ATrQlsQ5FiXjEnZhtYYDO14PhVzawH7YgMSeslQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793994899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bybjBxHNqM7z6/ThGRfLqV50wn4GjM3LN9Bzev6ch3M=; b=e8/pEyim6o/+/sFe9PRMzAcJiYkWE7wmRO/fRHxbLOXqDJfwW6EpRCDH26aALS7esw9s1L JmdN/HfUrPtLTY9JVQmqx0ABVTSnuG2XxnyUHaWK+cyC7Ah2Gmy8+gMRlUqKftLcSVIDV7 WghwEGB1W0ToNEWOffxifBi8R9tQnJ1wVh/qZLMrDWKx4uyxTkU5lCSchMpqz+HnKavFq+ IBjWSdULgJA6OpjzPKaivc134YoYxdaVaeG6W1uykHzORuYdlz47CSKG+6yhDrO1etFA+G 0OXIhUIQPwtpcXF3cS6VzavwfOkbDw5K73yiwLR3DX1SkWuYhTT8WVi1aWjlRg== 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 4jLqdv2QgDzrGg for ; Fri, 06 Nov 2026 19:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e11d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Nov 2026 19:54:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hans Rosenfeld From: Mark Johnston Subject: git: 06da67ded274 - stable/15 - amd64/vmm: Port vlapic interface changes from illumos (duplicate) List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 06da67ded27480ba0bc058e45ba1208f5be94b67 Auto-Submitted: auto-generated Date: Fri, 06 Nov 2026 19:54:59 +0000 Message-Id: <6aee3093.1e11d.368a244@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=06da67ded27480ba0bc058e45ba1208f5be94b67 commit 06da67ded27480ba0bc058e45ba1208f5be94b67 Author: Hans Rosenfeld AuthorDate: 2026-10-20 15:11:52 +0000 Commit: Mark Johnston CommitDate: 2026-11-06 15:52:19 +0000 amd64/vmm: Port vlapic interface changes from illumos (duplicate) This is a port of the bits related to vlapic-enablement of the following bhyve improvement from illumos: 14598 bhyve vlapic should handle APICBASE changes https://www.illumos.org/issues/14598 A LAPIC can be enabled/disabled in two ways: - by the global-enable bit in the APICBASE MSR - by the software-enable bit in the APIC's SVR register This change allows distinguishing between both forms of enablement where that matters. The more involved changes to allow guests to modify the APICBASE MSR are not included at this time. Reviewed by: corvink, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56347 (cherry picked from commit a11b901f5a46de33d53899200744252424a37efe) --- sys/amd64/vmm/io/vlapic.c | 74 ++++++++++++++++++++++++++++------------------- sys/amd64/vmm/io/vlapic.h | 1 - 2 files changed, 44 insertions(+), 31 deletions(-) diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index 6849ef7aa589..e0a1359dffb6 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -60,8 +60,6 @@ #define VLAPIC_VERSION (0x14) -#define x2apic(vlapic) (((vlapic)->msr_apicbase & APICBASE_X2APIC) ? 1 : 0) - /* * The 'vlapic->timer_mtx' is used to provide mutual exclusion between the * vlapic_callout_handler() and vcpu accesses to: @@ -83,11 +81,37 @@ static void vlapic_set_error(struct vlapic *, uint32_t, bool); static void vlapic_callout_handler(void *arg); static void vlapic_reset(struct vlapic *vlapic); +static __inline bool +vlapic_x2mode(const struct vlapic *vlapic) +{ + return ((vlapic->msr_apicbase & APICBASE_X2APIC) != 0); +} + +static __inline bool +vlapic_hw_disabled(const struct vlapic *vlapic) +{ + return ((vlapic->msr_apicbase & APICBASE_ENABLED) == 0); +} + +static __inline bool +vlapic_sw_disabled(const struct vlapic *vlapic) +{ + const struct LAPIC *lapic = vlapic->apic_page; + + return ((lapic->svr & APIC_SVR_ENABLE) == 0); +} + +static __inline bool +vlapic_enabled(const struct vlapic *vlapic) +{ + return (!vlapic_hw_disabled(vlapic) && !vlapic_sw_disabled(vlapic)); +} + static __inline uint32_t vlapic_get_id(struct vlapic *vlapic) { - if (x2apic(vlapic)) + if (vlapic_x2mode(vlapic)) return (vlapic->vcpuid); else return (vlapic->vcpuid << 24); @@ -111,7 +135,7 @@ vlapic_dfr_write_handler(struct vlapic *vlapic) struct LAPIC *lapic; lapic = vlapic->apic_page; - if (x2apic(vlapic)) { + if (vlapic_x2mode(vlapic)) { VM_CTR1(vlapic->vm, "ignoring write to DFR in x2apic mode: %#x", lapic->dfr); lapic->dfr = 0; @@ -137,7 +161,7 @@ vlapic_ldr_write_handler(struct vlapic *vlapic) lapic = vlapic->apic_page; /* LDR is read-only in x2apic mode */ - if (x2apic(vlapic)) { + if (vlapic_x2mode(vlapic)) { VLAPIC_CTR1(vlapic, "ignoring write to LDR in x2apic mode: %#x", lapic->ldr); lapic->ldr = x2apic_ldr(vlapic); @@ -669,7 +693,7 @@ int vlapic_trigger_lvt(struct vlapic *vlapic, int vector) { - if (vlapic_enabled(vlapic) == false) { + if (!vlapic_enabled(vlapic)) { /* * When the local APIC is global/hardware disabled, * LINT[1:0] pins are configured as INTR and NMI pins, @@ -873,7 +897,7 @@ vlapic_calcdest(struct vm *vm, cpuset_t *dmask, uint32_t dest, bool phys, mda_ldest = mda_flat_ldest; } else if ((dfr & APIC_DFR_MODEL_MASK) == APIC_DFR_MODEL_CLUSTER) { - if (x2apic(vlapic)) { + if (vlapic_x2mode(vlapic)) { cluster = ldr >> 16; ldest = ldr & 0xffff; } else { @@ -1045,7 +1069,7 @@ vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu) lapic->icr_lo &= ~APIC_DELSTAT_PEND; icrval = ((uint64_t)lapic->icr_hi << 32) | lapic->icr_lo; - if (x2apic(vlapic)) + if (vlapic_x2mode(vlapic)) dest = icrval >> 32; else dest = icrval >> (32 + 24); @@ -1058,7 +1082,8 @@ vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu) switch (shorthand) { case APIC_DEST_DESTFLD: - vlapic_calcdest(vlapic->vm, &dmask, dest, phys, false, x2apic(vlapic)); + vlapic_calcdest(vlapic->vm, &dmask, dest, phys, false, + vlapic_x2mode(vlapic)); break; case APIC_DEST_SELF: CPU_SETOF(vlapic->vcpuid, &dmask); @@ -1218,7 +1243,8 @@ vlapic_self_ipi_handler(struct vlapic *vlapic, uint64_t val) { int vec; - KASSERT(x2apic(vlapic), ("SELF_IPI does not exist in xAPIC mode")); + KASSERT(vlapic_x2mode(vlapic), + ("SELF_IPI does not exist in xAPIC mode")); vec = val & 0xff; lapic_intr_edge(vlapic->vcpu, vec); @@ -1340,14 +1366,14 @@ vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset, int i; /* Ignore MMIO accesses in x2APIC mode */ - if (x2apic(vlapic) && mmio_access) { + if (vlapic_x2mode(vlapic) && mmio_access) { VLAPIC_CTR1(vlapic, "MMIO read from offset %#lx in x2APIC mode", offset); *data = 0; goto done; } - if (!x2apic(vlapic) && !mmio_access) { + if (!vlapic_x2mode(vlapic) && !mmio_access) { /* * XXX Generate GP fault for MSR accesses in xAPIC mode */ @@ -1412,7 +1438,7 @@ vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset, break; case APIC_OFFSET_ICR_LOW: *data = lapic->icr_lo; - if (x2apic(vlapic)) + if (vlapic_x2mode(vlapic)) *data |= (uint64_t)lapic->icr_hi << 32; break; case APIC_OFFSET_ICR_HI: @@ -1470,7 +1496,7 @@ vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset, return (0); /* Ignore MMIO accesses in x2APIC mode */ - if (x2apic(vlapic) && mmio_access) { + if (vlapic_x2mode(vlapic) && mmio_access) { VLAPIC_CTR2(vlapic, "MMIO write of %#lx to offset %#lx " "in x2APIC mode", data, offset); return (0); @@ -1479,7 +1505,7 @@ vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset, /* * XXX Generate GP fault for MSR accesses in xAPIC mode */ - if (!x2apic(vlapic) && !mmio_access) { + if (!vlapic_x2mode(vlapic) && !mmio_access) { VLAPIC_CTR2(vlapic, "x2APIC MSR write of %#lx to offset %#lx " "in xAPIC mode", data, offset); return (0); @@ -1512,7 +1538,7 @@ vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset, break; case APIC_OFFSET_ICR_LOW: lapic->icr_lo = data; - if (x2apic(vlapic)) + if (vlapic_x2mode(vlapic)) lapic->icr_hi = data >> 32; retval = vlapic_icrlo_write_handler(vlapic, retu); break; @@ -1540,7 +1566,7 @@ vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset, break; case APIC_OFFSET_SELF_IPI: - if (x2apic(vlapic)) + if (vlapic_x2mode(vlapic)) vlapic_self_ipi_handler(vlapic, data); break; @@ -1661,7 +1687,7 @@ vlapic_set_x2apic_state(struct vcpu *vcpu, enum x2apic_state state) */ lapic = vlapic->apic_page; lapic->id = vlapic_get_id(vlapic); - if (x2apic(vlapic)) { + if (vlapic_x2mode(vlapic)) { lapic->ldr = x2apic_ldr(vlapic); lapic->dfr = 0; } else { @@ -1727,18 +1753,6 @@ vlapic_post_intr(struct vlapic *vlapic, int hostcpu, int ipinum) ipi_cpu(hostcpu, ipinum); } -bool -vlapic_enabled(struct vlapic *vlapic) -{ - struct LAPIC *lapic = vlapic->apic_page; - - if ((vlapic->msr_apicbase & APICBASE_ENABLED) != 0 && - (lapic->svr & APIC_SVR_ENABLE) != 0) - return (true); - else - return (false); -} - static void vlapic_set_tmr(struct vlapic *vlapic, int vector, bool level) { diff --git a/sys/amd64/vmm/io/vlapic.h b/sys/amd64/vmm/io/vlapic.h index 569dce6b272f..08b6bbe8534c 100644 --- a/sys/amd64/vmm/io/vlapic.h +++ b/sys/amd64/vmm/io/vlapic.h @@ -78,7 +78,6 @@ void vlapic_sync_tpr(struct vlapic *vlapic); uint64_t vlapic_get_apicbase(struct vlapic *vlapic); int vlapic_set_apicbase(struct vlapic *vlapic, uint64_t val); void vlapic_set_x2apic_state(struct vcpu *vcpu, enum x2apic_state s); -bool vlapic_enabled(struct vlapic *vlapic); void vlapic_deliver_intr(struct vm *vm, bool level, uint32_t dest, bool phys, int delmode, int vec);