[31/31] FIXME: acpi/ghes: properly set data record size

Commit Message

Mauro Carvalho Chehab Dec. 6, 2024, 5:12 p.m. UTC

Signed-off-by: Mauro Carvalho Chehab <[e-mail]>
---
 hw/acpi/ghes.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

Comments

Markus Armbruster Dec. 7, 2024, 6:17 a.m. UTC | #1

Another subject line that suggests this isn't fully baked.  Respin to
reduce confusion?

Mauro Carvalho Chehab Dec. 7, 2024, 8:48 a.m. UTC | #2

Em Sat, 07 Dec 2024 07:17:42 +0100
Markus Armbruster <[e-mail]> escreveu:

> Another subject line that suggests this isn't fully baked.  Respin to
> reduce confusion?

The last 3 patches on this series were purely to debug some things,
and aren't meant to be submitted. This particular one is just a potential
future cleanup. The FIXME there is just to remind me that I would need
to double check it, and provide a better description when submitting it
again.

Thanks,
Mauro

Patch

diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c
index 1fe4c536611a..856551df2103 100644
--- a/hw/acpi/ghes.c
+++ b/hw/acpi/ghes.c
@@ -211,6 +211,12 @@  ghes_gen_err_data_uncorrectable_recoverable(GArray *block,
      */
     QemuUUID fru_id = {};
 
+    /*
+     * Calculate the size with this block. No need to check for
+     * too big CPER, as CPER size is checked at ghes_record_cper_errors()
+     */
+    data_length += ACPI_GHES_GESB_SIZE;
+
     /* Build the new generic error status block header */
     acpi_ghes_generic_error_status(block, ACPI_GEBS_UNCORRECTABLE,
         0, 0, data_length, ACPI_CPER_SEV_RECOVERABLE);
@@ -580,21 +586,12 @@  int acpi_ghes_memory_errors(uint16_t source_id, uint64_t physical_address)
           UUID_LE(0xA5BC1114, 0x6F64, 0x4EDE, 0xB8, 0x63, 0x3E, 0x83, \
                   0xED, 0x7C, 0x83, 0xB1);
     Error *errp = NULL;
-    int data_length;
     GArray *block;
 
     block = g_array_new(false, true /* clear */, 1);
 
-    data_length = ACPI_GHES_DATA_LENGTH + ACPI_GHES_MEM_CPER_LENGTH;
-    /*
-     * It should not run out of the preallocated memory if adding a new generic
-     * error data entry
-     */
-    assert((data_length + ACPI_GHES_GESB_SIZE) <=
-            ACPI_GHES_MAX_RAW_DATA_LENGTH);
-
     ghes_gen_err_data_uncorrectable_recoverable(block, guid,
-                                                data_length);
+                                                ACPI_GHES_MAX_RAW_DATA_LENGTH);
 
     /* Build the memory section CPER for above new generic error data entry */
     acpi_ghes_build_append_mem_cper(block, physical_address);