[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[for-6.0 v5 09/13] securable guest memory: Move SEV initialization into
From: |
David Gibson |
Subject: |
[for-6.0 v5 09/13] securable guest memory: Move SEV initialization into arch specific code |
Date: |
Fri, 4 Dec 2020 16:44:11 +1100 |
While we've abstracted some (potential) differences between mechanisms for
securing guest memory, the initialization is still specific to SEV. Given
that, move it into x86's kvm_arch_init() code, rather than the generic
kvm_init() code.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
accel/kvm/kvm-all.c | 14 --------------
target/i386/kvm.c | 12 ++++++++++++
target/i386/sev.c | 7 ++++++-
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 724e9294d0..1b676da6c2 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2178,20 +2178,6 @@ static int kvm_init(MachineState *ms)
kvm_state = s;
- /*
- * if memory encryption object is specified then initialize the memory
- * encryption context.
- */
- if (ms->sgm) {
- Error *local_err = NULL;
- /* FIXME handle mechanisms other than SEV */
- ret = sev_kvm_init(ms->sgm, &local_err);
- if (ret < 0) {
- error_report_err(local_err);
- goto err;
- }
- }
-
ret = kvm_arch_init(ms, s);
if (ret < 0) {
goto err;
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index a2934dda02..8e3617f3cd 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -42,6 +42,7 @@
#include "hw/i386/intel_iommu.h"
#include "hw/i386/x86-iommu.h"
#include "hw/i386/e820_memory_layout.h"
+#include "sysemu/sev.h"
#include "hw/pci/pci.h"
#include "hw/pci/msi.h"
@@ -2110,6 +2111,17 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
uint64_t shadow_mem;
int ret;
struct utsname utsname;
+ Error *local_err = NULL;
+
+ /*
+ * if memory encryption object is specified then initialize the
+ * memory encryption context (no-op otherwise)
+ */
+ ret = sev_kvm_init(ms->sgm, &local_err);
+ if (ret < 0) {
+ error_report_err(local_err);
+ return ret;
+ }
if (!kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) {
error_report("kvm: KVM_CAP_IRQ_ROUTING not supported by KVM");
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 022ce5fc3a..8c19f4aea6 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -628,13 +628,18 @@ sev_vm_state_change(void *opaque, int running, RunState
state)
int sev_kvm_init(SecurableGuestMemory *sgm, Error **errp)
{
- SevGuestState *sev = SEV_GUEST(sgm);
+ SevGuestState *sev
+ = (SevGuestState *)object_dynamic_cast(OBJECT(sgm), TYPE_SEV_GUEST);
char *devname;
int ret, fw_error;
uint32_t ebx;
uint32_t host_cbitpos;
struct sev_user_data_status status = {};
+ if (!sev) {
+ return 0;
+ }
+
ret = ram_block_discard_disable(true);
if (ret) {
error_report("%s: cannot disable RAM discard", __func__);
--
2.28.0
- Re: [for-6.0 v5 08/13] securable guest memory: Introduce sgm "ready" flag, (continued)
[for-6.0 v5 06/13] securable guest memory: Decouple kvm_memcrypt_*() helpers from KVM, David Gibson, 2020/12/04
[for-6.0 v5 11/13] spapr: PEF: prevent migration, David Gibson, 2020/12/04
- Re: [for-6.0 v5 11/13] spapr: PEF: prevent migration, Cornelia Huck, 2020/12/14
- Re: [for-6.0 v5 11/13] spapr: PEF: prevent migration, David Gibson, 2020/12/17
- Re: [for-6.0 v5 11/13] spapr: PEF: prevent migration, Cornelia Huck, 2020/12/17
- Re: [for-6.0 v5 11/13] spapr: PEF: prevent migration, Greg Kurz, 2020/12/17
- Re: [for-6.0 v5 11/13] spapr: PEF: prevent migration, Cornelia Huck, 2020/12/18
- Re: [for-6.0 v5 11/13] spapr: PEF: prevent migration, Dr. David Alan Gilbert, 2020/12/18
[for-6.0 v5 09/13] securable guest memory: Move SEV initialization into arch specific code,
David Gibson <=
[for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, David Gibson, 2020/12/04
- Re: [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, Christian Borntraeger, 2020/12/04
- Re: [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, Cornelia Huck, 2020/12/04
- Re: [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, Christian Borntraeger, 2020/12/04
- Re: [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, Halil Pasic, 2020/12/04
- Re: [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, David Gibson, 2020/12/07
- Re: [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, Christian Borntraeger, 2020/12/08
- Re: [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, Halil Pasic, 2020/12/08
- Re: [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, Cornelia Huck, 2020/12/08
- Re: [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests, David Gibson, 2020/12/17