From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH] KVM: MTRR: Use default type for non-MTRR-covered gfn before WARN_ON Date: Wed, 5 Aug 2015 11:58:32 +0200 Message-ID: <55C1DE48.80705@redhat.com> References: <20150804165639.26001.29833.stgit@gimli.home> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: linux-kernel@vger.kernel.org, guangrong.xiao@intel.com To: Alex Williamson , kvm@vger.kernel.org Return-path: In-Reply-To: <20150804165639.26001.29833.stgit@gimli.home> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On 04/08/2015 18:58, Alex Williamson wrote: > The patch was munged on commit to re-order these tests resulting in > excessive warnings when trying to do device assignment. Return to > original ordering: https://lkml.org/lkml/2015/7/15/769 > > Fixes: 3e5d2fdceda1 ("KVM: MTRR: simplify kvm_mtrr_get_guest_memory_type") > Signed-off-by: Alex Williamson Applied, thanks. Sorry for the delay. Paolo > --- > > For v4.2 > > arch/x86/kvm/mtrr.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c > index dc0a84a..9e8bf13 100644 > --- a/arch/x86/kvm/mtrr.c > +++ b/arch/x86/kvm/mtrr.c > @@ -672,16 +672,16 @@ u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn) > if (iter.mtrr_disabled) > return mtrr_disabled_type(); > > + /* not contained in any MTRRs. */ > + if (type == -1) > + return mtrr_default_type(mtrr_state); > + > /* > * We just check one page, partially covered by MTRRs is > * impossible. > */ > WARN_ON(iter.partial_map); > > - /* not contained in any MTRRs. */ > - if (type == -1) > - return mtrr_default_type(mtrr_state); > - > return type; > } > EXPORT_SYMBOL_GPL(kvm_mtrr_get_guest_memory_type); >