All of lore.kernel.org
 help / color / mirror / Atom feed
From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
To: pbonzini@redhat.com
Cc: gleb@kernel.org, mtosatti@redhat.com, kvm@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Xiao Guangrong <guangrong.xiao@linux.intel.com>
Subject: [PATCH v3 09/10] KVM: MMU: fix MTRR update
Date: Wed, 13 May 2015 14:42:27 +0800	[thread overview]
Message-ID: <1431499348-25188-10-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1431499348-25188-1-git-send-email-guangrong.xiao@linux.intel.com>

Currently, whenever guest MTRR registers are changed
kvm_mmu_reset_context is called to switch to the new root shadow page
table, however, it's useless since:
1) the cache type is not cached into shadow page's attribute so that
   the original root shadow page will be reused

2) the cache type is set on the last spte, that means we should sync
   the last sptes when MTRR is changed

This patch fixs this issue by drop all the spte in the gfn range which
is being updated by MTRR

Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
 arch/x86/kvm/x86.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index cde5d61..bbe184f 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1852,6 +1852,63 @@ bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 }
 EXPORT_SYMBOL_GPL(kvm_mtrr_valid);
 
+static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr)
+{
+	struct mtrr_state_type *mtrr_state = &vcpu->arch.mtrr_state;
+	unsigned char mtrr_enabled = mtrr_state->enabled;
+	gfn_t start, end, mask;
+	int index;
+	bool is_fixed = true;
+
+	if (msr == MSR_IA32_CR_PAT || !tdp_enabled ||
+	      !kvm_arch_has_noncoherent_dma(vcpu->kvm))
+		return;
+
+	if (!(mtrr_enabled & 0x2) && msr != MSR_MTRRdefType)
+		return;
+
+	switch (msr) {
+	case MSR_MTRRfix64K_00000:
+		start = 0x0;
+		end = 0x80000;
+		break;
+	case MSR_MTRRfix16K_80000:
+		start = 0x80000;
+		end = 0xa0000;
+		break;
+	case MSR_MTRRfix16K_A0000:
+		start = 0xa0000;
+		end = 0xc0000;
+		break;
+	case MSR_MTRRfix4K_C0000 ... MSR_MTRRfix4K_F8000:
+		index = msr - MSR_MTRRfix4K_C0000;
+		start = 0xc0000 + index * (32 << 10);
+		end = start + (32 << 10);
+		break;
+	case MSR_MTRRdefType:
+		is_fixed = false;
+		start = 0x0;
+		end = ~0ULL;
+		break;
+	default:
+		/* variable range MTRRs. */
+		is_fixed = false;
+		index = (msr - 0x200) / 2;
+		start = (((u64)mtrr_state->var_ranges[index].base_hi) << 32) +
+		       (mtrr_state->var_ranges[index].base_lo & PAGE_MASK);
+		mask = (((u64)mtrr_state->var_ranges[index].mask_hi) << 32) +
+		       (mtrr_state->var_ranges[index].mask_lo & PAGE_MASK);
+		mask |= ~0ULL << cpuid_maxphyaddr(vcpu);
+
+		end = ((start & mask) | ~mask) + 1;
+	}
+
+	if (is_fixed && !(mtrr_enabled & 0x1))
+		return;
+
+	kvm_zap_gfn_range(vcpu->kvm, gpa_to_gfn(start), gpa_to_gfn(end));
+}
+
 static int set_msr_mtrr(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 {
 	u64 *p = (u64 *)&vcpu->arch.mtrr_state.fixed_ranges;
@@ -1885,7 +1942,7 @@ static int set_msr_mtrr(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 		*pt = data;
 	}
 
-	kvm_mmu_reset_context(vcpu);
+	update_mtrr(vcpu, msr);
 	return 0;
 }
 
-- 
2.1.0


  parent reply	other threads:[~2015-05-13  6:46 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-13  6:42 [PATCH v3 00/10] KVM: MTRR fixes and some cleanups Xiao Guangrong
2015-05-13  6:42 ` [PATCH v3 01/10] KVM: MMU: fix decoding cache type from MTRR Xiao Guangrong
2015-05-13  8:09   ` Wanpeng Li
2015-07-12 17:33   ` Alex Williamson
2015-07-12 18:59     ` Xiao Guangrong
2015-07-13  7:32       ` Paolo Bonzini
2015-07-13 14:45         ` Xiao Guangrong
2015-07-13 15:13           ` Paolo Bonzini
2015-07-13 15:15             ` Xiao Guangrong
2015-07-14 21:12               ` MTRR setup in OVMF [was: PATCH v3 01/10 KVM: MMU: fix decoding cache type from MTRR] Laszlo Ersek
2015-07-14 21:15                 ` Paolo Bonzini
2015-07-14 21:15                   ` [edk2] " Paolo Bonzini
2015-07-14 21:29                   ` Laszlo Ersek
2015-07-14 21:29                     ` [edk2] " Laszlo Ersek
2015-07-14 22:37                     ` Jordan Justen
2015-07-15  9:57                       ` Laszlo Ersek
2015-07-15  9:57                         ` [edk2] " Laszlo Ersek
2015-07-15  0:14                   ` Fan, Jeff
2015-07-15  0:14                     ` Fan, Jeff
2015-07-15 19:30                   ` Xiao Guangrong
2015-07-15 19:41                     ` Laszlo Ersek
2015-07-12 19:12     ` [PATCH v3 01/10] KVM: MMU: fix decoding cache type from MTRR Bandan Das
2015-05-13  6:42 ` [PATCH v3 02/10] KVM: MMU: introduce for_each_rmap_spte() Xiao Guangrong
2015-05-13  6:42 ` [PATCH v3 03/10] KVM: MMU: introduce PT_MAX_HUGEPAGE_LEVEL Xiao Guangrong
2015-05-13  6:42 ` [PATCH v3 04/10] KVM: MMU: introduce for_each_slot_rmap_range Xiao Guangrong
2015-05-13  6:42 ` [PATCH v3 05/10] KVM: MMU: introduce slot_handle_level_range() and its helpers Xiao Guangrong
2015-05-13  6:42 ` [PATCH v3 06/10] KVM: MMU: use slot_handle_level and its helper to clean up the code Xiao Guangrong
2015-05-13  6:42 ` [PATCH v3 07/10] KVM: MMU: introduce kvm_zap_rmapp Xiao Guangrong
2015-05-13  6:42 ` [PATCH v3 08/10] KVM: MMU: introduce kvm_zap_gfn_range Xiao Guangrong
2015-05-13  6:42 ` Xiao Guangrong [this message]
2015-05-13  8:43   ` [PATCH v3 09/10] KVM: MMU: fix MTRR update Wanpeng Li
2015-05-13 14:10     ` Paolo Bonzini
2015-05-14  0:16       ` Wanpeng Li
2015-05-14  8:43         ` Paolo Bonzini
2015-05-13  6:42 ` [PATCH v3 10/10] KVM: x86: do not reset mmu if CR0.CD and CR0.NW are changed Xiao Guangrong
2015-05-13 14:14 ` [PATCH v3 00/10] KVM: MTRR fixes and some cleanups Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431499348-25188-10-git-send-email-guangrong.xiao@linux.intel.com \
    --to=guangrong.xiao@linux.intel.com \
    --cc=gleb@kernel.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=pbonzini@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.