On Wed, Aug 18, 2021, Mingwei Zhang wrote:
@@ -336,11 +322,9 @@ static int sev_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
goto e_free_session;
/* Bind ASID to this guest */
- ret = sev_bind_asid(kvm, start.handle, error);
- if (ret) {
- sev_guest_decommission(start.handle, NULL);
+ ret = sev_guest_bind_asid(sev_get_asid(kvm), start.handle, error);
+ if (ret)
goto e_free_session;
- }
/* return handle to userspace */
params.handle = start.handle;
...
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index e2d49bedc0ef..325e79360d9e 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -903,6 +903,21 @@ int sev_guest_activate(struct sev_data_activate *data, int *error)
}
EXPORT_SYMBOL_GPL(sev_guest_activate);
+int sev_guest_bind_asid(int asid, unsigned int handle, int *error)
+{
+ struct sev_data_activate activate;
+ int ret;
+
+ /* activate ASID on the given handle */
+ activate.handle = handle;
+ activate.asid = asid;
+ ret = sev_guest_activate(&activate, error);
+ if (ret)
+ sev_guest_decommission(handle, NULL);
Hrm, undoing state like this is a bad API. It assumes the caller is well-behaved,
e.g. has already done something that requires decommissioning, and it surprises
the caller, e.g. the KVM side (above) looks like it's missing error handling.
Something like this would be cleaner overall:
/* create memory encryption context */
ret = __sev_issue_cmd(argp->sev_fd, SEV_CMD_RECEIVE_START, &start,
error);
if (ret)
goto e_free_session;
/* Bind ASID to this guest */
ret = sev_guest_activate(sev_get_asid(kvm), start.handle, error);
if (ret)
goto e_decommision;
params.handle = start.handle;
if (copy_to_user((void __user *)(uintptr_t)argp->data,
¶ms, sizeof(struct kvm_sev_receive_start))) {
ret = -EFAULT;
goto e_deactivate;
}
sev->handle = start.handle;
sev->fd = argp->sev_fd;
e_deactivate:
sev_guest_deactivate(sev_get_asid(kvm), start.handle, error);
e_decommision:
sev_guest_decommission(start.handle, error);
e_free_session:
kfree(session_data);
e_free_pdh:
kfree(pdh_data);
However, I don't know that that's a good level of abstraction, e.g. the struct
details are abstracted from KVM but the exact sequencing is not, which is odd
to say the least.
Which is a good segue into my overarching complaint about the PSP API and what
made me suggest this change in the first place. IMO, the API exposed to KVM (and
others) is too low level, e.g. KVM is practically making direct calls to the PSP
via sev_issue_cmd_external_user(). Even the partially-abstracted helpers that
take a "struct sev_data_*" are too low level, KVM really shouldn't need to know
the hardware-defined structures for an off-CPU device.
My intent with the suggestion was to start driving toward a mostly-abstracted API
across the board, with an end goal of eliminating sev_issue_cmd_external_user()
and moving all of the sev_data* structs out of psp-sev.h and into a private
header. However, I think we should all explicitly agree on the desired level of
abstraction before shuffling code around.
My personal preference is obviously to work towards an abstracted API. And if
we decide to go that route, I think we should be much more aggressive with respect
to what is abstracted. Many of the functions will be rather gross due to the
sheer number of params, but I think the end result will be a net positive in terms
of readability and separation of concerns.
E.g. get KVM looking like this
static int sev_receive_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
{
struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
struct kvm_sev_receive_start params;
int ret;
if (!sev_guest(kvm))
return -ENOTTY;
/* Get parameter from the userspace */
if (copy_from_user(¶ms, (void __user *)(uintptr_t)argp->data,
sizeof(struct kvm_sev_receive_start)))
return -EFAULT;
ret = sev_guest_receive_start(argp->sev_fd, &arpg->error, sev->asid,
¶ms.handle, params.policy,
params.pdh_uaddr, params.pdh_len,
params.session_uaddr, params.session_len);
if (ret)
return ret;
/* Copy params back to user even on failure, e.g. for error info. */
if (copy_to_user((void __user *)(uintptr_t)argp->data,
¶ms, sizeof(struct kvm_sev_receive_start)))
return -EFAULT;
sev->handle = params.handle;
sev->fd = argp->sev_fd;
return 0;
}
