From: David Gibson <david@gibson.dropbear.id.au> To: qemu-devel@nongnu.org, brijesh.singh@amd.com, pair@us.ibm.com, pbonzini@redhat.com, dgilbert@redhat.com, frankja@linux.ibm.com Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, kvm@vger.kernel.org, qemu-ppc@nongnu.org, mst@redhat.com, mdroth@linux.vnet.ibm.com, Richard Henderson <rth@twiddle.net>, cohuck@redhat.com, pasic@linux.ibm.com, Eduardo Habkost <ehabkost@redhat.com>, David Gibson <david@gibson.dropbear.id.au>, qemu-s390x@nongnu.org, david@redhat.com, Richard Henderson <richard.henderson@linaro.org> Subject: [PATCH v3 3/9] host trust limitation: Move side effect out of machine_set_memory_encryption() Date: Fri, 19 Jun 2020 12:05:56 +1000 [thread overview] Message-ID: <20200619020602.118306-4-david@gibson.dropbear.id.au> (raw) In-Reply-To: <20200619020602.118306-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 1d80ab0e1d..fdc0c7e038 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -435,14 +435,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) @@ -1135,6 +1127,15 @@ void machine_run_board_init(MachineState *machine) } } + if (machine->memory_encryption) { + /* + * With host trust limitation, 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.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, pair@us.ibm.com, pbonzini@redhat.com, dgilbert@redhat.com, frankja@linux.ibm.com Cc: Eduardo Habkost <ehabkost@redhat.com>, kvm@vger.kernel.org, mst@redhat.com, Richard Henderson <richard.henderson@linaro.org>, cohuck@redhat.com, david@redhat.com, mdroth@linux.vnet.ibm.com, pasic@linux.ibm.com, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, David Gibson <david@gibson.dropbear.id.au>, Richard Henderson <rth@twiddle.net> Subject: [PATCH v3 3/9] host trust limitation: Move side effect out of machine_set_memory_encryption() Date: Fri, 19 Jun 2020 12:05:56 +1000 [thread overview] Message-ID: <20200619020602.118306-4-david@gibson.dropbear.id.au> (raw) In-Reply-To: <20200619020602.118306-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 1d80ab0e1d..fdc0c7e038 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -435,14 +435,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) @@ -1135,6 +1127,15 @@ void machine_run_board_init(MachineState *machine) } } + if (machine->memory_encryption) { + /* + * With host trust limitation, 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.26.2
next prev parent reply other threads:[~2020-06-19 2:06 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-19 2:05 [PATCH v3 0/9] Generalize memory encryption models David Gibson 2020-06-19 2:05 ` David Gibson 2020-06-19 2:05 ` [PATCH v3 1/9] host trust limitation: Introduce new host trust limitation interface David Gibson 2020-06-19 2:05 ` David Gibson 2020-06-26 11:01 ` Dr. David Alan Gilbert 2020-06-26 11:01 ` Dr. David Alan Gilbert 2020-07-14 19:26 ` Richard Henderson 2020-07-14 19:26 ` Richard Henderson 2020-06-19 2:05 ` [PATCH v3 2/9] host trust limitation: Handle memory encryption via interface David Gibson 2020-06-19 2:05 ` David Gibson 2020-06-19 2:05 ` David Gibson [this message] 2020-06-19 2:05 ` [PATCH v3 3/9] host trust limitation: Move side effect out of machine_set_memory_encryption() David Gibson 2020-06-19 2:05 ` [PATCH v3 4/9] host trust limitation: Rework the "memory-encryption" property David Gibson 2020-06-19 2:05 ` David Gibson 2020-07-14 19:36 ` Richard Henderson 2020-07-14 19:36 ` Richard Henderson 2020-06-19 2:05 ` [PATCH v3 5/9] host trust limitation: Decouple kvm_memcrypt_*() helpers from KVM David Gibson 2020-06-19 2:05 ` David Gibson 2020-06-19 2:05 ` [PATCH v3 6/9] host trust limitation: Add Error ** to HostTrustLimitation::kvm_init David Gibson 2020-06-19 2:05 ` David Gibson 2020-06-19 2:06 ` [PATCH v3 7/9] spapr: Add PEF based host trust limitation David Gibson 2020-06-19 2:06 ` David Gibson 2020-06-19 2:06 ` [PATCH v3 8/9] spapr: PEF: block migration David Gibson 2020-06-19 2:06 ` David Gibson 2020-06-26 10:33 ` Dr. David Alan Gilbert 2020-06-26 10:33 ` Dr. David Alan Gilbert 2020-07-05 7:38 ` David Gibson 2020-07-05 7:38 ` David Gibson 2020-06-19 2:06 ` [PATCH v3 9/9] host trust limitation: Alter virtio default properties for protected guests David Gibson 2020-06-19 2:06 ` David Gibson 2020-06-19 10:12 ` Daniel P. Berrangé 2020-06-19 10:12 ` Daniel P. Berrangé 2020-06-19 11:46 ` Michael S. Tsirkin 2020-06-19 11:46 ` Michael S. Tsirkin 2020-06-19 11:47 ` Michael S. Tsirkin 2020-06-19 11:47 ` Michael S. Tsirkin 2020-06-19 12:16 ` Daniel P. Berrangé 2020-06-19 12:16 ` Daniel P. Berrangé 2020-06-19 20:04 ` Halil Pasic 2020-06-19 20:04 ` Halil Pasic 2020-06-24 7:55 ` Michael S. Tsirkin 2020-06-24 7:55 ` Michael S. Tsirkin 2020-06-25 4:57 ` David Gibson 2020-06-25 4:57 ` David Gibson 2020-06-25 5:02 ` David Gibson 2020-06-25 5:02 ` David Gibson 2020-06-19 14:45 ` David Gibson 2020-06-19 14:45 ` David Gibson 2020-06-19 15:05 ` Daniel P. Berrangé 2020-06-19 15:05 ` Daniel P. Berrangé 2020-06-20 8:24 ` David Gibson 2020-06-20 8:24 ` David Gibson 2020-06-22 9:09 ` Daniel P. Berrangé 2020-06-22 9:09 ` Daniel P. Berrangé 2020-06-25 5:06 ` David Gibson 2020-06-25 5:06 ` David Gibson 2020-06-19 2:42 ` [PATCH v3 0/9] Generalize memory encryption models no-reply 2020-06-19 2:42 ` no-reply 2020-06-19 8:28 ` David Hildenbrand 2020-06-19 8:28 ` David Hildenbrand 2020-06-19 9:45 ` Cornelia Huck 2020-06-19 9:45 ` Cornelia Huck 2020-06-19 9:56 ` David Hildenbrand 2020-06-19 9:56 ` David Hildenbrand 2020-06-19 10:05 ` Cornelia Huck 2020-06-19 10:05 ` Cornelia Huck 2020-06-19 10:10 ` David Hildenbrand 2020-06-19 10:10 ` David Hildenbrand 2020-06-22 12:02 ` Cornelia Huck 2020-06-22 12:02 ` Cornelia Huck 2020-06-25 5:25 ` David Gibson 2020-06-25 5:25 ` David Gibson 2020-06-25 7:06 ` David Hildenbrand 2020-06-25 7:06 ` David Hildenbrand 2020-06-26 4:42 ` David Gibson 2020-06-26 4:42 ` David Gibson 2020-06-26 6:53 ` David Hildenbrand 2020-06-26 6:53 ` David Hildenbrand 2020-06-26 9:01 ` Janosch Frank 2020-06-26 9:01 ` Janosch Frank 2020-06-26 9:32 ` Daniel P. Berrangé 2020-06-26 9:32 ` Daniel P. Berrangé 2020-06-26 9:49 ` Janosch Frank 2020-06-26 9:49 ` Janosch Frank 2020-06-26 10:29 ` Dr. David Alan Gilbert 2020-06-26 10:29 ` Dr. David Alan Gilbert 2020-06-26 10:58 ` Daniel P. Berrangé 2020-06-26 10:58 ` Daniel P. Berrangé 2020-06-26 12:49 ` Janosch Frank 2020-06-26 12:49 ` Janosch Frank 2020-07-01 11:59 ` Halil Pasic 2020-07-01 11:59 ` Halil Pasic 2020-06-19 9:48 ` David Gibson 2020-06-19 9:48 ` David Gibson 2020-06-19 10:04 ` David Hildenbrand 2020-06-19 10:04 ` David Hildenbrand 2020-06-25 5:42 ` David Gibson 2020-06-25 5:42 ` David Gibson 2020-06-25 6:59 ` David Hildenbrand 2020-06-25 6:59 ` David Hildenbrand 2020-06-25 9:49 ` Cornelia Huck 2020-06-25 9:49 ` Cornelia Huck 2020-06-22 14:27 ` Christian Borntraeger 2020-06-22 14:27 ` Christian Borntraeger 2020-06-24 7:06 ` Cornelia Huck 2020-06-24 7:06 ` Cornelia Huck 2020-06-25 5:47 ` David Gibson 2020-06-25 5:47 ` David Gibson 2020-06-25 5:48 ` David Gibson 2020-06-25 5:48 ` David Gibson 2020-06-25 5:44 ` David Gibson 2020-06-25 5:44 ` 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=20200619020602.118306-4-david@gibson.dropbear.id.au \ --to=david@gibson.dropbear.id.au \ --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=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 \ /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.