From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752180AbbIAWkw (ORCPT ); Tue, 1 Sep 2015 18:40:52 -0400 Received: from mga01.intel.com ([192.55.52.88]:4330 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750717AbbIAWkv (ORCPT ); Tue, 1 Sep 2015 18:40:51 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,451,1437462000"; d="scan'208";a="795840846" Subject: Re: [GIT PULL] Early batch of KVM changes for 4.3 merge window To: Paolo Bonzini , Linus Torvalds References: <1439596650-7237-1-git-send-email-pbonzini@redhat.com> <55E5DA7C.60605@redhat.com> Cc: Linux Kernel Mailing List , Gleb Natapov , KVM list From: Xiao Guangrong Message-ID: <55E6280D.1070104@linux.intel.com> Date: Wed, 2 Sep 2015 06:34:53 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <55E5DA7C.60605@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/02/2015 01:03 AM, Paolo Bonzini wrote: > > diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c > index fb16a8ea3dee..3c745f3abde8 100644 > --- a/arch/x86/kvm/mmu.c > +++ b/arch/x86/kvm/mmu.c > @@ -3309,13 +3309,13 @@ walk_shadow_page_get_mmio_spte(struct kvm_vcpu *vcpu, u64 addr, u64 *sptep) > > walk_shadow_page_lockless_begin(vcpu); > > - for (shadow_walk_init(&iterator, vcpu, addr), root = iterator.level; > + for (shadow_walk_init(&iterator, vcpu, addr), > + leaf = root = iterator.level; > shadow_walk_okay(&iterator); > __shadow_walk_next(&iterator, spte)) { > - leaf = iterator.level; > spte = mmu_spte_get_lockless(iterator.sptep); > > - sptes[leaf - 1] = spte; > + sptes[--leaf] = spte; > > if (!is_shadow_present_pte(spte)) > break; > @@ -3329,7 +3329,7 @@ walk_shadow_page_get_mmio_spte(struct kvm_vcpu *vcpu, u64 addr, u64 *sptep) > if (reserved) { > pr_err("%s: detect reserved bits on spte, addr 0x%llx, dump hierarchy:\n", > __func__, addr); > - while (root >= leaf) { > + while (root > leaf) { > pr_err("------ spte 0x%llx level %d.\n", > sptes[root - 1], root); > root--; > > > But honestly I haven't even compiled it yet. Xiao, what do you think? > It looks good to me!