Skip to content

Commit

Permalink
KVM: SVM: Remove unneeded WBINVD and DF_FLUSH when starting SEV guests
Browse files Browse the repository at this point in the history
Performing a WBINVD and DF_FLUSH are expensive operations. The SEV support
currently performs this WBINVD/DF_FLUSH combination when an SEV guest is
terminated, so there is no need for it to be done before LAUNCH.

However, when the SEV firmware transitions the platform from UNINIT state
to INIT state, all ASIDs will be marked invalid across all threads.
Therefore, as part of transitioning the platform to INIT state, perform a
WBINVD/DF_FLUSH after a successful INIT in the PSP/SEV device driver.
Since the PSP/SEV device driver is x86 only, it can reference and use the
WBINVD related functions directly.

Cc: Gary Hook <gary.hook@amd.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Tested-by: David Rientjes <rientjes@google.com>
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
Tom Lendacky authored and Paolo Bonzini committed Oct 22, 2019
1 parent 04f11ef commit 0fc5dea
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
15 changes: 0 additions & 15 deletions arch/x86/kvm/svm.c
Original file line number Diff line number Diff line change
Expand Up @@ -6329,21 +6329,6 @@ static int sev_bind_asid(struct kvm *kvm, unsigned int handle, int *error)
int asid = sev_get_asid(kvm);
int ret;

/*
* Guard against a DEACTIVATE command before the DF_FLUSH command
* has completed.
*/
mutex_lock(&sev_deactivate_lock);

wbinvd_on_all_cpus();

ret = sev_guest_df_flush(error);

mutex_unlock(&sev_deactivate_lock);

if (ret)
return ret;

data = kzalloc(sizeof(*data), GFP_KERNEL_ACCOUNT);
if (!data)
return -ENOMEM;
Expand Down
9 changes: 9 additions & 0 deletions drivers/crypto/ccp/psp-dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <linux/ccp.h>
#include <linux/firmware.h>

#include <asm/smp.h>

#include "sp-dev.h"
#include "psp-dev.h"

Expand Down Expand Up @@ -235,6 +237,13 @@ static int __sev_platform_init_locked(int *error)
return rc;

psp->sev_state = SEV_STATE_INIT;

/* Prepare for first SEV guest launch after INIT */
wbinvd_on_all_cpus();
rc = __sev_do_cmd_locked(SEV_CMD_DF_FLUSH, NULL, error);
if (rc)
return rc;

dev_dbg(psp->dev, "SEV firmware initialized\n");

return rc;
Expand Down

0 comments on commit 0fc5dea

Please sign in to comment.