From: David Gibson <david@gibson.dropbear.id.au> To: qemu-devel@nongnu.org, brijesh.singh@amd.com, frankja@linux.ibm.com, dgilbert@redhat.com, pair@us.ibm.com Cc: qemu-ppc@nongnu.org, kvm@vger.kernel.org, David Gibson <david@gibson.dropbear.id.au>, mdroth@linux.vnet.ibm.com, cohuck@redhat.com, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Richard Henderson <rth@twiddle.net>, Eduardo Habkost <ehabkost@redhat.com> Subject: [RFC v2 14/18] guest memory protection: Rework the "memory-encryption" property Date: Thu, 21 May 2020 13:43:00 +1000 [thread overview] Message-ID: <20200521034304.340040-15-david@gibson.dropbear.id.au> (raw) In-Reply-To: <20200521034304.340040-1-david@gibson.dropbear.id.au> Currently the "memory-encryption" property is only looked at once we get to kvm_init(). Although protection of guest memory from the hypervisor isn't something that could really ever work with TCG, it's not conceptually tied to the KVM accelerator. In addition, the way the string property is resolved to an object is almost identical to how a QOM link property is handled. So, create a new "guest-memory-protection" link property which sets this QOM interface link directly in the machine. For compatibility we keep the "memory-encryption" property, but now implemented in terms of the new property. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- accel/kvm/kvm-all.c | 23 +++++++---------------- hw/core/machine.c | 41 ++++++++++++++++++++++++++++++++++++----- include/hw/boards.h | 4 +++- 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 5cf1a397e3..3588adf1e1 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2102,25 +2102,16 @@ static int kvm_init(MachineState *ms) * if memory encryption object is specified then initialize the memory * encryption context. */ - if (ms->memory_encryption) { - Object *obj = object_resolve_path_component(object_get_objects_root(), - ms->memory_encryption); - - if (object_dynamic_cast(obj, TYPE_GUEST_MEMORY_PROTECTION)) { - GuestMemoryProtection *gmpo = GUEST_MEMORY_PROTECTION(obj); - GuestMemoryProtectionClass *gmpc = - GUEST_MEMORY_PROTECTION_GET_CLASS(gmpo); - - ret = gmpc->kvm_init(gmpo); - if (ret < 0) { - goto err; - } + if (ms->gmpo) { + GuestMemoryProtectionClass *gmpc = + GUEST_MEMORY_PROTECTION_GET_CLASS(ms->gmpo); - kvm_state->guest_memory_protection = gmpo; - } else { - ret = -1; + ret = gmpc->kvm_init(ms->gmpo); + if (ret < 0) { goto err; } + + kvm_state->guest_memory_protection = ms->gmpo; } ret = kvm_arch_init(ms, s); diff --git a/hw/core/machine.c b/hw/core/machine.c index e75f0b73d0..88d699bceb 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -27,6 +27,7 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +#include "exec/guest-memory-protection.h" GlobalProperty hw_compat_5_0[] = {}; const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0); @@ -419,16 +420,37 @@ static char *machine_get_memory_encryption(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); - return g_strdup(ms->memory_encryption); + if (ms->gmpo) { + return object_get_canonical_path_component(OBJECT(ms->gmpo)); + } + + return NULL; } static void machine_set_memory_encryption(Object *obj, const char *value, Error **errp) { - MachineState *ms = MACHINE(obj); + Object *gmpo = + object_resolve_path_component(object_get_objects_root(), value); + + if (!gmpo) { + error_setg(errp, "No such memory encryption object '%s'", value); + return; + } - g_free(ms->memory_encryption); - ms->memory_encryption = g_strdup(value); + object_property_set_link(obj, gmpo, "guest-memory-protection", errp); +} + +static void machine_check_guest_memory_protection(const Object *obj, + const char *name, + Object *new_target, + Error **errp) +{ + /* + * So far the only constraint is that the target has the + * TYPE_GUEST_MEMORY_PROTECTION interface, and that's checked by + * the QOM core + */ } static bool machine_get_nvdimm(Object *obj, Error **errp) @@ -849,6 +871,15 @@ static void machine_class_init(ObjectClass *oc, void *data) object_class_property_set_description(oc, "enforce-config-section", "Set on to enforce configuration section migration"); + object_class_property_add_link(oc, "guest-memory-protection", + TYPE_GUEST_MEMORY_PROTECTION, + offsetof(MachineState, gmpo), + machine_check_guest_memory_protection, + OBJ_PROP_LINK_STRONG); + object_class_property_set_description(oc, "guest-memory-protection", + "Set guest memory protection object to use"); + + /* For compatibility */ object_class_property_add_str(oc, "memory-encryption", machine_get_memory_encryption, machine_set_memory_encryption); object_class_property_set_description(oc, "memory-encryption", @@ -1121,7 +1152,7 @@ void machine_run_board_init(MachineState *machine) } } - if (machine->memory_encryption) { + if (machine->gmpo) { /* * With guest memory protection, the host can't see the real * contents of RAM, so there's no point in it trying to merge diff --git a/include/hw/boards.h b/include/hw/boards.h index 18815d9be2..19bf2c38fc 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -12,6 +12,8 @@ #include "qom/object.h" #include "hw/core/cpu.h" +typedef struct GuestMemoryProtection GuestMemoryProtection; + #define TYPE_MACHINE_SUFFIX "-machine" /* Machine class name that needs to be used for class-name-based machine @@ -277,7 +279,7 @@ struct MachineState { bool suppress_vmdesc; bool enforce_config_section; bool enable_graphics; - char *memory_encryption; + GuestMemoryProtection *gmpo; char *ram_memdev_id; /* * convenience alias to ram_memdev_id backend memory region -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: David Gibson <david@gibson.dropbear.id.au> To: qemu-devel@nongnu.org, brijesh.singh@amd.com, frankja@linux.ibm.com, dgilbert@redhat.com, pair@us.ibm.com Cc: Eduardo Habkost <ehabkost@redhat.com>, kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>, cohuck@redhat.com, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <rth@twiddle.net>, David Gibson <david@gibson.dropbear.id.au> Subject: [RFC v2 14/18] guest memory protection: Rework the "memory-encryption" property Date: Thu, 21 May 2020 13:43:00 +1000 [thread overview] Message-ID: <20200521034304.340040-15-david@gibson.dropbear.id.au> (raw) In-Reply-To: <20200521034304.340040-1-david@gibson.dropbear.id.au> Currently the "memory-encryption" property is only looked at once we get to kvm_init(). Although protection of guest memory from the hypervisor isn't something that could really ever work with TCG, it's not conceptually tied to the KVM accelerator. In addition, the way the string property is resolved to an object is almost identical to how a QOM link property is handled. So, create a new "guest-memory-protection" link property which sets this QOM interface link directly in the machine. For compatibility we keep the "memory-encryption" property, but now implemented in terms of the new property. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- accel/kvm/kvm-all.c | 23 +++++++---------------- hw/core/machine.c | 41 ++++++++++++++++++++++++++++++++++++----- include/hw/boards.h | 4 +++- 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 5cf1a397e3..3588adf1e1 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2102,25 +2102,16 @@ static int kvm_init(MachineState *ms) * if memory encryption object is specified then initialize the memory * encryption context. */ - if (ms->memory_encryption) { - Object *obj = object_resolve_path_component(object_get_objects_root(), - ms->memory_encryption); - - if (object_dynamic_cast(obj, TYPE_GUEST_MEMORY_PROTECTION)) { - GuestMemoryProtection *gmpo = GUEST_MEMORY_PROTECTION(obj); - GuestMemoryProtectionClass *gmpc = - GUEST_MEMORY_PROTECTION_GET_CLASS(gmpo); - - ret = gmpc->kvm_init(gmpo); - if (ret < 0) { - goto err; - } + if (ms->gmpo) { + GuestMemoryProtectionClass *gmpc = + GUEST_MEMORY_PROTECTION_GET_CLASS(ms->gmpo); - kvm_state->guest_memory_protection = gmpo; - } else { - ret = -1; + ret = gmpc->kvm_init(ms->gmpo); + if (ret < 0) { goto err; } + + kvm_state->guest_memory_protection = ms->gmpo; } ret = kvm_arch_init(ms, s); diff --git a/hw/core/machine.c b/hw/core/machine.c index e75f0b73d0..88d699bceb 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -27,6 +27,7 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +#include "exec/guest-memory-protection.h" GlobalProperty hw_compat_5_0[] = {}; const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0); @@ -419,16 +420,37 @@ static char *machine_get_memory_encryption(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); - return g_strdup(ms->memory_encryption); + if (ms->gmpo) { + return object_get_canonical_path_component(OBJECT(ms->gmpo)); + } + + return NULL; } static void machine_set_memory_encryption(Object *obj, const char *value, Error **errp) { - MachineState *ms = MACHINE(obj); + Object *gmpo = + object_resolve_path_component(object_get_objects_root(), value); + + if (!gmpo) { + error_setg(errp, "No such memory encryption object '%s'", value); + return; + } - g_free(ms->memory_encryption); - ms->memory_encryption = g_strdup(value); + object_property_set_link(obj, gmpo, "guest-memory-protection", errp); +} + +static void machine_check_guest_memory_protection(const Object *obj, + const char *name, + Object *new_target, + Error **errp) +{ + /* + * So far the only constraint is that the target has the + * TYPE_GUEST_MEMORY_PROTECTION interface, and that's checked by + * the QOM core + */ } static bool machine_get_nvdimm(Object *obj, Error **errp) @@ -849,6 +871,15 @@ static void machine_class_init(ObjectClass *oc, void *data) object_class_property_set_description(oc, "enforce-config-section", "Set on to enforce configuration section migration"); + object_class_property_add_link(oc, "guest-memory-protection", + TYPE_GUEST_MEMORY_PROTECTION, + offsetof(MachineState, gmpo), + machine_check_guest_memory_protection, + OBJ_PROP_LINK_STRONG); + object_class_property_set_description(oc, "guest-memory-protection", + "Set guest memory protection object to use"); + + /* For compatibility */ object_class_property_add_str(oc, "memory-encryption", machine_get_memory_encryption, machine_set_memory_encryption); object_class_property_set_description(oc, "memory-encryption", @@ -1121,7 +1152,7 @@ void machine_run_board_init(MachineState *machine) } } - if (machine->memory_encryption) { + if (machine->gmpo) { /* * With guest memory protection, the host can't see the real * contents of RAM, so there's no point in it trying to merge diff --git a/include/hw/boards.h b/include/hw/boards.h index 18815d9be2..19bf2c38fc 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -12,6 +12,8 @@ #include "qom/object.h" #include "hw/core/cpu.h" +typedef struct GuestMemoryProtection GuestMemoryProtection; + #define TYPE_MACHINE_SUFFIX "-machine" /* Machine class name that needs to be used for class-name-based machine @@ -277,7 +279,7 @@ struct MachineState { bool suppress_vmdesc; bool enforce_config_section; bool enable_graphics; - char *memory_encryption; + GuestMemoryProtection *gmpo; char *ram_memdev_id; /* * convenience alias to ram_memdev_id backend memory region -- 2.26.2
next prev parent reply other threads:[~2020-05-21 3:43 UTC|newest] Thread overview: 156+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-21 3:42 [RFC v2 00/18] Refactor configuration of guest memory protection David Gibson 2020-05-21 3:42 ` David Gibson 2020-05-21 3:42 ` [RFC v2 01/18] target/i386: sev: Remove unused QSevGuestInfoClass David Gibson 2020-05-21 3:42 ` David Gibson 2020-05-29 9:01 ` Philippe Mathieu-Daudé 2020-06-02 3:04 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 02/18] target/i386: sev: Move local structure definitions into .c file David Gibson 2020-05-21 3:42 ` David Gibson 2020-05-29 9:03 ` Philippe Mathieu-Daudé 2020-06-02 3:05 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 03/18] target/i386: sev: Rename QSevGuestInfo David Gibson 2020-05-21 3:42 ` David Gibson 2020-05-29 9:05 ` Philippe Mathieu-Daudé 2020-06-02 3:06 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 04/18] target/i386: sev: Embed SEVState in SevGuestState David Gibson 2020-05-21 3:42 ` David Gibson 2020-05-29 9:09 ` Philippe Mathieu-Daudé 2020-06-04 3:15 ` David Gibson 2020-06-04 3:15 ` David Gibson 2020-06-02 3:07 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 05/18] target/i386: sev: Partial cleanup to sev_state global David Gibson 2020-05-21 3:42 ` David Gibson 2020-06-02 3:08 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 06/18] target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields David Gibson 2020-05-21 3:42 ` David Gibson 2020-05-29 9:11 ` Philippe Mathieu-Daudé 2020-06-02 3:09 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 07/18] target/i386: sev: Remove redundant policy field David Gibson 2020-05-21 3:42 ` David Gibson 2020-06-02 3:13 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 08/18] target/i386: sev: Remove redundant handle field David Gibson 2020-05-21 3:42 ` David Gibson 2020-06-02 3:16 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 09/18] target/i386: sev: Unify SEVState and SevGuestState David Gibson 2020-05-21 3:42 ` David Gibson 2020-05-29 9:13 ` Philippe Mathieu-Daudé 2020-06-02 3:18 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 10/18] guest memory protection: Add guest memory protection interface David Gibson 2020-05-21 3:42 ` David Gibson 2020-05-25 10:27 ` Greg Kurz 2020-05-25 10:27 ` Greg Kurz 2020-06-03 10:09 ` David Gibson 2020-06-03 10:09 ` David Gibson 2020-06-02 1:44 ` Richard Henderson 2020-06-03 10:09 ` David Gibson 2020-06-03 10:09 ` David Gibson 2020-05-21 3:42 ` [RFC v2 11/18] guest memory protection: Handle memory encrption via interface David Gibson 2020-05-21 3:42 ` David Gibson 2020-05-25 10:26 ` Greg Kurz 2020-05-25 10:26 ` Greg Kurz 2020-06-04 3:27 ` David Gibson 2020-06-04 3:27 ` David Gibson 2020-06-02 3:21 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 12/18] guest memory protection: Perform KVM init " David Gibson 2020-05-21 3:42 ` David Gibson 2020-06-02 3:39 ` Richard Henderson 2020-06-02 3:45 ` Richard Henderson 2020-05-21 3:42 ` [RFC v2 13/18] guest memory protection: Move side effect out of machine_set_memory_encryption() David Gibson 2020-05-21 3:42 ` David Gibson 2020-06-02 3:41 ` Richard Henderson 2020-05-21 3:43 ` David Gibson [this message] 2020-05-21 3:43 ` [RFC v2 14/18] guest memory protection: Rework the "memory-encryption" property David Gibson 2020-06-02 3:54 ` Richard Henderson 2020-06-04 5:56 ` David Gibson 2020-06-04 5:56 ` David Gibson 2020-06-04 6:19 ` Thomas Huth 2020-06-04 6:19 ` Thomas Huth 2020-06-04 6:25 ` David Gibson 2020-06-04 6:25 ` David Gibson 2020-05-21 3:43 ` [RFC v2 15/18] guest memory protection: Decouple kvm_memcrypt_*() helpers from KVM David Gibson 2020-05-21 3:43 ` David Gibson 2020-06-02 4:13 ` Richard Henderson 2020-06-03 10:18 ` David Gibson 2020-06-03 10:18 ` David Gibson 2020-05-21 3:43 ` [RFC v2 16/18] guest memory protection: Add Error ** to GuestMemoryProtection::kvm_init David Gibson 2020-05-21 3:43 ` David Gibson 2020-05-29 9:16 ` Philippe Mathieu-Daudé 2020-06-02 4:15 ` Richard Henderson 2020-05-21 3:43 ` [RFC v2 17/18] spapr: Added PEF based guest memory protection David Gibson 2020-05-21 3:43 ` David Gibson 2020-05-25 11:14 ` Greg Kurz 2020-05-25 11:14 ` Greg Kurz 2020-05-29 7:59 ` Ram Pai 2020-05-29 7:59 ` Ram Pai 2020-06-04 3:46 ` David Gibson 2020-06-04 3:46 ` David Gibson 2020-05-21 3:43 ` [RFC v2 18/18] guest memory protection: Alter virtio default properties for protected guests David Gibson 2020-05-21 3:43 ` David Gibson 2020-06-05 10:45 ` Cornelia Huck 2020-06-05 10:45 ` Cornelia Huck 2020-06-05 16:04 ` Halil Pasic 2020-06-05 16:04 ` Halil Pasic 2020-06-06 20:21 ` Michael S. Tsirkin 2020-06-06 20:21 ` Michael S. Tsirkin 2020-06-07 3:07 ` David Gibson 2020-06-07 3:07 ` David Gibson 2020-06-09 10:16 ` Cornelia Huck 2020-06-09 10:16 ` Cornelia Huck 2020-06-09 15:40 ` Halil Pasic 2020-06-09 15:40 ` Halil Pasic 2020-06-09 15:57 ` Cornelia Huck 2020-06-09 15:57 ` Cornelia Huck 2020-06-09 16:01 ` Michael S. Tsirkin 2020-06-09 16:01 ` Michael S. Tsirkin 2020-06-10 4:45 ` David Gibson 2020-06-10 4:45 ` David Gibson 2020-06-10 4:39 ` David Gibson 2020-06-10 4:39 ` David Gibson 2020-06-10 8:48 ` Cornelia Huck 2020-06-10 8:48 ` Cornelia Huck 2020-06-10 10:07 ` David Gibson 2020-06-10 10:07 ` David Gibson 2020-06-10 13:21 ` Halil Pasic 2020-06-10 13:21 ` Halil Pasic 2020-05-29 22:19 ` [RFC v2 00/18] Refactor configuration of guest memory protection Sean Christopherson 2020-05-29 22:19 ` Sean Christopherson 2020-06-01 9:16 ` Dr. David Alan Gilbert 2020-06-01 9:16 ` Dr. David Alan Gilbert 2020-06-04 3:11 ` David Gibson 2020-06-04 3:11 ` David Gibson 2020-06-04 16:20 ` Sean Christopherson 2020-06-04 16:20 ` Sean Christopherson 2020-06-04 3:05 ` David Gibson 2020-06-04 3:05 ` David Gibson 2020-06-04 4:39 ` Thiago Jung Bauermann 2020-06-04 4:39 ` Thiago Jung Bauermann 2020-06-04 6:21 ` David Gibson 2020-06-04 6:21 ` David Gibson 2020-06-04 21:54 ` Thiago Jung Bauermann 2020-06-04 21:54 ` Thiago Jung Bauermann 2020-06-04 22:47 ` Paolo Bonzini 2020-06-04 22:47 ` Paolo Bonzini 2020-06-04 23:30 ` Thiago Jung Bauermann 2020-06-04 23:30 ` Thiago Jung Bauermann 2020-06-04 23:41 ` Paolo Bonzini 2020-06-04 23:41 ` Paolo Bonzini 2020-06-05 20:01 ` Thiago Jung Bauermann 2020-06-05 20:01 ` Thiago Jung Bauermann 2020-06-06 8:24 ` David Gibson 2020-06-06 8:24 ` David Gibson 2020-06-08 15:10 ` Thiago Jung Bauermann 2020-06-08 15:10 ` Thiago Jung Bauermann 2020-06-04 6:44 ` David Gibson 2020-06-04 6:44 ` David Gibson 2020-06-04 9:08 ` Greg Kurz 2020-06-04 9:08 ` Greg Kurz 2020-06-06 8:45 ` David Gibson 2020-06-06 8:45 ` David Gibson 2020-06-05 10:55 ` Cornelia Huck 2020-06-05 10:55 ` Cornelia Huck 2020-06-06 8:44 ` David Gibson 2020-06-06 8:44 ` David Gibson 2020-06-09 10:11 ` Halil Pasic 2020-06-09 10:11 ` Halil Pasic 2020-06-10 4:36 ` David Gibson 2020-06-10 4:36 ` David Gibson
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=20200521034304.340040-15-david@gibson.dropbear.id.au \ --to=david@gibson.dropbear.id.au \ --cc=brijesh.singh@amd.com \ --cc=cohuck@redhat.com \ --cc=dgilbert@redhat.com \ --cc=ehabkost@redhat.com \ --cc=frankja@linux.ibm.com \ --cc=kvm@vger.kernel.org \ --cc=marcel.apfelbaum@gmail.com \ --cc=mdroth@linux.vnet.ibm.com \ --cc=mst@redhat.com \ --cc=pair@us.ibm.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=rth@twiddle.net \ /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: linkBe 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.