[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/6] target/i386/sev: Replace qemu_map_ram_ptr with address_space_
From: |
Daniel P . Berrangé |
Subject: |
[PULL 6/6] target/i386/sev: Replace qemu_map_ram_ptr with address_space_map |
Date: |
Thu, 18 Nov 2021 13:35:32 +0000 |
From: Dov Murik <dovmurik@linux.ibm.com>
Use address_space_map/unmap and check for errors.
Signed-off-by: Dov Murik <dovmurik@linux.ibm.com>
Acked-by: Brijesh Singh <brijesh.singh@amd.com>
[Two lines wrapped for length - Daniel]
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
target/i386/sev.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 4fd258a570..025ff7a6f8 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -37,6 +37,7 @@
#include "qapi/qmp/qerror.h"
#include "exec/confidential-guest-support.h"
#include "hw/i386/pc.h"
+#include "exec/address-spaces.h"
#define TYPE_SEV_GUEST "sev-guest"
OBJECT_DECLARE_SIMPLE_TYPE(SevGuestState, SEV_GUEST)
@@ -1232,6 +1233,9 @@ bool sev_add_kernel_loader_hashes(SevKernelLoaderContext
*ctx, Error **errp)
uint8_t kernel_hash[HASH_SIZE];
uint8_t *hashp;
size_t hash_len = HASH_SIZE;
+ hwaddr mapped_len = sizeof(*padded_ht);
+ MemTxAttrs attrs = { 0 };
+ bool ret = true;
/*
* Only add the kernel hashes if the sev-guest configuration explicitly
@@ -1292,7 +1296,12 @@ bool sev_add_kernel_loader_hashes(SevKernelLoaderContext
*ctx, Error **errp)
* Populate the hashes table in the guest's memory at the OVMF-designated
* area for the SEV hashes table
*/
- padded_ht = qemu_map_ram_ptr(NULL, area->base);
+ padded_ht = address_space_map(&address_space_memory, area->base,
+ &mapped_len, true, attrs);
+ if (!padded_ht || mapped_len != sizeof(*padded_ht)) {
+ error_setg(errp, "SEV: cannot map hashes table guest memory area");
+ return false;
+ }
ht = &padded_ht->ht;
ht->guid = sev_hash_table_header_guid;
@@ -1314,10 +1323,13 @@ bool
sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **errp)
memset(padded_ht->padding, 0, sizeof(padded_ht->padding));
if (sev_encrypt_flash((uint8_t *)padded_ht, sizeof(*padded_ht), errp) < 0)
{
- return false;
+ ret = false;
}
- return true;
+ address_space_unmap(&address_space_memory, padded_ht,
+ mapped_len, true, mapped_len);
+
+ return ret;
}
static void
--
2.31.1
- [PULL 0/6 for-6.2] AMD SEV patches, Daniel P . Berrangé, 2021/11/18
- [PULL 1/6] qapi/qom, target/i386: sev-guest: Introduce kernel-hashes=on|off option, Daniel P . Berrangé, 2021/11/18
- [PULL 2/6] target/i386/sev: Add kernel hashes only if sev-guest.kernel-hashes=on, Daniel P . Berrangé, 2021/11/18
- [PULL 4/6] target/i386/sev: Fail when invalid hashes table area detected, Daniel P . Berrangé, 2021/11/18
- [PULL 3/6] target/i386/sev: Rephrase error message when no hashes table in guest firmware, Daniel P . Berrangé, 2021/11/18
- [PULL 5/6] target/i386/sev: Perform padding calculations at compile-time, Daniel P . Berrangé, 2021/11/18
- [PULL 6/6] target/i386/sev: Replace qemu_map_ram_ptr with address_space_map,
Daniel P . Berrangé <=
- Re: [PULL 0/6 for-6.2] AMD SEV patches, Richard Henderson, 2021/11/18