All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brijesh Singh <brijesh.singh@amd.com>
To: qemu-devel@nongnu.org
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
	Tom Lendacky <Thomas.Lendacky@amd.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Richard Henderson <richard.henderson@linaro.org>,
	"Edgar E. Iglesias" <edgar.iglesias@xilinx.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Stefan Hajnoczi <stefanha@gmail.com>,
	Eric Blake <eblake@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Daniel P . Berrange" <berrange@redhat.com>,
	Brijesh Singh <brijesh.singh@amd.com>
Subject: [PATCH v6 15/23] sev: add command to encrypt guest memory region
Date: Mon, 29 Jan 2018 11:41:24 -0600	[thread overview]
Message-ID: <20180129174132.108925-16-brijesh.singh@amd.com> (raw)
In-Reply-To: <20180129174132.108925-1-brijesh.singh@amd.com>

The KVM_SEV_LAUNCH_UPDATE_DATA command is used to encrypt a guest memory
region using the VM Encryption Key created using LAUNCH_START.

Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
---
 accel/kvm/kvm-all.c    |  2 ++
 accel/kvm/sev.c        | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 accel/kvm/trace-events |  1 +
 include/sysemu/sev.h   |  1 +
 4 files changed, 53 insertions(+)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 54a0fd6097fb..d35eebb97901 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1675,6 +1675,8 @@ static int kvm_init(MachineState *ms)
         if (!kvm_state->memcrypt_handle) {
             goto err;
         }
+
+        kvm_state->memcrypt_encrypt_data = sev_encrypt_data;
     }
 
     ret = kvm_arch_init(ms, s);
diff --git a/accel/kvm/sev.c b/accel/kvm/sev.c
index eea07ac9642f..1f757df725df 100644
--- a/accel/kvm/sev.c
+++ b/accel/kvm/sev.c
@@ -95,6 +95,12 @@ fw_error_to_str(int code)
     return sev_fw_errlist[code];
 }
 
+static bool
+sev_check_state(SevGuestState state)
+{
+    return current_sev_guest_state == state ? true : false;
+}
+
 static void
 sev_set_guest_state(SevGuestState new_state)
 {
@@ -382,6 +388,36 @@ sev_launch_start(SEVState *s)
     return 0;
 }
 
+static int
+sev_launch_update_data(uint8_t *addr, uint64_t len)
+{
+    int ret, fw_error;
+    struct kvm_sev_launch_update_data *update;
+
+    if (addr == NULL || len <= 0) {
+        return 1;
+    }
+
+    update = g_malloc0(sizeof(*update));
+    if (!update) {
+        return 1;
+    }
+
+    update->uaddr = (__u64)addr;
+    update->len = len;
+    trace_kvm_sev_launch_update_data(addr, len);
+    ret = sev_ioctl(KVM_SEV_LAUNCH_UPDATE_DATA, update, &fw_error);
+    if (ret) {
+        error_report("%s: LAUNCH_UPDATE ret=%d fw_error=%d '%s'",
+                __func__, ret, fw_error, fw_error_to_str(fw_error));
+        goto err;
+    }
+
+err:
+    g_free(update);
+    return ret;
+}
+
 void *
 sev_guest_init(const char *id)
 {
@@ -432,6 +468,19 @@ err:
     return NULL;
 }
 
