android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: MTRR: remove mtrr_state.have_fixed

Browse Source 
vMTRR does not depend on any host MTRR feature and fixed MTRRs have always
been implemented, so drop this field

Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Xiao Guangrong
2015-06-15 16:55:24 +08:00
committed by Paolo Bonzini
parent eb839917a7
commit 70109e7d9d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/include/asm/kvm_host.h
View File

@ -342,6 +342,13 @@ enum {
KVM_DEBUGREG_RELOAD = 4, KVM_DEBUGREG_RELOAD = 4,
}; };
struct kvm_mtrr {
struct mtrr_var_range var_ranges[MTRR_MAX_VAR_RANGES];
mtrr_type fixed_ranges[KVM_NR_FIXED_MTRR_REGION];
unsigned char enabled;
mtrr_type def_type;
};
struct kvm_vcpu_arch { struct kvm_vcpu_arch {
/* /*
* rip and regs accesses must go through * rip and regs accesses must go through
@ -472,7 +479,7 @@ struct kvm_vcpu_arch {
bool nmi_injected; /* Trying to inject an NMI this entry */ bool nmi_injected; /* Trying to inject an NMI this entry */
bool smi_pending; /* SMI queued after currently running handler */ bool smi_pending; /* SMI queued after currently running handler */
struct mtrr_state_type mtrr_state; struct kvm_mtrr mtrr_state;
u64 pat; u64 pat;
unsigned switch_db_regs; unsigned switch_db_regs;

7
arch/x86/kvm/mtrr.c
View File

@ -103,7 +103,7 @@ EXPORT_SYMBOL_GPL(kvm_mtrr_valid);
static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr) static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr)
{ {
struct mtrr_state_type *mtrr_state = &vcpu->arch.mtrr_state; struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state;
unsigned char mtrr_enabled = mtrr_state->enabled; unsigned char mtrr_enabled = mtrr_state->enabled;
gfn_t start, end, mask; gfn_t start, end, mask;
int index; int index;
@ -247,7 +247,7 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
* The function is based on mtrr_type_lookup() in * The function is based on mtrr_type_lookup() in
* arch/x86/kernel/cpu/mtrr/generic.c * arch/x86/kernel/cpu/mtrr/generic.c
*/ */
static int get_mtrr_type(struct mtrr_state_type *mtrr_state, static int get_mtrr_type(struct kvm_mtrr *mtrr_state,
u64 start, u64 end) u64 start, u64 end)
{ {
u64 base, mask; u64 base, mask;
@ -262,8 +262,7 @@ static int get_mtrr_type(struct mtrr_state_type *mtrr_state,
end--; end--;
/* Look in fixed ranges. Just return the type as per start */ /* Look in fixed ranges. Just return the type as per start */
if (mtrr_state->have_fixed && (mtrr_state->enabled & 0x1) && if ((mtrr_state->enabled & 0x1) && (start < 0x100000)) {
(start < 0x100000)) {
int idx; int idx;
if (start < 0x80000) { if (start < 0x80000) {

1
arch/x86/kvm/x86.c
View File

@ -7379,7 +7379,6 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
{ {
int r; int r;
vcpu->arch.mtrr_state.have_fixed = 1;
r = vcpu_load(vcpu); r = vcpu_load(vcpu);
if (r) if (r)
return r; return r;