korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-13 17:24:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

KVM: x86: Add helper to get variable MTRR range from MSR index

Browse Source 
Add a helper to dedup the logic for retrieving a variable MTRR range
structure given a variable MTRR MSR index.

No functional change intended.

Reviewed-by: Kai Huang <kai.huang@intel.com>
Link: https://lore.kernel.org/r/20230511233351.635053-5-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
This commit is contained in:
Sean Christopherson 2023-05-11 16:33:47 -07:00
parent ebda79e505
commit 9ae38b4fb1
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,14 @@ static bool is_mtrr_base_msr(unsigned int msr)
return !(msr & 0x1); return !(msr & 0x1);
} }
static struct kvm_mtrr_range *var_mtrr_msr_to_range(struct kvm_vcpu *vcpu,
unsigned int msr)
{
int index = (msr - 0x200) / 2;
return &vcpu->arch.mtrr_state.var_ranges[index];
}
static bool msr_mtrr_valid(unsigned msr) static bool msr_mtrr_valid(unsigned msr)
{ {
switch (msr) { switch (msr) {
@ -314,7 +322,6 @@ static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr)
{ {
struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state; struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state;
gfn_t start, end; gfn_t start, end;
int index;
if (msr == MSR_IA32_CR_PAT || !tdp_enabled || if (msr == MSR_IA32_CR_PAT || !tdp_enabled ||
!kvm_arch_has_noncoherent_dma(vcpu->kvm)) !kvm_arch_has_noncoherent_dma(vcpu->kvm))
@ -332,8 +339,7 @@ static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr)
end = ~0ULL; end = ~0ULL;
} else { } else {
/* variable range MTRRs. */ /* variable range MTRRs. */
index = (msr - 0x200) / 2; var_mtrr_range(var_mtrr_msr_to_range(vcpu, msr), &start, &end);
var_mtrr_range(&mtrr_state->var_ranges[index], &start, &end);
} }
kvm_zap_gfn_range(vcpu->kvm, gpa_to_gfn(start), gpa_to_gfn(end)); kvm_zap_gfn_range(vcpu->kvm, gpa_to_gfn(start), gpa_to_gfn(end));
@ -348,14 +354,12 @@ static void set_var_mtrr_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data)
{ {
struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state; struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state;
struct kvm_mtrr_range *tmp, *cur; struct kvm_mtrr_range *tmp, *cur;
int index;
index = (msr - 0x200) / 2; cur = var_mtrr_msr_to_range(vcpu, msr);
cur = &mtrr_state->var_ranges[index];
/* remove the entry if it's in the list. */ /* remove the entry if it's in the list. */
if (var_mtrr_range_is_valid(cur)) if (var_mtrr_range_is_valid(cur))
list_del(&mtrr_state->var_ranges[index].node); list_del(&cur->node);
/* /*
* Set all illegal GPA bits in the mask, since those bits must * Set all illegal GPA bits in the mask, since those bits must
@ -423,11 +427,10 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
else if (msr == MSR_IA32_CR_PAT) else if (msr == MSR_IA32_CR_PAT)
*pdata = vcpu->arch.pat; *pdata = vcpu->arch.pat;
else { /* Variable MTRRs */ else { /* Variable MTRRs */
index = (msr - 0x200) / 2;
if (is_mtrr_base_msr(msr)) if (is_mtrr_base_msr(msr))
*pdata = vcpu->arch.mtrr_state.var_ranges[index].base; *pdata = var_mtrr_msr_to_range(vcpu, msr)->base;
else else
*pdata = vcpu->arch.mtrr_state.var_ranges[index].mask; *pdata = var_mtrr_msr_to_range(vcpu, msr)->mask;
*pdata &= ~kvm_vcpu_reserved_gpa_bits_raw(vcpu); *pdata &= ~kvm_vcpu_reserved_gpa_bits_raw(vcpu);
} }