| Message ID | 20230319084927.29607-6-binbin.wu@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Linear Address Masking (LAM) KVM Enabling | expand |
On Sun, Mar 19, 2023 at 04:49:25PM +0800, Binbin Wu wrote: >Introduce a new interface untag_addr() to kvm_x86_ops to untag the metadata >from linear address. Implement LAM version in VMX and dummy version in SVM. > >When enabled feature like Intel Linear Address Masking or AMD Upper >Address Ignore, linear address may be tagged with metadata. Linear >address should be checked for modified canonicality and untagged in >instrution emulations or vmexit handlings if LAM or UAI is applicable. > >Introduce untag_addr() to kvm_x86_ops to hide the code related to vendor >specific details. >- For VMX, LAM version is implemented. > LAM has a modified canonical check when applicable: > * LAM_S48 : [ 1 ][ metadata ][ 1 ] > 63 47 > * LAM_U48 : [ 0 ][ metadata ][ 0 ] > 63 47 > * LAM_S57 : [ 1 ][ metadata ][ 1 ] > 63 56 > * LAM_U57 + 5-lvl paging : [ 0 ][ metadata ][ 0 ] > 63 56 > * LAM_U57 + 4-lvl paging : [ 0 ][ metadata ][ 0...0 ] > 63 56..47 > If LAM is applicable to certain address, untag the metadata bits and > replace them with the value of bit 47 (LAM48) or bit 56 (LAM57). Later > the untagged address will do legacy canonical check. So that LAM canonical > check and mask can be covered by "untag + legacy canonical check". > > For cases LAM is not applicable, 'flags' is passed to the interface > to skip untag. > >- For SVM, add a dummy version to do nothing, but return the original > address. > >Signed-off-by: Binbin Wu <binbin.wu@linux.intel.com> >--- > arch/x86/include/asm/kvm-x86-ops.h | 1 + > arch/x86/include/asm/kvm_host.h | 5 +++ > arch/x86/kvm/svm/svm.c | 7 ++++ > arch/x86/kvm/vmx/vmx.c | 60 ++++++++++++++++++++++++++++++ > arch/x86/kvm/vmx/vmx.h | 2 + > 5 files changed, 75 insertions(+) > >diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h >index 8dc345cc6318..7d63d1b942ac 100644 >--- a/arch/x86/include/asm/kvm-x86-ops.h >+++ b/arch/x86/include/asm/kvm-x86-ops.h >@@ -52,6 +52,7 @@ KVM_X86_OP(cache_reg) > KVM_X86_OP(get_rflags) > KVM_X86_OP(set_rflags) > KVM_X86_OP(get_if_flag) >+KVM_X86_OP(untag_addr) Suppose AMD doesn't/won't use CR4.LAM_SUP and CR3.LAM_U48/U57 for other purposes, it is fine to use a common x86 function to perform LAM masking for pointers. It won't do anything harmful on AMD parts because those enabling bits shouldn't be set and then no bits will be masked out by the common x86 function. Probably we can defer the introduction of the hook to when the assumption becomes wrong.
On 3/20/2023 8:07 PM, Chao Gao wrote: > On Sun, Mar 19, 2023 at 04:49:25PM +0800, Binbin Wu wrote: >> Introduce a new interface untag_addr() to kvm_x86_ops to untag the metadata > >from linear address. Implement LAM version in VMX and dummy version in SVM. >> When enabled feature like Intel Linear Address Masking or AMD Upper >> Address Ignore, linear address may be tagged with metadata. Linear >> address should be checked for modified canonicality and untagged in >> instrution emulations or vmexit handlings if LAM or UAI is applicable. >> >> Introduce untag_addr() to kvm_x86_ops to hide the code related to vendor >> specific details. >> - For VMX, LAM version is implemented. >> LAM has a modified canonical check when applicable: >> * LAM_S48 : [ 1 ][ metadata ][ 1 ] >> 63 47 >> * LAM_U48 : [ 0 ][ metadata ][ 0 ] >> 63 47 >> * LAM_S57 : [ 1 ][ metadata ][ 1 ] >> 63 56 >> * LAM_U57 + 5-lvl paging : [ 0 ][ metadata ][ 0 ] >> 63 56 >> * LAM_U57 + 4-lvl paging : [ 0 ][ metadata ][ 0...0 ] >> 63 56..47 >> If LAM is applicable to certain address, untag the metadata bits and >> replace them with the value of bit 47 (LAM48) or bit 56 (LAM57). Later >> the untagged address will do legacy canonical check. So that LAM canonical >> check and mask can be covered by "untag + legacy canonical check". >> >> For cases LAM is not applicable, 'flags' is passed to the interface >> to skip untag. >> >> - For SVM, add a dummy version to do nothing, but return the original >> address. >> >> Signed-off-by: Binbin Wu <binbin.wu@linux.intel.com> >> --- >> arch/x86/include/asm/kvm-x86-ops.h | 1 + >> arch/x86/include/asm/kvm_host.h | 5 +++ >> arch/x86/kvm/svm/svm.c | 7 ++++ >> arch/x86/kvm/vmx/vmx.c | 60 ++++++++++++++++++++++++++++++ >> arch/x86/kvm/vmx/vmx.h | 2 + >> 5 files changed, 75 insertions(+) >> >> diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h >> index 8dc345cc6318..7d63d1b942ac 100644 >> --- a/arch/x86/include/asm/kvm-x86-ops.h >> +++ b/arch/x86/include/asm/kvm-x86-ops.h >> @@ -52,6 +52,7 @@ KVM_X86_OP(cache_reg) >> KVM_X86_OP(get_rflags) >> KVM_X86_OP(set_rflags) >> KVM_X86_OP(get_if_flag) >> +KVM_X86_OP(untag_addr) > Suppose AMD doesn't/won't use CR4.LAM_SUP and CR3.LAM_U48/U57 for other > purposes, it is fine to use a common x86 function to perform LAM masking > for pointers. It won't do anything harmful on AMD parts because those > enabling bits shouldn't be set and then no bits will be masked out by > the common x86 function. > > Probably we can defer the introduction of the hook to when the > assumption becomes wrong. Another reason I introduced the hook is I noticed the AMD Upper Address Ignore using [63:57] as metadata. So the untag implementaion will be differnet. But indeed, it also will be a future issue. Let's hear more opinions from others, if more guys think the hook is unnecessary for now, I can switch back to a common x86 function.
On 3/20/2023 8:23 PM, Binbin Wu wrote: > > On 3/20/2023 8:07 PM, Chao Gao wrote: >> On Sun, Mar 19, 2023 at 04:49:25PM +0800, Binbin Wu wrote: >>> Introduce a new interface untag_addr() to kvm_x86_ops to untag the >>> metadata >> >from linear address. Implement LAM version in VMX and dummy version >> in SVM. >>> When enabled feature like Intel Linear Address Masking or AMD Upper >>> Address Ignore, linear address may be tagged with metadata. Linear >>> address should be checked for modified canonicality and untagged in >>> instrution emulations or vmexit handlings if LAM or UAI is applicable. >>> >>> Introduce untag_addr() to kvm_x86_ops to hide the code related to >>> vendor >>> specific details. >>> - For VMX, LAM version is implemented. >>> LAM has a modified canonical check when applicable: >>> * LAM_S48 : [ 1 ][ metadata ][ 1 ] >>> 63 47 >>> * LAM_U48 : [ 0 ][ metadata ][ 0 ] >>> 63 47 >>> * LAM_S57 : [ 1 ][ metadata ][ 1 ] >>> 63 56 >>> * LAM_U57 + 5-lvl paging : [ 0 ][ metadata ][ 0 ] >>> 63 56 >>> * LAM_U57 + 4-lvl paging : [ 0 ][ metadata ][ 0...0 ] >>> 63 56..47 >>> If LAM is applicable to certain address, untag the metadata bits and >>> replace them with the value of bit 47 (LAM48) or bit 56 (LAM57). >>> Later >>> the untagged address will do legacy canonical check. So that LAM >>> canonical >>> check and mask can be covered by "untag + legacy canonical check". >>> >>> For cases LAM is not applicable, 'flags' is passed to the interface >>> to skip untag. >>> >>> - For SVM, add a dummy version to do nothing, but return the original >>> address. >>> >>> Signed-off-by: Binbin Wu <binbin.wu@linux.intel.com> >>> --- >>> arch/x86/include/asm/kvm-x86-ops.h | 1 + >>> arch/x86/include/asm/kvm_host.h | 5 +++ >>> arch/x86/kvm/svm/svm.c | 7 ++++ >>> arch/x86/kvm/vmx/vmx.c | 60 ++++++++++++++++++++++++++++++ >>> arch/x86/kvm/vmx/vmx.h | 2 + >>> 5 files changed, 75 insertions(+) >>> >>> diff --git a/arch/x86/include/asm/kvm-x86-ops.h >>> b/arch/x86/include/asm/kvm-x86-ops.h >>> index 8dc345cc6318..7d63d1b942ac 100644 >>> --- a/arch/x86/include/asm/kvm-x86-ops.h >>> +++ b/arch/x86/include/asm/kvm-x86-ops.h >>> @@ -52,6 +52,7 @@ KVM_X86_OP(cache_reg) >>> KVM_X86_OP(get_rflags) >>> KVM_X86_OP(set_rflags) >>> KVM_X86_OP(get_if_flag) >>> +KVM_X86_OP(untag_addr) >> Suppose AMD doesn't/won't use CR4.LAM_SUP and CR3.LAM_U48/U57 for other >> purposes, it is fine to use a common x86 function to perform LAM masking >> for pointers. It won't do anything harmful on AMD parts because those >> enabling bits shouldn't be set and then no bits will be masked out by >> the common x86 function. >> >> Probably we can defer the introduction of the hook to when the >> assumption becomes wrong. > > Another reason I introduced the hook is I noticed the AMD Upper > Address Ignore using [63:57] as metadata. > So the untag implementaion will be differnet. But indeed, it also will > be a future issue. > > Let's hear more opinions from others, if more guys think the hook is > unnecessary for now, I can switch back to > a common x86 function. Hi Sean, What's your opinion? Do you think it is too early to introduce the hook? > >
diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h index 8dc345cc6318..7d63d1b942ac 100644 --- a/arch/x86/include/asm/kvm-x86-ops.h +++ b/arch/x86/include/asm/kvm-x86-ops.h @@ -52,6 +52,7 @@ KVM_X86_OP(cache_reg) KVM_X86_OP(get_rflags) KVM_X86_OP(set_rflags) KVM_X86_OP(get_if_flag) +KVM_X86_OP(untag_addr) KVM_X86_OP(flush_tlb_all) KVM_X86_OP(flush_tlb_current) KVM_X86_OP_OPTIONAL(tlb_remote_flush) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 2174ad27013b..dd34041e3a4a 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -69,6 +69,9 @@ #define KVM_X86_NOTIFY_VMEXIT_VALID_BITS (KVM_X86_NOTIFY_VMEXIT_ENABLED | \ KVM_X86_NOTIFY_VMEXIT_USER) +/* flags for kvm_x86_ops::untag_addr() */ +#define KVM_X86_UNTAG_ADDR_SKIP_LAM _BITULL(0) + /* x86-specific vcpu->requests bit members */ #define KVM_REQ_MIGRATE_TIMER KVM_ARCH_REQ(0) #define KVM_REQ_REPORT_TPR_ACCESS KVM_ARCH_REQ(1) @@ -1597,6 +1600,8 @@ struct kvm_x86_ops { void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags); bool (*get_if_flag)(struct kvm_vcpu *vcpu); + u64 (*untag_addr)(struct kvm_vcpu *vcpu, u64 la, u64 flags); + void (*flush_tlb_all)(struct kvm_vcpu *vcpu); void (*flush_tlb_current)(struct kvm_vcpu *vcpu); int (*tlb_remote_flush)(struct kvm *kvm); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index d13cf53e7390..48ce80235728 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4696,6 +4696,11 @@ static int svm_vm_init(struct kvm *kvm) return 0; } +static u64 svm_untag_addr(struct kvm_vcpu *vcpu, u64 addr, u64 flags) +{ + return addr; +} + static struct kvm_x86_ops svm_x86_ops __initdata = { .name = KBUILD_MODNAME, @@ -4745,6 +4750,8 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .set_rflags = svm_set_rflags, .get_if_flag = svm_get_if_flag, + .untag_addr = svm_untag_addr, + .flush_tlb_all = svm_flush_tlb_current, .flush_tlb_current = svm_flush_tlb_current, .flush_tlb_gva = svm_flush_tlb_gva, diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 9638a3000256..736544f20709 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -8124,6 +8124,64 @@ static void vmx_vm_destroy(struct kvm *kvm) free_pages((unsigned long)kvm_vmx->pid_table, vmx_get_pid_table_order(kvm)); } + +#define LAM_S57_EN_MASK (X86_CR4_LAM_SUP | X86_CR4_LA57) + +static int lam_sign_extend_bit(bool user, struct kvm_vcpu *vcpu) +{ + u64 cr3, cr4; + + if (user) { + cr3 = kvm_read_cr3(vcpu); + if (cr3 & X86_CR3_LAM_U57) + return 56; + if (cr3 & X86_CR3_LAM_U48) + return 47; + } else { + cr4 = kvm_read_cr4_bits(vcpu, LAM_S57_EN_MASK); + if (cr4 == LAM_S57_EN_MASK) + return 56; + if (cr4 & X86_CR4_LAM_SUP) + return 47; + } + return -1; +} + +/* + * Only called in 64-bit mode. + * + * Mask metadata in pointers by sign-extending the value of bit 47 (LAM48) or + * 56 (LAM57). Metadata are bits [62:48] in LAM48 and are [62:57] in LAM57. + * The resulting address after untagging isn't guaranteed to be canonical. + * Callers should perform the original canonical check and raise #GP/#SS if the + * address is non-canonical. + */ +u64 vmx_untag_addr(struct kvm_vcpu *vcpu, u64 addr, u64 flags) +{ + int sign_ext_bit; + + /* + * Instead of calling relatively expensive guest_cpuid_has(), just check + * LAM_U48 in cr3_ctrl_bits. If not set, vCPU doesn't supports LAM. + */ + if (!(vcpu->arch.cr3_ctrl_bits & X86_CR3_LAM_U48) || + (flags & KVM_X86_UNTAG_ADDR_SKIP_LAM)) + return addr; + + if(!is_64_bit_mode(vcpu)){ + WARN_ONCE(1, "Only be called in 64-bit mode"); + return addr; + } + + sign_ext_bit = lam_sign_extend_bit(!(addr >> 63), vcpu); + + if (sign_ext_bit < 0) + return addr; + + return (sign_extend64(addr, sign_ext_bit) & ~BIT_ULL(63)) | + (addr & BIT_ULL(63)); +} + static struct kvm_x86_ops vmx_x86_ops __initdata = { .name = KBUILD_MODNAME, @@ -8172,6 +8230,8 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { .set_rflags = vmx_set_rflags, .get_if_flag = vmx_get_if_flag, + .untag_addr = vmx_untag_addr, + .flush_tlb_all = vmx_flush_tlb_all, .flush_tlb_current = vmx_flush_tlb_current, .flush_tlb_gva = vmx_flush_tlb_gva, diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h index a3da84f4ea45..023d9b359ded 100644 --- a/arch/x86/kvm/vmx/vmx.h +++ b/arch/x86/kvm/vmx/vmx.h @@ -433,6 +433,8 @@ void vmx_enable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type); u64 vmx_get_l2_tsc_offset(struct kvm_vcpu *vcpu); u64 vmx_get_l2_tsc_multiplier(struct kvm_vcpu *vcpu); +u64 vmx_untag_addr(struct kvm_vcpu *vcpu, u64 addr, u64 flags); + static inline void vmx_set_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type, bool value) {
Introduce a new interface untag_addr() to kvm_x86_ops to untag the metadata from linear address. Implement LAM version in VMX and dummy version in SVM. When enabled feature like Intel Linear Address Masking or AMD Upper Address Ignore, linear address may be tagged with metadata. Linear address should be checked for modified canonicality and untagged in instrution emulations or vmexit handlings if LAM or UAI is applicable. Introduce untag_addr() to kvm_x86_ops to hide the code related to vendor specific details. - For VMX, LAM version is implemented. LAM has a modified canonical check when applicable: * LAM_S48 : [ 1 ][ metadata ][ 1 ] 63 47 * LAM_U48 : [ 0 ][ metadata ][ 0 ] 63 47 * LAM_S57 : [ 1 ][ metadata ][ 1 ] 63 56 * LAM_U57 + 5-lvl paging : [ 0 ][ metadata ][ 0 ] 63 56 * LAM_U57 + 4-lvl paging : [ 0 ][ metadata ][ 0...0 ] 63 56..47 If LAM is applicable to certain address, untag the metadata bits and replace them with the value of bit 47 (LAM48) or bit 56 (LAM57). Later the untagged address will do legacy canonical check. So that LAM canonical check and mask can be covered by "untag + legacy canonical check". For cases LAM is not applicable, 'flags' is passed to the interface to skip untag. - For SVM, add a dummy version to do nothing, but return the original address. Signed-off-by: Binbin Wu <binbin.wu@linux.intel.com> --- arch/x86/include/asm/kvm-x86-ops.h | 1 + arch/x86/include/asm/kvm_host.h | 5 +++ arch/x86/kvm/svm/svm.c | 7 ++++ arch/x86/kvm/vmx/vmx.c | 60 ++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/vmx.h | 2 + 5 files changed, 75 insertions(+)