From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755538AbbFOJC5 (ORCPT ); Mon, 15 Jun 2015 05:02:57 -0400 Received: from mga09.intel.com ([134.134.136.24]:21771 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754254AbbFOJAT (ORCPT ); Mon, 15 Jun 2015 05:00:19 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,617,1427785200"; d="scan'208";a="508417153" From: Xiao Guangrong 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 Subject: [PATCH v2 10/15] KVM: MTRR: introduce var_mtrr_range Date: Mon, 15 Jun 2015 16:55:30 +0800 Message-Id: <1434358535-19923-11-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1434358535-19923-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1434358535-19923-1-git-send-email-guangrong.xiao@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It gets the range for the specified variable MTRR Signed-off-by: Xiao Guangrong --- arch/x86/kvm/mtrr.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c index df73149..cb9702d 100644 --- a/arch/x86/kvm/mtrr.c +++ b/arch/x86/kvm/mtrr.c @@ -241,10 +241,21 @@ static int fixed_msr_to_range_index(u32 msr) return fixed_mtrr_seg_unit_range_index(seg, unit); } +static void var_mtrr_range(struct kvm_mtrr_range *range, u64 *start, u64 *end) +{ + u64 mask; + + *start = range->base & PAGE_MASK; + + mask = range->mask & PAGE_MASK; + mask |= ~0ULL << boot_cpu_data.x86_phys_bits; + *end = ((*start & mask) | ~mask) + 1; +} + static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr) { struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state; - gfn_t start, end, mask; + gfn_t start, end; int index; if (msr == MSR_IA32_CR_PAT || !tdp_enabled || @@ -264,11 +275,7 @@ static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr) } else { /* variable range MTRRs. */ index = (msr - 0x200) / 2; - start = mtrr_state->var_ranges[index].base & PAGE_MASK; - mask = mtrr_state->var_ranges[index].mask & PAGE_MASK; - mask |= ~0ULL << cpuid_maxphyaddr(vcpu); - - end = ((start & mask) | ~mask) + 1; + var_mtrr_range(&mtrr_state->var_ranges[index], &start, &end); } kvm_zap_gfn_range(vcpu->kvm, gpa_to_gfn(start), gpa_to_gfn(end)); -- 2.1.0