From: Shiju Jose <shiju.jose@xxxxxxxxxx> Add handling of following new fields in trace aer_event for advisory non-fatal and other errors. - cor_status (Correctable Error Status) - cor_mask (Correctable Error Mask) - uncor_status (Uncorrectable Error Status) - uncor_severity (Uncorrectable Error Severity) - uncor_mask (Uncorrectable Error Mask) - aer_cap_ctrl (AER Capabilities and Control) - link_status (Link Status) - device_status (Device Status) - device_control_2 (Device Control 2) https://lore.kernel.org/lkml/20240125062802.50819-5-qingshun.wang@xxxxxxxxxxxxxxx/ Question: Does "aer_event" table in SQLite DB to be rename, for example "aer_event_v2" because new fields are added? Signed-off-by: Shiju Jose <shiju.jose@xxxxxxxxxx> --- ras-aer-handler.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ ras-record.c | 20 ++++++++++++++++ ras-record.h | 10 ++++++++ ras-report.c | 24 +++++++++++++++++-- 4 files changed, 112 insertions(+), 2 deletions(-) diff --git a/ras-aer-handler.c b/ras-aer-handler.c index bb1a6f6..9a732e7 100644 --- a/ras-aer-handler.c +++ b/ras-aer-handler.c @@ -54,6 +54,30 @@ static const char *aer_uncor_errors[32] = { #define BUF_LEN 1024 +struct aer_header_log_regs { + uint32_t dw0; + uint32_t dw1; + uint32_t dw2; + uint32_t dw3; +}; + +struct aer_capability_regs { + uint32_t header; + uint32_t uncor_status; + uint32_t uncor_mask; + uint32_t uncor_severity; + uint32_t cor_status; + uint32_t cor_mask; + uint32_t cap_control; + struct aer_header_log_regs header_log; + uint32_t root_command; + uint32_t root_status; + uint16_t cor_err_source; + uint16_t uncor_err_source; +}; + +#define PCI_ERR_CAP_FEP(x) ((x) & 0x1f) /* First Error Pointer */ + int ras_aer_event_handler(struct trace_seq *s, struct tep_record *record, struct tep_event *event, void *context) @@ -70,6 +94,7 @@ int ras_aer_event_handler(struct trace_seq *s, char ipmi_add_sel[105]; uint8_t sel_data[5]; int seg, bus, dev, fn; + struct aer_capability_regs *aer_caps = NULL; /* * Newer kernels (3.10-rc1 or upper) provide an uptime clock. @@ -148,6 +173,41 @@ int ras_aer_event_handler(struct trace_seq *s, } trace_seq_puts(s, ev.error_type); + aer_caps = tep_get_field_raw(s, event, "aer_caps", + record, &len, 1); + if (aer_caps) { + ev.cor_status = aer_caps->cor_status; + ev.cor_mask = aer_caps->cor_mask; + ev.uncor_status = aer_caps->uncor_status; + ev.uncor_mask = aer_caps->uncor_mask; + ev.uncor_severity = aer_caps->uncor_severity; + ev.cap_control = aer_caps->cap_control; + ev.first_err_ptr = PCI_ERR_CAP_FEP(aer_caps->cap_control); + + trace_seq_printf(s, " cor_status: 0x%08x", ev.cor_status); + trace_seq_printf(s, " cor_mask: 0x%08x", ev.cor_mask); + trace_seq_printf(s, " uncor_status: 0x%08x", ev.uncor_status); + trace_seq_printf(s, " uncor_mask: 0x%08x", ev.uncor_mask); + trace_seq_printf(s, " uncor_severity: 0x%08x", ev.uncor_severity); + trace_seq_printf(s, " cap_control: 0x%08x", ev.cap_control); + trace_seq_printf(s, " first_error_pointer: 0x%x", + ev.first_err_ptr); + } + if (tep_get_field_val(s, event, "link_status", record, &val, 1) >= 0) { + ev.link_status = val; + trace_seq_printf(s, " link_status: 0x%04x ", ev.link_status); + } + + if (tep_get_field_val(s, event, "device_status", record, &val, 1) >= 0) { + ev.device_status = val; + trace_seq_printf(s, " device_status: 0x%04x ", ev.device_status); + } + + if (tep_get_field_val(s, event, "device_control_2", record, &val, 1) >= 0) { + ev.device_control_2 = val; + trace_seq_printf(s, " device_control_2: 0x%04x ", ev.device_control_2); + } + /* Insert data into the SGBD */ #ifdef HAVE_SQLITE3 ras_store_aer_event(ras, &ev); diff --git a/ras-record.c b/ras-record.c index f3ffafb..889e96f 100644 --- a/ras-record.c +++ b/ras-record.c @@ -111,6 +111,16 @@ static const struct db_fields aer_event_fields[] = { { .name = "dev_name", .type = "TEXT" }, { .name = "err_type", .type = "TEXT" }, { .name = "err_msg", .type = "TEXT" }, + { .name = "cor_status", .type = "INTEGER" }, + { .name = "cor_mask", .type = "INTEGER" }, + { .name = "uncor_status", .type = "INTEGER" }, + { .name = "uncor_mask", .type = "INTEGER" }, + { .name = "uncor_severity", .type = "INTEGER" }, + { .name = "cap_control", .type = "INTEGER" }, + { .name = "first_err_pointer", .type = "INTEGER" }, + { .name = "link_status", .type = "INTEGER" }, + { .name = "device_status", .type = "INTEGER" }, + { .name = "device_control_2", .type = "INTEGER" }, }; static const struct db_table_descriptor aer_event_tab = { @@ -132,6 +142,16 @@ int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev) sqlite3_bind_text(priv->stmt_aer_event, 2, ev->dev_name, -1, NULL); sqlite3_bind_text(priv->stmt_aer_event, 3, ev->error_type, -1, NULL); sqlite3_bind_text(priv->stmt_aer_event, 4, ev->msg, -1, NULL); + sqlite3_bind_int(priv->stmt_aer_event, 5, ev->cor_status); + sqlite3_bind_int(priv->stmt_aer_event, 6, ev->cor_mask); + sqlite3_bind_int(priv->stmt_aer_event, 7, ev->uncor_status); + sqlite3_bind_int(priv->stmt_aer_event, 8, ev->uncor_mask); + sqlite3_bind_int(priv->stmt_aer_event, 9, ev->uncor_severity); + sqlite3_bind_int(priv->stmt_aer_event, 10, ev->cap_control); + sqlite3_bind_int(priv->stmt_aer_event, 11, ev->first_err_ptr); + sqlite3_bind_int(priv->stmt_aer_event, 12, ev->link_status); + sqlite3_bind_int(priv->stmt_aer_event, 13, ev->device_status); + sqlite3_bind_int(priv->stmt_aer_event, 14, ev->device_control_2); rc = sqlite3_step(priv->stmt_aer_event); if (rc != SQLITE_OK && rc != SQLITE_DONE) diff --git a/ras-record.h b/ras-record.h index 2b2231c..ecab219 100644 --- a/ras-record.h +++ b/ras-record.h @@ -59,6 +59,16 @@ struct ras_aer_event { uint8_t tlp_header_valid; uint32_t *tlp_header; const char *msg; + uint32_t cor_status; + uint32_t cor_mask; + uint32_t uncor_status; + uint32_t uncor_mask; + uint32_t uncor_severity; + uint32_t cap_control; + uint32_t first_err_ptr; + uint16_t link_status; + uint16_t device_status; + uint16_t device_control_2; }; struct ras_extlog_event { diff --git a/ras-report.c b/ras-report.c index 5cc55b6..5e659ce 100644 --- a/ras-report.c +++ b/ras-report.c @@ -205,11 +205,31 @@ static int set_aer_event_backtrace(char *buf, struct ras_aer_event *ev) "timestamp=%s\n" \ "error_type=%s\n" \ "dev_name=%s\n" \ - "msg=%s\n", \ + "msg=%s\n" \ + "cor_status=0x%08x\n" \ + "cor_mask=0x%08x\n" \ + "uncor_status=0x%08x\n" \ + "uncor_mask=0x%08x\n" \ + "uncor_severity=0x%08x\n" \ + "cap_control=0x%08x\n" \ + "first_error_pointer=0x%x\n" \ + "link_status=0x%04x\n" \ + "device_status=0x%04x\n" \ + "device_control_2=0x%04x\n", \ ev->timestamp, \ ev->error_type, \ ev->dev_name, \ - ev->msg); + ev->msg, \ + ev->cor_status, \ + ev->cor_mask, \ + ev->uncor_status, \ + ev->uncor_mask, \ + ev->uncor_severity, \ + ev->cap_control, \ + ev->first_err_ptr, \ + ev->link_status, \ + ev->device_status, \ + ev->device_control_2); strcat(buf, bt_buf); -- 2.34.1
