From patchwork Tue Sep 14 15:59: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: 179852 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 o8EFwkGO023775 for ; Tue, 14 Sep 2010 15:58:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752892Ab0INP6m (ORCPT ); Tue, 14 Sep 2010 11:58:42 -0400 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14]:1590 "EHLO TX2EHSOBE008.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752221Ab0INP6k (ORCPT ); Tue, 14 Sep 2010 11:58:40 -0400 Received: from mail32-tx2-R.bigfish.com (10.9.14.253) by TX2EHSOBE008.bigfish.com (10.9.40.28) with Microsoft SMTP Server id 8.1.340.0; Tue, 14 Sep 2010 15:58:40 +0000 Received: from mail32-tx2 (localhost.localdomain [127.0.0.1]) by mail32-tx2-R.bigfish.com (Postfix) with ESMTP id 611D919C8169; Tue, 14 Sep 2010 15:58:40 +0000 (UTC) X-SpamScore: 1 X-BigFish: VS1(zzzz1202hzz8275bhz32i2a8h87h62h) X-Spam-TCS-SCL: 1:0 X-FB-DOMAIN-IP-MATCH: fail Received: from mail32-tx2 (localhost.localdomain [127.0.0.1]) by mail32-tx2 (MessageSwitch) id 128447991929490_6780; Tue, 14 Sep 2010 15:58:39 +0000 (UTC) Received: from TX2EHSMHS015.bigfish.com (unknown [10.9.14.243]) by mail32-tx2.bigfish.com (Postfix) with ESMTP id 9957520058; Tue, 14 Sep 2010 15:58:38 +0000 (UTC) Received: from ausb3extmailp02.amd.com (163.181.251.22) by TX2EHSMHS015.bigfish.com (10.9.99.115) with Microsoft SMTP Server (TLS) id 14.0.482.44; Tue, 14 Sep 2010 15:58:36 +0000 Received: from ausb3twp01.amd.com (ausb3twp01.amd.com [163.181.250.37]) by ausb3extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o8EG1O1c005839; Tue, 14 Sep 2010 11:01:27 -0500 X-WSS-ID: 0L8QV1G-01-0PF-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 2AD411028781; Tue, 14 Sep 2010 10:58:28 -0500 (CDT) Received: from storexhtp01.amd.com (172.24.4.3) by sausexhtp01.amd.com (163.181.3.165) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 14 Sep 2010 10:58:32 -0500 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp01.amd.com (172.24.4.3) with Microsoft SMTP Server id 8.3.83.0; Tue, 14 Sep 2010 11:58:31 -0400 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id 2C20B49C1ED; Tue, 14 Sep 2010 16:58:31 +0100 (BST) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id B68D7A024F; Tue, 14 Sep 2010 17:59:13 +0200 (CEST) From: Joerg Roedel To: Avi Kivity CC: , Joerg Roedel Subject: [PATCH 1/7] svm: Add test for selective cr0 intercept Date: Tue, 14 Sep 2010 17:59:06 +0200 Message-ID: <1284479952-4916-2-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1284479952-4916-1-git-send-email-joerg.roedel@amd.com> References: <1284479952-4916-1-git-send-email-joerg.roedel@amd.com> MIME-Version: 1.0 X-Reverse-DNS: ausb3extmailp02.amd.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 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Sep 2010 15:58:46 +0000 (UTC) diff --git a/x86/svm.c b/x86/svm.c index 2f1c900..689880d 100644 --- a/x86/svm.c +++ b/x86/svm.c @@ -357,6 +357,40 @@ static bool check_asid_zero(struct test *test) return test->vmcb->control.exit_code == SVM_EXIT_ERR; } +static void sel_cr0_bug_prepare(struct test *test) +{ + vmcb_ident(test->vmcb); + test->vmcb->control.intercept |= (1ULL << INTERCEPT_SELECTIVE_CR0); +} + +static bool sel_cr0_bug_finished(struct test *test) +{ + return true; +} + +static void sel_cr0_bug_test(struct test *test) +{ + unsigned long cr0; + + /* read cr0, clear CD, and write back */ + cr0 = read_cr0(); + cr0 |= (1UL << 30); + write_cr0(cr0); + + /* + * If we are here the test failed, not sure what to do now because we + * are not in guest-mode anymore so we can't trigger an intercept. + * Trigger a tripple-fault for now. + */ + printf("sel_cr0 test failed. Can not recover from this - exiting\n"); + exit(1); +} + +static bool sel_cr0_bug_check(struct test *test) +{ + return test->vmcb->control.exit_code == SVM_EXIT_CR0_SEL_WRITE; +} + static struct test tests[] = { { "null", default_supported, default_prepare, null_test, default_finished, null_check }, @@ -377,7 +411,8 @@ static struct test tests[] = { mode_switch_finished, check_mode_switch }, { "asid_zero", default_supported, prepare_asid_zero, test_asid_zero, default_finished, check_asid_zero }, - + { "sel_cr0_bug", default_supported, sel_cr0_bug_prepare, sel_cr0_bug_test, + sel_cr0_bug_finished, sel_cr0_bug_check }, }; int main(int ac, char **av)