From patchwork Thu May 13 02:07: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: 99196 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 o4D2AvsT028478 for ; Thu, 13 May 2010 02:10:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756521Ab0EMCKR (ORCPT ); Wed, 12 May 2010 22:10:17 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:57647 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755776Ab0EMCKN (ORCPT ); Wed, 12 May 2010 22:10:13 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id E4FF9170129; Thu, 13 May 2010 10:10:12 +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 o4D28G70007904; Thu, 13 May 2010 10:08:16 +0800 Received: from [10.167.141.99] (unknown [10.167.141.99]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id A8FB210C00A; Thu, 13 May 2010 10:13:39 +0800 (CST) Message-ID: <4BEB5EC4.6070802@cn.fujitsu.com> Date: Thu, 13 May 2010 10:07: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 2/5] KVM MMU: remove rmap before clear spte References: <4BEB5E8A.7030606@cn.fujitsu.com> In-Reply-To: <4BEB5E8A.7030606@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]); Thu, 13 May 2010 02:10:58 +0000 (UTC) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 67da751..a474d93 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1812,6 +1812,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, if (level > PT_PAGE_TABLE_LEVEL && has_wrprotected_page(vcpu->kvm, gfn, level)) { ret = 1; + rmap_remove(vcpu->kvm, sptep); spte = shadow_trap_nonpresent_pte; goto set_pte; }