From nobody Fri Nov 13 16:46:50 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 4jR37Z5zcXz70stP for ; Fri, 13 Nov 2026 16:46:50 +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 4jR37Z40b3z3L4N for ; Fri, 13 Nov 2026 16:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794588410; 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=WgBRNMRDTCqofmu58dqZvXR0H4bT9XGOLNQDGrO1DqI=; b=EarEYw4Nh11Xcz4DDb+STIRmKDprDEddIE6THW7Fs675wigIYMkDTBOCYc0XwQi4/5qm8o B9gZmmky75V0DFVYOaqn7vnuQ9OQwDSIFoo0BgXlK62X6umqDSlgNQysI7y42C+2g6miy1 +5693yKxhDm5iDqHh+FIMaOsyIW7K9Yv1kDkAFui6LD2qCAlQuxViTZKS473+w0W/ZYuFh S0GTc+aWj76e9epDaWOUXU8o+VE8EAdprf5UURYLEU6ZLeqQEpxN+6oEZ23jEugMNkAobo natLqlTWuaQU8nP6pUJ24m4vRvsPfQRfpxb5LX2eA/3nZoAaseqXUFc+7R5XPg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794588410; b=gMXI5TShNvl03+/wZFvqcOeNRSMFjxjq4IMzM6r/bAZM4MDpElJS5UQXxkmYUtvLv8lPPw 5xm5E5Uq2b/8evO2wfOFNoA6B4DcXBv+T9QQe7tDpPJr0K8ypfoPwTGow0TpAEgyPKMJRd vev1THZN1U50G8s8MaHR4NyZVHRXyZeJC/jFkQOFOUdYZoCR4WXnArNokFyr+L3MA14pq4 M3EHPSE9OV0apes0rq7iHSB5T/QqRhqY503WdkGdfDwhSw6brihmNC5UCxnTnJ0rQxipto ciJRqmrU698afIVH56v2tBN3qj7BwosnXkDkouGD/Nf6rRZtBkuA6SqO0alP7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794588410; 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=WgBRNMRDTCqofmu58dqZvXR0H4bT9XGOLNQDGrO1DqI=; b=U20aLMpUPUtHqTfqVPQtV+CR5M5bW3p1D3pcyyy2sGpRMFvyDMwnRLCYikrXUYPehxTutE 201OlbO0Ghx8vnn6GTtXAwB+84aZY0s9plOP+bUi6xY1RdpjR368u6p1MWGXhe5x1UMCYI NiZTYc2/Ru26lbyHun8MW73FMAzPDMvdcGx4LTUPBz7JbDwvEuQvLzC9SUhfRGQABxS4ek dvAWrOBjlTpyNqlUUnHkuiibtVEvgidF/1vYC2SX2z5dtg/vkfev/gTXCfh0UVUcMWIIz7 Ddu3vKDtImEt9F/VdyCtnUd5hTeVAkbjkPFBPVlIgqWNOySeeAZ8cwbWDM9S/Q== 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 4jR37Z2gVRzkCK for ; Fri, 13 Nov 2026 16:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1441f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 16:46:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: 4aa3a5ef7a12 - main - vmm: Route MMIO-to-MMIO MOVS by GPA List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 4aa3a5ef7a1269cc34ec47c657f851162206c6e4 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 16:46:50 +0000 Message-Id: <6af73efa.1441f.79fa0e04@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4aa3a5ef7a1269cc34ec47c657f851162206c6e4 commit 4aa3a5ef7a1269cc34ec47c657f851162206c6e4 Author: Hayzam Sherif AuthorDate: 2026-11-13 16:44:16 +0000 Commit: Mark Johnston CommitDate: 2026-11-13 16:45:57 +0000 vmm: Route MMIO-to-MMIO MOVS by GPA emulate_movs() uses the memread and memwrite callbacks selected from the faulting GPA for both operands of an MMIO-to-MMIO MOVS. A guest can therefore make the local APIC handler write to a GPA outside the APIC page, which trips the offset assertion in vlapic_write() on INVARIANTS kernels. Dispatch each MMIO read and write according to its GPA. This allows MOVS between in-kernel devices. During in-kernel emulation, return EINVAL if an MMIO operand lies outside those devices' ranges. Reported by: llm-postcr Reviewed by: markj MFC after: 1 week Sponsored by: Alchemilla Ventures Private Limited Differential Revision: https://reviews.freebsd.org/D61495 --- sys/amd64/vmm/vmm.c | 76 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 14 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index fe31e76d600c..dbfbdc9ff9e7 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -884,6 +884,65 @@ done: return (0); } +/* + * In-kernel MMIO devices. A MOVS can have its operands in different + * devices, so each access is dispatched using its own GPA. + */ +struct vm_mmio_device { + uint64_t base; + uint64_t size; + mem_region_read_t read; + mem_region_write_t write; +}; + +static const struct vm_mmio_device vm_mmio_devices[] = { + { DEFAULT_APIC_BASE, PAGE_SIZE, lapic_mmio_read, lapic_mmio_write }, + { VIOAPIC_BASE, VIOAPIC_SIZE, vioapic_mmio_read, vioapic_mmio_write }, + { VHPET_BASE, VHPET_SIZE, vhpet_mmio_read, vhpet_mmio_write }, +}; + +static const struct vm_mmio_device * +vm_mmio_lookup(uint64_t gpa) +{ + size_t i; + + for (i = 0; i < nitems(vm_mmio_devices); i++) { + /* + * Match only the starting GPA, as before. The device handlers + * determine how to handle the access size, alignment and offset; + * a full-range check here could reject accesses they would ignore. + */ + if (gpa >= vm_mmio_devices[i].base && + gpa - vm_mmio_devices[i].base < vm_mmio_devices[i].size) + return (&vm_mmio_devices[i]); + } + return (NULL); +} + +static int +vm_mmio_read(struct vcpu *vcpu, uint64_t gpa, uint64_t *rval, int size, + void *arg) +{ + const struct vm_mmio_device *dev; + + dev = vm_mmio_lookup(gpa); + if (dev == NULL) + return (EINVAL); + return (dev->read(vcpu, gpa, rval, size, arg)); +} + +static int +vm_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, int size, + void *arg) +{ + const struct vm_mmio_device *dev; + + dev = vm_mmio_lookup(gpa); + if (dev == NULL) + return (EINVAL); + return (dev->write(vcpu, gpa, wval, size, arg)); +} + static int vm_handle_inst_emul(struct vcpu *vcpu, bool *retu) { @@ -891,8 +950,6 @@ vm_handle_inst_emul(struct vcpu *vcpu, bool *retu) struct vm_exit *vme; uint64_t gla, gpa, cs_base; struct vm_guest_paging *paging; - mem_region_read_t mread; - mem_region_write_t mwrite; enum vm_cpu_mode cpu_mode; int cs_d, error, fault; @@ -940,22 +997,13 @@ vm_handle_inst_emul(struct vcpu *vcpu, bool *retu) vcpu->nextrip); /* return to userland unless this is an in-kernel emulated device */ - if (gpa >= DEFAULT_APIC_BASE && gpa < DEFAULT_APIC_BASE + PAGE_SIZE) { - mread = lapic_mmio_read; - mwrite = lapic_mmio_write; - } else if (gpa >= VIOAPIC_BASE && gpa < VIOAPIC_BASE + VIOAPIC_SIZE) { - mread = vioapic_mmio_read; - mwrite = vioapic_mmio_write; - } else if (gpa >= VHPET_BASE && gpa < VHPET_BASE + VHPET_SIZE) { - mread = vhpet_mmio_read; - mwrite = vhpet_mmio_write; - } else { + if (vm_mmio_lookup(gpa) == NULL) { *retu = true; return (0); } - error = vmm_emulate_instruction(vcpu, gpa, vie, paging, mread, mwrite, - retu); + error = vmm_emulate_instruction(vcpu, gpa, vie, paging, + vm_mmio_read, vm_mmio_write, retu); return (error); }