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
169 lines
5.2 KiB
Diff
169 lines
5.2 KiB
Diff
From 0bc4fd78361c340ad4ee0c77bfde2d487fb580f5 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 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-sev-launch-measure QMP command.
|
|
|
|
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>
|
|
---
|
|
include/sysemu/sev.h | 2 ++
|
|
stubs/sev.c | 5 ++++
|
|
target/i386/sev.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
target/i386/trace-events | 1 +
|
|
4 files changed, 76 insertions(+)
|
|
|
|
diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h
|
|
index c16102b05e..ad4a1f1338 100644
|
|
--- a/include/sysemu/sev.h
|
|
+++ b/include/sysemu/sev.h
|
|
@@ -33,6 +33,7 @@ extern void sev_get_fw_version(uint8_t *major, uint8_t *minor, uint8_t *build);
|
|
extern void sev_get_policy(uint32_t *policy);
|
|
extern uint32_t sev_get_cbit_position(void);
|
|
extern uint32_t sev_get_reduced_phys_bits(void);
|
|
+extern char *sev_get_launch_measurement(void);
|
|
|
|
typedef struct QSevGuestInfo QSevGuestInfo;
|
|
typedef struct QSevGuestInfoClass QSevGuestInfoClass;
|
|
@@ -64,6 +65,7 @@ struct QSevGuestInfoClass {
|
|
|
|
struct SEVState {
|
|
QSevGuestInfo *sev_info;
|
|
+ gchar *measurement;
|
|
};
|
|
|
|
typedef struct SEVState SEVState;
|
|
diff --git a/stubs/sev.c b/stubs/sev.c
|
|
index 74182bb545..5420ada7fd 100644
|
|
--- a/stubs/sev.c
|
|
+++ b/stubs/sev.c
|
|
@@ -57,3 +57,8 @@ void sev_get_fw_version(uint8_t *major, uint8_t *minor, uint8_t *build)
|
|
void sev_get_policy(uint32_t *policy)
|
|
{
|
|
}
|
|
+
|
|
+char *sev_get_launch_measurement(void)
|
|
+{
|
|
+ return NULL;
|
|
+}
|
|
diff --git a/target/i386/sev.c b/target/i386/sev.c
|
|
index 04a64b5bc6..401b2a33d7 100644
|
|
--- a/target/i386/sev.c
|
|
+++ b/target/i386/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"
|
|
@@ -28,6 +29,7 @@ static bool sev_active;
|
|
static int sev_fd;
|
|
static uint32_t x86_cbitpos;
|
|
static uint32_t x86_reduced_phys_bits;
|
|
+static SEVState *sev_state;
|
|
|
|
static SevState current_sev_guest_state = SEV_STATE_UNINIT;
|
|
|
|
@@ -502,6 +504,69 @@ 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_LSECRET);
|
|
+
|
|
+ /* 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 current_sev_guest_state >= SEV_STATE_LSECRET ?
|
|
+ g_strdup(sev_state->measurement) : NULL;
|
|
+}
|
|
+
|
|
+static Notifier sev_machine_done_notify = {
|
|
+ .notify = sev_launch_get_measure,
|
|
+};
|
|
+
|
|
void *
|
|
sev_guest_init(const char *id)
|
|
{
|
|
@@ -569,6 +634,9 @@ sev_guest_init(const char *id)
|
|
x86_cbitpos = cbitpos;
|
|
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/target/i386/trace-events b/target/i386/trace-events
|
|
index c0cd8e9321..f7a1a1e6b8 100644
|
|
--- a/target/i386/trace-events
|
|
+++ b/target/i386/trace-events
|
|
@@ -13,3 +13,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"
|