From patchwork Sun Apr 25 07:00:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 94880 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3P74jV1003707 for ; Sun, 25 Apr 2010 07:04:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751307Ab0DYHDK (ORCPT ); Sun, 25 Apr 2010 03:03:10 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:63552 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751038Ab0DYHDI (ORCPT ); Sun, 25 Apr 2010 03:03:08 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id E288A170044; Sun, 25 Apr 2010 15:03:06 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o3P71Mxn018237; Sun, 25 Apr 2010 15:01:22 +0800 Received: from [10.167.141.99] (unknown [10.167.141.99]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id EDC6BDC2D2; Sun, 25 Apr 2010 15:06:09 +0800 (CST) Message-ID: <4BD3E870.60000@cn.fujitsu.com> Date: Sun, 25 Apr 2010 15:00:00 +0800 From: Xiao Guangrong User-Agent: Thunderbird 2.0.0.24 (Windows/20100228) MIME-Version: 1.0 To: Avi Kivity CC: Marcelo Tosatti , KVM list , LKML Subject: [PATCH v2 1/10] KVM MMU: fix for calculating gpa in invlpg code References: <4BD3E306.4020202@cn.fujitsu.com> In-Reply-To: <4BD3E306.4020202@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 25 Apr 2010 07:04:45 +0000 (UTC) diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index d0cc07e..83cc72f 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -478,9 +478,18 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva) ((level == PT_DIRECTORY_LEVEL && is_large_pte(*sptep))) || ((level == PT_PDPE_LEVEL && is_large_pte(*sptep)))) { struct kvm_mmu_page *sp = page_header(__pa(sptep)); - + int offset = 0; + + if (PTTYPE == 32) { + if (level == PT_DIRECTORY_LEVEL) + offset = PAGE_SHIFT - 4; + else + offset = PT64_LEVEL_BITS; + offset = sp->role.quadrant << offset; + } pte_gpa = (sp->gfn << PAGE_SHIFT); - pte_gpa += (sptep - sp->spt) * sizeof(pt_element_t); + pte_gpa += (sptep - sp->spt + offset) * + sizeof(pt_element_t); if (is_shadow_present_pte(*sptep)) { rmap_remove(vcpu->kvm, sptep);