You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
135 lines
4.2 KiB
135 lines
4.2 KiB
From d009fa2cebebd1da80f4f2f5d0c4fffb87e02afc Mon Sep 17 00:00:00 2001
|
|
From: Dov Murik <dovmurik@linux.ibm.com>
|
|
Date: Thu, 30 May 2024 06:16:34 -0500
|
|
Subject: [PATCH 079/100] i386/sev: Reorder struct declarations
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 245: SEV-SNP support
|
|
RH-Jira: RHEL-39544
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Bandan Das <bdas@redhat.com>
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
RH-Commit: [79/91] 1274d4620e88dda99ec10173ca5e3cd4184c8fb6 (bonzini/rhel-qemu-kvm)
|
|
|
|
Move the declaration of PaddedSevHashTable before SevSnpGuest so
|
|
we can add a new such field to the latter.
|
|
|
|
No functional change intended.
|
|
|
|
Signed-off-by: Dov Murik <dovmurik@linux.ibm.com>
|
|
Signed-off-by: Michael Roth <michael.roth@amd.com>
|
|
Signed-off-by: Pankaj Gupta <pankaj.gupta@amd.com>
|
|
Message-ID: <20240530111643.1091816-23-pankaj.gupta@amd.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit cc483bf911931f405dea682c74a3d8b9b6c54369)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
target/i386/sev.c | 84 +++++++++++++++++++++++------------------------
|
|
1 file changed, 42 insertions(+), 42 deletions(-)
|
|
|
|
diff --git a/target/i386/sev.c b/target/i386/sev.c
|
|
index 73f9406715..3fce4c08eb 100644
|
|
--- a/target/i386/sev.c
|
|
+++ b/target/i386/sev.c
|
|
@@ -46,6 +46,48 @@ OBJECT_DECLARE_TYPE(SevCommonState, SevCommonStateClass, SEV_COMMON)
|
|
OBJECT_DECLARE_TYPE(SevGuestState, SevCommonStateClass, SEV_GUEST)
|
|
OBJECT_DECLARE_TYPE(SevSnpGuestState, SevCommonStateClass, SEV_SNP_GUEST)
|
|
|
|
+/* hard code sha256 digest size */
|
|
+#define HASH_SIZE 32
|
|
+
|
|
+typedef struct QEMU_PACKED SevHashTableEntry {
|
|
+ QemuUUID guid;
|
|
+ uint16_t len;
|
|
+ uint8_t hash[HASH_SIZE];
|
|
+} SevHashTableEntry;
|
|
+
|
|
+typedef struct QEMU_PACKED SevHashTable {
|
|
+ QemuUUID guid;
|
|
+ uint16_t len;
|
|
+ SevHashTableEntry cmdline;
|
|
+ SevHashTableEntry initrd;
|
|
+ SevHashTableEntry kernel;
|
|
+} SevHashTable;
|
|
+
|
|
+/*
|
|
+ * Data encrypted by sev_encrypt_flash() must be padded to a multiple of
|
|
+ * 16 bytes.
|
|
+ */
|
|
+typedef struct QEMU_PACKED PaddedSevHashTable {
|
|
+ SevHashTable ht;
|
|
+ uint8_t padding[ROUND_UP(sizeof(SevHashTable), 16) - sizeof(SevHashTable)];
|
|
+} PaddedSevHashTable;
|
|
+
|
|
+QEMU_BUILD_BUG_ON(sizeof(PaddedSevHashTable) % 16 != 0);
|
|
+
|
|
+#define SEV_INFO_BLOCK_GUID "00f771de-1a7e-4fcb-890e-68c77e2fb44e"
|
|
+typedef struct __attribute__((__packed__)) SevInfoBlock {
|
|
+ /* SEV-ES Reset Vector Address */
|
|
+ uint32_t reset_addr;
|
|
+} SevInfoBlock;
|
|
+
|
|
+#define SEV_HASH_TABLE_RV_GUID "7255371f-3a3b-4b04-927b-1da6efa8d454"
|
|
+typedef struct QEMU_PACKED SevHashTableDescriptor {
|
|
+ /* SEV hash table area guest address */
|
|
+ uint32_t base;
|
|
+ /* SEV hash table area size (in bytes) */
|
|
+ uint32_t size;
|
|
+} SevHashTableDescriptor;
|
|
+
|
|
struct SevCommonState {
|
|
X86ConfidentialGuest parent_obj;
|
|
|
|
@@ -128,48 +170,6 @@ typedef struct SevLaunchUpdateData {
|
|
|
|
static QTAILQ_HEAD(, SevLaunchUpdateData) launch_update;
|
|
|
|
-#define SEV_INFO_BLOCK_GUID "00f771de-1a7e-4fcb-890e-68c77e2fb44e"
|
|
-typedef struct __attribute__((__packed__)) SevInfoBlock {
|
|
- /* SEV-ES Reset Vector Address */
|
|
- uint32_t reset_addr;
|
|
-} SevInfoBlock;
|
|
-
|
|
-#define SEV_HASH_TABLE_RV_GUID "7255371f-3a3b-4b04-927b-1da6efa8d454"
|
|
-typedef struct QEMU_PACKED SevHashTableDescriptor {
|
|
- /* SEV hash table area guest address */
|
|
- uint32_t base;
|
|
- /* SEV hash table area size (in bytes) */
|
|
- uint32_t size;
|
|
-} SevHashTableDescriptor;
|
|
-
|
|
-/* hard code sha256 digest size */
|
|
-#define HASH_SIZE 32
|
|
-
|
|
-typedef struct QEMU_PACKED SevHashTableEntry {
|
|
- QemuUUID guid;
|
|
- uint16_t len;
|
|
- uint8_t hash[HASH_SIZE];
|
|
-} SevHashTableEntry;
|
|
-
|
|
-typedef struct QEMU_PACKED SevHashTable {
|
|
- QemuUUID guid;
|
|
- uint16_t len;
|
|
- SevHashTableEntry cmdline;
|
|
- SevHashTableEntry initrd;
|
|
- SevHashTableEntry kernel;
|
|
-} SevHashTable;
|
|
-
|
|
-/*
|
|
- * Data encrypted by sev_encrypt_flash() must be padded to a multiple of
|
|
- * 16 bytes.
|
|
- */
|
|
-typedef struct QEMU_PACKED PaddedSevHashTable {
|
|
- SevHashTable ht;
|
|
- uint8_t padding[ROUND_UP(sizeof(SevHashTable), 16) - sizeof(SevHashTable)];
|
|
-} PaddedSevHashTable;
|
|
-
|
|
-QEMU_BUILD_BUG_ON(sizeof(PaddedSevHashTable) % 16 != 0);
|
|
-
|
|
static Error *sev_mig_blocker;
|
|
|
|
static const char *const sev_fw_errlist[] = {
|
|
--
|
|
2.39.3
|
|
|