From nobody Thu Nov 12 14:45:02 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 4jQNTW5VVBz70jWG for ; Thu, 12 Nov 2026 14:45:03 +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 4jQNTW26KRz4rXH for ; Thu, 12 Nov 2026 14:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794494703; 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=NaIUwuFsnsBcxiBd87OC4icDKXEqvuE7j9jVMn5XTVc=; b=yNy/VX7eaYZc974eSBMRzy2exKogfykHzQiQXVvAadqDyFUFpQlvz9bKiUpueEJ0cZlLrq g709HGPapBHAVYdw/vqzfmGyejf4ZdVKoFYMurnLs+5SbQC3Ndo78AS/XAynRF483+JRGW X4HrY3tJ5LVLTtKrpHGL90obcXfsTk54q4lw4KAilZI51UdfCCT8eMKMsec7YpXaBiDgDl EWwJTnyc82/QNjllR6R2ezMdPusAai4mtnnp5qtBgaIuWWPI7iAyktyhZF7fOIl0q3w87d ojCjkFWSyseVAgJlUyWtlvJwJUgDwtEAeXcxorEv0bH62MSLAr/W1EnqjQO4Uw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794494703; b=vifJH2xg1Pf223oYXDCYf27C3EWynuyv2HC5PJonw2pBdeZYOdTZ2YaRoDXh7A/Pre4OLW kKUxQdwJGch1jfczBynfq9b4ywIyG+SWqD+Ms3E6DJhO1bKgAjzINIJ8tpy8oqgj8x6BJz MkZFFJehm/MdgDCjzQNzBZfwK7gRAzu9N7NBe/4lEVHxge1du22s6kIzd55mGf51Qtrgvs pr6hlnHoEVS44DWGg/VXfTHaZ61/ZLsUG8wW/lyLb4EcwbsruLn3MoI5QYI6Bt05LkfpGY 0RScfyUNBHnTUc/SWjcYLvjzsvYEu6HGi6fVzJ7u3JsGGCcTPCx+inWBkr7P9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794494703; 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=NaIUwuFsnsBcxiBd87OC4icDKXEqvuE7j9jVMn5XTVc=; b=rCIQEu4yTKOUhXZnZKOuEb64IXqtWyh1iZrFRbnyuZI6d2CqHvtQTXCIpj+UCXpYyIiJ8o 252VPvuf4B211P5uhQV0jA8L5vpB/6MbFSaYry5gLhiZcY6dWHOXyDTTsNpCICer5Bh7MB nOZaGlfqLp0LxMEEC8zneqwbOB3JyCoqdfuOpvE3GgNaYbjbOu07HxjNAAHDpRSYtWA/n1 zx2CprGTNoHIQuSJGK0qeqYek1jiwKjqrV5YzW2wNVINgySfNK40ByJTgArC3V9smGUVNm 8acQIufiSXn2iosGmcf1gApX+l19GawmdqSbquAeHIFRuzYDx02ITjCxGUJzLg== 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 4jQNTW0kblz16Zx for ; Thu, 12 Nov 2026 14:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 182d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 14:45:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hayzam Sherif From: Dave Cottlehuber Subject: git: 88d7efb9e4fa - stable/15 - vmm: Add a bulk TMR reset hook for Intel APICv 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: dch X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 88d7efb9e4fa03c8d364f9aeb88b10075e1bf69c Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 14:45:02 +0000 Message-Id: <6af5d0ee.182d5.268869b4@gitrepo.freebsd.org> The branch stable/15 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=88d7efb9e4fa03c8d364f9aeb88b10075e1bf69c commit 88d7efb9e4fa03c8d364f9aeb88b10075e1bf69c Author: Hayzam Sherif AuthorDate: 2026-11-02 16:21:18 +0000 Commit: Dave Cottlehuber CommitDate: 2026-11-12 14:44:33 +0000 vmm: Add a bulk TMR reset hook for Intel APICv vioapic_update_tmr() resets all 256 vectors before rebuilding the level-triggered vector set. With Intel virtual interrupt delivery, each per-vector reset loads the VMCS, reads and writes an EOI-exit bitmap, and clears the VMCS. Add an optional bulk-reset hook so VMX can clear the four EOI-exit bitmaps with one VMCS load/clear pair. Clear the software TMR banks directly when using the hook, and retain the per-vector fallback for backends without it. Approved by: markj, cperciva Differential Revision: https://reviews.freebsd.org/D60692 MFC to: releng/15.2 Reviewed by: markj (cherry picked from commit ee9205f068c7675cf4d23e51cc98238d95ba1950) --- sys/amd64/vmm/intel/vmx.c | 21 +++++++++++++++++++++ sys/amd64/vmm/io/vlapic.c | 12 +++++++++++- sys/amd64/vmm/io/vlapic_priv.h | 1 + 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index ff0e1cb2b882..0b9a4eea3ebb 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -3921,6 +3921,26 @@ vmx_set_tmr(struct vlapic *vlapic, int vector, bool level) VMCLEAR(vmcs); } +static void +vmx_reset_tmr(struct vlapic *vlapic) +{ + struct vlapic_vtx *vlapic_vtx; + struct vmcs *vmcs; + + KASSERT(!vcpu_is_running(vlapic->vcpu, NULL), + ("vmx_reset_tmr: vcpu cannot be running")); + + vlapic_vtx = (struct vlapic_vtx *)vlapic; + vmcs = vlapic_vtx->vcpu->vmcs; + + VMPTRLD(vmcs); + vmcs_write(VMCS_EOI_EXIT0, 0); + vmcs_write(VMCS_EOI_EXIT1, 0); + vmcs_write(VMCS_EOI_EXIT2, 0); + vmcs_write(VMCS_EOI_EXIT3, 0); + VMCLEAR(vmcs); +} + static void vmx_enable_x2apic_mode_ts(struct vlapic *vlapic) { @@ -4121,6 +4141,7 @@ vmx_vlapic_init(void *vcpui) vlapic->ops.pending_intr = vmx_pending_intr; vlapic->ops.intr_accepted = vmx_intr_accepted; vlapic->ops.set_tmr = vmx_set_tmr; + vlapic->ops.reset_tmr = vmx_reset_tmr; vlapic->ops.enable_x2apic_mode = vmx_enable_x2apic_mode_vid; } diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index e0a1359dffb6..a5009804d72b 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -1776,10 +1776,20 @@ vlapic_set_tmr(struct vlapic *vlapic, int vector, bool level) void vlapic_reset_tmr(struct vlapic *vlapic) { - int vector; + uint32_t *tmrptr; + int i, vector; VLAPIC_CTR0(vlapic, "vlapic resetting all vectors to edge-triggered"); + if (vlapic->ops.reset_tmr != NULL) { + tmrptr = &vlapic->apic_page->tmr0; + /* APIC register slots are 16 bytes apart. */ + for (i = 0; i < 8; i++) + tmrptr[i * 4] = 0; + (*vlapic->ops.reset_tmr)(vlapic); + return; + } + for (vector = 0; vector <= 255; vector++) vlapic_set_tmr(vlapic, vector, false); } diff --git a/sys/amd64/vmm/io/vlapic_priv.h b/sys/amd64/vmm/io/vlapic_priv.h index 1dce593b9444..f8d23530d277 100644 --- a/sys/amd64/vmm/io/vlapic_priv.h +++ b/sys/amd64/vmm/io/vlapic_priv.h @@ -139,6 +139,7 @@ struct vlapic_ops { void (*intr_accepted)(struct vlapic *vlapic, int vector); void (*post_intr)(struct vlapic *vlapic, int hostcpu); void (*set_tmr)(struct vlapic *vlapic, int vector, bool level); + void (*reset_tmr)(struct vlapic *vlapic); void (*enable_x2apic_mode)(struct vlapic *vlapic); };