From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH] KVM: mmio: cleanup kvm_set_mmio_spte_mask Date: Mon, 01 Sep 2014 12:50:09 +0200 Message-ID: <54044F61.7060805@redhat.com> References: <1409568244-23147-1-git-send-email-tiejun.chen@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Tiejun Chen Return-path: Received: from mx1.redhat.com ([209.132.183.28]:42714 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753247AbaIAKuN (ORCPT ); Mon, 1 Sep 2014 06:50:13 -0400 In-Reply-To: <1409568244-23147-1-git-send-email-tiejun.chen@intel.com> Sender: kvm-owner@vger.kernel.org List-ID: Il 01/09/2014 12:44, Tiejun Chen ha scritto: > Just reuse rsvd_bits() inside kvm_set_mmio_spte_mask() > for slightly better code. > > Signed-off-by: Tiejun Chen > --- > arch/x86/kvm/mmu.c | 5 ----- > arch/x86/kvm/mmu.h | 5 +++++ > arch/x86/kvm/x86.c | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c > index 9314678..ae5a085 100644 > --- a/arch/x86/kvm/mmu.c > +++ b/arch/x86/kvm/mmu.c > @@ -296,11 +296,6 @@ static bool check_mmio_spte(struct kvm *kvm, u64 spte) > return likely(kvm_gen == spte_gen); > } > > -static inline u64 rsvd_bits(int s, int e) > -{ > - return ((1ULL << (e - s + 1)) - 1) << s; > -} > - > void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask, > u64 dirty_mask, u64 nx_mask, u64 x_mask) > { > diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h > index b982112..bde8ee7 100644 > --- a/arch/x86/kvm/mmu.h > +++ b/arch/x86/kvm/mmu.h > @@ -56,6 +56,11 @@ > #define PFERR_RSVD_MASK (1U << PFERR_RSVD_BIT) > #define PFERR_FETCH_MASK (1U << PFERR_FETCH_BIT) > > +static inline u64 rsvd_bits(int s, int e) > +{ > + return ((1ULL << (e - s + 1)) - 1) << s; > +} > + > int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4]); > void kvm_mmu_set_mmio_spte_mask(u64 mmio_mask); > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 8f1e22d..a933d4e 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -5545,7 +5545,7 @@ static void kvm_set_mmio_spte_mask(void) > * entry to generate page fault with PFER.RSV = 1. > */ > /* Mask the reserved physical address bits. */ > - mask = ((1ull << (51 - maxphyaddr + 1)) - 1) << maxphyaddr; > + mask = rsvd_bits(maxphyaddr, 51); > > /* Bit 62 is always reserved for 32bit host. */ > mask |= 0x3ull << 62; > Nice, thanks. Paolo