From: Tom Lendacky <thomas.lendacky@amd.com>
To: Sean Christopherson <seanjc@google.com>,
Michael Roth <michael.roth@amd.com>
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
Andy Lutomirski <luto@amacapital.net>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org, "H . Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 1/3] KVM: SVM: use vmsave/vmload for saving/restoring additional host state
Date: Thu, 7 Jan 2021 09:32:37 -0600 [thread overview]
Message-ID: <b04bf56d-c6ef-3636-020f-ce107cffbe59@amd.com> (raw)
In-Reply-To: <X/Sfw15OWarseivB@google.com>
On 1/5/21 11:20 AM, Sean Christopherson wrote:
> On Tue, Jan 05, 2021, Michael Roth wrote:
>> @@ -3703,16 +3688,9 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu,
>> if (sev_es_guest(svm->vcpu.kvm)) {
>> __svm_sev_es_vcpu_run(svm->vmcb_pa);
>> } else {
>> - __svm_vcpu_run(svm->vmcb_pa, (unsigned long *)&svm->vcpu.arch.regs);
>> -
>> -#ifdef CONFIG_X86_64
>> - native_wrmsrl(MSR_GS_BASE, svm->host.gs_base);
>> -#else
>> - loadsegment(fs, svm->host.fs);
>> -#ifndef CONFIG_X86_32_LAZY_GS
>> - loadsegment(gs, svm->host.gs);
>> -#endif
>> -#endif
>> + __svm_vcpu_run(svm->vmcb_pa, (unsigned long *)&svm->vcpu.arch.regs,
>> + page_to_phys(per_cpu(svm_data,
>> + vcpu->cpu)->save_area));
>
> Does this need to use __sme_page_pa()?
Yes, it should now. The SEV-ES support added the SME encryption bit to the
MSR_VM_HSAVE_PA MSR, so we need to be consistent in how the data is read
and written.
Thanks,
Tom
>
>> }
>>
>> /*
>
> ...
>
>> diff --git a/arch/x86/kvm/svm/vmenter.S b/arch/x86/kvm/svm/vmenter.S
>> index 6feb8c08f45a..89f4e8e7bf0e 100644
>> --- a/arch/x86/kvm/svm/vmenter.S
>> +++ b/arch/x86/kvm/svm/vmenter.S
>> @@ -33,6 +33,7 @@
>> * __svm_vcpu_run - Run a vCPU via a transition to SVM guest mode
>> * @vmcb_pa: unsigned long
>> * @regs: unsigned long * (to guest registers)
>> + * @hostsa_pa: unsigned long
>> */
>> SYM_FUNC_START(__svm_vcpu_run)
>> push %_ASM_BP
>> @@ -47,6 +48,9 @@ SYM_FUNC_START(__svm_vcpu_run)
>> #endif
>> push %_ASM_BX
>>
>> + /* Save @hostsa_pa */
>> + push %_ASM_ARG3
>> +
>> /* Save @regs. */
>> push %_ASM_ARG2
>>
>> @@ -154,6 +158,12 @@ SYM_FUNC_START(__svm_vcpu_run)
>> xor %r15d, %r15d
>> #endif
>>
>> + /* "POP" @hostsa_pa to RAX. */
>> + pop %_ASM_AX
>> +
>> + /* Restore host user state and FS/GS base */
>> + vmload %_ASM_AX
>
> This VMLOAD needs the "handle fault on reboot" goo. Seeing the code, I think
> I'd prefer to handle this in C code, especially if Paolo takes the svm_ops.h
> patch[*]. Actually, I think with that patch it'd make sense to move the
> existing VMSAVE+VMLOAD for the guest into svm.c, too. And completely unrelated,
> the fault handling in svm/vmenter.S can be cleaned up a smidge to eliminate the
> JMPs.
>
> Paolo, what do you think about me folding these patches into my series to do the
> above cleanups? And maybe sending a pull request for the end result? (I'd also
> like to add on a patch to use the user return MSR mechanism for MSR_TSC_AUX).
>
> [*] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flkml.kernel.org%2Fr%2F20201231002702.2223707-8-seanjc%40google.com&data=04%7C01%7Cthomas.lendacky%40amd.com%7C5125acb3a3384ee75a5c08d8b19e2888%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637454640159484993%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=Q%2F%2B7kxE9pcV%2BelzHbeRpvs8wlQGQkirKUPg7fBP3QbU%3D&reserved=0
>
>> +
>> pop %_ASM_BX
>>
>> #ifdef CONFIG_X86_64
>> --
>> 2.25.1
>>
next prev parent reply other threads:[~2021-01-07 15:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 14:37 [PATCH 0/3] KVM: SVM: Refactor vcpu_load/put to use vmload/vmsave for host state Michael Roth
2021-01-05 14:37 ` [PATCH v3 1/3] KVM: SVM: use vmsave/vmload for saving/restoring additional " Michael Roth
2021-01-05 17:20 ` Sean Christopherson
2021-01-07 15:32 ` Tom Lendacky [this message]
2021-01-07 15:47 ` Tom Lendacky
2021-01-08 0:32 ` Michael Roth
2021-02-02 17:32 ` Paolo Bonzini
2021-01-07 15:39 ` Tom Lendacky
2021-01-05 14:37 ` [PATCH v3 2/3] KVM: SVM: remove uneeded fields from host_save_users_msrs Michael Roth
2021-01-05 14:37 ` [PATCH v3 3/3] KVM: SVM: use .prepare_guest_switch() to handle CPU register save/setup Michael Roth
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=b04bf56d-c6ef-3636-020f-ce107cffbe59@amd.com \
--to=thomas.lendacky@amd.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=michael.roth@amd.com \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
/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).