On Thu, Oct 03, 2019 at 02:23:48PM -0700, Rick Edgecombe wrote: > Mask gfn by maxphyaddr in kvm_mtrr_get_guest_memory_type so that the > guests view of gfn is used when high bits of the physical memory are > used as extra permissions bits. This supports the KVM XO feature. > > TODO: Since MTRR is emulated using EPT permissions, the XO version of > the gpa range will not inherrit the MTRR type with this implementation. > There shouldn't be any legacy use of KVM XO, but hypothetically it could > interfere with the uncacheable MTRR type. > > Signed-off-by: Rick Edgecombe <rick.p.edgecombe@xxxxxxxxx> > --- > arch/x86/kvm/mtrr.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c > index 25ce3edd1872..da38f3b83e51 100644 > --- a/arch/x86/kvm/mtrr.c > +++ b/arch/x86/kvm/mtrr.c > @@ -621,6 +621,14 @@ u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn) > const int wt_wb_mask = (1 << MTRR_TYPE_WRBACK) > | (1 << MTRR_TYPE_WRTHROUGH); > > + /* > + * Handle situations where gfn bits are used as permissions bits by > + * masking KVMs view of the gfn with the guests physical address bits > + * in order to match the guests view of physical address. For normal > + * situations this will have no effect. > + */ > + gfn &= (1ULL << (cpuid_maxphyaddr(vcpu) - PAGE_SHIFT)); > + Won't this break the MTRR calculation for normal gfns? Are you suggesting use the same MTRR value for the XO range as the normal one's? If so, may be we should use: if (guest_cpuid_has(vcpu, X86_FEATURE_KVM_XO)) gfn &= ~(1ULL << (cpuid_maxphyaddr(vcpu) - PAGE_SHIFT)); > start = gfn_to_gpa(gfn); > end = start + PAGE_SIZE; > > -- > 2.17.1 > B.R. Yu
