cxl/events: Separate UUID from event structures

The UEFI CXL CPER structure does not include the UUID.  Now that the
UUID is passed separately to the trace event there is no need to have
the UUID in those structures.

Move UUID from the event record header to the raw structures.  Adjust
cxl-test to Create dummy structures for creating test records.

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Link: https://lore.kernel.org/r/20231220-cxl-cper-v5-5-1bb8a4ca2c7a@intel.com
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index 5f3681de10dec383ab72d90976a7b13880e2736d..4c516189682644a5c5b10592f344a64f146a32bd 100644 (file)
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -840,7 +840,7 @@ static void cxl_event_trace_record(const struct cxl_memdev *cxlmd,
                                   enum cxl_event_log_type type,
                                   struct cxl_event_record_raw *record)
 {
-       uuid_t *id = &record->hdr.id;
+       uuid_t *id = &record->id;
 
        if (uuid_equal(id, &CXL_EVENT_GEN_MEDIA_UUID)) {
                struct cxl_event_gen_media *rec =

diff --git a/include/linux/cxl-event.h b/include/linux/cxl-event.h
index 0fc068123f8edba19fbc3744c2de9b52e1c9602b..3d9b5954d0c11c459262132abb77f234331408d7 100644 (file)
--- a/include/linux/cxl-event.h
+++ b/include/linux/cxl-event.h
@@ -8,7 +8,6 @@
  * CXL rev 3.0 section 8.2.9.2.1; Table 8-42
  */
 struct cxl_event_record_hdr {
-       uuid_t id;
        u8 length;
        u8 flags[3];
        __le16 handle;
@@ -18,8 +17,13 @@ struct cxl_event_record_hdr {
        u8 reserved[15];
 } __packed;
 
+/*
+ * Common Event Record Format
+ * CXL rev 3.0 section 8.2.9.2.1; Table 8-42
+ */
 #define CXL_EVENT_RECORD_DATA_LENGTH 0x50
 struct cxl_event_record_raw {
+       uuid_t id;
        struct cxl_event_record_hdr hdr;
        u8 data[CXL_EVENT_RECORD_DATA_LENGTH];
 } __packed;

diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
index 5a95b04b329aeab753e5de8e18e6e69140e161c7..9cc2b8ce1efd098fdf10980168409c99827411c2 100644 (file)
--- a/tools/testing/cxl/test/mem.c
+++ b/tools/testing/cxl/test/mem.c
@@ -337,9 +337,9 @@ static void cxl_mock_event_trigger(struct device *dev)
 }
 
 struct cxl_event_record_raw maint_needed = {
+       .id = UUID_INIT(0xBA5EBA11, 0xABCD, 0xEFEB,
+                       0xa5, 0x5a, 0xa5, 0x5a, 0xa5, 0xa5, 0x5a, 0xa5),
        .hdr = {
-               .id = UUID_INIT(0xBA5EBA11, 0xABCD, 0xEFEB,
-                               0xa5, 0x5a, 0xa5, 0x5a, 0xa5, 0xa5, 0x5a, 0xa5),
                .length = sizeof(struct cxl_event_record_raw),
                .flags[0] = CXL_EVENT_RECORD_FLAG_MAINT_NEEDED,
                /* .handle = Set dynamically */
@@ -349,9 +349,9 @@ struct cxl_event_record_raw maint_needed = {
 };
 
 struct cxl_event_record_raw hardware_replace = {
+       .id = UUID_INIT(0xABCDEFEB, 0xBA11, 0xBA5E,
+                       0xa5, 0x5a, 0xa5, 0x5a, 0xa5, 0xa5, 0x5a, 0xa5),
        .hdr = {
-               .id = UUID_INIT(0xABCDEFEB, 0xBA11, 0xBA5E,
-                               0xa5, 0x5a, 0xa5, 0x5a, 0xa5, 0xa5, 0x5a, 0xa5),
                .length = sizeof(struct cxl_event_record_raw),
                .flags[0] = CXL_EVENT_RECORD_FLAG_HW_REPLACE,
                /* .handle = Set dynamically */
@@ -360,61 +360,82 @@ struct cxl_event_record_raw hardware_replace = {
        .data = { 0xDE, 0xAD, 0xBE, 0xEF },
 };
 
-struct cxl_event_gen_media gen_media = {
-       .hdr = {
-               .id = CXL_EVENT_GEN_MEDIA_UUID,
-               .length = sizeof(struct cxl_event_gen_media),
-               .flags[0] = CXL_EVENT_RECORD_FLAG_PERMANENT,
-               /* .handle = Set dynamically */
-               .related_handle = cpu_to_le16(0),
+struct cxl_test_gen_media {
+       uuid_t id;
+       struct cxl_event_gen_media rec;
+} __packed;
+
+struct cxl_test_gen_media gen_media = {
+       .id = CXL_EVENT_GEN_MEDIA_UUID,
+       .rec = {
+               .hdr = {
+                       .length = sizeof(struct cxl_test_gen_media),
+                       .flags[0] = CXL_EVENT_RECORD_FLAG_PERMANENT,
+                       /* .handle = Set dynamically */
+                       .related_handle = cpu_to_le16(0),
+               },
+               .phys_addr = cpu_to_le64(0x2000),
+               .descriptor = CXL_GMER_EVT_DESC_UNCORECTABLE_EVENT,
+               .type = CXL_GMER_MEM_EVT_TYPE_DATA_PATH_ERROR,
+               .transaction_type = CXL_GMER_TRANS_HOST_WRITE,
+               /* .validity_flags = <set below> */
+               .channel = 1,
+               .rank = 30
        },
-       .phys_addr = cpu_to_le64(0x2000),
-       .descriptor = CXL_GMER_EVT_DESC_UNCORECTABLE_EVENT,
-       .type = CXL_GMER_MEM_EVT_TYPE_DATA_PATH_ERROR,
-       .transaction_type = CXL_GMER_TRANS_HOST_WRITE,
-       /* .validity_flags = <set below> */
-       .channel = 1,
-       .rank = 30
 };
 
-struct cxl_event_dram dram = {
-       .hdr = {
-               .id = CXL_EVENT_DRAM_UUID,
-               .length = sizeof(struct cxl_event_dram),
-               .flags[0] = CXL_EVENT_RECORD_FLAG_PERF_DEGRADED,
-               /* .handle = Set dynamically */
-               .related_handle = cpu_to_le16(0),
+struct cxl_test_dram {
+       uuid_t id;
+       struct cxl_event_dram rec;
+} __packed;
+
+struct cxl_test_dram dram = {
+       .id = CXL_EVENT_DRAM_UUID,
+       .rec = {
+               .hdr = {
+                       .length = sizeof(struct cxl_test_dram),
+                       .flags[0] = CXL_EVENT_RECORD_FLAG_PERF_DEGRADED,
+                       /* .handle = Set dynamically */
+                       .related_handle = cpu_to_le16(0),
+               },
+               .phys_addr = cpu_to_le64(0x8000),
+               .descriptor = CXL_GMER_EVT_DESC_THRESHOLD_EVENT,
+               .type = CXL_GMER_MEM_EVT_TYPE_INV_ADDR,
+               .transaction_type = CXL_GMER_TRANS_INTERNAL_MEDIA_SCRUB,
+               /* .validity_flags = <set below> */
+               .channel = 1,
+               .bank_group = 5,
+               .bank = 2,
+               .column = {0xDE, 0xAD},
        },
-       .phys_addr = cpu_to_le64(0x8000),
-       .descriptor = CXL_GMER_EVT_DESC_THRESHOLD_EVENT,
-       .type = CXL_GMER_MEM_EVT_TYPE_INV_ADDR,
-       .transaction_type = CXL_GMER_TRANS_INTERNAL_MEDIA_SCRUB,
-       /* .validity_flags = <set below> */
-       .channel = 1,
-       .bank_group = 5,
-       .bank = 2,
-       .column = {0xDE, 0xAD},
 };
 
-struct cxl_event_mem_module mem_module = {
-       .hdr = {
-               .id = CXL_EVENT_MEM_MODULE_UUID,
-               .length = sizeof(struct cxl_event_mem_module),
-               /* .handle = Set dynamically */
-               .related_handle = cpu_to_le16(0),
+struct cxl_test_mem_module {
+       uuid_t id;
+       struct cxl_event_mem_module rec;
+} __packed;
+
+struct cxl_test_mem_module mem_module = {
+       .id = CXL_EVENT_MEM_MODULE_UUID,
+       .rec = {
+               .hdr = {
+                       .length = sizeof(struct cxl_test_mem_module),
+                       /* .handle = Set dynamically */
+                       .related_handle = cpu_to_le16(0),
+               },
+               .event_type = CXL_MMER_TEMP_CHANGE,
+               .info = {
+                       .health_status = CXL_DHI_HS_PERFORMANCE_DEGRADED,
+                       .media_status = CXL_DHI_MS_ALL_DATA_LOST,
+                       .add_status = (CXL_DHI_AS_CRITICAL << 2) |
+                                     (CXL_DHI_AS_WARNING << 4) |
+                                     (CXL_DHI_AS_WARNING << 5),
+                       .device_temp = { 0xDE, 0xAD},
+                       .dirty_shutdown_cnt = { 0xde, 0xad, 0xbe, 0xef },
+                       .cor_vol_err_cnt = { 0xde, 0xad, 0xbe, 0xef },
+                       .cor_per_err_cnt = { 0xde, 0xad, 0xbe, 0xef },
+               }
        },
-       .event_type = CXL_MMER_TEMP_CHANGE,
-       .info = {
-               .health_status = CXL_DHI_HS_PERFORMANCE_DEGRADED,
-               .media_status = CXL_DHI_MS_ALL_DATA_LOST,
-               .add_status = (CXL_DHI_AS_CRITICAL << 2) |
-                             (CXL_DHI_AS_WARNING << 4) |
-                             (CXL_DHI_AS_WARNING << 5),
-               .device_temp = { 0xDE, 0xAD},
-               .dirty_shutdown_cnt = { 0xde, 0xad, 0xbe, 0xef },
-               .cor_vol_err_cnt = { 0xde, 0xad, 0xbe, 0xef },
-               .cor_per_err_cnt = { 0xde, 0xad, 0xbe, 0xef },
-       }
 };
 
 static int mock_set_timestamp(struct cxl_dev_state *cxlds,
@@ -436,11 +457,11 @@ static int mock_set_timestamp(struct cxl_dev_state *cxlds,
 static void cxl_mock_add_event_logs(struct mock_event_store *mes)
 {
        put_unaligned_le16(CXL_GMER_VALID_CHANNEL | CXL_GMER_VALID_RANK,
-                          &gen_media.validity_flags);
+                          &gen_media.rec.validity_flags);
 
        put_unaligned_le16(CXL_DER_VALID_CHANNEL | CXL_DER_VALID_BANK_GROUP |
                           CXL_DER_VALID_BANK | CXL_DER_VALID_COLUMN,
-                          &dram.validity_flags);
+                          &dram.rec.validity_flags);
 
        mes_add_event(mes, CXL_EVENT_TYPE_INFO, &maint_needed);
        mes_add_event(mes, CXL_EVENT_TYPE_INFO,