From patchwork Mon Apr 26 08:48:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 95017 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 o3Q8mmDP027810 for ; Mon, 26 Apr 2010 08:48:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751539Ab0DZIsr (ORCPT ); Mon, 26 Apr 2010 04:48:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50547 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751085Ab0DZIsp (ORCPT ); Mon, 26 Apr 2010 04:48:45 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q8mino006974 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 26 Apr 2010 04:48:44 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q8mhif027580 for ; Mon, 26 Apr 2010 04:48:44 -0400 Received: from localhost.localdomain (file.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 5EC3E2500C5; Mon, 26 Apr 2010 11:48:43 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 1/5] KVM: MMU: Rearrange struct kvm_mmu_page Date: Mon, 26 Apr 2010 11:48:39 +0300 Message-Id: <1272271723-9070-2-git-send-email-avi@redhat.com> In-Reply-To: <1272271723-9070-1-git-send-email-avi@redhat.com> References: <1272271723-9070-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 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]); Mon, 26 Apr 2010 08:48:49 +0000 (UTC) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 3f0007b..cdaaedc 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -192,6 +192,13 @@ struct kvm_mmu_page { */ gfn_t gfn; union kvm_mmu_page_role role; + int root_count; /* Currently serving as active root */ + bool multimapped; /* More than one parent_pte? */ + bool unsync; + union { + u64 *parent_pte; /* !multimapped */ + struct hlist_head parent_ptes; /* multimapped, kvm_pte_chain */ + }; u64 *spt; /* hold the gfn of each spte inside spt */ @@ -201,14 +208,8 @@ struct kvm_mmu_page { * in this shadow page. */ DECLARE_BITMAP(slot_bitmap, KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS); - bool multimapped; /* More than one parent_pte? */ - bool unsync; - int root_count; /* Currently serving as active root */ + unsigned int unsync_children; - union { - u64 *parent_pte; /* !multimapped */ - struct hlist_head parent_ptes; /* multimapped, kvm_pte_chain */ - }; DECLARE_BITMAP(unsync_child_bitmap, 512); };