+int
+sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len)
+{
+    assert (handle);
+
+    /* if SEV is in update state then encrypt the data else do nothing */
+    if (sev_check_state(SEV_STATE_LUPDATE)) {
+        return sev_launch_update_data(ptr, len);
+    }
+
+    return 0;
+}
+
 static void
 sev_register_types(void)
 {
diff --git a/accel/kvm/trace-events b/accel/kvm/trace-events
index a4ea1c382ec2..c55546f36a25 100644
--- a/accel/kvm/trace-events
+++ b/accel/kvm/trace-events
@@ -19,3 +19,4 @@ kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%lu"
 kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%lu"
 kvm_sev_change_state(char *old, 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
diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h
index 392b21fafbd3..839800efdbbf 100644
--- a/include/sysemu/sev.h
+++ b/include/sysemu/sev.h
@@ -68,6 +68,7 @@ struct SEVState {
 typedef struct SEVState SEVState;
 
 void *sev_guest_init(const char *id);
+int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len);
 
 #endif
 
-- 
2.9.5

WARNING: multiple messages have this Message-ID (diff)
From: Brijesh Singh <brijesh.singh@amd.com>
To: qemu-devel@nongnu.org
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
	Tom Lendacky <Thomas.Lendacky@amd.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Richard Henderson <richard.henderson@linaro.org>,
	"Edgar E. Iglesias" <edgar.iglesias@xilinx.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Stefan Hajnoczi <stefanha@gmail.com>,
	Eric Blake <eblake@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Daniel P . Berrange" <berrange@redhat.com>,
	Brijesh Singh <brijesh.singh@amd.com>
Subject: [Qemu-devel] [PATCH v6 15/23] sev: add command to encrypt guest memory region
Date: Mon, 29 Jan 2018 11:41:24 -0600	[thread overview]
Message-ID: <20180129174132.108925-16-brijesh.singh@amd.com> (raw)
In-Reply-To: <20180129174132.108925-1-brijesh.singh@amd.com>

The KVM_SEV_LAUNCH_UPDATE_DATA command is used to encrypt a guest memory
region using the VM Encryption Key created using LAUNCH_START.

Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
---
 accel/kvm/kvm-all.c    |  2 ++
 accel/kvm/sev.c        | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 accel/kvm/trace-events |  1 +
 include/sysemu/sev.h   |  1 +
 4 files changed, 53 insertions(+)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 54a0fd6097fb..d35eebb97901 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1675,6 +1675,8 @@ static int kvm_init(MachineState *ms)
         if (!kvm_state->memcrypt_handle) {
             goto err;
         }
+
+        kvm_state->memcrypt_encrypt_data = sev_encrypt_data;
     }
 
     ret = kvm_arch_init(ms, s);
diff --git a/accel/kvm/sev.c b/accel/kvm/sev.c
index eea07ac9642f..1f757df725df 100644
--- a/accel/kvm/sev.c
+++ b/accel/kvm/sev.c
@@ -95,6 +95,12 @@ fw_error_to_str(int code)
     return sev_fw_errlist[code];
 }
 
+static bool
+sev_check_state(SevGuestState state)
+{
+    return current_sev_guest_state == state ? true : false;
+}
+
 static void
 sev_set_guest_state(SevGuestState new_state)
 {
@@ -382,6 +388,36 @@ sev_launch_start(SEVState *s)
     return 0;
 }
 
+static int
+sev_launch_update_data(uint8_t *addr, uint64_t len)
+{
+    int ret, fw_error;
+    struct kvm_sev_launch_update_data *update;
+
+    if (addr == NULL || len <= 0) {
+        return 1;
+    }
+
+    update = g_malloc0(sizeof(*update));
+    if (!update) {
+        return 1;
+    }
+
+    update->uaddr = (__u64)addr;
+    update->len = len;
+    trace_kvm_sev_launch_update_data(addr, len);
+    ret = sev_ioctl(KVM_SEV_LAUNCH_UPDATE_DATA, update, &fw_error);
+    if (ret) {
+        error_report("%s: LAUNCH_UPDATE ret=%d fw_error=%d '%s'",
+                __func__, ret, fw_error, fw_error_to_str(fw_error));
+        goto err;
+    }
+
+err:
+    g_free(update);
+    return ret;
+}
+
 void *
 sev_guest_init(const char *id)
 {
@@ -432,6 +468,19 @@ err:
     return NULL;
 }
 
