From patchwork Wed May 24 17:49:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 9746651 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 54BB460209 for ; Wed, 24 May 2017 17:50:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4586E223B3 for ; Wed, 24 May 2017 17:50:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3821528988; Wed, 24 May 2017 17:50:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E4C5223B3 for ; Wed, 24 May 2017 17:50:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932373AbdEXRuF (ORCPT ); Wed, 24 May 2017 13:50:05 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:35408 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932362AbdEXRuD (ORCPT ); Wed, 24 May 2017 13:50:03 -0400 Received: by mail-pg0-f49.google.com with SMTP id q125so69070878pgq.2 for ; Wed, 24 May 2017 10:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=t8raMo2/gHuDyS9ntprBoBlgA7q6UorF7JsM+6xDQZM=; b=us29lS/63S3kHpe+ctDySRJ6ebBFnz1/FmI1IXe7MMfHggmkpv0f6YCsxUBP7ujX1J dW4GrVObI2N3S4zSkJsuUWrr0epvmMrGtD5rdJb6y9jeJYDMl1vDqQTg7grRAQtDM0gp cl2qI1yB95/okljSU27F14uG//EZ2vgKWmC3dytrThk7fP3J4HIejQYQ30zxDbBiZIZL KD2w4RAj1cFiM47t+wuc3/ky2KVI6yttP72Exo2b6/uPxqjUltc42onGap2zdOFbjVU0 6XpuysKn1L1Tx/KvSdpqW0Zg4F5kIBPXh6MZ1WDoVTdzTqyzwDRkTEHeVAuVJg7XCE2V Xtvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=t8raMo2/gHuDyS9ntprBoBlgA7q6UorF7JsM+6xDQZM=; b=AEQ1ZmoDdmycPTpIQLvlgvbL20h279xamAgOsX+vWlztefyogGxWIU3rsP42zAmCOI 19a7T5zW6vLAFOKQ+uwnLRIrU+FVHm8OR8sw3nBLYGd20N+6DlAiplDuKq2Zvbu2eQIC PYdunHrYvxN3aSoex2th5M8wRQrBk0p+Gu4a84P+jboLEm1T5KMdXdxbYXNN3Hb6ORQF vaauFolu/GN9awlns6JL0eYoyJ3EGvr/LZBzKwcES0n++MMCHcJ5x1hMoN7DzobhJCAA /XWJqGY19mzKQErNBCcNNtkQewK6JwVMMVJeugL1F+BMTrtwozUhHyUgnGO4vV0Ej4nM 6lcw== X-Gm-Message-State: AODbwcCYiUIMrCdb7cz7fXNWaS34Bs5Qm+obcPeKBHwdwzyEkIvUyU+h 8NaGAwxiBJm5Eotg X-Received: by 10.98.178.72 with SMTP id x69mr38884266pfe.74.1495648202583; Wed, 24 May 2017 10:50:02 -0700 (PDT) Received: from turtle.sea.corp.google.com ([172.31.88.24]) by smtp.gmail.com with ESMTPSA id q9sm7596389pfg.77.2017.05.24.10.50.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 May 2017 10:50:01 -0700 (PDT) From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson Subject: [PATCH 2/3 v3] kvm: x86: Guest BNDCFGS requires guest MPX support Date: Wed, 24 May 2017 10:49:25 -0700 Message-Id: <20170524174925.189832-1-jmattson@google.com> X-Mailer: git-send-email 2.13.0.219.gdb65acc882-goog In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The BNDCFGS MSR should only be exposed to the guest if the guest supports MPX. (cf. the TSC_AUX MSR and RDTSCP.) Fixes: 0dd376e709975779 ("KVM: x86: add MSR_IA32_BNDCFGS to msrs_to_save") Change-Id: I3ad7c01bda616715137ceac878f3fa7e66b6b387 Signed-off-by: Jim Mattson Reviewed-by: Radim Krčmář --- arch/x86/kvm/cpuid.h | 8 ++++++++ arch/x86/kvm/vmx.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h index a6fd40aade7c..da6728383052 100644 --- a/arch/x86/kvm/cpuid.h +++ b/arch/x86/kvm/cpuid.h @@ -144,6 +144,14 @@ static inline bool guest_cpuid_has_rtm(struct kvm_vcpu *vcpu) return best && (best->ebx & bit(X86_FEATURE_RTM)); } +static inline bool guest_cpuid_has_mpx(struct kvm_vcpu *vcpu) +{ + struct kvm_cpuid_entry2 *best; + + best = kvm_find_cpuid_entry(vcpu, 7, 0); + return best && (best->ebx & bit(X86_FEATURE_MPX)); +} + static inline bool guest_cpuid_has_rdtscp(struct kvm_vcpu *vcpu) { struct kvm_cpuid_entry2 *best; diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 763d27ee00fb..c9bbbf509c2a 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3195,7 +3195,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) msr_info->data = vmcs_readl(GUEST_SYSENTER_ESP); break; case MSR_IA32_BNDCFGS: - if (!kvm_mpx_supported()) + if (!kvm_mpx_supported() || !guest_cpuid_has_mpx(vcpu)) return 1; msr_info->data = vmcs_read64(GUEST_BNDCFGS); break; @@ -3277,7 +3277,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) vmcs_writel(GUEST_SYSENTER_ESP, data); break; case MSR_IA32_BNDCFGS: - if (!kvm_mpx_supported()) + if (!kvm_mpx_supported() || !guest_cpuid_has_mpx(vcpu)) return 1; vmcs_write64(GUEST_BNDCFGS, data); break;