Skip to content

Commit 9ae38b4

Browse files
committed
KVM: x86: Add helper to get variable MTRR range from MSR index
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>
1 parent ebda79e commit 9ae38b4

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

arch/x86/kvm/mtrr.c

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ static bool is_mtrr_base_msr(unsigned int msr)
3131
return !(msr & 0x1);
3232
}
3333

34+
static struct kvm_mtrr_range *var_mtrr_msr_to_range(struct kvm_vcpu *vcpu,
35+
unsigned int msr)
36+
{
37+
int index = (msr - 0x200) / 2;
38+
39+
return &vcpu->arch.mtrr_state.var_ranges[index];
40+
}
41+
3442
static bool msr_mtrr_valid(unsigned msr)
3543
{
3644
switch (msr) {
@@ -314,7 +322,6 @@ static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr)
314322
{
315323
struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state;
316324
gfn_t start, end;
317-
int index;
318325

319326
if (msr == MSR_IA32_CR_PAT || !tdp_enabled ||
320327
!kvm_arch_has_noncoherent_dma(vcpu->kvm))
@@ -332,8 +339,7 @@ static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr)
332339
end = ~0ULL;
333340
} else {
334341
/* variable range MTRRs. */
335-
index = (msr - 0x200) / 2;
336-
var_mtrr_range(&mtrr_state->var_ranges[index], &start, &end);
342+
var_mtrr_range(var_mtrr_msr_to_range(vcpu, msr), &start, &end);
337343
}
338344

339345
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)
348354
{
349355
struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state;
350356
struct kvm_mtrr_range *tmp, *cur;
351-
int index;
352357

353-
index = (msr - 0x200) / 2;
354-
cur = &mtrr_state->var_ranges[index];
358+
cur = var_mtrr_msr_to_range(vcpu, msr);
355359

356360
/* remove the entry if it's in the list. */
357361
if (var_mtrr_range_is_valid(cur))
358-
list_del(&mtrr_state->var_ranges[index].node);
362+
list_del(&cur->node);
359363

360364
/*
361365
* 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)
423427
else if (msr == MSR_IA32_CR_PAT)
424428
*pdata = vcpu->arch.pat;
425429
else { /* Variable MTRRs */
426-
index = (msr - 0x200) / 2;
427430
if (is_mtrr_base_msr(msr))
428-
*pdata = vcpu->arch.mtrr_state.var_ranges[index].base;
431+
*pdata = var_mtrr_msr_to_range(vcpu, msr)->base;
429432
else
430-
*pdata = vcpu->arch.mtrr_state.var_ranges[index].mask;
433+
*pdata = var_mtrr_msr_to_range(vcpu, msr)->mask;
431434

432435
*pdata &= ~kvm_vcpu_reserved_gpa_bits_raw(vcpu);
433436
}

0 commit comments

Comments
 (0)