[PATCH v6 0/9] x86/cpu: KVM: Clean up PAT and VMX macros

Sean Christopherson
2024-03-09T01:27:31Z

This is v6 of Xin's series to clean up a variety of KVM's VMX macros, but
this version obviously goes beyond cleaning up the VMX macros.

While reviewiing the VMX changes, we realized that (a) KVM was defining
VMX specific macros for the architectural memtypes, (b) the PAT and MTRR
code define similar, yet different macros, and (c) that the PAT code not
only has macros for the types (well, enums), it also has macros for
encoding the entire PAT MSR.

The first half of the series moves as much of the memtype stuff to
common code as is reasonably possible.

The second half is Xin's cleanup (though split into more patches than
what were posted in v5).

Based on:

https://github.com/kvm-x86/linux next

v6:
- Add all the PAT/memtype patches.
- Split the VMX changes into more appropriately sized chunks.
- Multiple minor modifications to make the macro mess more maintainable
(and yes, I edited that sentence to use "modifications" specifically
for alliteration purposes).

v5:
* https://lore.kernel.org/all/20240206182032.1596-1-xin3.li@intel.com
* Do not split VMX_BASIC bit definitions across multiple files (Kai
Huang).
* Put some words to the changelog to justify changes around memory
type macros (Kai Huang).
* Remove a leftover ';' (Kai Huang).

v4:
* Remove vmx_basic_vmcs_basic_cap() (Kai Huang).
* Add 2 macros VMX_BASIC_VMCS12_SIZE and VMX_BASIC_MEM_TYPE_WB to
avoid keeping 2 their bit shift macros (Kai Huang).

v3:
* Simply save the full/raw value of MSR_IA32_VMX_BASIC in the global
vmcs_config, and then use the helpers to extract info from it as
needed (Sean Christopherson).
* Move all VMX_MISC related changes to the second patch (Kai Huang).
* Commonize memory type definitions used in the VMX files, as memory
types are architectural.

v2:
* Don't add field shift macros unless it's really needed, extra layer
of indirect makes it harder to read (Sean Christopherson).
* Add a static_assert() to ensure that VMX_BASIC_FEATURES_MASK doesn't
overlap with VMX_BASIC_RESERVED_BITS (Sean Christopherson).
* read MSR_IA32_VMX_BASIC into an u64 rather than 2 u32 (Sean
Christopherson).
* Add 2 new functions for extracting fields from VMX basic (Sean
Christopherson).
* Drop the tools header update (Sean Christopherson).
* Move VMX basic field macros to arch/x86/include/asm/vmx.h.

Sean Christopherson (5):
x86/cpu: KVM: Add common defines for architectural memory types (PAT,
MTRRs, etc.)
x86/cpu: KVM: Move macro to encode PAT value to common header
KVM: x86: Stuff vCPU's PAT with default value at RESET, not creation
KVM: VMX: Track CPU's MSR_IA32_VMX_BASIC as a single 64-bit value
KVM VMX: Move MSR_IA32_VMX_MISC bit defines to asm/vmx.h

Xin Li (4):
KVM: VMX: Move MSR_IA32_VMX_BASIC bit defines to asm/vmx.h
KVM: nVMX: Use macros and #defines in vmx_restore_vmx_basic()
KVM: VMX: Open code VMX preemption timer rate mask in its accessor
KVM: nVMX: Use macros and #defines in vmx_restore_vmx_misc()

arch/x86/include/asm/msr-index.h | 34 +++++++++++--------
arch/x86/include/asm/vmx.h | 37 +++++++++++++++------
arch/x86/kernel/cpu/mtrr/mtrr.c | 6 ++++
arch/x86/kvm/vmx/capabilities.h | 10 +++---
arch/x86/kvm/vmx/nested.c | 56 +++++++++++++++++++++++---------
arch/x86/kvm/vmx/nested.h | 2 +-
arch/x86/kvm/vmx/vmx.c | 30 ++++++++---------
arch/x86/kvm/x86.c | 4 +--
arch/x86/kvm/x86.h | 3 +-
arch/x86/mm/pat/memtype.c | 35 ++++++--------------
10 files changed, 127 insertions(+), 90 deletions(-)

base-commit: 964d0c614c7f71917305a5afdca9178fe8231434
--
2.44.0.278.ge034bb2e1d-goog