From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Feiner Subject: [kvm-unit-tests v3 4/6] x86: vmx: Named constant: EPT_LEVEL_SHIFT Date: Wed, 2 Mar 2016 09:10:55 -0800 Message-ID: <1456938657-20850-5-git-send-email-pfeiner@google.com> References: <1456860622-31251-1-git-send-email-pfeiner@google.com> <1456938657-20850-1-git-send-email-pfeiner@google.com> Cc: pfeiner@google.com To: kvm@vger.kernel.org, jan.kiszka@siemens.com, drjones@redhat.com, pbonzini@redhat.com Return-path: Received: from mail-pf0-f169.google.com ([209.85.192.169]:35667 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754515AbcCBRLO (ORCPT ); Wed, 2 Mar 2016 12:11:14 -0500 Received: by mail-pf0-f169.google.com with SMTP id w128so92689930pfb.2 for ; Wed, 02 Mar 2016 09:11:14 -0800 (PST) In-Reply-To: <1456938657-20850-1-git-send-email-pfeiner@google.com> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Peter Feiner --- x86/vmx.c | 17 ++++++----------- x86/vmx.h | 1 + 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/x86/vmx.c b/x86/vmx.c index 9811a28..140ad86 100644 --- a/x86/vmx.c +++ b/x86/vmx.c @@ -233,7 +233,7 @@ void install_ept_entry(unsigned long *pml4, unsigned offset; for (level = EPT_PAGE_LEVEL; level > pte_level; --level) { - offset = (guest_addr >> ((level-1) * EPT_PGDIR_WIDTH + 12)) + offset = (guest_addr >> EPT_LEVEL_SHIFT(level)) & EPT_PGDIR_MASK; if (!(pt[offset] & (EPT_PRESENT))) { unsigned long *new_pt = pt_page; @@ -248,8 +248,7 @@ void install_ept_entry(unsigned long *pml4, pt[offset] &= ~EPT_LARGE_PAGE; pt = phys_to_virt(pt[offset] & EPT_ADDR_MASK); } - offset = ((unsigned long)guest_addr >> ((level-1) * - EPT_PGDIR_WIDTH + 12)) & EPT_PGDIR_MASK; + offset = (guest_addr >> EPT_LEVEL_SHIFT(level)) & EPT_PGDIR_MASK; pt[offset] = pte; } @@ -325,8 +324,7 @@ unsigned long get_ept_pte(unsigned long *pml4, if (level < 1 || level > 3) return -1; for (l = EPT_PAGE_LEVEL; ; --l) { - offset = (guest_addr >> (((l-1) * EPT_PGDIR_WIDTH) + 12)) - & EPT_PGDIR_MASK; + offset = (guest_addr >> EPT_LEVEL_SHIFT(l)) & EPT_PGDIR_MASK; pte = pt[offset]; if (!(pte & (EPT_PRESENT))) return 0; @@ -336,8 +334,7 @@ unsigned long get_ept_pte(unsigned long *pml4, return pte; pt = (unsigned long *)(pte & EPT_ADDR_MASK); } - offset = (guest_addr >> (((l-1) * EPT_PGDIR_WIDTH) + 12)) - & EPT_PGDIR_MASK; + offset = (guest_addr >> EPT_LEVEL_SHIFT(l)) & EPT_PGDIR_MASK; pte = pt[offset]; return pte; } @@ -372,16 +369,14 @@ int set_ept_pte(unsigned long *pml4, unsigned long guest_addr, if (level < 1 || level > 3) return -1; for (l = EPT_PAGE_LEVEL; ; --l) { - offset = (guest_addr >> (((l-1) * EPT_PGDIR_WIDTH) + 12)) - & EPT_PGDIR_MASK; + offset = (guest_addr >> EPT_LEVEL_SHIFT(l)) & EPT_PGDIR_MASK; if (l == level) break; if (!(pt[offset] & (EPT_PRESENT))) return -1; pt = (unsigned long *)(pt[offset] & EPT_ADDR_MASK); } - offset = (guest_addr >> (((l-1) * EPT_PGDIR_WIDTH) + 12)) - & EPT_PGDIR_MASK; + offset = (guest_addr >> EPT_LEVEL_SHIFT(l)) & EPT_PGDIR_MASK; pt[offset] = pte_val; return 0; } diff --git a/x86/vmx.h b/x86/vmx.h index 459dd13..d3a852e 100644 --- a/x86/vmx.h +++ b/x86/vmx.h @@ -467,6 +467,7 @@ enum Ctrl1 { #define EPT_PAGE_LEVEL 4 #define EPT_PGDIR_WIDTH 9 #define EPT_PGDIR_MASK 511 +#define EPT_LEVEL_SHIFT(level) (((level)-1) * EPT_PGDIR_WIDTH + 12) #define EPT_ADDR_MASK GENMASK_ULL(51, 12) #define PAGE_MASK (~(PAGE_SIZE-1)) #define PAGE_MASK_2M (~(PAGE_SIZE_2M-1)) -- 2.7.0.rc3.207.g0ac5344