All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brijesh Singh <brijesh.singh@amd.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Brijesh Singh <brijesh.singh@amd.com>,
	kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>,
	Stefan Hajnoczi <stefanha@gmail.com>,
	Alexander Graf <agraf@suse.de>,
	"Edgar E. Iglesias" <edgar.iglesias@xilinx.com>,
	Markus Armbruster <armbru@redhat.com>,
	Bruce Rogers <brogers@suse.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	Marcel Apfelbaum <marcel@redhat.com>,
	Borislav Petkov <bp@suse.de>,
	Thomas Lendacky <Thomas.Lendacky@amd.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Richard Henderson <richard.henderson@linaro.org>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	Alistair Francis <alistair.francis@xilinx.com>,
	Cornelia Huck <cornelia.huck@de.ibm.com>,
	Richard Henderson <rth@twiddle.net>,
	Peter Crosthwaite <crosthwaite.peter@gmail.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH v12 16/28] sev/i386: add command to encrypt guest memory region
Date: Thu,  8 Mar 2018 06:48:49 -0600	[thread overview]
Message-ID: <20180308124901.83533-17-brijesh.singh@amd.com> (raw)
In-Reply-To: <20180308124901.83533-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.

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>
---
 accel/kvm/kvm-all.c      |  2 ++
 stubs/sev.c              |  5 +++++
 target/i386/sev.c        | 43 +++++++++++++++++++++++++++++++++++++++++++
 target/i386/trace-events |  1 +
 4 files changed, 51 insertions(+)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 975ba3845234..411aa87719e6 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1680,6 +1680,8 @@ static int kvm_init(MachineState *ms)
             ret = -1;
             goto err;
         }
+
+        kvm_state->memcrypt_encrypt_data = sev_encrypt_data;
     }
 
     ret = kvm_arch_init(ms, s);
diff --git a/stubs/sev.c b/stubs/sev.c
index 4a5cc5569e5f..2e20f3b73a5b 100644
--- a/stubs/sev.c
+++ b/stubs/sev.c
@@ -15,6 +15,11 @@
 #include "qemu-common.h"
 #include "sysemu/sev.h"
 
+int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len)
+{
+    return 1;
+}
+
 void *sev_guest_init(const char *id)
 {
     return NULL;
diff --git a/target/i386/sev.c b/target/i386/sev.c
index eee693745103..cb0bf84742ed 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -105,6 +105,13 @@ fw_error_to_str(int code)
     return sev_fw_errlist[code];
 }
 
+static bool
+sev_check_state(SevState state)
+{
+    assert(sev_state);
+    return sev_state->state == state ? true : false;
+}
+
 static void
 sev_set_guest_state(SevState new_state)
 {
@@ -486,6 +493,29 @@ 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 || !len) {
+        return 1;
+    }
+
+    update.uaddr = (__u64)addr;
+    update.len = len;
+    trace_kvm_sev_launch_update_data(addr, len);
+    ret = sev_ioctl(sev_state->sev_fd, 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));
+    }
+
+    return ret;
+}
+
 void *
 sev_guest_init(const char *id)
 {
@@ -571,6 +601,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/target/i386/trace-events b/target/i386/trace-events
index 9402251e9991..c0cd8e93217f 100644
--- a/target/i386/trace-events
+++ b/target/i386/trace-events
@@ -12,3 +12,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(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
-- 
2.14.3

WARNING: multiple messages have this Message-ID (diff)
From: Brijesh Singh <brijesh.singh@amd.com>
To: qemu-devel@nongnu.org
Cc: Alistair Francis <alistair.francis@xilinx.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	Cornelia Huck <cornelia.huck@de.ibm.com>,
	"Daniel P . Berrange" <berrange@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Edgar E. Iglesias" <edgar.iglesias@xilinx.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Eric Blake <eblake@redhat.com>,
	kvm@vger.kernel.org, Marcel Apfelbaum <marcel@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Peter Crosthwaite <crosthwaite.peter@gmail.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Richard Henderson <richard.henderson@linaro.org>,
	Stefan Hajnoczi <stefanha@gmail.com>,
	Thomas Lendacky <Thomas.Lendacky@amd.com>,
	Borislav Petkov <bp@suse.de>, Alexander Graf <agraf@suse.de>,
	Bruce Rogers <brogers@suse.com>,
	Brijesh Singh <brijesh.singh@amd.com>,
	Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PATCH v12 16/28] sev/i386: add command to encrypt guest memory region
Date: Thu,  8 Mar 2018 06:48:49 -0600	[thread overview]
Message-ID: <20180308124901.83533-17-brijesh.singh@amd.com> (raw)
In-Reply-To: <20180308124901.83533-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.

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>
---
 accel/kvm/kvm-all.c      |  2 ++
 stubs/sev.c              |  5 +++++
 target/i386/sev.c        | 43 +++++++++++++++++++++++++++++++++++++++++++
 target/i386/trace-events |  1 +
 4 files changed, 51 insertions(+)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 975ba3845234..411aa87719e6 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1680,6 +1680,8 @@ static int kvm_init(MachineState *ms)
             ret = -1;
             goto err;
         }
