KVM: SVM: fix missing sev_decommission in sev_receive_start
PATCH 1/1 KVM: SVM: fix missing sev_decommission in sev_receive_start
sev_decommission is needed in the error path of sev_bind_asid. The purpose of this function is to clear the firmware context. Missing this step may cause subsequent SEV launch failures.
Although missing sev_decommission issue has previously been found and was fixed in sev_launch_start function. It is supposed to be fixed on all scenarios where a firmware context needs to be freed. According to the AMD SEV API v0.24 Section 1.3.3:
"The RECEIVE_START command is the only command other than the LAUNCH_START command that generates a new guest context and guest handle."
The above indicates that RECEIVE_START command also requires calling sev_decommission if ASID binding fails after RECEIVE_START succeeds.
So add the sev_decommission function in sev_receive_start.
--- arch/x86/kvm/svm/sev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +3 -1
@@ -1397,8 +1397,10 @@ static int sev_receive_start(struct kvm *kvm, struct kvm_sev_cmd *argp)/* Bind ASID to this guest */ ret =sev_bind_asid (kvm, start.handle, error); -if (ret) +if (ret) { +sev_decommission (start.handle); goto e_free_session; + } params.handle = start.handle; if (copy_to_user((void __user *)(uintptr_t)argp->data,
Signature · 1 line
2.33.0.309.g3052b89438-goog
Quoted 1 line · Mingwei Zhang
sev_decommission
It's not a ubiquitous "requirement", but adding parantheses after function names in changelogs is generally preferred as it succinctly identifies a function call.
Quoted 1 line
is needed in the error path of
sev_bind_asid. The purpose
"error path of sev_bind_asid()" could be interpreted as meaning DECOMMISSION is needed within sev_bind_asid(), whereas you mean when sev_bind_asid() fails. One way to avoid confusion, and a good habit in general, is to avoid talking in terms of code details when possible. There are certainly cases where talking about the code itself is absolutely necessary, but this could be worded as:
DECOMMISSION the current SEV context if binding an ASID fails after RECEIVE_START. Per AMD's SEV API, RECEIVE_START generates a new guest context and thus needs to be paired with DECOMMISSION:
The RECEIVE_START command is the only command other than the LAUNCH_START command that generates a new guest context and guest handle.
The missing DECOMMISSION can result in subsequent SEV launch failures due to <fill in this part>.
Note, LAUNCH_START suffered the same bug, but was previously fixed by 934002cd660b ("KVM: SVM: Call SEV Guest Decommission if ASID binding fails").
Quoted 1 line
of this function is to clear the firmware context. Missing this step may
Kind of a nit: "this function" is ambiguous. I'm pretty sure you're referring to sev_decommission(), but it's trivially easy to be 100% unambiguous (see above).
Quoted 5 lines
cause subsequent SEV launch failures.
Although missing
sev_decommissionissue has previously been found and was fixed insev_launch_startfunction. It is supposed to be fixed on all scenarios where a firmware context needs to be freed.
More nits: provide the commit ID of the previous fix so that folks don't have to hunt it down (even though it's an easy git blame away). And this is better as a footnote of sorts as it's not relevant to the justification of the patch in the sense that it's best to avoid "we do x there, so we should do x here". That might be a true statement, as is the case here, but the patch still needs to be justified without that type of reasoning.
Quoted 9 lines
According to the AMD SEV API v0.24 Section 1.3.3:
"The
RECEIVE_STARTcommand is the only command other than theLAUNCH_STARTcommand that generates a new guest context and guest handle."The above indicates that
RECEIVE_STARTcommand also requires callingsev_decommissionif ASID binding fails afterRECEIVE_STARTsucceeds.So add the
sev_decommissionfunction insev_receive_start.
And more nits :-) As alluded to above the, last few sentences are somewhat redundant and can be dropped and/or worded into the statement about what the patch is doing.
Quoted 11 lines
Cc Alper Gun <[email protected]>Cc Borislav Petkov <[email protected]>Cc Brijesh Singh <[email protected]>Cc David Rienjes <[email protected]>Cc Marc Orr <[email protected]>Cc John Allen <[email protected]>Cc Peter Gonda <[email protected]>Cc Sean Christopherson <[email protected]>Cc Tom Lendacky <[email protected]>Cc Vipin Sharma <[email protected]>
Quoted 3 lines
Reviewed-by Marc Orr <[email protected]>Acked-by Brijesh Singh <[email protected]>Fixes af43cbbf954b ("KVM: SVM: Add support for KVM_SEV_RECEIVE_START command")
Quoted 2 lines
Signed-off-by Mingwei Zhang <[email protected]>---
With a cleaned up changelog,
Paolo Bonzini
maintainerQuoted 4 lines · Sean Christopherson
With a cleaned up changelog,
Reviewed-by Sean Christopherson<[email protected]>
Done and queued, thanks.
Paolo