+int
+sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len)
+{
+    assert (handle);
+
+    /* if SEV is in update state then encrypt the data else do nothing */
+    if (sev_check_state(SEV_STATE_LUPDATE)) {
+        return sev_launch_update_data(ptr, len);
+    }
+
+    return 0;
+}
+
 static void
 sev_register_types(void)
 {
diff --git a/accel/kvm/trace-events b/accel/kvm/trace-events
index a4ea1c382ec2..c55546f36a25 100644
--- a/accel/kvm/trace-events
+++ b/accel/kvm/trace-events
@@ -19,3 +19,4 @@ kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%lu"
 kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%lu"
 kvm_sev_change_state(char *old, 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
diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h
index 392b21fafbd3..839800efdbbf 100644
--- a/include/sysemu/sev.h
+++ b/include/sysemu/sev.h
@@ -68,6 +68,7 @@ struct SEVState {
 typedef struct SEVState SEVState;
 
 void *sev_guest_init(const char *id);
+int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len);
 
 #endif
 
-- 
2.9.5

  parent reply	other threads:[~2018-01-29 17:42 UTC|newest]

Thread overview: 118+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-29 17:41 [PATCH v6 00/23] x86: Secure Encrypted Virtualization (AMD) Brijesh Singh
2018-01-29 17:41 ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 01/23] memattrs: add debug attribute Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-30 21:59   ` Edgar E. Iglesias
2018-01-30 21:59     ` [Qemu-devel] " Edgar E. Iglesias
2018-01-29 17:41 ` [PATCH v6 02/23] exec: add ram_debug_ops support Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-30 21:59   ` Edgar E. Iglesias
2018-01-30 21:59     ` [Qemu-devel] " Edgar E. Iglesias
2018-01-30 22:34     ` Brijesh Singh
2018-01-30 22:34       ` [Qemu-devel] " Brijesh Singh
2018-01-30 22:37       ` Edgar E. Iglesias
2018-01-30 22:37         ` [Qemu-devel] " Edgar E. Iglesias
2018-01-30 23:26         ` Brijesh Singh
2018-01-30 23:26           ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 03/23] exec: add debug version of physical memory read and write API Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 04/23] monitor/i386: use debug APIs when accessing guest memory Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 05/23] target/i386: add memory encryption feature cpuid support Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-30 17:49   ` Dr. David Alan Gilbert
2018-01-30 17:49     ` [Qemu-devel] " Dr. David Alan Gilbert
2018-01-30 21:46     ` Brijesh Singh
2018-01-30 21:46       ` [Qemu-devel] " Brijesh Singh
2018-01-30 22:15       ` Brijesh Singh
2018-01-30 22:15         ` [Qemu-devel] " Brijesh Singh
2018-01-31  9:57       ` Dr. David Alan Gilbert
2018-01-31  9:57         ` [Qemu-devel] " Dr. David Alan Gilbert
2018-01-31 13:41       ` Eduardo Habkost
2018-01-31 13:41         ` [Qemu-devel] " Eduardo Habkost
2018-01-31 16:05         ` Brijesh Singh
2018-01-31 16:05           ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 06/23] machine: add -memory-encryption property Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 07/23] kvm: update kvm.h to include memory encryption ioctls Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 08/23] docs: add AMD Secure Encrypted Virtualization (SEV) Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 09/23] accel: add Secure Encrypted Virtulization (SEV) object Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 10/23] sev: add command to initialize the memory encryption context Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-02-01 12:13   ` Dr. David Alan Gilbert
2018-02-01 12:13     ` [Qemu-devel] " Dr. David Alan Gilbert
2018-02-01 15:33     ` Brijesh Singh
2018-02-01 15:33       ` [Qemu-devel] " Brijesh Singh
2018-02-01 15:46       ` Dr. David Alan Gilbert
2018-02-01 15:46         ` [Qemu-devel] " Dr. David Alan Gilbert
2018-01-29 17:41 ` [PATCH v6 11/23] sev: register the guest memory range which may contain encrypted data Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 12/23] kvm: introduce memory encryption APIs Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 13/23] hmp: display memory encryption support in 'info kvm' Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-31 17:43   ` Markus Armbruster
2018-02-01 15:21     ` Brijesh Singh
2018-02-01 17:58   ` Dr. David Alan Gilbert
2018-02-01 17:58     ` [Qemu-devel] " Dr. David Alan Gilbert
2018-02-01 19:55     ` Brijesh Singh
2018-02-01 19:55       ` [Qemu-devel] " Brijesh Singh
2018-02-01 20:04       ` Dr. David Alan Gilbert
2018-02-01 20:04         ` [Qemu-devel] " Dr. David Alan Gilbert
2018-02-02 13:08         ` Daniel P. Berrangé
2018-02-02 13:08           ` [Qemu-devel] " Daniel P. Berrangé
2018-02-02 13:46           ` Brijesh Singh
2018-02-02 13:46             ` [Qemu-devel] " Brijesh Singh
2018-02-02 15:24             ` Dr. David Alan Gilbert
2018-02-02 15:24               ` [Qemu-devel] " Dr. David Alan Gilbert
2018-01-29 17:41 ` [PATCH v6 14/23] sev: add command to create launch memory encryption context Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` Brijesh Singh [this message]
2018-01-29 17:41   ` [Qemu-devel] [PATCH v6 15/23] sev: add command to encrypt guest memory region Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 16/23] target/i386: encrypt bios rom Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 17/23] qapi: add SEV_MEASUREMENT event Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-31 17:45   ` Markus Armbruster
2018-02-01 15:25     ` Brijesh Singh
2018-02-01 15:28       ` Eric Blake
2018-02-01 15:28         ` Eric Blake
2018-01-29 17:41 ` [PATCH v6 18/23] sev: emit the " Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-30 20:08   ` Dr. David Alan Gilbert
2018-01-30 20:08     ` [Qemu-devel] " Dr. David Alan Gilbert
2018-01-30 22:13     ` Brijesh Singh
2018-01-30 22:13       ` [Qemu-devel] " Brijesh Singh
2018-02-01 17:27       ` Dr. David Alan Gilbert
2018-02-01 17:27         ` [Qemu-devel] " Dr. David Alan Gilbert
2018-02-02 15:11         ` Brijesh Singh
2018-02-02 15:11           ` [Qemu-devel] " Brijesh Singh
2018-02-02 15:16           ` Daniel P. Berrangé
2018-02-02 15:16             ` [Qemu-devel] " Daniel P. Berrangé
2018-02-08 16:17             ` Brijesh Singh
2018-02-08 16:17               ` [Qemu-devel] " Brijesh Singh
2018-02-08 16:22               ` Daniel P. Berrangé
2018-01-29 17:41 ` [PATCH v6 19/23] sev: Finalize the SEV guest launch flow Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 20/23] hw: i386: set ram_debug_ops when memory encryption is enabled Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 21/23] sev: add debug encrypt and decrypt commands Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 22/23] target/i386: clear C-bit when walking SEV guest page table Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 17:41 ` [PATCH v6 23/23] sev: add migration blocker Brijesh Singh
2018-01-29 17:41   ` [Qemu-devel] " Brijesh Singh
2018-01-29 18:13 ` [Qemu-devel] [PATCH v6 00/23] x86: Secure Encrypted Virtualization (AMD) no-reply
2018-01-29 18:13   ` no-reply
2018-01-29 18:17 ` no-reply
2018-01-29 18:17   ` [Qemu-devel] " no-reply
2018-01-29 18:19 ` no-reply
2018-01-29 18:19   ` no-reply
2018-01-29 18:31 ` no-reply
2018-01-29 18:31   ` [Qemu-devel] " no-reply
2018-02-06 15:51 ` Bruce Rogers
2018-02-06 15:51   ` Bruce Rogers
2018-02-07  1:07   ` Brijesh Singh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180129174132.108925-16-brijesh.singh@amd.com \
    --to=brijesh.singh@amd.com \
    --cc=Thomas.Lendacky@amd.com \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=edgar.iglesias@xilinx.com \
    --cc=ehabkost@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanha@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.