170 lines
4.9 KiB
Diff
170 lines
4.9 KiB
Diff
|
From 8593c38925a2c54bceb27e16f1ad9f02789afbf4 Mon Sep 17 00:00:00 2001
|
||
|
From: Brijesh Singh <brijesh.singh@amd.com>
|
||
|
Date: Tue, 6 Feb 2018 19:08:10 -0600
|
||
|
Subject: [PATCH] sev: add support to LAUNCH_MEASURE command
|
||
|
|
||
|
During machine creation we encrypted the guest bios image, the
|
||
|
LAUNCH_MEASURE command can be used to retrieve the measurement of
|
||
|
the encrypted memory region. This measurement is a signature of
|
||
|
the memory contents that can be sent to the guest owner as an
|
||
|
attestation that the memory was encrypted correctly by the firmware.
|
||
|
VM management tools like libvirt can query the measurement using
|
||
|
query-launch-measure QMP command.
|
||
|
|
||
|
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/sev.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||
|
accel/kvm/trace-events | 1 +
|
||
|
accel/stubs/kvm-stub.c | 5 ++++
|
||
|
include/sysemu/sev.h | 2 ++
|
||
|
4 files changed, 75 insertions(+)
|
||
|
|
||
|
diff --git a/accel/kvm/sev.c b/accel/kvm/sev.c
|
||
|
index 4414bda255..8d99c6cda4 100644
|
||
|
--- a/accel/kvm/sev.c
|
||
|
+++ b/accel/kvm/sev.c
|
||
|
@@ -19,6 +19,7 @@
|
||
|
#include "sysemu/sev.h"
|
||
|
#include "sysemu/sysemu.h"
|
||
|
#include "trace.h"
|
||
|
+#include "qapi-event.h"
|
||
|
|
||
|
#define DEFAULT_GUEST_POLICY 0x1 /* disable debug */
|
||
|
#define DEFAULT_SEV_DEVICE "/dev/sev"
|
||
|
@@ -26,6 +27,7 @@
|
||
|
static uint64_t me_mask;
|
||
|
static bool sev_active;
|
||
|
static int sev_fd;
|
||
|
+static SEVState *sev_state;
|
||
|
|
||
|
#define SEV_FW_MAX_ERROR 0x17
|
||
|
|
||
|
@@ -483,6 +485,68 @@ err:
|
||
|
return ret;
|
||
|
}
|
||
|
|
||
|
+static void
|
||
|
+sev_launch_get_measure(Notifier *notifier, void *unused)
|
||
|
+{
|
||
|
+ int ret, error;
|
||
|
+ guchar *data;
|
||
|
+ SEVState *s = sev_state;
|
||
|
+ struct kvm_sev_launch_measure *measurement;
|
||
|
+
|
||
|
+ if (!sev_check_state(SEV_STATE_LUPDATE)) {
|
||
|
+ return;
|
||
|
+ }
|
||
|
+
|
||
|
+ measurement = g_malloc0(sizeof(*measurement));
|
||
|
+ if (!measurement) {
|
||
|
+ return;
|
||
|
+ }
|
||
|
+
|
||
|
+ /* query the measurement blob length */
|
||
|
+ ret = sev_ioctl(KVM_SEV_LAUNCH_MEASURE, measurement, &error);
|
||
|
+ if (!measurement->len) {
|
||
|
+ error_report("%s: LAUNCH_MEASURE ret=%d fw_error=%d '%s'",
|
||
|
+ __func__, ret, error, fw_error_to_str(errno));
|
||
|
+ goto free_measurement;
|
||
|
+ }
|
||
|
+
|
||
|
+ data = g_malloc(measurement->len);
|
||
|
+ if (s->measurement) {
|
||
|
+ goto free_data;
|
||
|
+ }
|
||
|
+
|
||
|
+ measurement->uaddr = (unsigned long)data;
|
||
|
+
|
||
|
+ /* get the measurement blob */
|
||
|
+ ret = sev_ioctl(KVM_SEV_LAUNCH_MEASURE, measurement, &error);
|
||
|
+ if (ret) {
|
||
|
+ error_report("%s: LAUNCH_MEASURE ret=%d fw_error=%d '%s'",
|
||
|
+ __func__, ret, error, fw_error_to_str(errno));
|
||
|
+ goto free_data;
|
||
|
+ }
|
||
|
+
|
||
|
+ sev_set_guest_state(SEV_STATE_SECRET);
|
||
|
+
|
||
|
+ /* encode the measurement value and emit the event */
|
||
|
+ s->measurement = g_base64_encode(data, measurement->len);
|
||
|
+ trace_kvm_sev_launch_measurement(s->measurement);
|
||
|
+
|
||
|
+free_data:
|
||
|
+ g_free(data);
|
||
|
+free_measurement:
|
||
|
+ g_free(measurement);
|
||
|
+}
|
||
|
+
|
||
|
+char *
|
||
|
+sev_get_launch_measurement(void)
|
||
|
+{
|
||
|
+ return g_strdup(sev_state->measurement);
|
||
|
+}
|
||
|
+
|
||
|
+static Notifier sev_machine_done_notify = {
|
||
|
+ .notify = sev_launch_get_measure,
|
||
|
+};
|
||
|
+
|
||
|
void *
|
||
|
sev_guest_init(const char *id)
|
||
|
{
|
||
|
@@ -535,6 +599,9 @@ sev_guest_init(const char *id)
|
||
|
|
||
|
sev_active = true;
|
||
|
ram_block_notifier_add(&sev_ram_notifier);
|
||
|
+ qemu_add_machine_init_done_notifier(&sev_machine_done_notify);
|
||
|
+
|
||
|
+ sev_state = s;
|
||
|
|
||
|
return s;
|
||
|
err:
|
||
|
diff --git a/accel/kvm/trace-events b/accel/kvm/trace-events
|
||
|
index bd92f868b7..19742bf9dd 100644
|
||
|
--- a/accel/kvm/trace-events
|
||
|
+++ b/accel/kvm/trace-events
|
||
|
@@ -20,3 +20,4 @@ kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%lu"
|
||
|
kvm_sev_change_state(const char *old, const char *new) "%s -> %s"
|
||
|
kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session %p pdh %p"
|
||
|
kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64
|
||
|
+kvm_sev_launch_measurement(const char *value) "data %s"
|
||
|
diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c
|
||
|
index e7d579e3e5..d0f1aa6d6f 100644
|
||
|
--- a/accel/stubs/kvm-stub.c
|
||
|
+++ b/accel/stubs/kvm-stub.c
|
||
|
@@ -133,6 +133,11 @@ void sev_get_policy(uint32_t *policy)
|
||
|
{
|
||
|
}
|
||
|
|
||
|
+char *sev_get_launch_measurement(void)
|
||
|
+{
|
||
|
+ return NULL;
|
||
|
+}
|
||
|
+
|
||
|
bool kvm_memcrypt_enabled(void)
|
||
|
{
|
||
|
return false;
|
||
|
diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h
|
||
|
index f7af1a00c5..c173ad33f8 100644
|
||
|
--- a/include/sysemu/sev.h
|
||
|
+++ b/include/sysemu/sev.h
|
||
|
@@ -30,6 +30,7 @@ extern uint64_t sev_get_me_mask(void);
|
||
|
extern void sev_get_current_state(char **state);
|
||
|
extern void sev_get_fw_version(uint8_t *major, uint8_t *minor, uint8_t *build);
|
||
|
extern void sev_get_policy(uint32_t *policy);
|
||
|
+extern char *sev_get_launch_measurement(void);
|
||
|
|
||
|
typedef struct QSevGuestInfo QSevGuestInfo;
|
||
|
typedef struct QSevGuestInfoClass QSevGuestInfoClass;
|
||
|
@@ -70,6 +71,7 @@ typedef enum {
|
||
|
|
||
|
struct SEVState {
|
||
|
QSevGuestInfo *sev_info;
|
||
|
+ gchar *measurement;
|
||
|
};
|
||
|
|
||
|
typedef struct SEVState SEVState;
|