[PATCH v4 00/30] KVM: x86: x86.{c,h} spring cleaning

From: Sean Christopherson

Date: Fri Jun 12 2026 - 20:03:39 EST


It's still technically spring!

Perform spring cleaning on x86.{c,h} and asm/kvm_host.h, by adding regs.c
(the kvm_cache_regs.h => regs.h is already applied) and msrs.{c,h}, and moving
relevant code out of x86.c.

v4:
- Drop the GPR API cleanups (already applied).
- Collect more tags. [Yosry, Kai
- Chunked the x86.c => regs.c code movement into several patches, so that the
bulk move is as close to a pure move as is reasonably possible. [Yosry]
- Drop a redundant BUILD_BUG_ON() from store_regs().
- Fix various changelog goofs. [Kai]
- Fix alignment goofs in kvm_get_{,feature_}msr_index_list(). [Kai]
- Drop the defunct x86.h include from mtrr.c. [Kai]
- Fix whitespace goofs. [Kai]
- Rewrite the changelog for the bulk regs.c move to better explain why only a
tiny amount of EFER code is moved. [Yosry]
- Move "struct kvm_x86_msr_filter" and "struct kvm_x86_pmu_event_filter" to
msrs.c and pmu.c respectively. [Kai]
- Rename LDT helpers to vmx_{load,store}_ldt(), and call out that they will
hopefully be replaced by kernel helpers in the near future. [Kai]
- Drop the kvm_cpu_get_apicid() code movement (sent a separate patch to kill
it off entirely). [Kai]
- Add more detail to explain why using VALID_MASK defines outside of x86.c is
dangerous. [Yosry, Kai]
- Bury kvm_arch_interrupt_allowed() in x86.c as kvm_is_interrupt_allowed(). [Kai]
- Move kvm_find_async_pf_gfn() prototype to x86.h. [Sashiko]

v3:
- Collect more tags. [David, Binbin, Yosry]
- Use kvm_run_sync_regs_{from,to}_user() instead of kvm_run_{g,s}et_regs().
[Kai]
- Fix a variety of typos. [Binbin]
- Everything beyond patch 15...

v2:
- https://lore.kernel.org/all/20260514215355.1648463-2-seanjc@xxxxxxxxxx
- Collect tags. [Yosry, Kai]
- Fix some truly egregious goofs. [Binbin]
- Rename kvm_cache_regs.h => regs.h, add regs.c. [Yosry, because he
complained, not because he actually suggested this :-D ]
- Drop superfluous casting/masking of e*x() usage. [Kai]

v1: https://lore.kernel.org/all/20260409235622.2052730-1-seanjc@xxxxxxxxxx

Sean Christopherson (30):
KVM: x86: Extract REGS and SREGS runtime sync code to helpers
KVM: x86: Move get_segment_base() to regs.h, as kvm_get_segment_base()
KVM: x86: Rename __{g,s}et_sregs2() =>
kvm_x86_vcpu_ioctl_{g,s}et_sregs2()
KVM: x86: Move the bulk of register specific code from x86.c to regs.c
KVM: x86: Move local APIC specific helpers out of asm/kvm_host.h
KVM: x86: Move kvm_caps and kvm_host_values to asm/kvm_host.h
KVM: x86: Swap the include order between x86.h and mmu.h
KVM: x86: Move tdp_enabled from kvm_host.h to mmu.h
KVM: x86: Move eager_page_split to mmu.{c,h}
KVM: x86/hyperv: Eliminate an unnecessary include of x86.h in hyperv.h
KVM: x86: Move kvm_{load,put}_guest_fpu() to fpu.h
KVM: x86: Extract get/set MSR (list) ioctl logic to helpers
KVM: x86: Expose several TSC helpers via x86.h for use by MSR code
KVM: x86: Move the bulk of MSR specific code from x86.c to msrs.{c,h}
KVM: x86: Move register helper declarations from kvm_host.h => regs.h
KVM: x86: Move kvm_{g,s}et_segment() to inline helpers in regs.h
KVM: x86: Move MSR helper declarations from kvm_host.h => msrs.h
KVM: x86: Move "struct kvm_x86_msr_filter" definition to msrs.c
KVM: x86/pmu: Move "struct kvm_x86_pmu_event_filter" definition to
pmu.c
KVM: x86: Move MMU helper declarations from kvm_host.h => mmu.h
KVM: x86: Move LLDT assembly wrappers into VMX
KVM: x86: Move misc "VALID MASK" defines from kvm_host.h => x86.c
KVM: x86: Move __kvm_irq_line_state() from kvm_host.h => ioapic.h
KVM: x86: Move IRQ-related helper declarations from kvm_host.h =>
irq.h
KVM: x86: Move kvm_pv_send_ipi() declaration from kvm_host.h =>
lapic.h
KVM: x86: Don't treat interrupts as allowed just because a nested run
is pending
KVM: x86: Rework kvm_arch_interrupt_allowed() into
kvm_is_interrupt_allowed()
KVM: x86/mmu: Move kvm_arch_async_page_ready() below
kvm_tdp_page_fault()
KVM: x86/mmu: Move kvm_mmu_do_page_fault() from mmu_internal.h =>
mmu.c
KVM: x86: Move a pile of stuff from kvm_host.h => x86.h

arch/x86/include/asm/kvm_host.h | 470 +---
arch/x86/kvm/Makefile | 4 +-
arch/x86/kvm/cpuid.c | 1 +
arch/x86/kvm/fpu.h | 26 +
arch/x86/kvm/hyperv.h | 3 +-
arch/x86/kvm/ioapic.c | 1 +
arch/x86/kvm/ioapic.h | 12 +
arch/x86/kvm/irq.c | 7 +
arch/x86/kvm/irq.h | 6 +
arch/x86/kvm/lapic.h | 8 +
arch/x86/kvm/mmu.h | 90 +-
arch/x86/kvm/mmu/mmu.c | 132 +-
arch/x86/kvm/mmu/mmu_internal.h | 66 -
arch/x86/kvm/msrs.c | 2745 +++++++++++++++++++++++
arch/x86/kvm/msrs.h | 156 ++
arch/x86/kvm/mtrr.c | 2 +-
arch/x86/kvm/pmu.c | 12 +
arch/x86/kvm/regs.c | 875 ++++++++
arch/x86/kvm/regs.h | 60 +
arch/x86/kvm/svm/nested.c | 1 +
arch/x86/kvm/svm/svm.c | 6 +-
arch/x86/kvm/vmx/nested.c | 1 +
arch/x86/kvm/vmx/vmx.c | 23 +-
arch/x86/kvm/x86.c | 3709 +------------------------------
arch/x86/kvm/x86.h | 354 +--
25 files changed, 4457 insertions(+), 4313 deletions(-)
create mode 100644 arch/x86/kvm/msrs.c
create mode 100644 arch/x86/kvm/msrs.h
create mode 100644 arch/x86/kvm/regs.c


base-commit: c1f7303302927f9cbf4efedf70f0512cde168c65
--
2.54.0.1136.gdb2ca164c4-goog