Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp406154ybt; Wed, 1 Jul 2020 01:09:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOUyx1A+XDmxT84IKAtyCZBofAZgDqHtnrq6X/TwFgr81/bhW9jJpp5uUaE/Yujhynnp3r X-Received: by 2002:a17:906:cd2:: with SMTP id l18mr22799332ejh.18.1593590951593; Wed, 01 Jul 2020 01:09:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593590951; cv=none; d=google.com; s=arc-20160816; b=izpKCruCbBF80LLHSwOY6SUc8UsSCLzu6HCGdtVfMhaH8SKHYF0tQHDffnWyjpwOs3 WdVWI2O7JTMtzAR2gXDrK0k4kPEOZJnGEPdulv2NL0ECguJpFIEAL6b0D4JVD4EfQnja VmSTNsxQeXnPqrRBHysXVE2tkxEFlhmv+DRfO4fL2hkcATGaacV+YLzAAM4E6Vm/LAUz IYqGoo9q+ARQwfa8soolnw0sUc9HOLsbuUMxhOYr67yyGSWQHFICbAmtDEbiqyj59Ge7 kEa1unxSw/ozUP8M1HB6YgWZpNcC9iFPwDqEyQttkw+0QiInVbw/hEOUzKGspzpsm1SN V5Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr; bh=BlR7Nyafm8IhGVSZjcgPha2btWzHa5qibp+ODbsCZVI=; b=VtFjzyUjn273/vc8BCu4Ta1JruB5wreZvwjAP8Br3YABZzpPSnpCc2rSPMuoTwqvBN uNN5hup9aaGNTnr9c4ro2Ml9Uc5Yyr+o3MULu5/wHg8BgpXO0ii80MBoLnGVU1jLAVM6 d4hX8dmtV7W3lOfapNifzgyVww3lNTPNHTClxYBSsD0GMfD4WgYoB95HNAhVPRDdfFg9 FuBkON+4/UK5OYRnEdIbqJfvAubP1t9aDna49NK1SJesnKSLvAw16q69EHRSP0PFxitz kO+RVk9h72JV3kgr/f9juTjgkH1Oyj51qt/xsfVwuuMbrOiJedcOZk4GXBxu5VhpfrOR 9tLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p22si3134510edm.430.2020.07.01.01.08.49; Wed, 01 Jul 2020 01:09:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728614AbgGAIEe (ORCPT + 99 others); Wed, 1 Jul 2020 04:04:34 -0400 Received: from mga14.intel.com ([192.55.52.115]:2420 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728559AbgGAIE0 (ORCPT ); Wed, 1 Jul 2020 04:04:26 -0400 IronPort-SDR: fH2f/k7R8Ta23mI+JVt069IAwHoHHK70hHG2jsA8dpp1zorZT4bc7QnoPei8MExtibQmPohORS R33OzXsrZQyg== X-IronPort-AV: E=McAfee;i="6000,8403,9668"; a="145581902" X-IronPort-AV: E=Sophos;i="5.75,299,1589266800"; d="scan'208";a="145581902" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jul 2020 01:04:25 -0700 IronPort-SDR: h6kF0ie/3Tu/eBacfEyB1wdARMI1pHv/z8552Qwwq1s8MR5Z27v1TthsHE0UNVdcbiIyREjGej nwPsUvkPqmww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,299,1589266800"; d="scan'208";a="455010296" Received: from unknown (HELO local-michael-cet-test.sh.intel.com) ([10.239.159.128]) by orsmga005.jf.intel.com with ESMTP; 01 Jul 2020 01:04:23 -0700 From: Yang Weijiang To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, pbonzini@redhat.com, sean.j.christopherson@intel.com, jmattson@google.com Cc: yu.c.zhang@linux.intel.com, Yang Weijiang Subject: [PATCH v13 06/11] KVM: x86: Load guest fpu state when access MSRs managed by XSAVES Date: Wed, 1 Jul 2020 16:04:06 +0800 Message-Id: <20200701080411.5802-7-weijiang.yang@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200701080411.5802-1-weijiang.yang@intel.com> References: <20200701080411.5802-1-weijiang.yang@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Christopherson A handful of CET MSRs are not context switched through "traditional" methods, e.g. VMCS or manual switching, but rather are passed through to the guest and are saved and restored by XSAVES/XRSTORS, i.e. in the guest's FPU state. Load the guest's FPU state if userspace is accessing MSRs whose values are managed by XSAVES so that the MSR helper, e.g. vmx_{get,set}_msr(), can simply do {RD,WR}MSR to access the guest's value. Note that guest_cpuid_has() is not queried as host userspace is allowed to access MSRs that have not been exposed to the guest, e.g. it might do KVM_SET_MSRS prior to KVM_SET_CPUID2. Signed-off-by: Sean Christopherson Co-developed-by: Yang Weijiang Signed-off-by: Yang Weijiang --- arch/x86/kvm/x86.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c866087ed0ef..50f80dcab3a9 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -109,6 +109,8 @@ static void enter_smm(struct kvm_vcpu *vcpu); static void __kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags); static void store_regs(struct kvm_vcpu *vcpu); static int sync_regs(struct kvm_vcpu *vcpu); +static void kvm_load_guest_fpu(struct kvm_vcpu *vcpu); +static void kvm_put_guest_fpu(struct kvm_vcpu *vcpu); struct kvm_x86_ops kvm_x86_ops __read_mostly; EXPORT_SYMBOL_GPL(kvm_x86_ops); @@ -3267,6 +3269,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) } EXPORT_SYMBOL_GPL(kvm_get_msr_common); +static bool is_xsaves_msr(u32 index) +{ + return index == MSR_IA32_U_CET || + (index >= MSR_IA32_PL0_SSP && index <= MSR_IA32_PL3_SSP); +} + /* * Read or write a bunch of msrs. All parameters are kernel addresses. * @@ -3277,11 +3285,20 @@ static int __msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs *msrs, int (*do_msr)(struct kvm_vcpu *vcpu, unsigned index, u64 *data)) { + bool fpu_loaded = false; int i; - for (i = 0; i < msrs->nmsrs; ++i) + for (i = 0; i < msrs->nmsrs; ++i) { + if (vcpu && !fpu_loaded && supported_xss && + is_xsaves_msr(entries[i].index)) { + kvm_load_guest_fpu(vcpu); + fpu_loaded = true; + } if (do_msr(vcpu, entries[i].index, &entries[i].data)) break; + } + if (fpu_loaded) + kvm_put_guest_fpu(vcpu); return i; } -- 2.17.2