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.
203 lines
6.6 KiB
203 lines
6.6 KiB
7 years ago
|
From 0a31d938cf29e065e96de1206a7d35042962e02a Mon Sep 17 00:00:00 2001
|
||
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
|
||
|
Date: Fri, 31 May 2013 14:18:24 -0300
|
||
|
Subject: [PATCH 07/32] Add support to store MCE events at the database
|
||
|
|
||
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
||
|
---
|
||
|
ras-mce-handler.c | 5 +++
|
||
|
ras-record.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
|
||
|
ras-record.h | 9 +++++
|
||
|
3 files changed, 116 insertions(+), 2 deletions(-)
|
||
|
|
||
|
diff --git a/ras-mce-handler.c b/ras-mce-handler.c
|
||
|
index 614a0eb..59e8d05 100644
|
||
|
--- a/ras-mce-handler.c
|
||
|
+++ b/ras-mce-handler.c
|
||
|
@@ -396,5 +396,10 @@ int ras_mce_event_handler(struct trace_seq *s,
|
||
|
return rc;
|
||
|
|
||
|
report_mce_event(ras, record, s, &e);
|
||
|
+
|
||
|
+#ifdef HAVE_SQLITE3
|
||
|
+ ras_store_mce_record(ras, &e);
|
||
|
+#endif
|
||
|
+
|
||
|
return 0;
|
||
|
}
|
||
|
diff --git a/ras-record.c b/ras-record.c
|
||
|
index cb302ce..daa3cb1 100644
|
||
|
--- a/ras-record.c
|
||
|
+++ b/ras-record.c
|
||
|
@@ -27,6 +27,7 @@
|
||
|
#include "ras-events.h"
|
||
|
#include "ras-mc-handler.h"
|
||
|
#include "ras-aer-handler.h"
|
||
|
+#include "ras-mce-handler.h"
|
||
|
#include "ras-logger.h"
|
||
|
|
||
|
/* #define DEBUG_SQL 1 */
|
||
|
@@ -135,7 +136,7 @@ int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev)
|
||
|
|
||
|
if (!priv || !priv->stmt_aer_event)
|
||
|
return 0;
|
||
|
- log(TERM, LOG_INFO, "mc_event store: %p\n", priv->stmt_aer_event);
|
||
|
+ log(TERM, LOG_INFO, "aer_event store: %p\n", priv->stmt_aer_event);
|
||
|
|
||
|
sqlite3_bind_text(priv->stmt_aer_event, 1, ev->timestamp, -1, NULL);
|
||
|
sqlite3_bind_text(priv->stmt_aer_event, 3, ev->error_type, -1, NULL);
|
||
|
@@ -156,6 +157,98 @@ int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev)
|
||
|
}
|
||
|
#endif
|
||
|
|
||
|
+
|
||
|
+/*
|
||
|
+ * Table and functions to handle mce:mce_record
|
||
|
+ */
|
||
|
+
|
||
|
+#ifdef HAVE_MCE
|
||
|
+static const struct db_fields mce_record_fields[] = {
|
||
|
+ { .name="id", .type="INTEGER PRIMARY KEY" },
|
||
|
+ { .name="timestamp", .type="TEXT" },
|
||
|
+
|
||
|
+ /* MCE registers */
|
||
|
+ { .name="mcgcap", .type="INTEGER" },
|
||
|
+ { .name="mcgstatus", .type="INTEGER" },
|
||
|
+ { .name="status", .type="INTEGER" },
|
||
|
+ { .name="addr", .type="INTEGER" }, // 5
|
||
|
+ { .name="misc", .type="INTEGER" },
|
||
|
+ { .name="ip", .type="INTEGER" },
|
||
|
+ { .name="tsc", .type="INTEGER" },
|
||
|
+ { .name="walltime", .type="INTEGER" },
|
||
|
+ { .name="cpu", .type="INTEGER" }, // 10
|
||
|
+ { .name="cpuid", .type="INTEGER" },
|
||
|
+ { .name="apicid", .type="INTEGER" },
|
||
|
+ { .name="socketid", .type="INTEGER" },
|
||
|
+ { .name="cs", .type="INTEGER" },
|
||
|
+ { .name="bank", .type="INTEGER" }, //15
|
||
|
+ { .name="cpuvendor", .type="INTEGER" },
|
||
|
+
|
||
|
+ /* Parsed data - will likely change */
|
||
|
+ { .name="bank_name", .type="TEXT" },
|
||
|
+ { .name="error_msg", .type="TEXT" },
|
||
|
+ { .name="mcgstatus_msg", .type="TEXT" },
|
||
|
+ { .name="mcistatus_msg", .type="TEXT" }, // 20
|
||
|
+ { .name="user_action", .type="TEXT" },
|
||
|
+ { .name="mc_location", .type="TEXT" },
|
||
|
+};
|
||
|
+
|
||
|
+static const struct db_table_descriptor mce_record_tab = {
|
||
|
+ .name = "mce_record",
|
||
|
+ .fields = mce_record_fields,
|
||
|
+ .num_fields = ARRAY_SIZE(mce_record_fields),
|
||
|
+};
|
||
|
+
|
||
|
+int ras_store_mce_record(struct ras_events *ras, struct mce_event *ev)
|
||
|
+{
|
||
|
+ int rc;
|
||
|
+ struct sqlite3_priv *priv = ras->db_priv;
|
||
|
+
|
||
|
+ if (!priv || !priv->stmt_mce_record)
|
||
|
+ return 0;
|
||
|
+ log(TERM, LOG_INFO, "mce_record store: %p\n", priv->stmt_mce_record);
|
||
|
+
|
||
|
+ sqlite3_bind_text(priv->stmt_mce_record, 1, ev->timestamp, -1, NULL);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 2, ev->mcgcap);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 3, ev->mcgstatus);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 4, ev->status);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 5, ev->addr);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 6, ev->misc);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 7, ev->ip);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 8, ev->tsc);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 9, ev->walltime);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 10, ev->cpu);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 11, ev->cpuid);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 12, ev->apicid);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 13, ev->socketid);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 14, ev->cs);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 15, ev->bank);
|
||
|
+ sqlite3_bind_int (priv->stmt_mce_record, 16, ev->cpuvendor);
|
||
|
+
|
||
|
+ sqlite3_bind_text(priv->stmt_mce_record, 17, ev->bank_name, -1, NULL);
|
||
|
+ sqlite3_bind_text(priv->stmt_mce_record, 18, ev->error_msg, -1, NULL);
|
||
|
+ sqlite3_bind_text(priv->stmt_mce_record, 19, ev->mcgstatus_msg, -1, NULL);
|
||
|
+ sqlite3_bind_text(priv->stmt_mce_record, 20, ev->mcistatus_msg, -1, NULL);
|
||
|
+ sqlite3_bind_text(priv->stmt_mce_record, 21, ev->mcastatus_msg, -1, NULL);
|
||
|
+ sqlite3_bind_text(priv->stmt_mce_record, 22, ev->user_action, -1, NULL);
|
||
|
+ sqlite3_bind_text(priv->stmt_mce_record, 23, ev->mc_location, -1, NULL);
|
||
|
+
|
||
|
+ rc = sqlite3_step(priv->stmt_mce_record);
|
||
|
+ if (rc != SQLITE_OK && rc != SQLITE_DONE)
|
||
|
+ log(TERM, LOG_ERR,
|
||
|
+ "Failed to do mce_record step on sqlite: error = %d\n", rc);
|
||
|
+ rc = sqlite3_reset(priv->stmt_mce_record);
|
||
|
+ if (rc != SQLITE_OK && rc != SQLITE_DONE)
|
||
|
+ log(TERM, LOG_ERR,
|
||
|
+ "Failed reset mce_record on sqlite: error = %d\n",
|
||
|
+ rc);
|
||
|
+ log(TERM, LOG_INFO, "register inserted at db\n");
|
||
|
+
|
||
|
+ return rc;
|
||
|
+}
|
||
|
+#endif
|
||
|
+
|
||
|
+
|
||
|
/*
|
||
|
* Generic code
|
||
|
*/
|
||
|
@@ -291,6 +384,13 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
|
||
|
&aer_event_tab);
|
||
|
#endif
|
||
|
|
||
|
- ras->db_priv = priv;
|
||
|
+#ifdef HAVE_MCE
|
||
|
+ rc = ras_mc_create_table(priv, &mce_record_tab);
|
||
|
+ if (rc == SQLITE_OK)
|
||
|
+ rc = ras_mc_prepare_stmt(priv, &priv->stmt_mce_record,
|
||
|
+ &mce_record_tab);
|
||
|
+#endif
|
||
|
+
|
||
|
+ ras->db_priv = priv;
|
||
|
return 0;
|
||
|
}
|
||
|
diff --git a/ras-record.h b/ras-record.h
|
||
|
index 5008906..6f146a8 100644
|
||
|
--- a/ras-record.h
|
||
|
+++ b/ras-record.h
|
||
|
@@ -40,6 +40,10 @@ struct ras_aer_event {
|
||
|
const char *msg;
|
||
|
};
|
||
|
|
||
|
+struct ras_mc_event;
|
||
|
+struct ras_aer_event;
|
||
|
+struct mce_event;
|
||
|
+
|
||
|
#ifdef HAVE_SQLITE3
|
||
|
|
||
|
#include <sqlite3.h>
|
||
|
@@ -50,16 +54,21 @@ struct sqlite3_priv {
|
||
|
#ifdef HAVE_AER
|
||
|
sqlite3_stmt *stmt_aer_event;
|
||
|
#endif
|
||
|
+#ifdef HAVE_MCE
|
||
|
+ sqlite3_stmt *stmt_mce_record;
|
||
|
+#endif
|
||
|
};
|
||
|
|
||
|
int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras);
|
||
|
int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev);
|
||
|
int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev);
|
||
|
+int ras_store_mce_record(struct ras_events *ras, struct mce_event *ev);
|
||
|
|
||
|
#else
|
||
|
static inline int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras) { return 0; };
|
||
|
static inline int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev) { return 0; };
|
||
|
static inline int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev) { return 0; };
|
||
|
+static inline int ras_store_mce_record(struct ras_events *ras, struct mce_event *ev) { return 0; };
|
||
|
|
||
|
#endif
|
||
|
|
||
|
--
|
||
|
1.7.1
|
||
|
|