From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takuya Yoshikawa Subject: [PATCH 2/4] KVM: MMU: Move some variables into the walk loop Date: Thu, 9 Jun 2011 23:02:36 +0900 Message-ID: <20110609230236.b7d3be2f.takuya.yoshikawa@gmail.com> References: <20110609225949.91cce4a0.takuya.yoshikawa@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, yoshikawa.takuya@oss.ntt.co.jp, mingo@elte.hu To: avi@redhat.com, mtosatti@redhat.com Return-path: Received: from mail-px0-f179.google.com ([209.85.212.179]:50771 "EHLO mail-px0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757646Ab1FIOCt (ORCPT ); Thu, 9 Jun 2011 10:02:49 -0400 Received: by pxi2 with SMTP id 2so1064063pxi.10 for ; Thu, 09 Jun 2011 07:02:49 -0700 (PDT) In-Reply-To: <20110609225949.91cce4a0.takuya.yoshikawa@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: From: Takuya Yoshikawa This will help us split out the big body of the walk loop later. Signed-off-by: Takuya Yoshikawa --- arch/x86/kvm/paging_tmpl.h | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 51e5990..3270789 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -122,11 +122,8 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, { pt_element_t pte; pt_element_t __user *ptep_user; - gfn_t table_gfn; - unsigned index, pt_access, uninitialized_var(pte_access); - gpa_t pte_gpa; + unsigned pt_access, uninitialized_var(pte_access); bool eperm; - int offset; const int write_fault = access & PFERR_WRITE_MASK; const int user_fault = access & PFERR_USER_MASK; const int fetch_fault = access & PFERR_FETCH_MASK; @@ -158,12 +155,11 @@ walk: for (;;) { gfn_t real_gfn; unsigned long host_addr; + unsigned index = PT_INDEX(addr, walker->level); + int offset = index * sizeof(pt_element_t); + gfn_t table_gfn = gpte_to_gfn(pte); + gpa_t pte_gpa = gfn_to_gpa(table_gfn) + offset; - index = PT_INDEX(addr, walker->level); - - table_gfn = gpte_to_gfn(pte); - offset = index * sizeof(pt_element_t); - pte_gpa = gfn_to_gpa(table_gfn) + offset; walker->table_gfn[walker->level - 1] = table_gfn; walker->pte_gpa[walker->level - 1] = pte_gpa; @@ -273,6 +269,8 @@ walk: if (write_fault && unlikely(!is_dirty_gpte(pte))) { int ret; + unsigned index = PT_INDEX(addr, walker->level); + gfn_t table_gfn = walker->table_gfn[walker->level - 1]; trace_kvm_mmu_set_dirty_bit(table_gfn, index, sizeof(pte)); ret = FNAME(cmpxchg_gpte)(vcpu, mmu, ptep_user, index, -- 1.7.4.1