From patchwork Sat May 30 10:59:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 6512881 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 24AE2C0020 for ; Sat, 30 May 2015 11:03:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 376FA204AE for ; Sat, 30 May 2015 11:03:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 416CF2049D for ; Sat, 30 May 2015 11:03:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932656AbbE3LDA (ORCPT ); Sat, 30 May 2015 07:03:00 -0400 Received: from mga11.intel.com ([192.55.52.93]:5141 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757769AbbE3K7s (ORCPT ); Sat, 30 May 2015 06:59:48 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 30 May 2015 03:59:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,522,1427785200"; d="scan'208";a="717943239" Received: from slu40-mobl2.ccr.corp.intel.com (HELO homedesktop.ccr.corp.intel.com) ([10.254.212.183]) by fmsmga001.fm.intel.com with ESMTP; 30 May 2015 03:59:40 -0700 From: Xiao Guangrong To: pbonzini@redhat.com Cc: gleb@kernel.org, mtosatti@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Xiao Guangrong Subject: [PATCH 06/15] KVM: MTRR: do not split 64 bits MSR content Date: Sat, 30 May 2015 18:59:17 +0800 Message-Id: <1432983566-15773-7-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1432983566-15773-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1432983566-15773-1-git-send-email-guangrong.xiao@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Variable MTRR MSRs are 64 bits which are directly accessed with full length, no reason to split them to two 32 bits Signed-off-by: Xiao Guangrong --- arch/x86/include/asm/kvm_host.h | 7 ++++++- arch/x86/kvm/mtrr.c | 32 ++++++++++---------------------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 95ce2ff..f3fc152 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -344,8 +344,13 @@ enum { KVM_DEBUGREG_RELOAD = 4, }; +struct kvm_mtrr_range { + u64 base; + u64 mask; +}; + struct kvm_mtrr { - struct mtrr_var_range var_ranges[KVM_NR_VAR_MTRR]; + struct kvm_mtrr_range var_ranges[KVM_NR_VAR_MTRR]; mtrr_type fixed_ranges[KVM_NR_FIXED_MTRR_REGION]; union { diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c index 6de49dd..bc9c6da 100644 --- a/arch/x86/kvm/mtrr.c +++ b/arch/x86/kvm/mtrr.c @@ -143,10 +143,8 @@ static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr) /* variable range MTRRs. */ is_fixed = false; index = (msr - 0x200) / 2; - start = (((u64)mtrr_state->var_ranges[index].base_hi) << 32) + - (mtrr_state->var_ranges[index].base_lo & PAGE_MASK); - mask = (((u64)mtrr_state->var_ranges[index].mask_hi) << 32) + - (mtrr_state->var_ranges[index].mask_lo & PAGE_MASK); + 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; @@ -177,17 +175,13 @@ int kvm_mtrr_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data) vcpu->arch.pat = data; else { /* Variable MTRRs */ int idx, is_mtrr_mask; - u64 *pt; idx = (msr - 0x200) / 2; is_mtrr_mask = msr - 0x200 - 2 * idx; if (!is_mtrr_mask) - pt = - (u64 *)&vcpu->arch.mtrr_state.var_ranges[idx].base_lo; + vcpu->arch.mtrr_state.var_ranges[idx].base = data; else - pt = - (u64 *)&vcpu->arch.mtrr_state.var_ranges[idx].mask_lo; - *pt = data; + vcpu->arch.mtrr_state.var_ranges[idx].mask = data; } update_mtrr(vcpu, msr); @@ -225,17 +219,13 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) *pdata = vcpu->arch.pat; else { /* Variable MTRRs */ int idx, is_mtrr_mask; - u64 *pt; idx = (msr - 0x200) / 2; is_mtrr_mask = msr - 0x200 - 2 * idx; if (!is_mtrr_mask) - pt = - (u64 *)&vcpu->arch.mtrr_state.var_ranges[idx].base_lo; + *pdata = vcpu->arch.mtrr_state.var_ranges[idx].base; else - pt = - (u64 *)&vcpu->arch.mtrr_state.var_ranges[idx].mask_lo; - *pdata = *pt; + *pdata = vcpu->arch.mtrr_state.var_ranges[idx].mask; } return 0; @@ -287,13 +277,11 @@ static int get_mtrr_type(struct kvm_mtrr *mtrr_state, for (i = 0; i < num_var_ranges; ++i) { unsigned short start_state, end_state; - if (!(mtrr_state->var_ranges[i].mask_lo & (1 << 11))) + if (!(mtrr_state->var_ranges[i].mask & (1 << 11))) continue; - base = (((u64)mtrr_state->var_ranges[i].base_hi) << 32) + - (mtrr_state->var_ranges[i].base_lo & PAGE_MASK); - mask = (((u64)mtrr_state->var_ranges[i].mask_hi) << 32) + - (mtrr_state->var_ranges[i].mask_lo & PAGE_MASK); + base = mtrr_state->var_ranges[i].base & PAGE_MASK; + mask = mtrr_state->var_ranges[i].mask & PAGE_MASK; start_state = ((start & mask) == (base & mask)); end_state = ((end & mask) == (base & mask)); @@ -303,7 +291,7 @@ static int get_mtrr_type(struct kvm_mtrr *mtrr_state, if ((start & mask) != (base & mask)) continue; - curr_match = mtrr_state->var_ranges[i].base_lo & 0xff; + curr_match = mtrr_state->var_ranges[i].base & 0xff; if (prev_match == 0xFF) { prev_match = curr_match; continue;