2015-08-04 16:58:29

by Alex Williamson

Subject: [PATCH] KVM: MTRR: Use default type for non-MTRR-covered gfn before WARN_ON

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 <[email protected]>
---

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);

2015-08-05 02:28:35

by Xiao Guangrong

Subject: Re: [PATCH] KVM: MTRR: Use default type for non-MTRR-covered gfn before WARN_ON

On 08/05/2015 12:58 AM, 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
>

Reviewed-by: Xiao Guangrong <[email protected]>

2015-08-05 09:58:38

by Paolo Bonzini

Subject: Re: [PATCH] KVM: MTRR: Use default type for non-MTRR-covered gfn before WARN_ON

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 <[email protected]>

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);
>