From patchwork Fri Sep 10 15:34:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 169652 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8AFdcOI003840 for ; Fri, 10 Sep 2010 15:39:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755027Ab0IJPim (ORCPT ); Fri, 10 Sep 2010 11:38:42 -0400 Received: from tx2ehsobe003.messaging.microsoft.com ([65.55.88.13]:7775 "EHLO TX2EHSOBE005.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754971Ab0IJPil (ORCPT ); Fri, 10 Sep 2010 11:38:41 -0400 Received: from mail106-tx2-R.bigfish.com (10.9.14.245) by TX2EHSOBE005.bigfish.com (10.9.40.25) with Microsoft SMTP Server id 8.1.340.0; Fri, 10 Sep 2010 15:38:40 +0000 Received: from mail106-tx2 (localhost.localdomain [127.0.0.1]) by mail106-tx2-R.bigfish.com (Postfix) with ESMTP id 54C4F1920664; Fri, 10 Sep 2010 15:38:40 +0000 (UTC) X-SpamScore: 1 X-BigFish: VS1(zzzz1202hzz8275bhz32i2a8h87h43h61h) X-Spam-TCS-SCL: 0:0 X-FB-DOMAIN-IP-MATCH: fail Received: from mail106-tx2 (localhost.localdomain [127.0.0.1]) by mail106-tx2 (MessageSwitch) id 1284133119896311_22231; Fri, 10 Sep 2010 15:38:39 +0000 (UTC) Received: from TX2EHSMHS001.bigfish.com (unknown [10.9.14.249]) by mail106-tx2.bigfish.com (Postfix) with ESMTP id CA9BC1708054; Fri, 10 Sep 2010 15:38:39 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by TX2EHSMHS001.bigfish.com (10.9.99.101) with Microsoft SMTP Server (TLS) id 14.0.482.44; Fri, 10 Sep 2010 15:38:28 +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 o8AFa5hW015959; Fri, 10 Sep 2010 10:37:05 -0500 X-WSS-ID: 0L8JF8L-01-7VJ-02 X-M-MSG: Received: from sausexhtp01.amd.com (sausexhtp01.amd.com [163.181.3.165]) (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 258E910286DA; Fri, 10 Sep 2010 10:33:57 -0500 (CDT) Received: from storexhtp02.amd.com (172.24.4.4) by sausexhtp01.amd.com (163.181.3.165) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 10 Sep 2010 10:34:01 -0500 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp02.amd.com (172.24.4.4) with Microsoft SMTP Server id 8.3.83.0; Fri, 10 Sep 2010 11:33:59 -0400 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id 5014249C256; Fri, 10 Sep 2010 16:33:59 +0100 (BST) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id 80730A0500; Fri, 10 Sep 2010 17:34:18 +0200 (CEST) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: , Joerg Roedel Subject: [PATCH 3/7] svm: Add test for NX bit check in emulated NPT Date: Fri, 10 Sep 2010 17:34:06 +0200 Message-ID: <1284132850-19302-4-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1284132850-19302-1-git-send-email-joerg.roedel@amd.com> References: <1284132850-19302-1-git-send-email-joerg.roedel@amd.com> 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 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Sep 2010 15:39:39 +0000 (UTC) diff --git a/x86/svm.c b/x86/svm.c index 0e15819..0fa9fec 100644 --- a/x86/svm.c +++ b/x86/svm.c @@ -25,6 +25,7 @@ static void setup_svm(void) wrmsr(MSR_VM_HSAVE_PA, virt_to_phys(hsave)); wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_SVME); + wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_NX); if (!npt_supported()) return; @@ -68,6 +69,17 @@ static void setup_svm(void) pml4e[0] = ((u64)pdpe) | 0x27; } +static u64 *get_pte(u64 address) +{ + int i1, i2; + + address >>= 12; + i1 = (address >> 9) & 0x7ff; + i2 = address & 0x1ff; + + return &pte[i1][i2]; +} + static void vmcb_set_seg(struct vmcb_seg *seg, u16 selector, u64 base, u32 limit, u32 attr) { @@ -450,6 +462,29 @@ static bool sel_cr0_check(struct test *test) return test->vmcb->control.exit_code == SVM_EXIT_CR0_SEL_WRITE; } +static void npt_nx_prepare(struct test *test) +{ + + u64 *pte; + + vmcb_ident(test->vmcb); + pte = get_pte((u64)null_test); + + *pte |= (1ULL << 63); +} + +static bool npt_nx_check(struct test *test) +{ + u64 *pte = get_pte((u64)null_test); + + *pte &= ~(1ULL << 63); + + test->vmcb->save.efer |= (1 << 11); + + return (test->vmcb->control.exit_code == SVM_EXIT_NPF) + && (test->vmcb->control.exit_info_1 == 0x15); +} + static struct test tests[] = { { "null", default_supported, default_prepare, null_test, default_finished, null_check }, @@ -472,6 +507,8 @@ static struct test tests[] = { default_finished, check_asid_zero }, { "sel_cr0", default_supported, sel_cr0_prepare, sel_cr0_test, sel_cr0_finished, sel_cr0_check }, + { "npt_nx", npt_supported, npt_nx_prepare, null_test, + default_finished, npt_nx_check } }; int main(int ac, char **av)