+
+        kvm_state->memcrypt_encrypt_data = sev_encrypt_data;
     }
 
     ret = kvm_arch_init(ms, s);
diff --git a/stubs/sev.c b/stubs/sev.c
index 4a5cc5569e5f..2e20f3b73a5b 100644
--- a/stubs/sev.c
+++ b/stubs/sev.c
@@ -15,6 +15,11 @@
 #include "qemu-common.h"
 #include "sysemu/sev.h"
 
+int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len)
+{
+    return 1;
+}
+
 void *sev_guest_init(const char *id)
 {
     return NULL;
diff --git a/target/i386/sev.c b/target/i386/sev.c
index eee693745103..cb0bf84742ed 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -105,6 +105,13 @@ fw_error_to_str(int code)
     return sev_fw_errlist[code];
 }
 
+static bool
+sev_check_state(SevState state)
+{
+    assert(sev_state);
+    return sev_state->state == state ? true : false;
+}
+
 static void
 sev_set_guest_state(SevState new_state)
 {
@@ -486,6 +493,29 @@ 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 || !len) {
+        return 1;
+    }
+
+    update.uaddr = (__u64)addr;
+    update.len = len;
+    trace_kvm_sev_launch_update_data(addr, len);
+    ret = sev_ioctl(sev_state->sev_fd, 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));
+    }
+
+    return ret;
+}
+
 void *
 sev_guest_init(const char *id)
 {
@@ -571,6 +601,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/target/i386/trace-events b/target/i386/trace-events
index 9402251e9991..c0cd8e93217f 100644
--- a/target/i386/trace-events
+++ b/target/i386/trace-events
@@ -12,3 +12,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(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
-- 
2.14.3

  parent reply	other threads:[~2018-03-08 12:48 UTC|newest]

Thread overview: 114+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-08 12:48 [PATCH v12 00/28] x86: Secure Encrypted Virtualization (AMD) Brijesh Singh
2018-03-08 12:48 ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 01/28] memattrs: add debug attribute Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 02/28] exec: add ram_debug_ops support Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 03/28] exec: add debug version of physical memory read and write API Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 04/28] monitor/i386: use debug APIs when accessing guest memory Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 05/28] machine: add -memory-encryption property Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 16:43   ` Daniel P. Berrangé
2018-03-08 16:43     ` [Qemu-devel] " Daniel P. Berrangé
2018-03-08 12:48 ` [PATCH v12 06/28] kvm: update kvm.h to include memory encryption ioctls Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 07/28] docs: add AMD Secure Encrypted Virtualization (SEV) Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 08/28] target/i386: add Secure Encrypted Virtulization (SEV) object Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 16:49   ` Daniel P. Berrangé
2018-03-08 16:49     ` [Qemu-devel] " Daniel P. Berrangé
2018-03-08 22:22     ` Brijesh Singh
2018-03-08 22:22       ` [Qemu-devel] " Brijesh Singh
2018-03-08 22:44       ` Eduardo Habkost
2018-03-08 22:44         ` [Qemu-devel] " Eduardo Habkost
2018-03-13  8:42         ` Paolo Bonzini
2018-03-13  8:42           ` [Qemu-devel] " Paolo Bonzini
2018-03-13 18:49           ` Eduardo Habkost
2018-03-13 18:49             ` [Qemu-devel] " Eduardo Habkost
2018-03-13 19:04             ` Paolo Bonzini
2018-03-13 19:04               ` [Qemu-devel] " Paolo Bonzini
2018-03-13 19:20               ` Eduardo Habkost
2018-03-13 19:20                 ` [Qemu-devel] " Eduardo Habkost
2018-03-13 19:49                 ` Dr. David Alan Gilbert
2018-03-13 19:49                   ` [Qemu-devel] " Dr. David Alan Gilbert
2018-03-08 12:48 ` [PATCH v12 09/28] qmp: add query-sev command Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 16:52   ` Daniel P. Berrangé
2018-03-08 16:52     ` [Qemu-devel] " Daniel P. Berrangé
2018-03-08 12:48 ` [PATCH v12 10/28] include: add psp-sev.h header file Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 16:54   ` Daniel P. Berrangé
2018-03-08 16:54     ` [Qemu-devel] " Daniel P. Berrangé
2018-03-09 12:24     ` Dr. David Alan Gilbert
2018-03-09 12:24       ` [Qemu-devel] " Dr. David Alan Gilbert
2018-03-12 10:32       ` Daniel P. Berrangé
2018-03-12 10:32         ` [Qemu-devel] " Daniel P. Berrangé
2018-03-08 12:48 ` [PATCH v12 11/28] sev/i386: add command to initialize the memory encryption context Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 16:57   ` Daniel P. Berrangé
2018-03-08 16:57     ` [Qemu-devel] " Daniel P. Berrangé
2018-03-08 12:48 ` [PATCH v12 12/28] sev/i386: register the guest memory range which may contain encrypted data Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 13/28] kvm: introduce memory encryption APIs Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 14/28] hmp: add 'info sev' command Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 15/28] sev/i386: add command to create launch memory encryption context Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` Brijesh Singh [this message]
2018-03-08 12:48   ` [Qemu-devel] [PATCH v12 16/28] sev/i386: add command to encrypt guest memory region Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 17/28] target/i386: encrypt bios rom Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 18/28] sev/i386: add support to LAUNCH_MEASURE command Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 19/28] sev/i386: finalize the SEV guest launch flow Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 20/28] hw/i386: set ram_debug_ops when memory encryption is enabled Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 21/28] sev/i386: add debug encrypt and decrypt commands Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 22/28] target/i386: clear C-bit when walking SEV guest page table Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 23/28] qmp: add query-sev-launch-measure command Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 17:03   ` Daniel P. Berrangé
2018-03-08 17:03     ` [Qemu-devel] " Daniel P. Berrangé
2018-03-08 12:48 ` [PATCH v12 24/28] sev/i386: add migration blocker Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-13  9:33   ` Paolo Bonzini
2018-03-13  9:33     ` [Qemu-devel] " Paolo Bonzini
2018-03-13 11:28     ` Brijesh Singh
2018-03-13 11:28       ` [Qemu-devel] " Brijesh Singh
2018-03-13 11:36       ` Paolo Bonzini
2018-03-13 11:36         ` [Qemu-devel] " Paolo Bonzini
2018-03-08 12:48 ` [PATCH v12 25/28] cpu/i386: populate CPUID 0x8000_001F when SEV is active Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:48 ` [PATCH v12 26/28] qmp: add query-sev-capabilities command Brijesh Singh
2018-03-08 12:48   ` [Qemu-devel] " Brijesh Singh
2018-03-08 17:05   ` Daniel P. Berrangé
2018-03-08 17:05     ` [Qemu-devel] " Daniel P. Berrangé
2018-03-08 22:52     ` Brijesh Singh
2018-03-08 22:52       ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:49 ` [PATCH v12 27/28] sev/i386: add sev_get_capabilities() Brijesh Singh
2018-03-08 12:49   ` [Qemu-devel] " Brijesh Singh
2018-03-08 12:49 ` [PATCH v12 28/28] tests/qmp-test: blacklist sev specific qmp commands Brijesh Singh
2018-03-08 12:49   ` [Qemu-devel] " Brijesh Singh
2018-03-08 17:08   ` Daniel P. Berrangé
2018-03-08 17:08     ` [Qemu-devel] " Daniel P. Berrangé
2018-03-08 20:18     ` Brijesh Singh
2018-03-08 20:18       ` [Qemu-devel] " Brijesh Singh
2018-03-08 21:45       ` Eduardo Habkost
2018-03-08 21:45         ` [Qemu-devel] " Eduardo Habkost
2018-03-08 23:22         ` Daniel P. Berrange
2018-03-08 23:22           ` [Qemu-devel] " Daniel P. Berrange
2018-03-09 10:12         ` Dr. David Alan Gilbert
2018-03-09 10:12           ` [Qemu-devel] " Dr. David Alan Gilbert
2018-03-13  9:07           ` Paolo Bonzini
2018-03-13  9:07             ` [Qemu-devel] " Paolo Bonzini
2018-03-13 11:21             ` Brijesh Singh
2018-03-13 11:21               ` [Qemu-devel] " Brijesh Singh
2018-03-13 11:36               ` Paolo Bonzini
2018-03-13 11:36                 ` [Qemu-devel] " Paolo Bonzini

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=20180308124901.83533-17-brijesh.singh@amd.com \
    --to=brijesh.singh@amd.com \
    --cc=Thomas.Lendacky@amd.com \
    --cc=agraf@suse.de \
    --cc=alistair.francis@xilinx.com \
    --cc=armbru@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=bp@suse.de \
    --cc=brogers@suse.com \
    --cc=cornelia.huck@de.ibm.com \
    --cc=crosthwaite.peter@gmail.com \
    --cc=dgilbert@redhat.com \
    --cc=edgar.iglesias@xilinx.com \
    --cc=ehabkost@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=marcel@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=rth@twiddle.net \
    --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.