From: Yang Weijiang <weijiang.yang@intel.com>
To: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Yang Weijiang <weijiang.yang@intel.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
pbonzini@redhat.com, mst@redhat.com, rkrcmar@redhat.com,
jmattson@google.com
Subject: Re: [PATCH v6 8/8] KVM: x86: Add user-space access interface for CET MSRs
Date: Tue, 13 Aug 2019 13:41:24 +0800 [thread overview]
Message-ID: <20190813054124.GB2432@local-michael-cet-test> (raw)
In-Reply-To: <20190812234336.GF4996@linux.intel.com>
On Mon, Aug 12, 2019 at 04:43:36PM -0700, Sean Christopherson wrote:
> On Thu, Jul 25, 2019 at 11:12:46AM +0800, Yang Weijiang wrote:
> > There're two different places storing Guest CET states, the states
> > managed with XSAVES/XRSTORS, as restored/saved
> > in previous patch, can be read/write directly from/to the MSRs.
> > For those stored in VMCS fields, they're access via vmcs_read/
> > vmcs_write.
> >
> > Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
> > ---
> > arch/x86/kvm/vmx/vmx.c | 43 ++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 43 insertions(+)
> >
> > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> > index 123285177c6b..e5eacd01e984 100644
> > --- a/arch/x86/kvm/vmx/vmx.c
> > +++ b/arch/x86/kvm/vmx/vmx.c
> > @@ -1774,6 +1774,27 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
> > else
> > msr_info->data = vmx->pt_desc.guest.addr_a[index / 2];
> > break;
> > + case MSR_IA32_S_CET:
> > + msr_info->data = vmcs_readl(GUEST_S_CET);
> > + break;
> > + case MSR_IA32_U_CET:
> > + rdmsrl(MSR_IA32_U_CET, msr_info->data);
> > + break;
> > + case MSR_IA32_INT_SSP_TAB:
> > + msr_info->data = vmcs_readl(GUEST_INTR_SSP_TABLE);
> > + break;
> > + case MSR_IA32_PL0_SSP:
> > + rdmsrl(MSR_IA32_PL0_SSP, msr_info->data);
> > + break;
> > + case MSR_IA32_PL1_SSP:
> > + rdmsrl(MSR_IA32_PL1_SSP, msr_info->data);
> > + break;
> > + case MSR_IA32_PL2_SSP:
> > + rdmsrl(MSR_IA32_PL2_SSP, msr_info->data);
> > + break;
> > + case MSR_IA32_PL3_SSP:
> > + rdmsrl(MSR_IA32_PL3_SSP, msr_info->data);
> > + break;
>
> These all need appropriate checks on guest and host support. The guest
> checks won't come into play very often, if ever, for the MSRs that exist
> if IBT *or* SHSTK is supported due to passing the MSRs through to the
> guest, but I don't think we want this code reliant on the interception
> logic. E.g.:
>
> case MSR_IA32_S_CET:
> if (!(host_xss & XFEATURE_MASK_CET_KERNEL))
> return 1;
>
> if (!msr_info->host_initiated &&
> !guest_cpuid_has(vcpu, X86_FEATURE_SHSTK) &&
> !guest_cpuid_has(vcpu, X86_FEATURE_IBT))
> return 1;
>
> MSR_IA32_U_CET is same as above, s/KERNEL/USER.
>
> case MSR_IA32_INT_SSP_TAB:
> if (!(host_xss & (XFEATURE_MASK_CET_KERNEL |
> XFEATURE_MASK_CET_USER)))
> return 1;
>
> if (!msr_info->host_initiated &&
> !guest_cpuid_has(vcpu, X86_FEATURE_SHSTK))
> return 1;
>
> MSR_IA32_PL[0-3]_SSP are same as above, but only check the appropriate
> KERNEL or USER bit.
>
> Note, the PL[0-2]_SSP MSRs can be collapsed into a single case, e.g.:
>
> case MSR_IA32_PL0_SSP ... MSR_IA32_PL2_SSP:
> <error handling code>;
>
> rdmsrl(msr_index, msr_info->data);
> break;
>
>
> Rinse and repeat for vmx_set_msr().
>
Thanks you, will modify this part of code.
> > case MSR_TSC_AUX:
> > if (!msr_info->host_initiated &&
> > !guest_cpuid_has(vcpu, X86_FEATURE_RDTSCP))
> > @@ -2007,6 +2028,28 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
> > else
> > vmx->pt_desc.guest.addr_a[index / 2] = data;
> > break;
> > + case MSR_IA32_S_CET:
> > + vmcs_writel(GUEST_S_CET, data);
> > + break;
> > + case MSR_IA32_U_CET:
> > + wrmsrl(MSR_IA32_U_CET, data);
> > + break;
> > + case MSR_IA32_INT_SSP_TAB:
> > + vmcs_writel(GUEST_INTR_SSP_TABLE, data);
> > + break;
> > + case MSR_IA32_PL0_SSP:
> > + wrmsrl(MSR_IA32_PL0_SSP, data);
> > + break;
> > + case MSR_IA32_PL1_SSP:
> > + wrmsrl(MSR_IA32_PL1_SSP, data);
> > + break;
> > + case MSR_IA32_PL2_SSP:
> > + wrmsrl(MSR_IA32_PL2_SSP, data);
> > + break;
> > + case MSR_IA32_PL3_SSP:
> > + wrmsrl(MSR_IA32_PL3_SSP, data);
> > + break;
> > +
> > case MSR_TSC_AUX:
> > if (!msr_info->host_initiated &&
> > !guest_cpuid_has(vcpu, X86_FEATURE_RDTSCP))
> > --
> > 2.17.2
> >
prev parent reply other threads:[~2019-08-13 5:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 3:12 [PATCH v6 0/8] Introduce support for Guest CET feature Yang Weijiang
2019-07-25 3:12 ` [PATCH v6 1/8] KVM: VMX: Define CET VMCS fields and control bits Yang Weijiang
2019-07-25 3:12 ` [PATCH v6 2/8] KVM: x86: Add a helper function for CPUID(0xD,n>=1) enumeration Yang Weijiang
2019-08-12 22:18 ` Sean Christopherson
2019-08-13 6:11 ` Yang Weijiang
2019-07-25 3:12 ` [PATCH v6 3/8] KVM: x86: Implement CET CPUID enumeration for Guest Yang Weijiang
2019-08-13 0:06 ` Sean Christopherson
2019-08-13 5:27 ` Yang Weijiang
2019-07-25 3:12 ` [PATCH v6 4/8] KVM: VMX: Pass through CET related MSRs to Guest Yang Weijiang
2019-08-12 23:53 ` Sean Christopherson
2019-08-13 5:49 ` Yang Weijiang
2019-07-25 3:12 ` [PATCH v6 5/8] KVM: VMX: Load Guest CET via VMCS when CET is enabled in Guest Yang Weijiang
2019-08-12 23:56 ` Sean Christopherson
2019-08-13 5:38 ` Yang Weijiang
2019-07-25 3:12 ` [PATCH v6 6/8] KVM: x86: Add CET bits setting in CR4 and XSS Yang Weijiang
2019-07-25 3:12 ` [PATCH v6 7/8] KVM: x86: Load Guest fpu state when accessing MSRs managed by XSAVES Yang Weijiang
2019-08-12 23:02 ` Sean Christopherson
2019-08-12 23:04 ` Sean Christopherson
2019-08-12 23:29 ` Sean Christopherson
2019-08-13 6:06 ` Yang Weijiang
2019-08-13 6:05 ` Yang Weijiang
2019-07-25 3:12 ` [PATCH v6 8/8] KVM: x86: Add user-space access interface for CET MSRs Yang Weijiang
2019-08-12 23:43 ` Sean Christopherson
2019-08-13 5:41 ` Yang Weijiang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190813054124.GB2432@local-michael-cet-test \
--to=weijiang.yang@intel.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=sean.j.christopherson@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).