49812da5a8
- Add AMD SEV (Secure Encrypted Virtualization) support by taking the v7 series of the patches posted to qemu ml. (fate#322124) - Update python3 related patches now that they are upstream OBS-URL: https://build.opensuse.org/request/show/574394 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=390
157 lines
4.5 KiB
Diff
157 lines
4.5 KiB
Diff
From ed8f2531e1b008cedfaca01980641c2432693fb3 Mon Sep 17 00:00:00 2001
|
|
From: Brijesh Singh <brijesh.singh@amd.com>
|
|
Date: Tue, 6 Feb 2018 19:08:11 -0600
|
|
Subject: [PATCH] sev: add debug encrypt and decrypt commands
|
|
|
|
KVM_SEV_DBG_DECRYPT and KVM_SEV_DBG_ENCRYPT commands are used for
|
|
decrypting and encrypting guest memory region. The command works only if
|
|
the guest policy allows the debugging.
|
|
|
|
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
|
Cc: kvm@vger.kernel.org
|
|
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
|
|
[BR: FATE#322124]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
accel/kvm/kvm-all.c | 1 +
|
|
accel/kvm/sev.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
accel/kvm/trace-events | 1 +
|
|
include/sysemu/sev.h | 1 +
|
|
4 files changed, 75 insertions(+)
|
|
|
|
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
|
|
index 37f7c442dc..7d3b7b4107 100644
|
|
--- a/accel/kvm/kvm-all.c
|
|
+++ b/accel/kvm/kvm-all.c
|
|
@@ -1677,6 +1677,7 @@ static int kvm_init(MachineState *ms)
|
|
}
|
|
|
|
kvm_state->memcrypt_encrypt_data = sev_encrypt_data;
|
|
+ kvm_state->memcrypt_debug_ops = sev_set_debug_ops;
|
|
}
|
|
|
|
ret = kvm_arch_init(ms, s);
|
|
diff --git a/accel/kvm/sev.c b/accel/kvm/sev.c
|
|
index e422f43caa..7b57575e2f 100644
|
|
--- a/accel/kvm/sev.c
|
|
+++ b/accel/kvm/sev.c
|
|
@@ -23,11 +23,13 @@
|
|
|
|
#define DEFAULT_GUEST_POLICY 0x1 /* disable debug */
|
|
#define DEFAULT_SEV_DEVICE "/dev/sev"
|
|
+#define GUEST_POLICY_DBG_BIT 0x1
|
|
|
|
static uint64_t me_mask;
|
|
static bool sev_active;
|
|
static int sev_fd;
|
|
static SEVState *sev_state;
|
|
+static MemoryRegionRAMReadWriteOps sev_ops;
|
|
|
|
#define SEV_FW_MAX_ERROR 0x17
|
|
|
|
@@ -575,6 +577,51 @@ sev_vm_state_change(void *opaque, int running, RunState state)
|
|
}
|
|
}
|
|
|
|
+static int
|
|
+sev_dbg_enc_dec(uint8_t *dst, const uint8_t *src, uint32_t len, bool write)
|
|
+{
|
|
+ int ret, error;
|
|
+ struct kvm_sev_dbg *dbg;
|
|
+
|
|
+ dbg = g_malloc0(sizeof(*dbg));
|
|
+ if (!dbg) {
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ dbg->src_uaddr = (unsigned long)src;
|
|
+ dbg->dst_uaddr = (unsigned long)dst;
|
|
+ dbg->len = len;
|
|
+
|
|
+ trace_kvm_sev_debug(write ? "encrypt" : "decrypt", src, dst, len);
|
|
+ ret = sev_ioctl(write ? KVM_SEV_DBG_ENCRYPT : KVM_SEV_DBG_DECRYPT,
|
|
+ dbg, &error);
|
|
+ if (ret) {
|
|
+ error_report("%s (%s) %#llx->%#llx+%#x ret=%d fw_error=%d '%s'",
|
|
+ __func__, write ? "write" : "read", dbg->src_uaddr,
|
|
+ dbg->dst_uaddr, dbg->len, ret, error,
|
|
+ fw_error_to_str(error));
|
|
+ }
|
|
+
|
|
+ g_free(dbg);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int
|
|
+sev_mem_read(uint8_t *dst, const uint8_t *src, uint32_t len, MemTxAttrs attrs)
|
|
+{
|
|
+ assert(attrs.debug);
|
|
+
|
|
+ return sev_dbg_enc_dec(dst, src, len, false);
|
|
+}
|
|
+
|
|
+static int
|
|
+sev_mem_write(uint8_t *dst, const uint8_t *src, uint32_t len, MemTxAttrs attrs)
|
|
+{
|
|
+ assert(attrs.debug);
|
|
+
|
|
+ return sev_dbg_enc_dec(dst, src, len, true);
|
|
+}
|
|
+
|
|
void *
|
|
sev_guest_init(const char *id)
|
|
{
|
|
@@ -651,6 +698,31 @@ sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len)
|
|
return 0;
|
|
}
|
|
|
|
+void
|
|
+sev_set_debug_ops(void *handle, MemoryRegion *mr)
|
|
+{
|
|
+ int policy;
|
|
+ SEVState *s = (SEVState *)handle;
|
|
+
|
|
+ policy = object_property_get_int(OBJECT(s->sev_info),
|
|
+ "policy", &error_abort);
|
|
+
|
|
+ /*
|
|
+ * Check if guest policy supports debugging
|
|
+ * Bit 0 :
|
|
+ * 0 - debug allowed
|
|
+ * 1 - debug is not allowed
|
|
+ */
|
|
+ if (policy & GUEST_POLICY_DBG_BIT) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ sev_ops.read = sev_mem_read;
|
|
+ sev_ops.write = sev_mem_write;
|
|
+
|
|
+ memory_region_set_ram_debug_ops(mr, &sev_ops);
|
|
+}
|
|
+
|
|
static void
|
|
sev_register_types(void)
|
|
{
|
|
diff --git a/accel/kvm/trace-events b/accel/kvm/trace-events
|
|
index e810d75ea1..de6a12c51e 100644
|
|
--- a/accel/kvm/trace-events
|
|
+++ b/accel/kvm/trace-events
|
|
@@ -22,3 +22,4 @@ kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session
|
|
kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64
|
|
kvm_sev_launch_measurement(const char *value) "data %s"
|
|
kvm_sev_launch_finish(void) ""
|
|
+kvm_sev_debug(const char *op, const uint8_t *src, uint8_t *dst, int len) "(%s) src %p dst %p len %d"
|
|
diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h
|
|
index c173ad33f8..186ebca0f9 100644
|
|
--- a/include/sysemu/sev.h
|
|
+++ b/include/sysemu/sev.h
|
|
@@ -78,6 +78,7 @@ typedef struct SEVState SEVState;
|
|
|
|
void *sev_guest_init(const char *id);
|
|
int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len);
|
|
+void sev_set_debug_ops(void *handle, MemoryRegion *mr);
|
|
|
|
#endif
|
|
|