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, dmatlack@google.com,
Xiao Guangrong <guangrong.xiao@linux.intel.com>
Subject: [PATCH v2 03/15] KVM: MTRR: handle MSR_MTRRcap in kvm_mtrr_get_msr
Date: Mon, 15 Jun 2015 16:55:23 +0800 [thread overview]
Message-ID: <1434358535-19923-4-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1434358535-19923-1-git-send-email-guangrong.xiao@linux.intel.com>
MSR_MTRRcap is a MTRR msr so move the handler to the common place, also
add some comments to make the hard code more readable
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
arch/x86/kvm/mtrr.c | 12 ++++++++++++
arch/x86/kvm/x86.c | 2 --
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c
index fb2f7e1..a05846a 100644
--- a/arch/x86/kvm/mtrr.c
+++ b/arch/x86/kvm/mtrr.c
@@ -199,6 +199,18 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
{
u64 *p = (u64 *)&vcpu->arch.mtrr_state.fixed_ranges;
+ /* MSR_MTRRcap is a readonly MSR. */
+ if (msr == MSR_MTRRcap) {
+ /*
+ * SMRR = 0
+ * WC = 1
+ * FIX = 1
+ * VCNT = KVM_NR_VAR_MTRR
+ */
+ *pdata = 0x500 | KVM_NR_VAR_MTRR;
+ return 0;
+ }
+
if (!msr_mtrr_valid(msr))
return 1;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e2bc798..fb6c9a1 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2443,8 +2443,6 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
msr_info->data = 0x100000000ULL;
break;
case MSR_MTRRcap:
- msr_info->data = 0x500 | KVM_NR_VAR_MTRR;
- break;
case 0x200 ... 0x2ff:
return kvm_mtrr_get_msr(vcpu, msr_info->index, &msr_info->data);
case 0xcd: /* fsb frequency */
--
2.1.0
next prev parent reply other threads:[~2015-06-15 9:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-15 8:55 [PATCH v2 00/15] vMTRR bugfix and optimization Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 01/15] KVM: x86: fix CR0.CD virtualization Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 02/15] KVM: x86: move MTRR related code to a separate file Xiao Guangrong
2015-06-15 8:55 ` Xiao Guangrong [this message]
2015-06-15 8:55 ` [PATCH v2 04/15] KVM: MTRR: remove mtrr_state.have_fixed Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 05/15] KVM: MTRR: exactly define the size of variable MTRRs Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 06/15] KVM: MTRR: clean up mtrr default type Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 07/15] KVM: MTRR: do not split 64 bits MSR content Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 08/15] KVM: MTRR: improve kvm_mtrr_get_guest_memory_type Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 09/15] KVM: MTRR: introduce fixed_mtrr_segment table Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 10/15] KVM: MTRR: introduce var_mtrr_range Xiao Guangrong
2015-06-17 15:38 ` Paolo Bonzini
2015-06-15 8:55 ` [PATCH v2 11/15] KVM: MTRR: sort variable MTRRs Xiao Guangrong
2015-06-17 15:40 ` Paolo Bonzini
2015-06-17 16:11 ` Paolo Bonzini
2015-06-22 11:24 ` Paolo Bonzini
2015-06-22 11:24 ` Paolo Bonzini
2015-06-23 2:29 ` Xiao Guangrong
2015-06-23 2:29 ` Xiao Guangrong
2015-06-23 8:00 ` Paolo Bonzini
2015-06-23 8:27 ` Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 12/15] KVM: MTRR: introduce fixed_mtrr_addr_* functions Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 13/15] KVM: MTRR: introduce mtrr_for_each_mem_type Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 14/15] KVM: MTRR: simplify kvm_mtrr_get_guest_memory_type Xiao Guangrong
2015-06-15 8:55 ` [PATCH v2 15/15] KVM: MTRR: do not map huage page for non-consistent range Xiao Guangrong
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=1434358535-19923-4-git-send-email-guangrong.xiao@linux.intel.com \
--to=guangrong.xiao@linux.intel.com \
--cc=dmatlack@google.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.