When building a kernel with CONFIG_PARAVIRT_XXL the paravirt infrastructure will always use functions for reading or writing MSRs, even when running on bare metal.
Switch to inline RDMSR/WRMSR instructions in this case, reducing the paravirt overhead. The first patch is a prerequisite fix for alternative patching. Its is needed due to the initial indirect call needs to be padded with NOPs in some cases with the following patches. In order to make this less intrusive, some further reorganization of the MSR access helpers is done in the patches 2-6. The next 5 patches are converting the non-paravirt case to use direct inlining of the MSR access instructions, including the WRMSRNS instruction and the immediate variants of RDMSR and WRMSR if possible. Patches 12-14 are some further preparations for making the real switch to directly patch in the native MSR instructions easier. Patch 15 is switching the paravirt MSR function interface from normal call ABI to one more similar to the native MSR instructions. Patch 16 is a little cleanup patch. Patch 17 is the final step for patching in the native MSR instructions when not running as a Xen PV guest. Patch 18 converts the rest of the MSR helpers to __always_inline. This series has been tested to work with Xen PV and on bare metal. Based on [1] and [2]. Changes since V3: - Rebase - wrmsrns() related changes (patches 9+10) Changes since V2: - switch back to the paravirt approach Changes since V1: - Use Xin Li's approach for inlining - Several new patches [1]: https://lore.kernel.org/lkml/[email protected]/T/#t [2]: https://lore.kernel.org/lkml/[email protected]/T/#t Juergen Gross (18): x86/alternative: Support alt_replace_call() with instructions after call coco/tdx: Rename MSR access helpers KVM: x86: Remove the KVM private read_msr() function x86/msr: Minimize usage of native_*() msr access functions x86/msr: Move MSR trace calls one function level up x86/hyperv: Switch from __rdmsr() to native_rdmsrq() x86/opcode: Add immediate form MSR instructions x86/extable: Add support for immediate form MSR instructions x86/msr: Make wrmsrns() a first class citizen x86/msr: Introduce sync_cpu_after_wrmsrns() x86/msr: Use the alternatives mechanism for RDMSR x86/alternatives: Add ALTERNATIVE_4() x86/paravirt: Split off MSR related hooks into new header x86/paravirt: Prepare support of MSR instruction interfaces x86/paravirt: Switch MSR access pv_ops functions to instruction interfaces x86/msr: Reduce number of low level MSR access helpers x86/paravirt: Use alternatives for MSR access with paravirt x86/msr: Make all MSR access functions __always_inline arch/x86/coco/tdx/tdx.c | 8 +- arch/x86/hyperv/hv_crash.c | 6 +- arch/x86/hyperv/ivm.c | 2 +- arch/x86/include/asm/alternative.h | 6 + arch/x86/include/asm/fred.h | 2 +- arch/x86/include/asm/kvm_host.h | 7 - arch/x86/include/asm/msr.h | 340 +++++++++++++++++----- arch/x86/include/asm/paravirt-msr.h | 180 ++++++++++++ arch/x86/include/asm/paravirt.h | 45 --- arch/x86/include/asm/paravirt_types.h | 57 ++-- arch/x86/include/asm/qspinlock_paravirt.h | 4 +- arch/x86/kernel/alternative.c | 5 +- arch/x86/kernel/cpu/mshyperv.c | 4 +- arch/x86/kernel/kvmclock.c | 2 +- arch/x86/kernel/paravirt.c | 42 ++- arch/x86/kvm/svm/svm.c | 16 +- arch/x86/kvm/vmx/tdx.c | 2 +- arch/x86/kvm/vmx/vmx.c | 6 +- arch/x86/lib/x86-opcode-map.txt | 5 +- arch/x86/mm/extable.c | 46 ++- arch/x86/xen/enlighten_pv.c | 52 +++- arch/x86/xen/pmu.c | 4 +- tools/arch/x86/lib/x86-opcode-map.txt | 5 +- tools/objtool/check.c | 1 + 24 files changed, 641 insertions(+), 206 deletions(-) create mode 100644 arch/x86/include/asm/paravirt-msr.h -- 2.54.0
