672f70aa3d
Update to 2.11.1, plus a few other fixes. OBS-URL: https://build.opensuse.org/request/show/579209 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=392
175 lines
5.0 KiB
Diff
175 lines
5.0 KiB
Diff
From 42f8013adf0a5f8ca17212ee54a8009471d6c8f3 Mon Sep 17 00:00:00 2001
|
|
From: Brijesh Singh <brijesh.singh@amd.com>
|
|
Date: Thu, 15 Feb 2018 09:03:23 -0600
|
|
Subject: [PATCH] sev/i386: 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: Richard Henderson <rth@twiddle.net>
|
|
Cc: Eduardo Habkost <ehabkost@redhat.com>
|
|
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 +
|
|
include/sysemu/sev.h | 1 +
|
|
stubs/sev.c | 4 +++
|
|
target/i386/sev.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
target/i386/trace-events | 1 +
|
|
5 files changed, 79 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/include/sysemu/sev.h b/include/sysemu/sev.h
|
|
index ad4a1f1338..ac70c7a00b 100644
|
|
--- a/include/sysemu/sev.h
|
|
+++ b/include/sysemu/sev.h
|
|
@@ -72,5 +72,6 @@ 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
|
|
diff --git a/stubs/sev.c b/stubs/sev.c
|
|
index 5420ada7fd..8ea167031e 100644
|
|
--- a/stubs/sev.c
|
|
+++ b/stubs/sev.c
|
|
@@ -15,6 +15,10 @@
|
|
#include "qemu-common.h"
|
|
#include "sysemu/sev.h"
|
|
|
|
+void sev_set_debug_ops(void *handle, MemoryRegion *mr)
|
|
+{
|
|
+}
|
|
+
|
|
int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len)
|
|
{
|
|
return 1;
|
|
diff --git a/target/i386/sev.c b/target/i386/sev.c
|
|
index 305ef65191..1fbc3beb16 100644
|
|
--- a/target/i386/sev.c
|
|
+++ b/target/i386/sev.c
|
|
@@ -23,6 +23,7 @@
|
|
|
|
#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;
|
|
@@ -30,6 +31,7 @@ static int sev_fd;
|
|
static uint32_t x86_cbitpos;
|
|
static uint32_t x86_reduced_phys_bits;
|
|
static SEVState *sev_state;
|
|
+static MemoryRegionRAMReadWriteOps sev_ops;
|
|
|
|
static SevState current_sev_guest_state = SEV_STATE_UNINIT;
|
|
|
|
@@ -595,6 +597,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)
|
|
{
|
|
@@ -686,6 +733,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/target/i386/trace-events b/target/i386/trace-events
|
|
index b1fbde6e40..00aa6e98d8 100644
|
|
--- a/target/i386/trace-events
|
|
+++ b/target/i386/trace-events
|
|
@@ -15,3 +15,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"
|