From: David Gibson <david@gibson.dropbear.id.au> To: pair@us.ibm.com, pbonzini@redhat.com, frankja@linux.ibm.com, brijesh.singh@amd.com, dgilbert@redhat.com, qemu-devel@nongnu.org Cc: Eduardo Habkost <ehabkost@redhat.com>, qemu-ppc@nongnu.org, rth@twiddle.net, thuth@redhat.com, berrange@redhat.com, mdroth@linux.vnet.ibm.com, Marcelo Tosatti <mtosatti@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, david@redhat.com, Richard Henderson <richard.henderson@linaro.org>, borntraeger@de.ibm.com, David Gibson <david@gibson.dropbear.id.au>, cohuck@redhat.com, kvm@vger.kernel.org, qemu-s390x@nongnu.org, pasic@linux.ibm.com Subject: [for-6.0 v5 04/13] securable guest memory: Move side effect out of machine_set_memory_encryption() Date: Fri, 4 Dec 2020 16:44:06 +1100 [thread overview] Message-ID: <20201204054415.579042-5-david@gibson.dropbear.id.au> (raw) In-Reply-To: <20201204054415.579042-1-david@gibson.dropbear.id.au> When the "memory-encryption" property is set, we also disable KSM merging for the guest, since it won't accomplish anything. We want that, but doing it in the property set function itself is thereoretically incorrect, in the unlikely event of some configuration environment that set the property then cleared it again before constructing the guest. More importantly, it makes some other cleanups we want more difficult. So, instead move this logic to machine_run_board_init() conditional on the final value of the property. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> --- hw/core/machine.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index d0408049b5..cb0711508d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -427,14 +427,6 @@ static void machine_set_memory_encryption(Object *obj, const char *value, g_free(ms->memory_encryption); ms->memory_encryption = g_strdup(value); - - /* - * With memory encryption, the host can't see the real contents of RAM, - * so there's no point in it trying to merge areas. - */ - if (value) { - machine_set_mem_merge(obj, false, errp); - } } static bool machine_get_nvdimm(Object *obj, Error **errp) @@ -1131,6 +1123,15 @@ void machine_run_board_init(MachineState *machine) cc->deprecation_note); } + if (machine->memory_encryption) { + /* + * With memory encryption, the host can't see the real + * contents of RAM, so there's no point in it trying to merge + * areas. + */ + machine_set_mem_merge(OBJECT(machine), false, &error_abort); + } + machine_class->init(machine); } -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: David Gibson <david@gibson.dropbear.id.au> To: pair@us.ibm.com, pbonzini@redhat.com, frankja@linux.ibm.com, brijesh.singh@amd.com, dgilbert@redhat.com, qemu-devel@nongnu.org Cc: thuth@redhat.com, cohuck@redhat.com, berrange@redhat.com, Eduardo Habkost <ehabkost@redhat.com>, kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Marcelo Tosatti <mtosatti@redhat.com>, david@redhat.com, mdroth@linux.vnet.ibm.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, David Gibson <david@gibson.dropbear.id.au>, rth@twiddle.net Subject: [for-6.0 v5 04/13] securable guest memory: Move side effect out of machine_set_memory_encryption() Date: Fri, 4 Dec 2020 16:44:06 +1100 [thread overview] Message-ID: <20201204054415.579042-5-david@gibson.dropbear.id.au> (raw) In-Reply-To: <20201204054415.579042-1-david@gibson.dropbear.id.au> When the "memory-encryption" property is set, we also disable KSM merging for the guest, since it won't accomplish anything. We want that, but doing it in the property set function itself is thereoretically incorrect, in the unlikely event of some configuration environment that set the property then cleared it again before constructing the guest. More importantly, it makes some other cleanups we want more difficult. So, instead move this logic to machine_run_board_init() conditional on the final value of the property. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> --- hw/core/machine.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index d0408049b5..cb0711508d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -427,14 +427,6 @@ static void machine_set_memory_encryption(Object *obj, const char *value, g_free(ms->memory_encryption); ms->memory_encryption = g_strdup(value); - - /* - * With memory encryption, the host can't see the real contents of RAM, - * so there's no point in it trying to merge areas. - */ - if (value) { - machine_set_mem_merge(obj, false, errp); - } } static bool machine_get_nvdimm(Object *obj, Error **errp) @@ -1131,6 +1123,15 @@ void machine_run_board_init(MachineState *machine) cc->deprecation_note); } + if (machine->memory_encryption) { + /* + * With memory encryption, the host can't see the real + * contents of RAM, so there's no point in it trying to merge + * areas. + */ + machine_set_mem_merge(OBJECT(machine), false, &error_abort); + } + machine_class->init(machine); } -- 2.28.0
next prev parent reply other threads:[~2020-12-04 5:45 UTC|newest] Thread overview: 186+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-04 5:44 [for-6.0 v5 00/13] Generalize memory encryption models David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-04 5:44 ` [for-6.0 v5 01/13] qom: Allow optional sugar props David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-04 12:57 ` Cornelia Huck 2020-12-04 12:57 ` Cornelia Huck 2020-12-14 21:25 ` Eduardo Habkost 2020-12-14 21:25 ` Eduardo Habkost 2021-01-11 18:04 ` Philippe Mathieu-Daudé 2021-01-11 18:04 ` Philippe Mathieu-Daudé 2020-12-04 5:44 ` [for-6.0 v5 02/13] securable guest memory: Introduce new securable guest memory base class David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-04 5:44 ` [for-6.0 v5 03/13] securable guest memory: Handle memory encryption via interface David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-04 13:10 ` Cornelia Huck 2020-12-04 13:10 ` Cornelia Huck 2021-01-08 4:03 ` David Gibson 2021-01-08 4:03 ` David Gibson 2021-01-12 3:49 ` David Gibson 2021-01-12 3:49 ` David Gibson 2020-12-04 5:44 ` David Gibson [this message] 2020-12-04 5:44 ` [for-6.0 v5 04/13] securable guest memory: Move side effect out of machine_set_memory_encryption() David Gibson 2020-12-04 5:44 ` [for-6.0 v5 05/13] securable guest memory: Rework the "memory-encryption" property David Gibson 2020-12-04 5:44 ` David Gibson 2021-01-11 18:09 ` Philippe Mathieu-Daudé 2021-01-11 18:09 ` Philippe Mathieu-Daudé 2020-12-04 5:44 ` [for-6.0 v5 06/13] securable guest memory: Decouple kvm_memcrypt_*() helpers from KVM David Gibson 2020-12-04 5:44 ` David Gibson 2021-01-11 18:13 ` Philippe Mathieu-Daudé 2021-01-11 18:13 ` Philippe Mathieu-Daudé 2021-01-12 3:03 ` David Gibson 2021-01-12 3:03 ` David Gibson 2020-12-04 5:44 ` [for-6.0 v5 07/13] sev: Add Error ** to sev_kvm_init() David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-14 16:50 ` Cornelia Huck 2020-12-14 16:50 ` Cornelia Huck 2020-12-04 5:44 ` [for-6.0 v5 08/13] securable guest memory: Introduce sgm "ready" flag David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-14 17:00 ` Cornelia Huck 2020-12-14 17:00 ` Cornelia Huck 2020-12-17 5:38 ` David Gibson 2020-12-17 5:38 ` David Gibson 2020-12-17 11:24 ` Cornelia Huck 2020-12-17 11:24 ` Cornelia Huck 2020-12-04 5:44 ` [for-6.0 v5 09/13] securable guest memory: Move SEV initialization into arch specific code David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-04 5:44 ` [for-6.0 v5 10/13] spapr: Add PEF based securable guest memory David Gibson 2020-12-04 5:44 ` David Gibson 2021-01-05 23:34 ` Ram Pai 2021-01-05 23:34 ` Ram Pai 2021-01-08 0:34 ` David Gibson 2021-01-08 0:34 ` David Gibson 2020-12-04 5:44 ` [for-6.0 v5 11/13] spapr: PEF: prevent migration David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-14 17:22 ` Cornelia Huck 2020-12-14 17:22 ` Cornelia Huck 2020-12-17 5:47 ` David Gibson 2020-12-17 5:47 ` David Gibson 2020-12-17 11:38 ` Cornelia Huck 2020-12-17 11:38 ` Cornelia Huck 2020-12-17 14:15 ` Greg Kurz 2020-12-17 14:15 ` Greg Kurz 2020-12-18 11:41 ` Cornelia Huck 2020-12-18 11:41 ` Cornelia Huck 2020-12-18 12:08 ` Dr. David Alan Gilbert 2020-12-18 12:08 ` Dr. David Alan Gilbert 2021-01-04 7:15 ` Ram Pai 2021-01-04 7:15 ` Ram Pai 2021-01-04 12:46 ` [EXTERNAL] " Halil Pasic 2021-01-04 12:46 ` Halil Pasic 2021-01-04 18:40 ` Ram Pai 2021-01-04 18:40 ` Ram Pai 2021-01-05 10:56 ` [EXTERNAL] " Halil Pasic 2021-01-05 10:56 ` Halil Pasic 2021-01-05 20:41 ` Ram Pai 2021-01-05 20:41 ` Ram Pai 2021-01-11 16:59 ` Cornelia Huck 2021-01-11 16:59 ` Cornelia Huck 2021-01-11 19:58 ` Ram Pai 2021-01-11 19:58 ` Ram Pai 2021-01-12 8:19 ` Cornelia Huck 2021-01-12 8:19 ` Cornelia Huck 2021-01-12 18:55 ` Ram Pai 2021-01-12 18:55 ` Ram Pai 2021-01-13 8:06 ` Cornelia Huck 2021-01-13 8:06 ` Cornelia Huck 2021-01-15 18:55 ` Ram Pai 2021-01-15 18:55 ` Ram Pai 2021-01-19 8:19 ` Cornelia Huck 2021-01-19 8:19 ` Cornelia Huck 2021-01-19 9:59 ` Daniel P. Berrangé 2021-01-19 9:59 ` Daniel P. Berrangé 2021-01-14 11:23 ` Daniel P. Berrangé 2021-01-14 11:23 ` Daniel P. Berrangé 2021-01-13 12:42 ` Dr. David Alan Gilbert 2021-01-13 12:42 ` Dr. David Alan Gilbert 2021-01-14 10:28 ` Christian Borntraeger 2021-01-14 10:28 ` Christian Borntraeger 2021-01-14 10:36 ` Dr. David Alan Gilbert 2021-01-14 10:36 ` Dr. David Alan Gilbert 2021-01-14 10:52 ` Christian Borntraeger 2021-01-14 10:52 ` Christian Borntraeger 2021-01-14 11:05 ` Cornelia Huck 2021-01-14 11:05 ` Cornelia Huck 2021-01-14 11:45 ` Dr. David Alan Gilbert 2021-01-14 11:45 ` Dr. David Alan Gilbert 2021-01-14 11:50 ` Christian Borntraeger 2021-01-14 11:50 ` Christian Borntraeger 2021-01-14 12:20 ` Daniel P. Berrangé 2021-01-14 12:20 ` Daniel P. Berrangé 2021-01-14 14:04 ` Cornelia Huck 2021-01-14 14:04 ` Cornelia Huck 2021-01-14 14:09 ` Christian Borntraeger 2021-01-14 14:09 ` Christian Borntraeger 2021-01-14 14:15 ` Daniel P. Berrangé 2021-01-14 14:15 ` Daniel P. Berrangé 2021-01-14 15:25 ` Christian Borntraeger 2021-01-14 15:25 ` Christian Borntraeger 2021-01-14 15:33 ` Daniel P. Berrangé 2021-01-14 15:33 ` Daniel P. Berrangé 2021-01-15 18:24 ` Ram Pai 2021-01-15 18:24 ` Ram Pai 2021-01-14 11:25 ` Daniel P. Berrangé 2021-01-14 11:25 ` Daniel P. Berrangé 2021-01-14 23:51 ` David Gibson 2021-01-14 23:51 ` David Gibson 2021-01-18 17:39 ` Dr. David Alan Gilbert 2021-01-18 17:39 ` Dr. David Alan Gilbert 2021-01-19 8:28 ` Christian Borntraeger 2021-01-19 8:28 ` Christian Borntraeger 2021-01-19 8:34 ` Cornelia Huck 2021-01-19 8:34 ` Cornelia Huck 2020-12-04 5:44 ` [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-04 8:10 ` Christian Borntraeger 2020-12-04 8:10 ` Christian Borntraeger 2020-12-04 8:17 ` Cornelia Huck 2020-12-04 8:17 ` Cornelia Huck 2020-12-04 8:29 ` Christian Borntraeger 2020-12-04 8:29 ` Christian Borntraeger 2020-12-04 14:43 ` Halil Pasic 2020-12-04 14:43 ` Halil Pasic 2020-12-08 1:54 ` David Gibson 2020-12-08 1:54 ` David Gibson 2020-12-08 8:16 ` Christian Borntraeger 2020-12-08 8:16 ` Christian Borntraeger 2020-12-08 10:28 ` Halil Pasic 2020-12-08 10:28 ` Halil Pasic 2020-12-08 12:50 ` Cornelia Huck 2020-12-08 12:50 ` Cornelia Huck 2020-12-17 5:53 ` David Gibson 2020-12-17 5:53 ` David Gibson 2020-12-04 17:04 ` Cornelia Huck 2020-12-04 17:04 ` Cornelia Huck 2020-12-04 5:44 ` [for-6.0 v5 13/13] s390: Recognize securable-guest-memory option David Gibson 2020-12-04 5:44 ` David Gibson 2020-12-15 11:45 ` Cornelia Huck 2020-12-15 11:45 ` Cornelia Huck 2020-12-17 5:54 ` David Gibson 2020-12-17 5:54 ` David Gibson 2020-12-04 8:06 ` [for-6.0 v5 00/13] Generalize memory encryption models Christian Borntraeger 2020-12-04 8:06 ` Christian Borntraeger 2020-12-04 13:02 ` Cornelia Huck 2020-12-04 13:02 ` Cornelia Huck 2020-12-04 13:07 ` Dr. David Alan Gilbert 2020-12-04 13:07 ` Dr. David Alan Gilbert 2020-12-04 13:12 ` Cornelia Huck 2020-12-04 13:12 ` Cornelia Huck 2020-12-08 2:57 ` David Gibson 2020-12-08 2:57 ` David Gibson 2020-12-08 12:43 ` Cornelia Huck 2020-12-08 12:43 ` Cornelia Huck 2020-12-17 6:21 ` David Gibson 2020-12-17 6:21 ` David Gibson 2020-12-17 11:43 ` Cornelia Huck 2020-12-17 11:43 ` Cornelia Huck 2020-12-04 13:25 ` Daniel P. Berrangé 2020-12-04 13:25 ` Daniel P. Berrangé 2020-12-04 13:51 ` Halil Pasic 2020-12-04 13:51 ` Halil Pasic 2020-12-08 2:54 ` David Gibson 2020-12-08 2:54 ` David Gibson 2020-12-04 9:50 ` Daniel P. Berrangé 2020-12-04 9:50 ` Daniel P. Berrangé 2021-01-12 3:02 ` David Gibson 2021-01-12 3:02 ` 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=20201204054415.579042-5-david@gibson.dropbear.id.au \ --to=david@gibson.dropbear.id.au \ --cc=berrange@redhat.com \ --cc=borntraeger@de.ibm.com \ --cc=brijesh.singh@amd.com \ --cc=cohuck@redhat.com \ --cc=david@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=mtosatti@redhat.com \ --cc=pair@us.ibm.com \ --cc=pasic@linux.ibm.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=richard.henderson@linaro.org \ --cc=rth@twiddle.net \ --cc=thuth@redhat.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: 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.