KVM, SEV: Add KVM_EXIT_SYSTEM_EVENT metadata for SEV-ES
PATCH v4 1/1 KVM, SEV: Add KVM_EXIT_SYSTEM_EVENT metadata for SEV-ES
SEV-ES guests can request termination using the GHCB's MSR protocol. See AMD's GHCB spec section '4.1.13 Termination Request'. Currently when a guest does this the userspace VMM sees an KVM_EXIT_UNKNOWN (-EVINAL) return code from KVM_RUN. By adding a KVM_EXIT_SYSTEM_EVENT to kvm_run struct the userspace VMM can clearly see the guest has requested a SEV-ES termination including the termination reason code set and reason code.
---
V4
* Switch to using KVM_SYSTEM_EVENT exit reason.
V3
* Add Documentation/ update.
* Updated other KVM_EXIT_SHUTDOWN exits to clear ndata and set reason to KVM_SHUTDOWN_REQ.
V2
* Add KVM_CAP_EXIT_SHUTDOWN_REASON check for KVM_CHECK_EXTENSION.
Tested by making an SEV-ES guest call sev_es_terminate() with hardcoded reason code set and reason code and then observing the codes from the userspace VMM in the kvm_run.system_event fields.
--- arch/x86/kvm/svm/sev.c | 7 +++++-- include/uapi/linux/kvm.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/sev.c +5 -2
@@ -2735,8 +2735,11 @@ static int sev_handle_vmgexit_msr_protocol(struct vcpu_svm *svm)pr_info ("SEV-ES guest requested termination: %#llx:%#llx\n" , reason_set, reason_code); - ret = -EINVAL ; -break ; + vcpu->run->exit_reason =KVM_EXIT_SHUTDOWN ; + vcpu->run->system_event.type =KVM_SYSTEM_EVENT_SEV_TERM ; + vcpu->run->system_event.flags = control->ghcb_gpa; + +return 0 ; }default :/* Error, keep GHCB MSR value as-is */
include/uapi/linux/kvm.h +1 -0
@@ -444,6 +444,7 @@ struct kvm_run {#define KVM_SYSTEM_EVENT_SHUTDOWN 1#define KVM_SYSTEM_EVENT_RESET 2#define KVM_SYSTEM_EVENT_CRASH 3 +#define KVM_SYSTEM_EVENT_SEV_TERM 4__u32 type;__u64 flags; } system_event;
Signature · 1 line
2.35.1.1094.g7c7d902a7c-goog
Sean Christopherson
maintainerQuoted 3 lines · Peter Gonda
SEV-ES guests can request termination using the GHCB's MSR protocol. See AMD's GHCB spec section '4.1.13 Termination Request'. Currently when a guest does this the userspace VMM sees an
KVM_EXIT_UNKNOWN(-EVINAL)
s/EVINAL/EINVAL
Quoted 3 lines
return code from
KVM_RUN. By adding aKVM_EXIT_SYSTEM_EVENTtokvm_runstruct the userspace VMM can clearly see the guest has requested a SEV-ES termination including the termination reason code set and reason code.
Nit, phrase that last part as a command, nowhere in the changelog is it actually stated that the patch converts to use KVM_EXIT_SYSTEM_EVENT.
And my personal preference is to lead with the "what", especially when there's already a fair amount of assumed knowledge, e.g. someone that's familiar with SEV-ES probably already knows the guest can request termination, or at least won't be surprised by the news, whereas leading with the SEV-ES and GHCB info is just going to add to the confusion of someone who's clueless about SEV-ES.
If an SEV-ES guest requests termination, exit to userspace with KVM_EXIT_SYSTEM_EVENT and a dedicated SEV_TERM type instead of -EINVAL so that userspace can take appropriate action.
See AMD's GHCB spec section '4.1.13 Termination Request' for more details.
Quoted 38 lines
Signed-off-by Peter Gonda <[email protected]>Suggested-by Sean Christopherson <[email protected]>Cc Vitaly Kuznetsov <[email protected]>Cc Borislav Petkov <[email protected]>Cc Tom Lendacky <[email protected]>Cc Brijesh Singh <[email protected]>Cc Joerg Roedel <[email protected]>Cc Marc Orr <[email protected]>---
V4
* Switch to usingKVM_SYSTEM_EVENTexit reason.V3
* AddDocumentation/update.
* Updated otherKVM_EXIT_SHUTDOWNexits to clear ndata and set reason toKVM_SHUTDOWN_REQ.V2
* AddKVM_CAP_EXIT_SHUTDOWN_REASONcheck forKVM_CHECK_EXTENSION.Tested by making an SEV-ES guest call
sev_es_terminate()with hardcoded reason code set and reason code and then observing the codes from the userspace VMM in the kvm_run.system_event fields.--- arch/x86/kvm/svm/sev.c | 7 +++++-- include/uapi/linux/kvm.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)arch/x86/kvm/svm/sev.c +0
-0
arch/x86/kvm/svm/sev.c static int sev_handle_vmgexit_msr_protocol(struct vcpu_svm *svm) · line 2738
Quoted 6 lines
arch/x86/kvm/svm/sev.c +1
-2@@ -2735,8 +2735,11 @@ static int sev_handle_vmgexit_msr_protocol(struct vcpu_svm *svm)pr_info ("SEV-ES guest requested termination: %#llx:%#llx\n" , reason_set, reason_code); - ret = -EINVAL ; -break ; + vcpu->run->exit_reason =KVM_EXIT_SHUTDOWN ;
Wrong exit reason.
Quoted 12 lines
arch/x86/kvm/svm/sev.c +4
-0+ vcpu->run->system_event.type =KVM_SYSTEM_EVENT_SEV_TERM ; + vcpu->run->system_event.flags = control->ghcb_gpa; + +return 0 ; }default :/* Error, keep GHCB MSR value as-is */ include/uapi/linux/kvm.h +0
-0
include/uapi/linux/kvm.h struct kvm_run { · line 449
Quoted 6 lines
include/uapi/linux/kvm.h +1
-0@@ -444,6 +444,7 @@ struct kvm_run {#define KVM_SYSTEM_EVENT_SHUTDOWN 1#define KVM_SYSTEM_EVENT_RESET 2#define KVM_SYSTEM_EVENT_CRASH 3 +#define KVM_SYSTEM_EVENT_SEV_TERM 4__u32 type;__u64 flags;
@type isn't properly padded, so this needs to be changed when using flags. And
we definitely want to grab more room than just a single u64.
Per Paolo and I's combined powers[*], use bit 31 of the type to enumerate that ndata is valid, and then change the sub-struct to:
struct {
#define KVM_SYSTEM_EVENT_SHUTDOWN 1
#define KVM_SYSTEM_EVENT_RESET 2
#define KVM_SYSTEM_EVENT_CRASH 3
#define KVM_SYSTEM_EVENT_SEV_TERM 4
#define KVM_SYSTEM_EVENT_NDATA_VALID (1u << 31)
__u32 type;
__u32 ndata;
__u64 data[16];
} system_event;Quoted 4 lines
include/uapi/linux/kvm.h +0
-0} system_event;Signature · 1 line
2.35.1.1094.g7c7d902a7c-goog