From patchwork Tue Apr 27 10:38:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 95374 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 o3RAiKZv020876 for ; Tue, 27 Apr 2010 10:44:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754838Ab0D0Kni (ORCPT ); Tue, 27 Apr 2010 06:43:38 -0400 Received: from tx2ehsobe002.messaging.microsoft.com ([65.55.88.12]:59235 "EHLO TX2EHSOBE003.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754582Ab0D0Kix (ORCPT ); Tue, 27 Apr 2010 06:38:53 -0400 Received: from mail160-tx2-R.bigfish.com (10.9.14.246) by TX2EHSOBE003.bigfish.com (10.9.40.23) with Microsoft SMTP Server id 8.1.340.0; Tue, 27 Apr 2010 10:38:48 +0000 Received: from mail160-tx2 (localhost.localdomain [127.0.0.1]) by mail160-tx2-R.bigfish.com (Postfix) with ESMTP id 556E53D0449; Tue, 27 Apr 2010 10:38:48 +0000 (UTC) X-SpamScore: 11 X-BigFish: VPS11(z1857rzab9bhzz1202hzz6ff19hz32i2a8h87h43h62h) X-Spam-TCS-SCL: 1:0 X-FB-DOMAIN-IP-MATCH: fail Received: from mail160-tx2 (localhost.localdomain [127.0.0.1]) by mail160-tx2 (MessageSwitch) id 127236472840310_21613; Tue, 27 Apr 2010 10:38:48 +0000 (UTC) Received: from TX2EHSMHS015.bigfish.com (unknown [10.9.14.248]) by mail160-tx2.bigfish.com (Postfix) with ESMTP id 06241182004D; Tue, 27 Apr 2010 10:38:48 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by TX2EHSMHS015.bigfish.com (10.9.99.115) with Microsoft SMTP Server (TLS) id 14.0.482.44; Tue, 27 Apr 2010 10:38:48 +0000 Received: from ausb3twp01.amd.com ([163.181.250.37]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o3RAVW9Y015004; Tue, 27 Apr 2010 05:31:35 -0500 X-WSS-ID: 0L1J6WH-01-32L-02 X-M-MSG: Received: from sausexhtp02.amd.com (sausexhtp02.amd.com [163.181.3.152]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 27E2D1028562; Tue, 27 Apr 2010 05:38:41 -0500 (CDT) Received: from storexhtp02.amd.com (172.24.4.4) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.2.234.1; Tue, 27 Apr 2010 05:38:44 -0500 Received: from storexmb1.amd.com (10.1.1.14) by storexhtp02.amd.com (172.24.4.4) with Microsoft SMTP Server id 8.2.234.1; Tue, 27 Apr 2010 05:38:43 -0500 Received: from sausexmb1.amd.com ([163.181.3.156]) by storexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 27 Apr 2010 06:38:43 -0400 Received: from seurexmb1.amd.com ([165.204.9.130]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 27 Apr 2010 05:38:41 -0500 Received: from lemmy.osrc.amd.com ([165.204.15.93]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 27 Apr 2010 12:38:35 +0200 Received: by lemmy.osrc.amd.com (Postfix, from userid 41430) id B1349C9B5E; Tue, 27 Apr 2010 12:38:35 +0200 (CEST) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 09/22] KVM: MMU: Let is_rsvd_bits_set take mmu context instead of vcpu Date: Tue, 27 Apr 2010 12:38:19 +0200 Message-ID: <1272364712-17425-10-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1272364712-17425-1-git-send-email-joerg.roedel@amd.com> References: <1272364712-17425-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 27 Apr 2010 10:38:35.0808 (UTC) FILETIME=[CA595200:01CAE5F5] MIME-Version: 1.0 X-Reverse-DNS: unknown 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]); Tue, 27 Apr 2010 10:44:33 +0000 (UTC) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index ef9d284..615c78f 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2252,12 +2252,12 @@ static void paging_free(struct kvm_vcpu *vcpu) nonpaging_free(vcpu); } -static bool is_rsvd_bits_set(struct kvm_vcpu *vcpu, u64 gpte, int level) +static bool is_rsvd_bits_set(struct kvm_mmu *mmu, u64 gpte, int level) { int bit7; bit7 = (gpte >> 7) & 1; - return (gpte & vcpu->arch.mmu.rsvd_bits_mask[bit7][level-1]) != 0; + return (gpte & mmu->rsvd_bits_mask[bit7][level-1]) != 0; } #define PTTYPE 64 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 802c513..1975ab6 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -158,7 +158,8 @@ walk: if (!is_present_gpte(pte)) goto not_present; - rsvd_fault = is_rsvd_bits_set(vcpu, pte, walker->level); + rsvd_fault = is_rsvd_bits_set(&vcpu->arch.mmu, pte, + walker->level); if (rsvd_fault) goto access_error;