KVM: x86: Enable APX for guests
v3 cover KVM: x86: Enable APX for guests
Hi all,
This revision tries to reflect the recent design discussions [1]. Notably the series also depends on preparatory work [1,2], so should be on hold until they are merged. But the intention here is to sort out next level of details by collecting feedbacks.
Below is a summary of the recently established direction:
Since the V2 posting [4], Sean gave his feedbacks that led to shift the approach. The initial approach was access physical EGPRs directly similar to vector registers, but this introduces non-uniform access patterns against directly accessing VCPU regs[].
To maintain uniformity, EGPRs need to be stored in regs[]. Sean's reg accessor infra updates [1] makes this feasible. It was also realized that saving EGPRs outside of the fastpath is not viable, as fastpath handlers may access EGPRs as well.
Then, saving EGPRs on entry code appears to be the choice. This also looks to provide some degree of robustness (but not completely yet though [*]) for when the kernel clobbers those registers. The VCPU XCR0 can gate this path to avoid #UD from non-APX guests.
The conditional path should be also under speculation-safety, rather than wild guest control. Paolo's rework on entry code [2] will establish a SPEC_CTRL macro which allows a finer control.
For userspace interactions, the EGPR state in regs[] can be copied directly to/from the userspace buffer at the boundary of ABI handlers.
With this design concept in mind, here are a couple of points to call out while each patch has a note of changes:
* Entry changes
The entry code is first refactored to generalize (64-bit) register save/restore via macros (part1-3). This simplifies integration of EGPR handling (patch5). I also sorted to simplify the register saving path by skipping VM-Fail check.
* XSAVE ABI
Similar to PKRU, the state is not managed by XSAVE internally but is exposed via the XSAVE format. KVM fully owns both ends: storage and ABI handling so KVM-side changes alone cover the support. There are some subtlties (noted in patch6) in arrangement with the existing copy function.
Finally, series layout and relevant test comments:
* Part1, PATCH 01-03: Prepare entry code by macrofying GPR handling Most KVM test will capture any regression out of it. I also tested it more explicitly with tweaking the posted patch [3].
* Part2, PATCH 04-06: Establish EGPR state management These new state management flow is rather unique compared to other XSTATEs. This fact leads to new test cases (patch18), in addition to state_test (patch19).
* Part3, PATCH 07-11: Update VMX handlers for extended reg. indices Previously I tweaked to test an exit case like LGDT with an extended ID. But this part leans into VMX unless KVM is paranoid.
* Part4, PATCH 12-15: Add emulator support for REX2 KVM unit test patch [3] covers emulator changes.
* Part5, PATCH 16-19: Expose features and add selftests XCR0 tests basically covers the exposition.
This series is currently based on an old commit (02896e0065ca) in x86 KVM next branch and includes preparatory patches [1,2]. It can be also found here:
git://github.com/intel/apx.git apx-kvm_v3
Thanks,
Chang
References:
[1] Sean's preparatory series:
https://lore.kernel.org/kvm/[email protected]/ [2] Paolo's SPEC_CTRL refactoring: https://lore.kernel.org/kvm/[email protected]/ [3] KVM unit tests: https://lore.kernel.org/kvm/[email protected]/ [4] Previous version (V2): https://lore.kernel.org/kvm/[email protected]/ [5] APX specification: https://cdrdv2.intel.com/v1/dl/getContent/784266
[*] E.g. NMIs at entry code could mess up with APX-clobbering handlers
when XCR0[APX]=0. VMX extention to afford XCR0 switching by hardware itself could be an option to avoid the issue.
Chang S. Bae (20):
KVM: VMX: Macrofy 64-bit GPR swapping in __vmx_vcpu_run()
KVM: SVM: Macrofy 64-bit GPR swapping in __svm_vcpu_run()
KVM: SEV: Macrofy 64-bit GPR swapping in __svm_sev_es_vcpu_run()
KVM: x86: Extend VCPU registers for EGPRs
KVM: VMX: Save guest EGPRs in VCPU cache
KVM: x86: Support APX state for XSAVE ABI
KVM: VMX: Refactor VMX instruction information access
KVM: VMX: Refactor instruction information decoding
KVM: VMX: Refactor register index retrieval from exit qualification
KVM: VMX: Support instruction information extension
KVM: nVMX: Propagate the extended instruction info field
KVM: x86: Support EGPR accessing and tracking for emulator
KVM: x86: Handle EGPR index and REX2-incompatible opcodes
KVM: x86: Support REX2-prefixed opcode decode
KVM: x86: Reject EVEX-prefixed instructions
KVM: x86: Guard valid XCR0.APX settings
KVM: x86: Expose APX foundation feature to guests
KVM: x86: Expose APX sub-features to guests
KVM: x86: selftests: Add APX state and ABI test
KVM: x86: selftests: Add APX state handling and XCR0 sanity checks
arch/x86/Kconfig.assembler | 5 + arch/x86/include/asm/kvm_host.h | 35 +++- arch/x86/include/asm/kvm_vcpu_regs.h | 11 - arch/x86/include/asm/vmx.h | 2 + arch/x86/kvm/Kconfig | 4 + arch/x86/kvm/cpuid.c | 28 ++- arch/x86/kvm/cpuid.h | 2 + arch/x86/kvm/emulate.c | 121 +++++++---- arch/x86/kvm/kvm_emulate.h | 13 +- arch/x86/kvm/reverse_cpuid.h | 6 + arch/x86/kvm/svm/svm.c | 8 +- arch/x86/kvm/svm/vmenter.S | 51 +---- arch/x86/kvm/vmenter.h | 51 +++++ arch/x86/kvm/vmx/nested.c | 74 +++---- arch/x86/kvm/vmx/nested.h | 2 +- arch/x86/kvm/vmx/vmcs12.c | 1 + arch/x86/kvm/vmx/vmcs12.h | 3 +- arch/x86/kvm/vmx/vmenter.S | 67 +++--- arch/x86/kvm/vmx/vmx.c | 26 ++- arch/x86/kvm/vmx/vmx.h | 77 ++++++- arch/x86/kvm/x86.c | 76 ++++++- tools/testing/selftests/kvm/Makefile.kvm | 1 + .../selftests/kvm/include/x86/processor.h | 120 +++++++++++ tools/testing/selftests/kvm/x86/apx_test.c | 192 ++++++++++++++++++ tools/testing/selftests/kvm/x86/state_test.c | 3 + .../selftests/kvm/x86/xcr0_cpuid_test.c | 19 ++ 26 files changed, 803 insertions(+), 195 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86/apx_test.c
base-commit: 109b8abcee6413717b09ba6b0bd4b3bc5aaa4608
Signature · 1 line
2.51.0
PATCH v3 1/20 KVM: VMX: Macrofy 64-bit GPR swapping in __vmx_vcpu_run()
Simplify repeated register saving/restoring sequences with macros to make it easier to extend for additional registers.
On x86_64, R8-R15 register naming indicates each register ID, and the ID itself can derive an offset in struct kvm_vcpu_arch. Leverage this fact to generalize save/restore sequences in macros, removing the need for defining offsets separately. Apply this approach to register clearing sequences as well.
No functional change intended.
---
V2 -> V3: New patch
Dependency: Based on Paolo's SPEC_CTRL rework [1]
Test:
* Broad KVM testing should catch regressions.
* The following KVM unit test on top of this patch [2] can validate the changes more explicitly:
TEST_MOV_GPRS(8, 15);
TEST_MOV_GPRS(9, 14);
...[1]: https://lore.kernel.org/[email protected]/
[2]: https://lore.kernel.org/[email protected]/
--- arch/x86/kvm/svm/vmenter.S | 3 --- arch/x86/kvm/vmenter.h | 22 ++++++++++++++++++++ arch/x86/kvm/vmx/vmenter.S | 41 +++----------------------------------- 3 files changed, 25 insertions(+), 41 deletions(-)
arch/x86/kvm/svm/vmenter.S +0 -3
@@ -6,11 +6,8 @@ #include <asm/frame.h> #include <asm/kvm_vcpu_regs.h> #include <asm/nospec-branch.h> -#include "kvm-asm-offsets.h" #include "vmenter.h" -#define WORD_SIZE (BITS_PER_LONG / 8) - /* Intentionally omit RAX as it's context switched by hardware */ #define VCPU_RCX (SVM_vcpu_arch_regs + __VCPU_REGS_RCX * WORD_SIZE) #define VCPU_RDX (SVM_vcpu_arch_regs + __VCPU_REGS_RDX * WORD_SIZE)
arch/x86/kvm/vmenter.h +22 -0
@@ -2,6 +2,8 @@#ifndef __KVM_X86_VMENTER_H#define __KVM_X86_VMENTER_H +#include "kvm-asm-offsets.h" +#define KVM_ENTER_VMRESUME BIT(0)#define KVM_ENTER_SAVE_SPEC_CTRL BIT(1)#define KVM_ENTER_CLEAR_CPU_BUFFERS_FOR_MMIO BIT(2)
@@ -76,5 +78,25 @@ wrmsr .endm +#define WORD_SIZE (BITS_PER_LONG / 8) + +#ifdef CONFIG_X86_64 +.macro CLEAR_REGS regs:vararg + .irp i, \regs + xor %r\i, %r\i + .endr +.endm +.macro VMX_LOAD_REGS src:req, regs:vararg + .irp i, \regs + mov (VMX_vcpu_arch_regs + \i * WORD_SIZE)(\src), %r\i + .endr +.endm +.macro VMX_STORE_REGS dst:req, regs:vararg + .irp i, \regs + mov %r\i, (VMX_vcpu_arch_regs + \i * WORD_SIZE)(\dst) + .endr +.endm +#endif +#endif /* __ASSEMBLER__ */ #endif /* __KVM_X86_ENTER_FLAGS_H */
arch/x86/kvm/vmx/vmenter.S +3 -38
73 lines not on this page · raw message
Signature · 1 line
2.51.0
Paolo Bonzini
maintainerRe: [PATCH v3 01/20] KVM: VMX: Macrofy 64-bit GPR swapping in __vmx_vcpu_run()
Review
Quoted 12 lines · Chang S. Bae
mov VCPU_RBP(%_ASM_DI), %_ASM_BP mov VCPU_RSI(%_ASM_DI), %_ASM_SI #ifdef CONFIG_X86_64(quoted diff) +1
-8- mov VCPU_R8 (%_ASM_DI), %r8 - mov VCPU_R9 (%_ASM_DI), %r9 - mov VCPU_R10(%_ASM_DI), %r10 - mov VCPU_R11(%_ASM_DI), %r11 - mov VCPU_R12(%_ASM_DI), %r12 - mov VCPU_R13(%_ASM_DI), %r13 - mov VCPU_R14(%_ASM_DI), %r14 - mov VCPU_R15(%_ASM_DI), %r15 + VMX_LOAD_REGS %_ASM_DI, 8,9,10,11,12,13,14,15
Please pass in VMX_vcpu_arch_regs so that you can use the same macro for Intel and AMD, similar to the SPEC_CTRL macros.
I would also consider using inst.h's name-to-index conversion:
.macro LOAD_GPRS src:req, regs_ofs:req, regs:vararg .irp reg, \regs
#ifdef CONFIG_X86_64
R64_NUM reg_num \reg
#else
R32_NUM reg_num \reg
#endif
.if \reg_num <> REG_NUM_INVALID
mov (\regs_ofs + \reg_num * WORD_SIZE)(%_ASM_DI), \reg .else
.err invalid register \reg
.endif
.endr
.endm
LOAD_GPRS %_ASM_DI, VMX_vcpu_arch_regs, \ %_ASM_AX, %_ASM_CX, %_ASM_DX, %_ASM_BX, %_ASM_BP, %_ASM_SI #ifdef CONFIG_X86_64 LOAD_GPRS %_ASM_DI, VMX_vcpu_arch_regs, \ %r8, %r9, %r10, %r11, %r12, %r13, %r14, %r15
#endif
/* Load guest RDI. This kills the @vmx pointer! */ LOAD_GPRS %_ASM_DI, VMX_vcpu_arch_regs, %_ASM_DI
(same for STORE_GPRS).
Note however that inst.h is currently dead code, so it would have to move into arch/x86/kvm/ as in the patch after my signature.
Paolo
arch/x86/kvm/inst.h renamed from arch/x86/include/asm/inst.h +4 -30
@@ -1,19 +1,16 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* Generate .byte code for some instructions not supported by old -* binutils. +* Convert register names to their sizes and the indices used when +* encoding instructions. */ -#ifndef X86_ASM_INST_H -#define X86_ASM_INST_H +#ifndef X86_KVM_INST_H +#define X86_KVM_INST_H #ifdef __ASSEMBLER__#define REG_NUM_INVALID 100 -#define REG_TYPE_R32 0 -#define REG_TYPE_R64 1 -#define REG_TYPE_INVALID 100 - .macro R32_NUM opd r32 \opd = REG_NUM_INVALID .ifc \r32,%eax
@@ -121,28 +114,6 @@ .endif #endif .endm - - .macro REG_TYPE type reg - R32_NUM reg_type_r32 \reg - R64_NUM reg_type_r64 \reg - .if reg_type_r64 <> REG_NUM_INVALID - \type = REG_TYPE_R64 - .elseif reg_type_r32 <> REG_NUM_INVALID - \type = REG_TYPE_R32 - .else - \type = REG_TYPE_INVALID - .endif - .endm - - .macro PFX_REX opd1 opd2 W=0 - .if ((\opd1 | \opd2) & 8) || \W - .byte 0x40 | ((\opd1 & 8) >> 3) | ((\opd2 & 8) >> 1) | (\W << 3) - .endif - .endm - - .macro MODRM mod opd1 opd2 - .byte \mod | (\opd1 & 7) | ((\opd2 & 7) << 3) - .endm#endif #endif
Re: [PATCH v3 01/20] KVM: VMX: Macrofy 64-bit GPR swapping in __vmx_vcpu_run()
Quoted 17 lines · Paolo Bonzini
I would also consider using inst.h's name-to-index conversion:
.macro
LOAD_GPRSsrc:req, regs_ofs:req, regs:vararg .irp reg, \regs
#ifdefCONFIG_X86_64
R64_NUMreg_num\reg
#else
R32_NUMreg_num\reg
#endif
.if \reg_num <>REG_NUM_INVALID
mov (\regs_ofs + \reg_num * WORD_SIZE)(%_ASM_DI), \reg .else
.err invalid register \reg
.endif
.endr
.endm
Yup! Also, looks like still needs the REG_TYPE macro:
.macro LOAD_REGS src:req, regs_ofs:req, regs:vararg .irp reg, \regs
REG_TYPE reg_type \reg
.if reg_type == REG_TYPE_R64
R64_NUM reg_num \reg
.else
R32_NUM reg_num \reg
.endif
.if reg_num <> REG_NUM_INVALID
mov (\regs_ofs + reg_num * WORD_SIZE)(\src), \reg .else
.err invalid register \reg
.endif
.endr
.endm
Thanks,
Chang
Paolo Bonzini
maintainerRe: [PATCH v3 01/20] KVM: VMX: Macrofy 64-bit GPR swapping in __vmx_vcpu_run()
Quoted 17 lines · Chang S. Bae
Quoted 16 lines · Paolo Bonzini
I would also consider using inst.h's name-to-index conversion:
.macro
LOAD_GPRSsrc:req, regs_ofs:req, regs:vararg .irp reg, \regs
#ifdefCONFIG_X86_64
R64_NUMreg_num\reg
#else
R32_NUMreg_num\reg
#endif
.if \reg_num <>REG_NUM_INVALID
mov (\regs_ofs + \reg_num * WORD_SIZE)(%_ASM_DI), \reg .else
.err invalid register \reg
.endif
.endr
.endm
Quoted 1 line
Yup! Also, looks like still needs the
REG_TYPEmacro:
I don't think so, you can (and should) assume that \reg has WORD_SIZE size (i.e. disallow %eax if CONFIG_X86_64 is set). Only CLEAR_REGS uses smaller registers but it does not need the reg_num.
Paolo
Quoted 19 lines
.macro
LOAD_REGSsrc:req, regs_ofs:req, regs:vararg .irp reg, \regs
REG_TYPEreg_type\reg
.ifreg_type==REG_TYPE_R64
R64_NUMreg_num\reg
.else
R32_NUMreg_num\reg
.endif
.ifreg_num<>REG_NUM_INVALID
mov (\regs_ofs +reg_num* WORD_SIZE)(\src), \reg .else
.err invalid register \reg
.endif
.endr
.endmThanks,
Chang
Re: [PATCH v3 01/20] KVM: VMX: Macrofy 64-bit GPR swapping in __vmx_vcpu_run()
Quoted 18 lines · Paolo Bonzini
Quoted 17 lines · Chang S. Bae
Quoted 16 lines · Paolo Bonzini
I would also consider using inst.h's name-to-index conversion:
.macro
LOAD_GPRSsrc:req, regs_ofs:req, regs:vararg .irp reg, \regs
#ifdefCONFIG_X86_64
R64_NUMreg_num\reg
#else
R32_NUMreg_num\reg
#endif
.if \reg_num <>REG_NUM_INVALID
mov (\regs_ofs + \reg_num * WORD_SIZE)(%_ASM_DI), \reg .else
.err invalid register \reg
.endif
.endr
.endm
Quoted 5 lines
Quoted 1 line
Yup! Also, looks like still needs the
REG_TYPEmacro:I don't think so, you can (and should) assume that \reg has
WORD_SIZEsize (i.e. disallow %eax ifCONFIG_X86_64is set). OnlyCLEAR_REGSuses smaller registers but it does not need thereg_num.
Okay, I think I didn't close look at the error. Simply "\reg_num" to "reg_num" builds fine. Yes, REG_TYPE can go away.
Thanks,
Chang
Paolo Bonzini
maintainerRe: [PATCH v3 01/20] KVM: VMX: Macrofy 64-bit GPR swapping in __vmx_vcpu_run()
In reply to Chang S. BaeQuoted 4 lines · Chang S. Bae
/* Clear return value to indicate VM-Exit (as opposed to VM-Fail). */
arch/x86/kvm/vmx/vmenter.S +0
-0@@ -227,14 +199,7 @@ SYM_INNER_LABEL_ALIGN(vmx_vmexit, SYM_L_GLOBAL) xor %esi, %esi xor %edi, %edi
arch/x86/kvm/vmx/vmenter.S SYM_INNER_LABEL_ALIGN(vmx_vmexit, SYM_L_GLOBAL) · line 202
Quoted 10 lines
arch/x86/kvm/vmx/vmenter.S +1
-8#ifdef CONFIG_X86_64 - xor %r8d, %r8d - xor %r9d, %r9d - xor %r10d, %r10d - xor %r11d, %r11d - xor %r12d, %r12d - xor %r13d, %r13d - xor %r14d, %r14d - xor %r15d, %r15d + CLEAR_REGS 8d,9d,10d,11d,12d,13d,14d,15d
Likewise, it's worth making this a bit more verbose:
.macro CLEAR_REGS regs:vararg
.irp reg, \regs
xorl \reg, \reg
.endr
.endm
CLEAR_REGS %eax, %ecx, %edx, %ebp, %esi, %edi #ifdef CONFIG_X86_64 CLEAR_REGS %r8d, %r9d, %r10d, %r11d, %r12d, %r13d, %r14d, %r15d
#endif
but macroize ten more lines of code across VMX and SVM.
Paolo
PATCH v3 2/20 KVM: SVM: Macrofy 64-bit GPR swapping in __svm_vcpu_run()
In reply to Chang S. BaeConvert the register save/restore sequences in SVM entry code to macros, following VMX code. Drop the now-redundant register offset defines.
No functional change intended.
---
V2 -> V3: New patch
--- arch/x86/kvm/svm/vmenter.S | 38 +++----------------------------------- arch/x86/kvm/vmenter.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 35 deletions(-)
arch/x86/kvm/svm/vmenter.S +3 -35
@@ -17,17 +17,6 @@ #define VCPU_RSI (SVM_vcpu_arch_regs + __VCPU_REGS_RSI * WORD_SIZE) #define VCPU_RDI (SVM_vcpu_arch_regs + __VCPU_REGS_RDI * WORD_SIZE) -#ifdef CONFIG_X86_64 -#define VCPU_R8 (SVM_vcpu_arch_regs + __VCPU_REGS_R8 * WORD_SIZE) -#define VCPU_R9 (SVM_vcpu_arch_regs + __VCPU_REGS_R9 * WORD_SIZE) -#define VCPU_R10 (SVM_vcpu_arch_regs + __VCPU_REGS_R10 * WORD_SIZE) -#define VCPU_R11 (SVM_vcpu_arch_regs + __VCPU_REGS_R11 * WORD_SIZE) -#define VCPU_R12 (SVM_vcpu_arch_regs + __VCPU_REGS_R12 * WORD_SIZE) -#define VCPU_R13 (SVM_vcpu_arch_regs + __VCPU_REGS_R13 * WORD_SIZE) -#define VCPU_R14 (SVM_vcpu_arch_regs + __VCPU_REGS_R14 * WORD_SIZE) -#define VCPU_R15 (SVM_vcpu_arch_regs + __VCPU_REGS_R15 * WORD_SIZE) -#endif - #define SVM_vmcb01_pa (SVM_vmcb01 + KVM_VMCB_pa) .section .noinstr.text, "ax"
@@ -115,14 +104,7 @@ SYM_FUNC_START(__svm_vcpu_run) mov VCPU_RBP(%_ASM_DI), %_ASM_BP mov VCPU_RSI(%_ASM_DI), %_ASM_SI #ifdef CONFIG_X86_64 - mov VCPU_R8 (%_ASM_DI), %r8 - mov VCPU_R9 (%_ASM_DI), %r9 - mov VCPU_R10(%_ASM_DI), %r10 - mov VCPU_R11(%_ASM_DI), %r11 - mov VCPU_R12(%_ASM_DI), %r12 - mov VCPU_R13(%_ASM_DI), %r13 - mov VCPU_R14(%_ASM_DI), %r14 - mov VCPU_R15(%_ASM_DI), %r15 + SVM_LOAD_REGS %_ASM_DI, 8,9,10,11,12,13,14,15 #endif mov VCPU_RDI(%_ASM_DI), %_ASM_DI
@@ -143,14 +125,7 @@ SYM_FUNC_START(__svm_vcpu_run) mov %_ASM_SI, VCPU_RSI(%_ASM_AX) mov %_ASM_DI, VCPU_RDI(%_ASM_AX) #ifdef CONFIG_X86_64 - mov %r8, VCPU_R8 (%_ASM_AX) - mov %r9, VCPU_R9 (%_ASM_AX) - mov %r10, VCPU_R10(%_ASM_AX) - mov %r11, VCPU_R11(%_ASM_AX) - mov %r12, VCPU_R12(%_ASM_AX) - mov %r13, VCPU_R13(%_ASM_AX) - mov %r14, VCPU_R14(%_ASM_AX) - mov %r15, VCPU_R15(%_ASM_AX) + SVM_STORE_REGS %_ASM_AX, 8,9,10,11,12,13,14,15 #endif /* @svm can stay in RDI from now on. */
@@ -200,14 +175,7 @@ SYM_FUNC_START(__svm_vcpu_run) xor %esi, %esi xor %edi, %edi #ifdef CONFIG_X86_64 - xor %r8d, %r8d - xor %r9d, %r9d - xor %r10d, %r10d - xor %r11d, %r11d - xor %r12d, %r12d - xor %r13d, %r13d - xor %r14d, %r14d - xor %r15d, %r15d + CLEAR_REGS 8d,9d,10d,11d,12d,13d,14d,15d #endif /* "Pop" @enter_flags. */
arch/x86/kvm/vmenter.h +10 -0
@@ -96,6 +96,16 @@ mov %r\i, (VMX_vcpu_arch_regs + \i * WORD_SIZE)(\dst) .endr .endm +.macro SVM_LOAD_REGS src:req, regs:vararg + .irp i, \regs + mov (SVM_vcpu_arch_regs + \i * WORD_SIZE)(\src), %r\i + .endr +.endm +.macro SVM_STORE_REGS dst:req, regs:vararg + .irp i, \regs + mov %r\i, (SVM_vcpu_arch_regs + \i * WORD_SIZE)(\dst) + .endr +.endm#endif #endif /* __ASSEMBLER__ */
Signature · 1 line
2.51.0
PATCH v3 3/20 KVM: SEV: Macrofy 64-bit GPR swapping in __svm_sev_es_vcpu_run()
In reply to Chang S. BaeConvert the SEV-ES entry code to use macros for saving guest GPRs, following VMX/SVM paths. Then, remove now-unused register offsets and __VCPU_REGS_R8–R15 defines.
No functional change intended.
---
V2 -> V3: New patch
--- arch/x86/include/asm/kvm_host.h | 16 ++++++++-------- arch/x86/include/asm/kvm_vcpu_regs.h | 11 ----------- arch/x86/kvm/svm/vmenter.S | 10 +--------- arch/x86/kvm/vmenter.h | 6 ++++++ 4 files changed, 15 insertions(+), 28 deletions(-)
arch/x86/include/asm/kvm_host.h +8 -8
@@ -182,14 +182,14 @@ enum kvm_reg { VCPU_REGS_RSI = __VCPU_REGS_RSI, VCPU_REGS_RDI = __VCPU_REGS_RDI,#ifdef CONFIG_X86_64 -VCPU_REGS_R8 = __VCPU_REGS_R8, -VCPU_REGS_R9 = __VCPU_REGS_R9, -VCPU_REGS_R10 = __VCPU_REGS_R10, -VCPU_REGS_R11 = __VCPU_REGS_R11, -VCPU_REGS_R12 = __VCPU_REGS_R12, -VCPU_REGS_R13 = __VCPU_REGS_R13, -VCPU_REGS_R14 = __VCPU_REGS_R14, -VCPU_REGS_R15 = __VCPU_REGS_R15, +VCPU_REGS_R8 , +VCPU_REGS_R9 , +VCPU_REGS_R10 , +VCPU_REGS_R11 , +VCPU_REGS_R12 , +VCPU_REGS_R13 , +VCPU_REGS_R14 , +VCPU_REGS_R15 , #endif NR_VCPU_GENERAL_PURPOSE_REGS,
arch/x86/include/asm/kvm_vcpu_regs.h +0 -11
@@ -11,15 +11,4 @@#define __VCPU_REGS_RSI 6#define __VCPU_REGS_RDI 7 -#ifdef CONFIG_X86_64 -#define __VCPU_REGS_R8 8 -#define __VCPU_REGS_R9 9 -#define __VCPU_REGS_R10 10 -#define __VCPU_REGS_R11 11 -#define __VCPU_REGS_R12 12 -#define __VCPU_REGS_R13 13 -#define __VCPU_REGS_R14 14 -#define __VCPU_REGS_R15 15 -#endif -#endif /* _ASM_X86_KVM_VCPU_REGS_H */
arch/x86/kvm/svm/vmenter.S +1 -9
@@ -226,15 +226,10 @@ SYM_FUNC_END(__svm_vcpu_run) #ifdef CONFIG_X86_64 -#define SEV_ES_GPRS_BASE 0x300 #define SEV_ES_RBX (SEV_ES_GPRS_BASE + __VCPU_REGS_RBX * WORD_SIZE) #define SEV_ES_RBP (SEV_ES_GPRS_BASE + __VCPU_REGS_RBP * WORD_SIZE) #define SEV_ES_RSI (SEV_ES_GPRS_BASE + __VCPU_REGS_RSI * WORD_SIZE) #define SEV_ES_RDI (SEV_ES_GPRS_BASE + __VCPU_REGS_RDI * WORD_SIZE) -#define SEV_ES_R12 (SEV_ES_GPRS_BASE + __VCPU_REGS_R12 * WORD_SIZE) -#define SEV_ES_R13 (SEV_ES_GPRS_BASE + __VCPU_REGS_R13 * WORD_SIZE) -#define SEV_ES_R14 (SEV_ES_GPRS_BASE + __VCPU_REGS_R14 * WORD_SIZE) -#define SEV_ES_R15 (SEV_ES_GPRS_BASE + __VCPU_REGS_R15 * WORD_SIZE) #endif /**
@@ -251,10 +246,7 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run) * saved on VMRUN. */ mov %rbp, SEV_ES_RBP (%rdx) - mov %r15, SEV_ES_R15 (%rdx) - mov %r14, SEV_ES_R14 (%rdx) - mov %r13, SEV_ES_R13 (%rdx) - mov %r12, SEV_ES_R12 (%rdx) + SEV_STORE_REGS %rdx, 15,14,13,12 mov %rbx, SEV_ES_RBX (%rdx) /*
arch/x86/kvm/vmenter.h +6 -0
@@ -79,6 +79,7 @@ .endm#define WORD_SIZE (BITS_PER_LONG / 8) +#define SEV_ES_GPRS_BASE 0x300#ifdef CONFIG_X86_64 .macro CLEAR_REGS regs:vararg
@@ -106,6 +107,11 @@ mov %r\i, (SVM_vcpu_arch_regs + \i * WORD_SIZE)(\dst) .endr .endm +.macro SEV_STORE_REGS dst:req, regs:vararg + .irp i, \regs + mov %r\i, (SEV_ES_GPRS_BASE + \i * WORD_SIZE)(\dst) + .endr +.endm#endif #endif /* __ASSEMBLER__ */
Signature · 1 line
2.51.0
PATCH v3 4/20 KVM: x86: Extend VCPU registers for EGPRs
In reply to Chang S. BaeExtend the storage to include extended general-purpose registers (EGPRs:
R16-R31) when CONFIG_KVM_APX=y. This option is for VMX only.
Although EGPR state is XSAVE-managed, and thus could be stored in the guest fpstate, VCPU storage provides a more convenient and efficient access path for KVM.
---
V2 -> V3: New patch, based on Sean's APX preparatory series [1]
[1] https://lore.kernel.org/[email protected]/
--- arch/x86/include/asm/kvm_host.h | 18 ++++++++++++++++++ arch/x86/kvm/Kconfig | 4 ++++ 2 files changed, 22 insertions(+)
arch/x86/include/asm/kvm_host.h +18 -0
@@ -190,6 +190,24 @@ enum kvm_reg {VCPU_REGS_R13 ,VCPU_REGS_R14 ,VCPU_REGS_R15 , +#endif +#ifdef CONFIG_KVM_APX +VCPU_REGS_R16 , +VCPU_REGS_R17 , +VCPU_REGS_R18 , +VCPU_REGS_R19 , +VCPU_REGS_R20 , +VCPU_REGS_R21 , +VCPU_REGS_R22 , +VCPU_REGS_R23 , +VCPU_REGS_R24 , +VCPU_REGS_R25 , +VCPU_REGS_R26 , +VCPU_REGS_R27 , +VCPU_REGS_R28 , +VCPU_REGS_R29 , +VCPU_REGS_R30 , +VCPU_REGS_R31 , #endif NR_VCPU_GENERAL_PURPOSE_REGS,
arch/x86/kvm/Kconfig +4 -0
@@ -93,10 +93,14 @@ config KVM_SW_PROTECTED_VM If unsure, say "N". +config KVM_APX + bool + config KVM_INTEL tristate "KVM for Intel (and compatible) processors support" depends on KVM && IA32_FEAT_CTL select X86_FRED if X86_64 + select KVM_APX if X86_64 help Provides support for KVM on processors equipped with Intel's VT extensions, a.k.a. Virtual Machine Extensions (VMX).
Signature · 1 line
2.51.0
PATCH v3 5/20 KVM: VMX: Save guest EGPRs in VCPU cache
In reply to Chang S. BaeSave and restore the guest EGPRs on VM exit/entry if the system supports Advanced Performance Extensions (APX).
KVM switches XCR0 outside of the fastpath loop. As a result, there is a window of still running with guest XCR0 where any EGPR access would induce #UD. But fastpath handlers may access guest EGPRs, i.e. for exits from an immediate form of WRMSR. So it is safe to handle them in __vmx_vcpu_run().
KVM intercepts all XCR0 writes, allowing itself to track the guest XCR0 state. Pivot XCR0[APX] to conditionally handle them. This in turn makes the VM behaves architecturally aligned. If XCR0[APX] is cleared, for example, the EGPR state is preserved and will be restored when APX is re-enabled.
Guard the switching path with speculation-safe control as well to avoid any mis-speculation into EGPR accesses when APX is disabled.
Saving may be skipped on VM-Fail but leave it unconditional simply because that's only for the slow path.
---
V2 -> V3: New patch
Note this change depends on Paolo's SPEC_CTRL rework [1]
[1] https://lore.kernel.org/[email protected]/
--- arch/x86/Kconfig.assembler | 5 +++++ arch/x86/kvm/Kconfig | 2 +- arch/x86/kvm/vmenter.h | 13 +++++++++++++ arch/x86/kvm/vmx/vmenter.S | 26 ++++++++++++++++++++++++-- arch/x86/kvm/vmx/vmx.c | 13 +++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-)
arch/x86/Kconfig.assembler +5 -0
@@ -1,6 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2020 Jason A. Donenfeld <[email protected]>. All Rights Reserved. +config AS_APX + def_bool $(as-instr64,xor %r16$(comma)%r16) + help + Supported by binutils >= 2.42 and LLVM integrated assembler >= V18 + config AS_WRUSS def_bool $(as-instr64,wrussq %rax$(comma)(%rbx)) help
arch/x86/kvm/Kconfig +1 -1
@@ -100,7 +100,7 @@ config KVM_INTEL tristate "KVM for Intel (and compatible) processors support" depends on KVM && IA32_FEAT_CTL select X86_FRED if X86_64 - select KVM_APX if X86_64 + select KVM_APX if X86_64 && AS_APX help Provides support for KVM on processors equipped with Intel's VT extensions, a.k.a. Virtual Machine Extensions (VMX).
arch/x86/kvm/vmenter.h +13 -0
@@ -7,6 +7,7 @@#define KVM_ENTER_VMRESUME BIT(0)#define KVM_ENTER_SAVE_SPEC_CTRL BIT(1)#define KVM_ENTER_CLEAR_CPU_BUFFERS_FOR_MMIO BIT(2) +#define KVM_ENTER_EGPR_SWITCH BIT(3)#ifdef __ASSEMBLER__ .macro RESTORE_GUEST_SPEC_CTRL_BODY guest_spec_ctrl:req, label:req
@@ -114,5 +115,17 @@ .endm #endif +#ifdef CONFIG_KVM_APX +.macro CLEAR_EGPRS + CLEAR_REGS 16d,17d,18d,19d,20d,21d,22d,23d,24d,25d,26d,27d,28d,29d,30d,31d +.endm +.macro VMX_LOAD_EGPRS src:req + VMX_LOAD_REGS \src, 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31 +.endm +.macro VMX_STORE_EGPRS dst:req + VMX_STORE_REGS \dst, 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31 +.endm +#endif + #endif /* __ASSEMBLER__ */ #endif /* __KVM_X86_ENTER_FLAGS_H */
arch/x86/kvm/vmx/vmenter.S +24 -2
@@ -57,6 +57,7 @@ * @flags: KVM_ENTER_RUN_VMRESUME: use VMRESUME instead of VMLAUNCH * KVM_ENTER_RUN_SAVE_SPEC_CTRL: save guest SPEC_CTRL into vmx->spec_ctrl * KVM_ENTER_RUN_CLEAR_CPU_BUFFERS_FOR_MMIO: vCPU can access host MMIO + * KVM_ENTER_RUN_EGPRS_SWITCH: load/store guest EGPRs * * Returns: * 0 on VM-Exit, 1 on VM-Fail
@@ -87,6 +88,14 @@ SYM_FUNC_START(__vmx_vcpu_run) /* Reload @vmx, _ASM_ARG1 may be modified by vmx_update_host_rsp(). */ mov WORD_SIZE(%_ASM_SP), %_ASM_DI +#ifdef CONFIG_KVM_APX + ALTERNATIVE "jmp .Lload_egprs_done", "", X86_FEATURE_APX + testl $KVM_ENTER_EGPR_SWITCH, (%_ASM_SP) + jz .Lload_egprs_done + VMX_LOAD_EGPRS %_ASM_DI +.Lload_egprs_done: +#endif + /* * Unlike AMD there's no V_SPEC_CTRL here, so do not leave the body * out of line. Clobbers RAX, RCX, RDX, RSI.
@@ -229,8 +238,21 @@ SYM_INNER_LABEL_ALIGN(vmx_vmexit, SYM_L_GLOBAL) mov %_ASM_BX, %_ASM_AX /* Pop our saved arguments from the stack */ - pop %_ASM_BX - pop %_ASM_BX + pop %_ASM_BX /* @flags */ + pop %_ASM_DI /* @vmx */ + +#ifdef CONFIG_KVM_APX + ALTERNATIVE "jmp .Lclear_egprs_done", "", X86_FEATURE_APX + test $KVM_ENTER_EGPR_SWITCH, %_ASM_BX + jz .Lclear_egprs_done + /* + * Unlike legacy GPRs, saving could be conditional here on VM-Fail, + * which however isn't in fastpath. Instead, simply saving EGPRs always. + */ + VMX_STORE_EGPRS %_ASM_DI + CLEAR_EGPRS +.Lclear_egprs_done: +#endif /* ... and then the callee-save registers */ pop %_ASM_BX
arch/x86/kvm/vmx/vmx.c +13 -0
@@ -984,6 +984,19 @@ unsigned int __vmx_vcpu_enter_flags(struct vcpu_vmx *vmx) kvm_vcpu_can_access_host_mmio(&vmx->vcpu)) flags |=KVM_ENTER_CLEAR_CPU_BUFFERS_FOR_MMIO ; +/* +* KVM intercepts XSETBV and thus always tracks the guest XCR0. EGPR +* save/restore is gated by this flag. The resulting behavior is: +* +* - When the guest enables APX, KVM restores EGPRs (initially zeroed). +* - When the guest disables APX, EGPRs are preserved in the VCPU cache +* - When APX is re-enabled, the saved state is restored, which matches +* with architectural expectations. +*/ +if (IS_ENABLED (CONFIG_KVM_APX ) &&cpu_feature_enabled (X86_FEATURE_APX ) && + vmx->vcpu.arch.xcr0 &XFEATURE_MASK_APX ) + flags |=KVM_ENTER_EGPR_SWITCH ; +return flags; }
Signature · 1 line
2.51.0
PATCH v3 6/20 KVM: x86: Support APX state for XSAVE ABI
In reply to Chang S. BaeIntroduce a facility to copy APX state between the VCPU cache and the userspace buffer since APX state is stored in the VCPU cache.
The existing fpstate copy functions historically sync all XSTATEs in between userspace and kernel buffers [1]. In this regard, any additional state handling logic should be consistent with them -- i.e. validation of XSTATE_BV against the supported XCR0 mask.
Now with the two copy paths, their invocations require to take care of ordering:
* When exporting to userspace, the fpstate function should runs first since it zeros out the area of components either not present or inactive. Then the VCPU cache function ensures its state copy.
* When importing from userspace, the VCPU cache function is better to run first. Clearing XSTATE_BV[APX] can help the fpstate function to skip the component.
[1] Except for PKRU state, as stored in struct thread_struct.
---
V2 -> V3: New patch
Note: While avoiding #ifdefs in general, defining those helpers under CONFIG_KVM_APX seems to make it clear the most. But appreciate any suggestions if any better option.
--- arch/x86/kvm/cpuid.c | 10 +++++++ arch/x86/kvm/cpuid.h | 2 ++ arch/x86/kvm/x86.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+)
arch/x86/kvm/cpuid.c +10 -0
@@ -59,6 +59,16 @@ void __init kvm_init_xstate_sizes(void) } } +u32 xstate_size (unsigned int xfeature) +{ +return xstate_sizes[xfeature].eax; +} + +u32 xstate_offset (unsigned int xfeature) +{ +return xstate_sizes[xfeature].ebx; +} +u32 xstate_required_size (u64 xstate_bv,bool compacted) {u32 ret =XSAVE_HDR_SIZE +XSAVE_HDR_OFFSET ;
arch/x86/kvm/cpuid.h +2 -0
@@ -64,6 +64,8 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx,void __init kvm_init_xstate_sizes (void );u32 xstate_required_size (u64 xstate_bv,bool compacted); +u32 xstate_size (unsigned int xfeature); +u32 xstate_offset (unsigned int xfeature);int cpuid_query_maxphyaddr (struct kvm_vcpu *vcpu);int cpuid_query_maxguestphyaddr (struct kvm_vcpu *vcpu);
arch/x86/kvm/x86.c +64 -0
94 lines not on this page · raw message
Signature · 1 line
2.51.0
Paolo Bonzini
maintainerRe: [PATCH v3 06/20] KVM: x86: Support APX state for XSAVE ABI
Review
Quoted 5 lines · Chang S. Bae
(quoted diff) +5
-0+ /* + * APX off in XSTATE_BV will guide fpu_copy_uabi_to_guest_fpstate() + * to avoid from unnecessary handling. + */ + xstate->xsave.header.xfeatures &= ~XFEATURE_MASK_APX;
I would place this statement inside in fpu_copy_uabi_to_guest_fpstate, and more in general make arch/x86/fpu ignore APX when dealing with guest_fpstate. This can be a separate patch like this:
-------------- 8< -------------
From: Paolo Bonzini <[email protected]>
Subject: x86/fpu: ignore APX when copying from/to guest FPU
KVM will store APX extended GPRs directly in the regs[] field of struct kvm_vcpu. This is done to make accessors more uniform between GPRs and EGPRs, and partly because x86 maintainers expressed the desire to compile Linux with APX enabled sooner or later; accessing guest EGPRs from KVM's C code would get in the way.
Therefore, let KVM handle the APX feature on its own when executing ioctls to get and set the virtual machine's XSAVE state.
arch/x86/kernel/fpu/core.c +4 -0
@@ -420,6 +420,8 @@ void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *buf,struct membuf mb = { .p = buf, .left = size };if (cpu_feature_enabled (X86_FEATURE_XSAVE )) { +/* Up to date APX registers are in struct kvm_vcpu anyway. */ + xfeatures &= ~XFEATURE_MASK_APX ;__copy_xstate_to_uabi_buf (mb, kstate, xfeatures, pkru,XSTATE_COPY_XSAVE ); }else {
@@ -464,6 +465,8 @@ int fpu_copy_uabi_to_guest_fpstate(struct fpu_guest *gfpu, const void *buf,if (!(ustate->xsave.header.xfeatures &XFEATURE_MASK_PKRU )) vpkru =NULL ; +/* APX registers are copied to and from struct kvm_vcpu, not the FPU. */ + ustate->xsave.header.xfeatures &= ~XFEATURE_MASK_APX ;return copy_uabi_from_kernel_to_xstate (kstate, ustate, vpkru); }EXPORT_SYMBOL_FOR_KVM (fpu_copy_uabi_to_guest_fpstate);
Thanks,
Paolo
PATCH v3 7/20 KVM: VMX: Refactor VMX instruction information access
In reply to Chang S. BaeIntroduce a helper that returns the instruction information as 64-bit value and adjust existing sites to prepare for a wider field.
The VMX instruction information field is currently 32 bits. Future extensions may expand this field to support extended register IDs, requiring a wider width. The change provides a single access point for the transition.
No functional change intended.
---
V2 -> V3: New patch
--- arch/x86/kvm/vmx/nested.c | 22 +++++++++++----------- arch/x86/kvm/vmx/nested.h | 2 +- arch/x86/kvm/vmx/vmx.c | 4 ++-- arch/x86/kvm/vmx/vmx.h | 10 ++++++++-- 4 files changed, 22 insertions(+), 16 deletions(-)
arch/x86/kvm/vmx/nested.c +11 -11
@@ -5216,7 +5216,7 @@ static void nested_vmx_triple_fault(struct kvm_vcpu *vcpu)* #UD, #GP, or #SS. */ int get_vmx_mem_address (struct kvm_vcpu *vcpu,unsigned long exit_qualification, -u32 vmx_instruction_info,bool wr,int len,gva_t *ret) +u64 vmx_instruction_info,bool wr,int len,gva_t *ret) {gva_t off;bool exn;
@@ -5348,7 +5348,7 @@ static int nested_vmx_get_vmptr(struct kvm_vcpu *vcpu, gpa_t *vmpointer,int r;if (get_vmx_mem_address (vcpu,vmx_get_exit_qual (vcpu), -vmcs_read32 (VMX_INSTRUCTION_INFO ), false, +vmx_get_instr_info (), false,sizeof (*vmpointer), &gva)) { *ret =1 ;return -EINVAL ;
@@ -5633,7 +5633,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)struct vmcs12 *vmcs12 =is_guest_mode (vcpu) ?get_shadow_vmcs12 (vcpu) :get_vmcs12 (vcpu);unsigned long exit_qualification =vmx_get_exit_qual (vcpu); -u32 instr_info =vmcs_read32 (VMX_INSTRUCTION_INFO ); +u64 instr_info =vmx_get_instr_info ();struct vcpu_vmx *vmx =to_vmx (vcpu);struct x86_exception e;unsigned long field;
@@ -5739,7 +5739,7 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu)struct vmcs12 *vmcs12 =is_guest_mode (vcpu) ?get_shadow_vmcs12 (vcpu) :get_vmcs12 (vcpu);unsigned long exit_qualification =vmx_get_exit_qual (vcpu); -u32 instr_info =vmcs_read32 (VMX_INSTRUCTION_INFO ); +u64 instr_info =vmx_get_instr_info ();struct vcpu_vmx *vmx =to_vmx (vcpu);struct x86_exception e;unsigned long field;
@@ -5928,7 +5928,7 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)static int handle_vmptrst (struct kvm_vcpu *vcpu) {unsigned long exit_qual =vmx_get_exit_qual (vcpu); -u32 instr_info =vmcs_read32 (VMX_INSTRUCTION_INFO ); +u64 instr_info =vmx_get_instr_info ();gpa_t current_vmptr =to_vmx (vcpu)->nested.current_vmptr;struct x86_exception e;gva_t gva;
@@ -5956,7 +5956,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)static int handle_invept (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); -u32 vmx_instruction_info, types; +u64 vmx_instruction_info, types;unsigned long type, roots_to_free;struct kvm_mmu *mmu;gva_t gva;
@@ -5976,7 +5976,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)if (!nested_vmx_check_permission (vcpu))return 1 ; - vmx_instruction_info =vmcs_read32 (VMX_INSTRUCTION_INFO ); + vmx_instruction_info =vmx_get_instr_info (); gpr_index =vmx_get_instr_info_reg2 (vmx_instruction_info); type =kvm_register_read (vcpu, gpr_index);
@@ -6036,7 +6036,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)static int handle_invvpid (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); -u32 vmx_instruction_info; +u64 vmx_instruction_info;unsigned long type, types;gva_t gva;struct x86_exception e;
@@ -6057,7 +6057,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)if (!nested_vmx_check_permission (vcpu))return 1 ; - vmx_instruction_info =vmcs_read32 (VMX_INSTRUCTION_INFO ); + vmx_instruction_info =vmx_get_instr_info (); gpr_index =vmx_get_instr_info_reg2 (vmx_instruction_info); type =kvm_register_read (vcpu, gpr_index);
@@ -6410,7 +6410,7 @@ static bool nested_vmx_exit_handled_encls(struct kvm_vcpu *vcpu,static bool nested_vmx_exit_handled_vmcs_access (struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12,gpa_t bitmap) { -u32 vmx_instruction_info; +u64 vmx_instruction_info;unsigned long field;u8 b;
@@ -6418,7 +6418,7 @@ static bool nested_vmx_exit_handled_vmcs_access(struct kvm_vcpu *vcpu,return true;/* Decode instruction info and find the field to access */ - vmx_instruction_info =vmcs_read32 (VMX_INSTRUCTION_INFO ); + vmx_instruction_info =vmx_get_instr_info (); field =kvm_register_read (vcpu, (((vmx_instruction_info) >>28 ) &0xf ));/* Out-of-range fields always cause a VM exit from L2 to L1 */
arch/x86/kvm/vmx/nested.h +1 -1
@@ -51,7 +51,7 @@ void nested_sync_vmcs12_to_shadow(struct kvm_vcpu *vcpu);int vmx_set_vmx_msr (struct kvm_vcpu *vcpu,u32 msr_index,u64 data);int vmx_get_vmx_msr (struct nested_vmx_msrs *msrs,u32 msr_index,u64 *pdata);int get_vmx_mem_address (struct kvm_vcpu *vcpu,unsigned long exit_qualification, -u32 vmx_instruction_info,bool wr,int len,gva_t *ret); +u64 vmx_instruction_info,bool wr,int len,gva_t *ret);bool nested_vmx_check_io_bitmaps (struct kvm_vcpu *vcpu,unsigned int port,int size);
arch/x86/kvm/vmx/vmx.c +2 -2
@@ -6119,7 +6119,7 @@ static int handle_monitor_trap(struct kvm_vcpu *vcpu)static int handle_invpcid (struct kvm_vcpu *vcpu) { -u32 vmx_instruction_info; +u64 vmx_instruction_info;unsigned long type;gva_t gva;struct {
@@ -6133,7 +6133,7 @@ static int handle_invpcid(struct kvm_vcpu *vcpu)return 1 ; } - vmx_instruction_info =vmcs_read32 (VMX_INSTRUCTION_INFO ); + vmx_instruction_info =vmx_get_instr_info (); gpr_index =vmx_get_instr_info_reg2 (vmx_instruction_info); type =kvm_register_read (vcpu, gpr_index);
arch/x86/kvm/vmx/vmx.h +8 -2
@@ -701,12 +701,18 @@ static inline bool vmx_guest_state_valid(struct kvm_vcpu *vcpu)void dump_vmcs (struct kvm_vcpu *vcpu); -static inline int vmx_get_instr_info_reg (u32 vmx_instr_info) +/* A placeholder to smoothen 64-bit extension */ +static inline u64 vmx_get_instr_info (void ) +{ +return vmcs_read32 (VMX_INSTRUCTION_INFO ); +} + +static inline int vmx_get_instr_info_reg (u64 vmx_instr_info) {return (vmx_instr_info >>3 ) &0xf ; } -static inline int vmx_get_instr_info_reg2 (u32 vmx_instr_info) +static inline int vmx_get_instr_info_reg2 (u64 vmx_instr_info) {return (vmx_instr_info >>28 ) &0xf ; }
Signature · 1 line
2.51.0
PATCH v3 8/20 KVM: VMX: Refactor instruction information decoding
In reply to Chang S. BaeKVM currently decodes the VMX instruction information field using a mix of open-coded bit manipulations and ad hoc helpers. Convert all decoding to use helpers to centralizes the decoding logic for the transition to a wider instruction information.
No functional change intended.
---
V2 -> V3: New patch
--- arch/x86/kvm/vmx/nested.c | 58 +++++++++++++++++++-------------------- arch/x86/kvm/vmx/vmx.c | 11 ++++---- arch/x86/kvm/vmx/vmx.h | 48 +++++++++++++++++++++++++++++--- 3 files changed, 78 insertions(+), 39 deletions(-)
arch/x86/kvm/vmx/nested.c +29 -29
@@ -5216,7 +5216,7 @@ static void nested_vmx_triple_fault(struct kvm_vcpu *vcpu)* #UD, #GP, or #SS. */ int get_vmx_mem_address (struct kvm_vcpu *vcpu,unsigned long exit_qualification, -u64 vmx_instruction_info,bool wr,int len,gva_t *ret) +u64 instr_info,bool wr,int len,gva_t *ret) {gva_t off;bool exn;
@@ -5224,20 +5224,20 @@ int get_vmx_mem_address(struct kvm_vcpu *vcpu, unsigned long exit_qualification,/* * According to Vol. 3B, "Information for VM Exits Due to Instruction -* Execution", on an exit, vmx_instruction_info holds most of the -* addressing components of the operand. Only the displacement part -* is put in exit_qualification (see 3B, "Basic VM-Exit Information"). +* Execution", on an exit, instr_info holds most of the addressing +* components of the operand. Only the displacement part is put in +* exit_qualification (see 3B, "Basic VM-Exit Information"). * For how an actual address is calculated from all these components, * refer to Vol. 1, "Operand Addressing". */ -int scaling = vmx_instruction_info &3 ; -int addr_size = (vmx_instruction_info >>7 ) &7 ; -bool is_reg = vmx_instruction_info & (1u <<10 ); -int seg_reg = (vmx_instruction_info >>15 ) &7 ; -int index_reg = (vmx_instruction_info >>18 ) &0xf ; -bool index_is_valid = !(vmx_instruction_info & (1u <<22 )); -int base_reg = (vmx_instruction_info >>23 ) &0xf ; -bool base_is_valid = !(vmx_instruction_info & (1u <<27 )); +int scaling =vmx_get_instr_info_scaling (instr_info); +int addr_size =vmx_get_instr_info_addr_size (instr_info); +bool is_reg =vmx_get_instr_info_is_reg (instr_info); +int seg_reg =vmx_get_instr_info_seg_reg (instr_info); +int index_reg =vmx_get_instr_info_index_reg (instr_info); +bool index_is_valid =vmx_get_instr_info_index_is_valid (instr_info); +int base_reg =vmx_get_instr_info_base_reg (instr_info); +bool base_is_valid =vmx_get_instr_info_base_is_valid (instr_info);if (is_reg) {kvm_queue_exception (vcpu,UD_VECTOR );
@@ -5646,7 +5646,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)return 1 ;/* Decode instruction info and find the field to read */ - field =kvm_register_read (vcpu, (((instr_info) >>28 ) &0xf )); + field =kvm_register_read (vcpu,vmx_get_instr_info_reg (instr_info));if (!nested_vmx_is_evmptr12_valid (vmx)) {/*
@@ -5694,8 +5694,8 @@ static int handle_vmread(struct kvm_vcpu *vcpu)* Note that the number of bits actually copied is 32 or 64 depending * on the guest's mode (32 or 64 bit), not on the given field's length. */ -if (instr_info &BIT (10 )) { -kvm_register_write (vcpu, (((instr_info) >>3 ) &0xf ), value); +if (vmx_get_instr_info_is_reg (instr_info)) { +kvm_register_write (vcpu,vmx_get_instr_info_reg (instr_info), value); }else { len =is_64_bit_mode (vcpu) ?8 :4 ; if (get_vmx_mem_address(vcpu, exit_qualification,
@@ -5768,8 +5768,8 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu) get_vmcs12(vcpu)->vmcs_link_pointer == INVALID_GPA))return nested_vmx_failInvalid (vcpu); -if (instr_info &BIT (10 )) - value =kvm_register_read (vcpu, (((instr_info) >>3 ) &0xf )); +if (vmx_get_instr_info_is_reg (instr_info)) + value =kvm_register_read (vcpu,vmx_get_instr_info_reg (instr_info));else { len =is_64_bit_mode (vcpu) ?8 :4 ; if (get_vmx_mem_address(vcpu, exit_qualification,
@@ -5780,7 +5780,7 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu)return kvm_handle_memory_failure (vcpu, r, &e); } - field =kvm_register_read (vcpu, (((instr_info) >>28 ) &0xf )); + field =kvm_register_read (vcpu,vmx_get_instr_info_reg2 (instr_info)); offset =get_vmcs12_field_offset (field);if (offset <0 )
@@ -5956,8 +5956,8 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)static int handle_invept (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); -u64 vmx_instruction_info, types;unsigned long type, roots_to_free; +u64 instr_info, types;struct kvm_mmu *mmu;gva_t gva;struct x86_exception e;
@@ -5976,8 +5976,8 @@ static int handle_invept(struct kvm_vcpu *vcpu)if (!nested_vmx_check_permission (vcpu))return 1 ; - vmx_instruction_info =vmx_get_instr_info (); - gpr_index =vmx_get_instr_info_reg2 (vmx_instruction_info); + instr_info =vmx_get_instr_info (); + gpr_index =vmx_get_instr_info_reg2 (instr_info); type =kvm_register_read (vcpu, gpr_index); types = (vmx->nested.msrs.ept_caps >>VMX_EPT_EXTENT_SHIFT ) &6 ;
@@ -5989,7 +5989,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)* operand is read even if it isn't needed (e.g., for type==global) */ if (get_vmx_mem_address (vcpu,vmx_get_exit_qual (vcpu), - vmx_instruction_info, false,sizeof (operand), &gva)) + instr_info, false,sizeof (operand), &gva))return 1 ; r =kvm_read_guest_virt (vcpu, gva, &operand,sizeof (operand), &e);if (r !=X86EMUL_CONTINUE )
@@ -6036,8 +6036,8 @@ static int handle_invept(struct kvm_vcpu *vcpu)static int handle_invvpid (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); -u64 vmx_instruction_info;unsigned long type, types; +u64 instr_info;gva_t gva;struct x86_exception e;struct {
@@ -6057,8 +6057,8 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)if (!nested_vmx_check_permission (vcpu))return 1 ; - vmx_instruction_info =vmx_get_instr_info (); - gpr_index =vmx_get_instr_info_reg2 (vmx_instruction_info); + instr_info =vmx_get_instr_info (); + gpr_index =vmx_get_instr_info_reg2 (instr_info); type =kvm_register_read (vcpu, gpr_index); types = (vmx->nested.msrs.vpid_caps &
@@ -6072,7 +6072,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)* operand is read even if it isn't needed (e.g., for type==global) */ if (get_vmx_mem_address (vcpu,vmx_get_exit_qual (vcpu), - vmx_instruction_info, false,sizeof (operand), &gva)) + instr_info, false,sizeof (operand), &gva))return 1 ; r =kvm_read_guest_virt (vcpu, gva, &operand,sizeof (operand), &e);if (r !=X86EMUL_CONTINUE )
@@ -6410,16 +6410,16 @@ static bool nested_vmx_exit_handled_encls(struct kvm_vcpu *vcpu,static bool nested_vmx_exit_handled_vmcs_access (struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12,gpa_t bitmap) { -u64 vmx_instruction_info;unsigned long field; +u64 instr_info;u8 b;if (!nested_cpu_has_shadow_vmcs (vmcs12))return true;/* Decode instruction info and find the field to access */ - vmx_instruction_info =vmx_get_instr_info (); - field =kvm_register_read (vcpu, (((vmx_instruction_info) >>28 ) &0xf )); + instr_info =vmx_get_instr_info (); + field =kvm_register_read (vcpu,vmx_get_instr_info_reg2 (instr_info));/* Out-of-range fields always cause a VM exit from L2 to L1 */ if (field >>15 )
arch/x86/kvm/vmx/vmx.c +5 -6
@@ -6119,8 +6119,8 @@ static int handle_monitor_trap(struct kvm_vcpu *vcpu)static int handle_invpcid (struct kvm_vcpu *vcpu) { -u64 vmx_instruction_info;unsigned long type; +u64 instr_info;gva_t gva;struct {u64 pcid;
@@ -6133,16 +6133,15 @@ static int handle_invpcid(struct kvm_vcpu *vcpu)return 1 ; } - vmx_instruction_info =vmx_get_instr_info (); - gpr_index =vmx_get_instr_info_reg2 (vmx_instruction_info); + instr_info =vmx_get_instr_info (); + gpr_index =vmx_get_instr_info_reg2 (instr_info); type =kvm_register_read (vcpu, gpr_index);/* According to the Intel instruction reference, the memory operand * is read even if it isn't needed (e.g., for type==all) */ if (get_vmx_mem_address (vcpu,vmx_get_exit_qual (vcpu), - vmx_instruction_info, false, -sizeof (operand), &gva)) + instr_info, false,sizeof (operand), &gva))return 1 ;return kvm_handle_invpcid (vcpu, type, gva);
@@ -6284,7 +6283,7 @@ static int handle_notify(struct kvm_vcpu *vcpu)static int vmx_get_msr_imm_reg (struct kvm_vcpu *vcpu) { -return vmx_get_instr_info_reg (vmcs_read32 (VMX_INSTRUCTION_INFO )); +return vmx_get_instr_info_reg (vmx_get_instr_info ()); }static int handle_rdmsr_imm (struct kvm_vcpu *vcpu)
arch/x86/kvm/vmx/vmx.h +44 -4
58 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v3 9/20 KVM: VMX: Refactor register index retrieval from exit qualification
In reply to Chang S. BaeIntroduce a helper to extract the register index from the VMX exit qualification field.
In addition to the VMX instruction information field, exit qualification also encodes a register index. This field will expand into the previously reserved bit for extended register IDs. This refactoring will simplify the extended register handling without code duplication.
Since the VMCS exit qualification is cached in VCPU state, the helper can reference it efficiently via vmx_get_exit_qual().
No functional change intended.
---
V2 -> V3: s/GPR/register (Sean)
--- arch/x86/kvm/vmx/nested.c | 2 +- arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/kvm/vmx/vmx.h | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/nested.c +1 -1
@@ -6332,7 +6332,7 @@ static bool nested_vmx_exit_handled_cr(struct kvm_vcpu *vcpu,switch ((exit_qualification >>4 ) &3 ) {case 0 :/* mov to cr */ - reg = (exit_qualification >>8 ) &15 ; + reg =vmx_get_exit_qual_reg (vcpu); val =kvm_register_read (vcpu, reg);switch (cr) {case 0 :
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -5653,7 +5653,7 @@ static int handle_cr(struct kvm_vcpu *vcpu) exit_qualification =vmx_get_exit_qual (vcpu); cr = exit_qualification &15 ; - reg = (exit_qualification >>8 ) &15 ; + reg =vmx_get_exit_qual_reg (vcpu);switch ((exit_qualification >>4 ) &3 ) {case 0 :/* mov to cr */ val =kvm_register_read (vcpu, reg);
arch/x86/kvm/vmx/vmx.h +5 -0
@@ -323,6 +323,11 @@ static __always_inline unsigned long vmx_get_exit_qual(struct kvm_vcpu *vcpu)return vt->exit_qualification; } +static inline int vmx_get_exit_qual_reg (struct kvm_vcpu *vcpu) +{ +return (vmx_get_exit_qual (vcpu) >>8 ) &0xf ; +} + static __always_inline u32 vmx_get_intr_info(struct kvm_vcpu *vcpu) {struct vcpu_vt *vt =to_vt (vcpu);
Signature · 1 line
2.51.0
PATCH v3 10/20 KVM: VMX: Support instruction information extension
In reply to Chang S. BaeDefine the VMCS field offset for the extended instruction information. Then, support 5-bit register indices retrieval from VMCS fields.
Note the APX enumeration alone indicates the extension is available. However, software must not assume that previously reserved bits were zero on older implementations.
---
V2 -> V3: Drop the data structure that matches with the field format (Sean)
--- arch/x86/include/asm/vmx.h | 2 ++ arch/x86/kvm/vmx/vmx.h | 42 +++++++++++++++++++++++++++----------- 2 files changed, 32 insertions(+), 12 deletions(-)
arch/x86/include/asm/vmx.h +2 -0
@@ -276,6 +276,8 @@ enum vmcs_field {PID_POINTER_TABLE_HIGH =0x00002043 ,GUEST_PHYSICAL_ADDRESS =0x00002400 ,GUEST_PHYSICAL_ADDRESS_HIGH =0x00002401 , +EXTENDED_INSTRUCTION_INFO =0x00002406 , +EXTENDED_INSTRUCTION_INFO_HIGH =0x00002407 ,VMCS_LINK_POINTER =0x00002800 ,VMCS_LINK_POINTER_HIGH =0x00002801 , GUEST_IA32_DEBUGCTL = 0x00002802,
arch/x86/kvm/vmx/vmx.h +30 -12
96 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v3 11/20 KVM: nVMX: Propagate the extended instruction info field
In reply to Chang S. BaeDefine the new extended_instruction_info field in struct vmcs12 and propagate it to nested VMX. Gate the propagation on the guest APX enumeration, which aligns with VMX behavior. Thus, define the CPUID bit here too.
--- arch/x86/kvm/reverse_cpuid.h | 2 ++ arch/x86/kvm/vmx/nested.c | 6 ++++++ arch/x86/kvm/vmx/vmcs12.c | 1 + arch/x86/kvm/vmx/vmcs12.h | 3 ++- 4 files changed, 11 insertions(+), 1 deletion(-)
arch/x86/kvm/reverse_cpuid.h +2 -0
@@ -35,6 +35,7 @@#define X86_FEATURE_AVX_VNNI_INT16 KVM_X86_FEATURE(CPUID_7_1_EDX, 10)#define X86_FEATURE_PREFETCHITI KVM_X86_FEATURE(CPUID_7_1_EDX, 14)#define X86_FEATURE_AVX10 KVM_X86_FEATURE(CPUID_7_1_EDX, 19) +#define KVM_X86_FEATURE_APX KVM_X86_FEATURE(CPUID_7_1_EDX, 21)/* Intel-defined sub-features, CPUID level 0x00000007:2 (EDX) */ #define X86_FEATURE_INTEL_PSFD KVM_X86_FEATURE(CPUID_7_2_EDX, 0)
@@ -144,6 +145,7 @@ static __always_inline u32 __feature_translate(int x86_feature)KVM_X86_TRANSLATE_FEATURE (SGX1 );KVM_X86_TRANSLATE_FEATURE (SGX2 );KVM_X86_TRANSLATE_FEATURE (SGX_EDECCSSA ); +KVM_X86_TRANSLATE_FEATURE (APX );KVM_X86_TRANSLATE_FEATURE (CONSTANT_TSC );KVM_X86_TRANSLATE_FEATURE (PERFMON_V2 );KVM_X86_TRANSLATE_FEATURE (RRSBA_CTRL );
arch/x86/kvm/vmx/nested.c +6 -0
@@ -4748,6 +4748,12 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, vmcs12->vm_exit_intr_info = exit_intr_info; vmcs12->vm_exit_instruction_len = exit_insn_len; vmcs12->vmx_instruction_info =vmcs_read32 (VMX_INSTRUCTION_INFO ); +/* +* The APX enumeration guarantees the presence of the extended +* fields. This CPUID bit alone is sufficient to rely on it. +*/ +if (guest_cpu_cap_has (vcpu,X86_FEATURE_APX )) + vmcs12->extended_instruction_info =vmcs_read64 (EXTENDED_INSTRUCTION_INFO );/* * According to spec, there's no need to store the guest's
arch/x86/kvm/vmx/vmcs12.c +1 -0
@@ -53,6 +53,7 @@ static const u16 kvm_supported_vmcs12_field_offsets[] __initconst = {FIELD64 (XSS_EXIT_BITMAP , xss_exit_bitmap),FIELD64 (ENCLS_EXITING_BITMAP , encls_exiting_bitmap),FIELD64 (GUEST_PHYSICAL_ADDRESS , guest_physical_address), +FIELD64 (EXTENDED_INSTRUCTION_INFO , extended_instruction_info),FIELD64 (VMCS_LINK_POINTER , vmcs_link_pointer),FIELD64 (GUEST_IA32_DEBUGCTL , guest_ia32_debugctl), FIELD64(GUEST_IA32_PAT, guest_ia32_pat),
arch/x86/kvm/vmx/vmcs12.h +2 -1
@@ -71,7 +71,7 @@ struct __packed vmcs12 {u64 pml_address;u64 encls_exiting_bitmap;u64 tsc_multiplier; -u64 padding64[1 ];/* room for future expansion */ +u64 extended_instruction_info;/* * To allow migration of L1 (complete with its L2 guests) between * machines of different natural widths (32 or 64 bit), we cannot have
@@ -261,6 +261,7 @@ static inline void vmx_check_vmcs12_offsets(void)CHECK_OFFSET (pml_address,312 );CHECK_OFFSET (encls_exiting_bitmap,320 );CHECK_OFFSET (tsc_multiplier,328 ); +CHECK_OFFSET (extended_instruction_info,336 );CHECK_OFFSET (cr0_guest_host_mask,344 );CHECK_OFFSET (cr4_guest_host_mask,352 );CHECK_OFFSET (cr0_read_shadow,360 );
Signature · 1 line
2.51.0
PATCH v3 12/20 KVM: x86: Support EGPR accessing and tracking for emulator
In reply to Chang S. BaeExtend the emulator context and GPR accessors to handle EGPRs before adding support for REX2-prefixed instructions. Like VCPU cache, the emulator can uniformly cache and track all GPRs.
---
V2 -> V3: Increase GPR number by CONFIG_KVM_APX=y (Sean)
--- arch/x86/kvm/kvm_emulate.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/x86/kvm/kvm_emulate.h +7 -5
@@ -105,13 +105,13 @@ struct x86_instruction_info {struct x86_emulate_ops {void (*vm_bugged)(struct x86_emulate_ctxt *ctxt);/* -* read_gpr: read a general purpose register (rax - r15) +* read_gpr: read a general purpose register (rax - r31) * * @reg: gpr number. */ ulong (*read_gpr)(struct x86_emulate_ctxt *ctxt,unsigned reg);/* -* write_gpr: write a general purpose register (rax - r15) +* write_gpr: write a general purpose register (rax - r31) * * @reg: gpr number. * @val: value to write.
@@ -315,7 +315,9 @@ typedef void (*fastop_t)(struct fastop *);* also uses _eip, RIP cannot be a register operand nor can it be an operand in * a ModRM or SIB byte. */ -#ifdef CONFIG_X86_64 +#if defined(CONFIG_KVM_APX ) +#define NR_EMULATOR_GPRS 32 +#elif defined(CONFIG_X86_64 )#define NR_EMULATOR_GPRS 16#else #define NR_EMULATOR_GPRS 8
@@ -375,9 +377,9 @@ struct x86_emulate_ctxt {u8 lock_prefix;u8 rep_prefix;/* bitmaps of registers in _regs[] that can be read */ -u16 regs_valid; +u32 regs_valid;/* bitmaps of registers in _regs[] that have been written */ -u16 regs_dirty; +u32 regs_dirty;/* modrm */ u8 modrm;u8 modrm_mod;
Signature · 1 line
2.51.0
PATCH v3 13/20 KVM: x86: Handle EGPR index and REX2-incompatible opcodes
In reply to Chang S. BaePrepare the emulator for REX2 handling by introducing the NoRex2 opcode flag and supporting extended register indices. For the latter, factor out common logic for calculating register IDs.
REX2 does not support three-byte opcodes. Instead, the REX2.M bit selects between one- and two-byte opcode tables, which were previously distinguished by the 0x0F escape byte.
Some legacy instructions in those tables never reference extended registers. When prefixed with REX, such instructions are treated as if the prefix were absent. In contrast, a REX2 prefix causes a #UD, which should be handled explicitly.
--- arch/x86/kvm/emulate.c | 80 +++++++++++++++++++++++--------------- arch/x86/kvm/kvm_emulate.h | 1 + 2 files changed, 50 insertions(+), 31 deletions(-)
arch/x86/kvm/emulate.c +49 -31
@@ -175,6 +175,7 @@#define TwoMemOp ((u64)1 << 55)/* Instruction has two memory operand */ #define IsBranch ((u64)1 << 56)/* Instruction is considered a branch. */ #define ShadowStack ((u64)1 << 57)/* Instruction affects Shadow Stacks. */ +#define NoRex2 ((u64)1 << 58)/* Instruction not present in REX2 maps */ #define DstXacc (DstAccLo | SrcAccHi | SrcWrite)
@@ -244,6 +245,7 @@ enum rex_bits {REX_X =2 ,REX_R =4 ,REX_W =8 , + REX_M = 0x80, };static void writeback_registers (struct x86_emulate_ctxt *ctxt)
@@ -1078,6 +1080,15 @@ static int em_fnstsw(struct x86_emulate_ctxt *ctxt)return X86EMUL_CONTINUE ; } +static __always_inline int rex_get_rxb(u8 rex, u8 fld) +{ +BUILD_BUG_ON (!__builtin_constant_p (fld)); +BUILD_BUG_ON (fld !=REX_B && fld !=REX_X && fld !=REX_R ); + + rex >>=ffs (fld) -1 ; +return (rex &1 ?8 :0 ) + (rex &0x10 ?16 :0 ); +} +static void __decode_register_operand (struct x86_emulate_ctxt *ctxt,struct operand *op,int reg) {
@@ -1117,7 +1128,7 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt,if (ctxt->d & ModRM) reg = ctxt->modrm_reg;else - reg = (ctxt->b &7 ) | (ctxt->rex_bits &REX_B ?8 :0 ); + reg = (ctxt->b &7 ) |rex_get_rxb (ctxt->rex_bits,REX_B );__decode_register_operand (ctxt, op, reg); }
@@ -1136,9 +1147,9 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,int rc =X86EMUL_CONTINUE ;ulong modrm_ea =0 ; - ctxt->modrm_reg = (ctxt->rex_bits &REX_R ?8 :0 ); - index_reg = (ctxt->rex_bits &REX_X ?8 :0 ); - base_reg = (ctxt->rex_bits &REX_B ?8 :0 ); + ctxt->modrm_reg =rex_get_rxb (ctxt->rex_bits,REX_R ); + index_reg =rex_get_rxb (ctxt->rex_bits,REX_X ); + base_reg =rex_get_rxb (ctxt->rex_bits,REX_B ); ctxt->modrm_mod = (ctxt->modrm &0xc0 ) >>6 ; ctxt->modrm_reg |= (ctxt->modrm &0x38 ) >>3 ;
@@ -4257,7 +4268,7 @@ static const struct opcode opcode_table[256] = {/* 0x38 - 0x3F */ I6ALU (NoWrite, em_cmp),N ,N ,/* 0x40 - 0x4F */ -X8 (I (DstReg, em_inc)),X8 (I (DstReg, em_dec)), +X8 (I (DstReg | NoRex2, em_inc)),X8 (I (DstReg | NoRex2, em_dec)),/* 0x50 - 0x57 */ X8(I(SrcReg | Stack, em_push)),/* 0x58 - 0x5F */
@@ -4275,7 +4286,7 @@ static const struct opcode opcode_table[256] = {I2bvIP (DstDI | SrcDX | Mov | String | Unaligned, em_in, ins, check_perm_in),/* insb, insw/insd */ I2bvIP (SrcSI | DstDX | String, em_out, outs, check_perm_out),/* outsb, outsw/outsd */ /* 0x70 - 0x7F */ -X16 (D (SrcImmByte | NearBranch | IsBranch)), +X16 (D (SrcImmByte | NearBranch | IsBranch | NoRex2)),/* 0x80 - 0x87 */ G (ByteOp | DstMem | SrcImm, group1), G(DstMem | SrcImm, group1),
@@ -4299,15 +4310,15 @@ static const struct opcode opcode_table[256] = {II (ImplicitOps | Stack, em_popf, popf),I (ImplicitOps, em_sahf),I (ImplicitOps, em_lahf),/* 0xA0 - 0xA7 */ -I2bv (DstAcc | SrcMem | Mov | MemAbs, em_mov), -I2bv (DstMem | SrcAcc | Mov | MemAbs | PageTable, em_mov), -I2bv (SrcSI | DstDI | Mov | String | TwoMemOp, em_mov), -I2bv (SrcSI | DstDI | String | NoWrite | TwoMemOp, em_cmp_r), +I2bv (DstAcc | SrcMem | Mov | MemAbs | NoRex2, em_mov), +I2bv (DstMem | SrcAcc | Mov | MemAbs | PageTable | NoRex2, em_mov), +I2bv (SrcSI | DstDI | Mov | String | TwoMemOp | NoRex2, em_mov), +I2bv (SrcSI | DstDI | String | NoWrite | TwoMemOp | NoRex2, em_cmp_r),/* 0xA8 - 0xAF */ -I2bv (DstAcc | SrcImm | NoWrite, em_test), -I2bv (SrcAcc | DstDI | Mov | String, em_mov), -I2bv (SrcSI | DstAcc | Mov | String, em_mov), -I2bv (SrcAcc | DstDI | String | NoWrite, em_cmp_r), +I2bv (DstAcc | SrcImm | NoWrite | NoRex2, em_test), +I2bv (SrcAcc | DstDI | Mov | String | NoRex2, em_mov), +I2bv (SrcSI | DstAcc | Mov | String | NoRex2, em_mov), +I2bv (SrcAcc | DstDI | String | NoWrite | NoRex2, em_cmp_r),/* 0xB0 - 0xB7 */ X8 (I (ByteOp | DstReg | SrcImm | Mov, em_mov)), /* 0xB8 - 0xBF */
@@ -4337,17 +4348,17 @@ static const struct opcode opcode_table[256] = {/* 0xD8 - 0xDF */ N ,E (0 , &escape_d9),N ,E (0 , &escape_db),N ,E (0 , &escape_dd),N ,N ,/* 0xE0 - 0xE7 */ -X3 (I (SrcImmByte | NearBranch | IsBranch, em_loop)), -I (SrcImmByte | NearBranch | IsBranch, em_jcxz), -I2bvIP (SrcImmUByte | DstAcc, em_in, in, check_perm_in), -I2bvIP (SrcAcc | DstImmUByte, em_out, out, check_perm_out), +X3 (I (SrcImmByte | NearBranch | IsBranch | NoRex2, em_loop)), +I (SrcImmByte | NearBranch | IsBranch | NoRex2, em_jcxz), +I2bvIP (SrcImmUByte | DstAcc | NoRex2, em_in, in, check_perm_in), +I2bvIP (SrcAcc | DstImmUByte | NoRex2, em_out, out, check_perm_out),/* 0xE8 - 0xEF */ -I (SrcImm | NearBranch | IsBranch | ShadowStack, em_call), -D (SrcImm | ImplicitOps | NearBranch | IsBranch), -I (SrcImmFAddr | No64 | IsBranch, em_jmp_far), -D (SrcImmByte | ImplicitOps | NearBranch | IsBranch), -I2bvIP (SrcDX | DstAcc, em_in, in, check_perm_in), -I2bvIP (SrcAcc | DstDX, em_out, out, check_perm_out), +I (SrcImm | NearBranch | IsBranch | ShadowStack | NoRex2, em_call), +D (SrcImm | ImplicitOps | NearBranch | IsBranch | NoRex2), +I (SrcImmFAddr | No64 | IsBranch | NoRex2, em_jmp_far), +D (SrcImmByte | ImplicitOps | NearBranch | IsBranch | NoRex2), +I2bvIP (SrcDX | DstAcc | NoRex2, em_in, in, check_perm_in), +I2bvIP (SrcAcc | DstDX | NoRex2, em_out, out, check_perm_out),/* 0xF0 - 0xF7 */ N ,DI (ImplicitOps, icebp),N ,N , DI(ImplicitOps | Priv, hlt), D(ImplicitOps),
@@ -4388,12 +4399,12 @@ static const struct opcode twobyte_table[256] = {N ,GP (ModRM | DstMem | SrcReg | Mov | Sse | Avx, &pfx_0f_2b),N ,N ,N ,N ,/* 0x30 - 0x3F */ -II (ImplicitOps | Priv, em_wrmsr, wrmsr), -IIP (ImplicitOps, em_rdtsc, rdtsc, check_rdtsc), -II (ImplicitOps | Priv, em_rdmsr, rdmsr), -IIP (ImplicitOps, em_rdpmc, rdpmc, check_rdpmc), -I (ImplicitOps | EmulateOnUD | IsBranch | ShadowStack, em_sysenter), -I (ImplicitOps | Priv | EmulateOnUD | IsBranch | ShadowStack, em_sysexit), +II (ImplicitOps | Priv | NoRex2, em_wrmsr, wrmsr), +IIP (ImplicitOps | NoRex2, em_rdtsc, rdtsc, check_rdtsc), +II (ImplicitOps | Priv | NoRex2, em_rdmsr, rdmsr), +IIP (ImplicitOps | NoRex2, em_rdpmc, rdpmc, check_rdpmc), +I (ImplicitOps | EmulateOnUD | IsBranch | ShadowStack | NoRex2, em_sysenter), +I (ImplicitOps | Priv | EmulateOnUD | IsBranch | ShadowStack | NoRex2, em_sysexit),N ,N ,N ,N ,N ,N ,N ,N ,N ,N , /* 0x40 - 0x4F */
@@ -4411,7 +4422,7 @@ static const struct opcode twobyte_table[256] = {N ,N ,N ,N ,N ,N ,N ,GP (SrcReg | DstMem | ModRM | Mov, &pfx_0f_6f_0f_7f),/* 0x80 - 0x8F */ -X16 (D (SrcImm | NearBranch | IsBranch)), +X16 (D (SrcImm | NearBranch | IsBranch | NoRex2)),/* 0x90 - 0x9F */ X16(D(ByteOp | DstMem | SrcNone | ModRM| Mov)),/* 0xA0 - 0xA7 */
@@ -5004,6 +5015,13 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len, int opcode = opcode_table[ctxt->b]; } +/* +* Instructions marked with NoRex2 ignore a legacy REX prefix, but +* #UD should be raised when prefixed with REX2. +*/ +if (ctxt->d & NoRex2 && ctxt->rex_prefix ==REX2_PREFIX ) + opcode.flags = Undefined; +if (opcode.flags & ModRM) ctxt->modrm =insn_fetch (u8, ctxt);
arch/x86/kvm/kvm_emulate.h +1 -0
@@ -329,6 +329,7 @@ typedef void (*fastop_t)(struct fastop *);enum rex_type {REX_NONE ,REX_PREFIX , +REX2_PREFIX , };struct x86_emulate_ctxt {
Signature · 1 line
2.51.0
PATCH v3 14/20 KVM: x86: Support REX2-prefixed opcode decode
In reply to Chang S. BaeExtend the instruction decoder to recognize and handle the REX2 prefix, including validation of prefix sequences and correct opcode table selection.
REX2 is a terminal prefix: once 0xD5 is encountered, the following byte is the opcode. When REX.M=0, most prefix bytes are invalid after REX2, including REX, VEX, EVEX, and another REX2. Also, REX2-prefixed instructions are only valid in 64-bit mode.
All of the invalid prefix combinations after REX2 coincide with opcodes that are architecturally invalid in 64-bit mode. Thus, marking such opcodes with No64 in opcode_table[] naturally disallows those illegal prefix sequences.
The 0x40–0x4F opcode row was missing the No64 flag. While NoRex2 already invalidates REX2 for these opcodes, adding No64 makes opcode attributes explicit and complete.
---
Note the posted unit-test patch [1] validates the decoding towards emulations
[1] https://lore.kernel.org/[email protected]
--- arch/x86/kvm/emulate.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-)
arch/x86/kvm/emulate.c +34 -4
@@ -4268,7 +4268,7 @@ static const struct opcode opcode_table[256] = {/* 0x38 - 0x3F */ I6ALU (NoWrite, em_cmp),N ,N ,/* 0x40 - 0x4F */ -X8 (I (DstReg | NoRex2, em_inc)),X8 (I (DstReg | NoRex2, em_dec)), +X8 (I (DstReg | NoRex2 | No64, em_inc)),X8 (I (DstReg | NoRex2 | No64, em_dec)),/* 0x50 - 0x57 */ X8(I(SrcReg | Stack, em_push)),/* 0x58 - 0x5F */
@@ -4862,6 +4862,17 @@ static int x86_decode_avx(struct x86_emulate_ctxt *ctxt,return rc; } +static inline bool rex2_invalid (struct x86_emulate_ctxt *ctxt) +{ +const struct x86_emulate_ops *ops = ctxt->ops; +u64 xcr =0 ; + +return ctxt->rex_prefix ==REX_PREFIX || + !(ops->get_cr (ctxt,4 ) &X86_CR4_OSXSAVE ) || + ops->get_xcr (ctxt,0 , &xcr) || + !(xcr &XFEATURE_MASK_APX ); +} +int x86_decode_insn (struct x86_emulate_ctxt *ctxt,void *insn,int insn_len,int emulation_type) {int rc =X86EMUL_CONTINUE ;
@@ -4915,7 +4926,7 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len, int ctxt->op_bytes = def_op_bytes; ctxt->ad_bytes = def_ad_bytes; -/* Legacy prefixes. */ +/* Legacy and REX/REX2 prefixes. */ for (;;) {switch (ctxt->b =insn_fetch (u8, ctxt)) {case 0x66 :/* operand-size override */
@@ -4961,6 +4972,17 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len, int ctxt->rex_prefix =REX_PREFIX ; ctxt->rex_bits = ctxt->b &0xf ;continue ; +case 0xd5 :/* REX2 */ +if (mode !=X86EMUL_MODE_PROT64 ) + goto done_prefixes; +if (rex2_invalid (ctxt)) { + opcode = ud; + goto done_modrm; + } + ctxt->rex_prefix =REX2_PREFIX ; + ctxt->rex_bits =insn_fetch (u8, ctxt); + ctxt->b =insn_fetch (u8, ctxt); + goto done_prefixes;case 0xf0 :/* LOCK */ ctxt->lock_prefix =1 ;break ;
@@ -4983,6 +5005,12 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len, intif (ctxt->rex_bits &REX_W ) ctxt->op_bytes =8 ; +/* REX2 opcode is one byte unless M-bit selects the two-byte map */ +if (ctxt->rex_bits &REX_M ) + goto decode_twobytes; +else if (ctxt->rex_prefix ==REX2_PREFIX ) + goto decode_onebyte; +/* Opcode byte(s). */ if (ctxt->b ==0xc4 || ctxt->b ==0xc5 ) {/* VEX or LDS/LES */
@@ -5000,17 +5028,19 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len, int goto done; }else if (ctxt->b ==0x0f ) {/* Two- or three-byte opcode */ - ctxt->opcode_len =2 ; ctxt->b =insn_fetch (u8, ctxt); +decode_twobytes: + ctxt->opcode_len =2 ; opcode = twobyte_table[ctxt->b];/* 0F_38 opcode map */ -if (ctxt->b ==0x38 ) { +if (ctxt->b ==0x38 && ctxt->rex_prefix !=REX2_PREFIX ) { ctxt->opcode_len =3 ; ctxt->b =insn_fetch (u8, ctxt); opcode = opcode_map_0f_38[ctxt->b]; } }else { +decode_onebyte:/* Opcode byte(s). */ opcode = opcode_table[ctxt->b]; }
Signature · 1 line
2.51.0
PATCH v3 15/20 KVM: x86: Reject EVEX-prefixed instructions
In reply to Chang S. BaeExplicitly mark EVEX-prefixed opcodes (0x62) as unsupported.
--- arch/x86/kvm/emulate.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kvm/emulate.c +5 -0
@@ -5052,6 +5052,11 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len, intif (ctxt->d & NoRex2 && ctxt->rex_prefix ==REX2_PREFIX ) opcode.flags = Undefined; +/* EVEX-prefixed instructions are not implemented */ +if (ctxt->opcode_len ==1 && ctxt->b ==0x62 && + (mode ==X86EMUL_MODE_PROT64 || (ctxt->modrm &0xc0 ) ==0xc0 )) + opcode.flags = NotImpl; +if (opcode.flags & ModRM) ctxt->modrm =insn_fetch (u8, ctxt);
Signature · 1 line
2.51.0
PATCH v3 16/20 KVM: x86: Guard valid XCR0.APX settings
In reply to Chang S. BaePrevent invalid XCR0.APX configurations in two cases: conflict with MPX and lack of SVM support.
In the non-compacted XSAVE format, APX and MPX conflict on the same offset. Although MPX is being deprecated in practice, KVM should explicitly reject such configurations that set both bits.
At this point, only VMX supports EGPRs. SVM will require corresponding extensions to handle EGPR indices.
Updating the supported XCR0 mask will be done separately with CPUID exposure.
--- arch/x86/kvm/svm/svm.c | 7 ++++++- arch/x86/kvm/x86.c | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/svm.c +6 -1
@@ -5546,8 +5546,13 @@ static __init int svm_hardware_setup(void)return -EOPNOTSUPP ; } +/* +* APX introduces EGPRs, which require additional VMCB support. +* Disable APX until the necessary extensions are handled. +*/ kvm_caps.supported_xcr0 &= ~(XFEATURE_MASK_BNDREGS | -XFEATURE_MASK_BNDCSR ); +XFEATURE_MASK_BNDCSR | +XFEATURE_MASK_APX );if (tsc_scaling) {if (!boot_cpu_has (X86_FEATURE_TSCRATEMSR )) {
arch/x86/kvm/x86.c +4 -0
@@ -1290,6 +1290,10 @@ int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr) (!(xcr0 & XFEATURE_MASK_BNDCSR)))return 1 ; +/* MPX and APX conflict in the non-compacted XSAVE format */ +if (xcr0 &XFEATURE_MASK_BNDREGS && xcr0 &XFEATURE_MASK_APX ) +return 1 ; +if (xcr0 &XFEATURE_MASK_AVX512 ) {if (!(xcr0 &XFEATURE_MASK_YMM ))return 1 ;
Signature · 1 line
2.51.0
PATCH v3 17/20 KVM: x86: Expose APX foundation feature to guests
In reply to Chang S. BaeAdd the APX xfeature bit to the list of supported XCR0 components and expose the APX feature to guests. Update the maximum supported CPUID leaf to 0x29 to include the APX leaf.
On SVM, do not advertise APX, as EGPR support is not yet implemented.
No APX sub-features are enumerated yet. Those will be exposed in a separate patch.
---
V2 -> V3: Make both APX XCR0 and CPUID consistent with CONFIG_KVM_APX
Note: with recent changes, the patch now is pretty much in a different shape from the original.
--- arch/x86/kvm/cpuid.c | 11 ++++++++++- arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/x86.c | 8 +++++++- 3 files changed, 18 insertions(+), 2 deletions(-)
arch/x86/kvm/cpuid.c +10 -1
@@ -1061,8 +1061,12 @@ void kvm_initialize_cpu_caps(void)F (AVX_VNNI_INT16 ),F (PREFETCHITI ),F (AVX10 ), + SCATTERED_F(APX), ); +if (!IS_ENABLED (CONFIG_KVM_APX )) +kvm_cpu_cap_clear (X86_FEATURE_APX ); + kvm_cpu_cap_init(CPUID_7_2_EDX, F(INTEL_PSFD), F(IPRED_CTRL),
@@ -1441,7 +1445,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)switch (function) {case 0 :/* Limited to the highest leaf implemented in KVM. */ - entry->eax =min (entry->eax,0x24U ); + entry->eax =min (entry->eax,0x29U );break ;case 1 :cpuid_entry_override (entry,CPUID_1_EDX );
@@ -1712,6 +1716,11 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) }break ; } +/* APX sub-features */ +case 0x29 : { + entry->eax = entry->ebx = entry->ecx = entry->edx =0 ; +break ; + }case KVM_CPUID_SIGNATURE : {const u32 *sigptr = (const u32 *)KVM_SIGNATURE ; entry->eax =KVM_CPUID_FEATURES ;
arch/x86/kvm/svm/svm.c +1 -0
@@ -5527,6 +5527,7 @@ static __init void svm_set_cpu_caps(void)*/ kvm_cpu_cap_clear (X86_FEATURE_BUS_LOCK_DETECT );kvm_cpu_cap_clear (X86_FEATURE_MSR_IMM ); +kvm_cpu_cap_clear (X86_FEATURE_APX );kvm_setup_xss_caps ();kvm_finalize_cpu_caps ();
arch/x86/kvm/x86.c +7 -1
@@ -219,10 +219,16 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_nr_uret_msrs);static u32 __read_mostly kvm_uret_msrs_list[KVM_MAX_NR_USER_RETURN_MSRS ]; static DEFINE_PER_CPU(struct kvm_user_return_msrs, user_return_msrs); +#ifndef CONFIG_KVM_APX +#undef XFEATURE_MASK_APX +#define XFEATURE_MASK_APX 0 +#endif +#define KVM_SUPPORTED_XCR0 (XFEATURE_MASK_FP | XFEATURE_MASK_SSE \ | XFEATURE_MASK_YMM | XFEATURE_MASK_BNDREGS \ | XFEATURE_MASK_BNDCSR | XFEATURE_MASK_AVX512 \ - | XFEATURE_MASK_PKRU | XFEATURE_MASK_XTILE) + | XFEATURE_MASK_PKRU | XFEATURE_MASK_XTILE \ + | XFEATURE_MASK_APX)#define XFEATURE_MASK_CET_ALL (XFEATURE_MASK_CET_USER | XFEATURE_MASK_CET_KERNEL)/*
Signature · 1 line
2.51.0
PATCH v3 18/20 KVM: x86: Expose APX sub-features to guests
In reply to Chang S. BaeAdd CPUID leaf 0x29 sub-leaf 0 to expose these APX sub-features, if the APX foundation is available:
* New Conditional Instructions (NCI)
* New Data Destination (NDD)
* Flags Suppression (NF)
---
V2 -> V3: Gate by APX foundation instead of XCR0
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/cpuid.c | 9 ++++++++- arch/x86/kvm/reverse_cpuid.h | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -810,6 +810,7 @@ enum kvm_only_cpuid_leafs {CPUID_7_1_ECX ,CPUID_1E_1_EAX ,CPUID_24_1_ECX , +CPUID_29_0_EBX ,NR_KVM_CPU_CAPS , NKVMCAPINTS = NR_KVM_CPU_CAPS - NCAPINTS,
arch/x86/kvm/cpuid.c +8 -1
@@ -1111,6 +1111,10 @@ void kvm_initialize_cpu_caps(void)F (AVX10_VNNI_INT ), ); +kvm_cpu_cap_init (CPUID_29_0_EBX , + F(APX_NCI_NDD_NF), + ); + kvm_cpu_cap_init(CPUID_8000_0001_ECX, F(LAHF_LM), F(CMP_LEGACY),
@@ -1718,7 +1722,10 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) }/* APX sub-features */ case 0x29 : { - entry->eax = entry->ebx = entry->ecx = entry->edx =0 ; +if (!kvm_cpu_cap_has (X86_FEATURE_APX )) { + entry->eax = entry->ebx = entry->ecx = entry->edx =0 ; +break ; + }break ; }case KVM_CPUID_SIGNATURE : {
arch/x86/kvm/reverse_cpuid.h +4 -0
@@ -67,6 +67,9 @@/* Intel-defined sub-features, CPUID level 0x00000024:1 (ECX) */ #define X86_FEATURE_AVX10_VNNI_INT KVM_X86_FEATURE(CPUID_24_1_ECX, 2) +/* Intel-defined sub-features, CPUID level 0x00000029:0 (EBX) */ +#define X86_FEATURE_APX_NCI_NDD_NF KVM_X86_FEATURE(CPUID_29_0_EBX, 0) +/* CPUID level 0x80000007 (EDX). */ #define KVM_X86_FEATURE_CONSTANT_TSC KVM_X86_FEATURE(CPUID_8000_0007_EDX, 8)
@@ -110,6 +113,7 @@ static const struct cpuid_reg reverse_cpuid[] = { [CPUID_7_1_ECX] = { 7, 1, CPUID_ECX}, [CPUID_1E_1_EAX] = { 0x1e, 1, CPUID_EAX}, [CPUID_24_1_ECX] = { 0x24, 1, CPUID_ECX}, + [CPUID_29_0_EBX] = { 0x29, 0, CPUID_EBX}, };/*
Signature · 1 line
2.51.0
PATCH v3 19/20 KVM: x86: selftests: Add APX state and ABI test
In reply to Chang S. BaeTest APX-specific behavior and ABI interactions as these are unique comparing to other state components:
* EGPR state is saved on VM entry assembly (unlike other components).
* The saved state is retained even if the guest disables APX.
* EGPR state is exposed via the XSAVE ABI while not stored in the kernel XSAVE buffer.
---
V2 -> V3: New patch
--- tools/testing/selftests/kvm/Makefile.kvm | 1 + .../selftests/kvm/include/x86/processor.h | 120 +++++++++++ tools/testing/selftests/kvm/x86/apx_test.c | 192 ++++++++++++++++++ 3 files changed, 313 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86/apx_test.c
tools/testing/selftests/kvm/Makefile.kvm +1 -0
@@ -158,6 +158,7 @@ TEST_GEN_PROGS_x86 += rseq_test TEST_GEN_PROGS_x86 += steal_time TEST_GEN_PROGS_x86 += system_counter_offset_test TEST_GEN_PROGS_x86 += pre_fault_memory_test +TEST_GEN_PROGS_x86 += x86/apx_test # Compiled outputs used by test targets TEST_GEN_PROGS_EXTENDED_x86 += x86/nx_huge_pages_test
tools/testing/selftests/kvm/include/x86/processor.h +120 -0
138 lines not on this page · raw message
tools/testing/selftests/kvm/x86/apx_test.c new file +192 -0
192 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v3 20/20 KVM: x86: selftests: Add APX state handling and XCR0 sanity checks
In reply to Chang S. BaeNow that KVM exposes the APX feature to guests, extend some existing selftests to validate XCR0 configuration and state management.
Since APX repurposes the XSAVE area previously used by MPX in the non-compacted format, add a check to ensure that MPX states are not set when APX is enabled.
Also, load non-init APX state data in the guest so that XSTATE_BV[APX] is set, allowing validation of APX state testing.
---
V2 -> V3: Use EGPR helper
--- tools/testing/selftests/kvm/x86/state_test.c | 3 +++ .../selftests/kvm/x86/xcr0_cpuid_test.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+)
tools/testing/selftests/kvm/x86/state_test.c +3 -0
@@ -171,6 +171,9 @@ static void __attribute__((__flatten__)) guest_code(void *arg) asmvolatile ("vmovupd %0, %%zmm16" ::"m" (buffer)); } +if (supported_xcr0 &XFEATURE_MASK_APX ) +write_egpr (16 ,0xcccccccc ); +if (this_cpu_has (X86_FEATURE_MPX )) {uint64_t bounds[2 ] = {10 ,0xffffffffull };uint64_t output[2 ] = { };
tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c +19 -0
@@ -46,6 +46,20 @@ do { \ __supported, (xfeatures)); \ }while (0 ) +/* +* Verify that mutually exclusive architectural features do not overlap. +* For example, APX and MPX must never be reported as supported together. + */ +#define ASSERT_XFEATURE_CONFLICT (supported_xcr0, xfeatures, conflicts) \ +do { \ + uint64_t __supported = (supported_xcr0) & ((xfeatures) | (conflicts)); \ + \ + __GUEST_ASSERT((__supported & (xfeatures)) != (xfeatures) || \ + !(__supported & (conflicts)), \ + "supported = 0x%lx, xfeatures = 0x%llx, conflicts = 0x%llx", \ + __supported, (xfeatures), (conflicts)); \ +} while (0) +static void guest_code (void ) {uint64_t initial_xcr0;
@@ -79,6 +93,11 @@ static void guest_code(void)ASSERT_ALL_OR_NONE_XFEATURE (supported_xcr0,XFEATURE_MASK_XTILE ); +/* Check APX by ensuring MPX is not exposed concurrently */ +ASSERT_XFEATURE_CONFLICT (supported_xcr0, +XFEATURE_MASK_APX , +XFEATURE_MASK_BNDREGS |XFEATURE_MASK_BNDCSR ); + vector =xsetbv_safe (0 ,XFEATURE_MASK_FP ); __GUEST_ASSERT(!vector, "Expected success on XSETBV(FP), got %s",
Signature · 1 line
2.51.0