From patchwork Sun Jun 15 14:24:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4354651 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9817BBEEAA for ; Sun, 15 Jun 2014 14:25:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB3A920219 for ; Sun, 15 Jun 2014 14:25:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA96020212 for ; Sun, 15 Jun 2014 14:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751377AbaFOOZA (ORCPT ); Sun, 15 Jun 2014 10:25:00 -0400 Received: from mout.web.de ([212.227.15.3]:50987 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbaFOOYv (ORCPT ); Sun, 15 Jun 2014 10:24:51 -0400 Received: from mchn199C.home ([95.157.58.223]) by smtp.web.de (mrweb003) with ESMTPSA (Nemesis) id 0Lylol-1Wi4Ri15vT-016AWR; Sun, 15 Jun 2014 16:24:49 +0200 From: Jan Kiszka To: Paolo Bonzini Cc: kvm , Bandan Das Subject: [PATCH 4/5] VMX: Validate capability MSRs Date: Sun, 15 Jun 2014 16:24:40 +0200 Message-Id: <6a1106d8fefb4c808cdacc2a0632a5a55bd825b6.1402842281.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.8.1.1.298.ge7eed54 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V03:K0:HiOgQieLOhXaUV1RyIiOVU9PCFLUCKgJQClft4rKKXmmjZPr7bY 108b0vrU1lnui9V4hYdTHAqehZP8Ujq3/z1jQGMc/Mnsc0EJ46gIMmv14BI89ADQL+JYkxC S8oYLMCBYYnwAJ2onFL8JHbb6Upa5G40K5zhCqhmlRIHVFzIJx3sYHzZe9QEyiIYXB1fwqn qBJpA7dvjNQzeFslzRhSg== Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jan Kiszka Check for required-0 or required-1 bits as well as known field value restrictions. Also check the consistency between VMX_*_CTLS and VMX_TRUE_*_CTLS and between CR0/4_FIXED0 and CR0/4_FIXED1. Signed-off-by: Jan Kiszka --- x86/vmx.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- x86/vmx.h | 5 +++-- 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/x86/vmx.c b/x86/vmx.c index 1182eef..84c514b 100644 --- a/x86/vmx.c +++ b/x86/vmx.c @@ -635,6 +635,76 @@ static void test_vmptrst(void) report("test vmptrst", (!ret) && (vmcs1 == vmcs2)); } +struct vmx_ctl_msr { + const char *name; + u32 index, true_index; + u32 default1; +} vmx_ctl_msr[] = { + { "MSR_IA32_VMX_PINBASED_CTLS", MSR_IA32_VMX_PINBASED_CTLS, + MSR_IA32_VMX_TRUE_PIN, 0x16 }, + { "MSR_IA32_VMX_PROCBASED_CTLS", MSR_IA32_VMX_PROCBASED_CTLS, + MSR_IA32_VMX_TRUE_PROC, 0x401e172 }, + { "MSR_IA32_VMX_PROCBASED_CTLS2", MSR_IA32_VMX_PROCBASED_CTLS2, + MSR_IA32_VMX_PROCBASED_CTLS2, 0 }, + { "MSR_IA32_VMX_EXIT_CTLS", MSR_IA32_VMX_EXIT_CTLS, + MSR_IA32_VMX_TRUE_EXIT, 0x36dff }, + { "MSR_IA32_VMX_ENTRY_CTLS", MSR_IA32_VMX_ENTRY_CTLS, + MSR_IA32_VMX_TRUE_ENTRY, 0x11ff }, +}; + +static void test_vmx_caps(void) +{ + u64 val, true_val, default1, fixed0, fixed1; + unsigned int n; + bool ok; + + printf("\nTest suite: VMX capability reporting\n"); + + report("MSR_IA32_VMX_BASIC", + (basic.revision & (1ul << 31)) == 0 && + basic.size > 0 && basic.size <= 4096 && + (basic.type == 0 || basic.type == 6) && + basic.reserved1 == 0 && basic.reserved2 == 0); + + val = rdmsr(MSR_IA32_VMX_MISC); + report("MSR_IA32_VMX_MISC", + (!(ctrl_cpu_rev[1].clr & CPU_URG) || val & (1ul << 5)) && + ((val >> 16) & 0x1ff) <= 256 && + (val & 0xc0007e00) == 0); + + for (n = 0; n < ARRAY_SIZE(vmx_ctl_msr); n++) { + val = rdmsr(vmx_ctl_msr[n].index); + default1 = vmx_ctl_msr[n].default1; + ok = (val & default1) == default1 && + ((((u32)val) ^ (val >> 32)) & ~(val >> 32)) == 0; + if (ok && basic.ctrl) { + true_val = rdmsr(vmx_ctl_msr[n].true_index); + ok = (val >> 32) == (true_val >> 32) && + ((u32)(val ^ true_val) & ~default1) == 0; + } + report(vmx_ctl_msr[n].name, ok); + } + + fixed0 = rdmsr(MSR_IA32_VMX_CR0_FIXED0); + fixed1 = rdmsr(MSR_IA32_VMX_CR0_FIXED1); + report("MSR_IA32_VMX_IA32_VMX_CR0_FIXED0/1", + ((fixed0 ^ fixed1) & ~fixed1) == 0); + + fixed0 = rdmsr(MSR_IA32_VMX_CR4_FIXED0); + fixed1 = rdmsr(MSR_IA32_VMX_CR4_FIXED1); + report("MSR_IA32_VMX_IA32_VMX_CR4_FIXED0/1", + ((fixed0 ^ fixed1) & ~fixed1) == 0); + + val = rdmsr(MSR_IA32_VMX_VMCS_ENUM); + report("MSR_IA32_VMX_VMCS_ENUM", + (val & 0x3e) >= 0x2a && + (val & 0xfffffffffffffc01Ull) == 0); + + val = rdmsr(MSR_IA32_VMX_EPT_VPID_CAP); + report("MSR_IA32_VMX_EPT_VPID_CAP", + (val & 0xfffff07ef9eebebeUll) == 0); +} + /* This function can only be called in guest */ static void __attribute__((__used__)) hypercall(u32 hypercall_no) { @@ -777,7 +847,7 @@ static int test_run(struct vmx_test *test) regs = test->guest_regs; vmcs_write(GUEST_RFLAGS, regs.rflags | 0x2); launched = 0; - printf("\nTest suite : %s\n", test->name); + printf("\nTest suite: %s\n", test->name); vmx_run(); if (vmx_off()) { printf("%s : vmxoff failed.\n", __func__); @@ -816,6 +886,7 @@ int main(void) goto exit; } test_vmxoff(); + test_vmx_caps(); while (vmx_tests[++i].name != NULL) if (test_run(&vmx_tests[i])) diff --git a/x86/vmx.h b/x86/vmx.h index 69a5385..38ec3c5 100644 --- a/x86/vmx.h +++ b/x86/vmx.h @@ -46,12 +46,13 @@ union vmx_basic { struct { u32 revision; u32 size:13, - : 3, + reserved1: 3, width:1, dual:1, type:4, insouts:1, - ctrl:1; + ctrl:1, + reserved2:8; }; };