From: <shiju.jose@huawei.com>
To: <linux-edac@vger.kernel.org>, <linux-cxl@vger.kernel.org>,
<mchehab@kernel.org>, <dave.jiang@intel.com>,
<dan.j.williams@intel.com>, <jonathan.cameron@huawei.com>,
<alison.schofield@intel.com>, <nifan.cxl@gmail.com>,
<vishal.l.verma@intel.com>, <ira.weiny@intel.com>,
<dave@stgolabs.net>
Cc: <linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>,
<tanxiaofei@huawei.com>, <prime.zeng@hisilicon.com>,
<shiju.jose@huawei.com>
Subject: [PATCH v2 04/14] rasdaemon: cxl: Add automatic indexing for storing CXL fields in SQLite database
Date: Fri, 10 Jan 2025 12:26:30 +0000 [thread overview]
Message-ID: <20250110122641.1668-5-shiju.jose@huawei.com> (raw)
In-Reply-To: <20250110122641.1668-1-shiju.jose@huawei.com>
From: Shiju Jose <shiju.jose@huawei.com>
When the CXL specification adds new fields to the common header of
CXL event records, manual updates to the indexing are required to
store these CXL fields in the SQLite database. This update introduces
automatic indexing to facilitate the storage of CXL fields in the
SQLite database, eliminating the need for manual update to indexing.
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
---
ras-record.c | 145 ++++++++++++++++++++++++++++-----------------------
1 file changed, 80 insertions(+), 65 deletions(-)
diff --git a/ras-record.c b/ras-record.c
index b4a1abd..3d95f97 100644
--- a/ras-record.c
+++ b/ras-record.c
@@ -780,23 +780,25 @@ int ras_store_cxl_overflow_event(struct ras_events *ras, struct ras_cxl_overflow
static int ras_store_cxl_common_hdr(sqlite3_stmt *stmt, struct ras_cxl_event_common_hdr *hdr)
{
- if (!stmt || !hdr)
- return 0;
+ int idx = 1;
- sqlite3_bind_text(stmt, 1, hdr->timestamp, -1, NULL);
- sqlite3_bind_text(stmt, 2, hdr->memdev, -1, NULL);
- sqlite3_bind_text(stmt, 3, hdr->host, -1, NULL);
- sqlite3_bind_int64(stmt, 4, hdr->serial);
- sqlite3_bind_text(stmt, 5, hdr->log_type, -1, NULL);
- sqlite3_bind_text(stmt, 6, hdr->hdr_uuid, -1, NULL);
- sqlite3_bind_int(stmt, 7, hdr->hdr_flags);
- sqlite3_bind_int(stmt, 8, hdr->hdr_handle);
- sqlite3_bind_int(stmt, 9, hdr->hdr_related_handle);
- sqlite3_bind_text(stmt, 10, hdr->hdr_timestamp, -1, NULL);
- sqlite3_bind_int(stmt, 11, hdr->hdr_length);
- sqlite3_bind_int(stmt, 12, hdr->hdr_maint_op_class);
+ if (!stmt || !hdr)
+ return -1;
- return 0;
+ sqlite3_bind_text(stmt, idx++, hdr->timestamp, -1, NULL);
+ sqlite3_bind_text(stmt, idx++, hdr->memdev, -1, NULL);
+ sqlite3_bind_text(stmt, idx++, hdr->host, -1, NULL);
+ sqlite3_bind_int64(stmt, idx++, hdr->serial);
+ sqlite3_bind_text(stmt, idx++, hdr->log_type, -1, NULL);
+ sqlite3_bind_text(stmt, idx++, hdr->hdr_uuid, -1, NULL);
+ sqlite3_bind_int(stmt, idx++, hdr->hdr_flags);
+ sqlite3_bind_int(stmt, idx++, hdr->hdr_handle);
+ sqlite3_bind_int(stmt, idx++, hdr->hdr_related_handle);
+ sqlite3_bind_text(stmt, idx++, hdr->hdr_timestamp, -1, NULL);
+ sqlite3_bind_int(stmt, idx++, hdr->hdr_length);
+ sqlite3_bind_int(stmt, idx++, hdr->hdr_maint_op_class);
+
+ return idx;
}
/*
@@ -827,15 +829,19 @@ static const struct db_table_descriptor cxl_generic_event_tab = {
int ras_store_cxl_generic_event(struct ras_events *ras, struct ras_cxl_generic_event *ev)
{
- int rc;
struct sqlite3_priv *priv = ras->db_priv;
+ int idx;
+ int rc;
if (!priv || !priv->stmt_cxl_generic_event)
- return 0;
+ return -1;
log(TERM, LOG_INFO, "cxl_generic_event store: %p\n", priv->stmt_cxl_generic_event);
- ras_store_cxl_common_hdr(priv->stmt_cxl_generic_event, &ev->hdr);
- sqlite3_bind_blob(priv->stmt_cxl_generic_event, 13, ev->data,
+ idx = ras_store_cxl_common_hdr(priv->stmt_cxl_generic_event, &ev->hdr);
+ if (idx <= 0)
+ return -1;
+
+ sqlite3_bind_blob(priv->stmt_cxl_generic_event, idx++, ev->data,
CXL_EVENT_RECORD_DATA_LENGTH, NULL);
rc = sqlite3_step(priv->stmt_cxl_generic_event);
@@ -891,28 +897,31 @@ static const struct db_table_descriptor cxl_general_media_event_tab = {
int ras_store_cxl_general_media_event(struct ras_events *ras,
struct ras_cxl_general_media_event *ev)
{
- int rc;
struct sqlite3_priv *priv = ras->db_priv;
+ int idx;
+ int rc;
if (!priv || !priv->stmt_cxl_general_media_event)
- return 0;
+ return -1;
log(TERM, LOG_INFO, "cxl_general_media_event store: %p\n",
priv->stmt_cxl_general_media_event);
- ras_store_cxl_common_hdr(priv->stmt_cxl_general_media_event, &ev->hdr);
- sqlite3_bind_int64(priv->stmt_cxl_general_media_event, 13, ev->dpa);
- sqlite3_bind_int(priv->stmt_cxl_general_media_event, 14, ev->dpa_flags);
- sqlite3_bind_int(priv->stmt_cxl_general_media_event, 15, ev->descriptor);
- sqlite3_bind_int(priv->stmt_cxl_general_media_event, 16, ev->type);
- sqlite3_bind_int(priv->stmt_cxl_general_media_event, 17, ev->transaction_type);
- sqlite3_bind_int(priv->stmt_cxl_general_media_event, 18, ev->channel);
- sqlite3_bind_int(priv->stmt_cxl_general_media_event, 19, ev->rank);
- sqlite3_bind_int(priv->stmt_cxl_general_media_event, 20, ev->device);
- sqlite3_bind_blob(priv->stmt_cxl_general_media_event, 21, ev->comp_id,
+ idx = ras_store_cxl_common_hdr(priv->stmt_cxl_general_media_event, &ev->hdr);
+ if (idx <= 0)
+ return -1;
+ sqlite3_bind_int64(priv->stmt_cxl_general_media_event, idx++, ev->dpa);
+ sqlite3_bind_int(priv->stmt_cxl_general_media_event, idx++, ev->dpa_flags);
+ sqlite3_bind_int(priv->stmt_cxl_general_media_event, idx++, ev->descriptor);
+ sqlite3_bind_int(priv->stmt_cxl_general_media_event, idx++, ev->type);
+ sqlite3_bind_int(priv->stmt_cxl_general_media_event, idx++, ev->transaction_type);
+ sqlite3_bind_int(priv->stmt_cxl_general_media_event, idx++, ev->channel);
+ sqlite3_bind_int(priv->stmt_cxl_general_media_event, idx++, ev->rank);
+ sqlite3_bind_int(priv->stmt_cxl_general_media_event, idx++, ev->device);
+ sqlite3_bind_blob(priv->stmt_cxl_general_media_event, idx++, ev->comp_id,
CXL_EVENT_GEN_MED_COMP_ID_SIZE, NULL);
- sqlite3_bind_int64(priv->stmt_cxl_general_media_event, 22, ev->hpa);
- sqlite3_bind_text(priv->stmt_cxl_general_media_event, 23, ev->region, -1, NULL);
- sqlite3_bind_text(priv->stmt_cxl_general_media_event, 24, ev->region_uuid, -1, NULL);
+ sqlite3_bind_int64(priv->stmt_cxl_general_media_event, idx++, ev->hpa);
+ sqlite3_bind_text(priv->stmt_cxl_general_media_event, idx++, ev->region, -1, NULL);
+ sqlite3_bind_text(priv->stmt_cxl_general_media_event, idx++, ev->region_uuid, -1, NULL);
rc = sqlite3_step(priv->stmt_cxl_general_media_event);
if (rc != SQLITE_OK && rc != SQLITE_DONE)
@@ -970,32 +979,35 @@ static const struct db_table_descriptor cxl_dram_event_tab = {
int ras_store_cxl_dram_event(struct ras_events *ras, struct ras_cxl_dram_event *ev)
{
- int rc;
struct sqlite3_priv *priv = ras->db_priv;
+ int idx;
+ int rc;
if (!priv || !priv->stmt_cxl_dram_event)
- return 0;
+ return -1;
log(TERM, LOG_INFO, "cxl_dram_event store: %p\n",
priv->stmt_cxl_dram_event);
- ras_store_cxl_common_hdr(priv->stmt_cxl_dram_event, &ev->hdr);
- sqlite3_bind_int64(priv->stmt_cxl_dram_event, 13, ev->dpa);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 14, ev->dpa_flags);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 15, ev->descriptor);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 16, ev->type);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 17, ev->transaction_type);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 18, ev->channel);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 19, ev->rank);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 20, ev->nibble_mask);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 21, ev->bank_group);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 22, ev->bank);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 23, ev->row);
- sqlite3_bind_int(priv->stmt_cxl_dram_event, 24, ev->column);
- sqlite3_bind_blob(priv->stmt_cxl_dram_event, 25, ev->cor_mask,
+ idx = ras_store_cxl_common_hdr(priv->stmt_cxl_dram_event, &ev->hdr);
+ if (idx <= 0)
+ return -1;
+ sqlite3_bind_int64(priv->stmt_cxl_dram_event, idx++, ev->dpa);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->dpa_flags);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->descriptor);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->type);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->transaction_type);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->channel);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->rank);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->nibble_mask);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->bank_group);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->bank);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->row);
+ sqlite3_bind_int(priv->stmt_cxl_dram_event, idx++, ev->column);
+ sqlite3_bind_blob(priv->stmt_cxl_dram_event, idx++, ev->cor_mask,
CXL_EVENT_DER_CORRECTION_MASK_SIZE, NULL);
- sqlite3_bind_int64(priv->stmt_cxl_dram_event, 26, ev->hpa);
- sqlite3_bind_text(priv->stmt_cxl_dram_event, 27, ev->region, -1, NULL);
- sqlite3_bind_text(priv->stmt_cxl_dram_event, 28, ev->region_uuid, -1, NULL);
+ sqlite3_bind_int64(priv->stmt_cxl_dram_event, idx++, ev->hpa);
+ sqlite3_bind_text(priv->stmt_cxl_dram_event, idx++, ev->region, -1, NULL);
+ sqlite3_bind_text(priv->stmt_cxl_dram_event, idx++, ev->region_uuid, -1, NULL);
rc = sqlite3_step(priv->stmt_cxl_dram_event);
if (rc != SQLITE_OK && rc != SQLITE_DONE)
@@ -1047,24 +1059,27 @@ static const struct db_table_descriptor cxl_memory_module_event_tab = {
int ras_store_cxl_memory_module_event(struct ras_events *ras,
struct ras_cxl_memory_module_event *ev)
{
- int rc;
struct sqlite3_priv *priv = ras->db_priv;
+ int idx;
+ int rc;
if (!priv || !priv->stmt_cxl_memory_module_event)
- return 0;
+ return -1;
log(TERM, LOG_INFO, "cxl_memory_module_event store: %p\n",
priv->stmt_cxl_memory_module_event);
- ras_store_cxl_common_hdr(priv->stmt_cxl_memory_module_event, &ev->hdr);
- sqlite3_bind_int(priv->stmt_cxl_memory_module_event, 13, ev->event_type);
- sqlite3_bind_int(priv->stmt_cxl_memory_module_event, 14, ev->health_status);
- sqlite3_bind_int(priv->stmt_cxl_memory_module_event, 15, ev->media_status);
- sqlite3_bind_int(priv->stmt_cxl_memory_module_event, 16, ev->life_used);
- sqlite3_bind_int(priv->stmt_cxl_memory_module_event, 17, ev->dirty_shutdown_cnt);
- sqlite3_bind_int(priv->stmt_cxl_memory_module_event, 18, ev->cor_vol_err_cnt);
- sqlite3_bind_int(priv->stmt_cxl_memory_module_event, 19, ev->cor_per_err_cnt);
- sqlite3_bind_int(priv->stmt_cxl_memory_module_event, 20, ev->device_temp);
- sqlite3_bind_int(priv->stmt_cxl_memory_module_event, 21, ev->add_status);
+ idx = ras_store_cxl_common_hdr(priv->stmt_cxl_memory_module_event, &ev->hdr);
+ if (idx <= 0)
+ return -1;
+ sqlite3_bind_int(priv->stmt_cxl_memory_module_event, idx++, ev->event_type);
+ sqlite3_bind_int(priv->stmt_cxl_memory_module_event, idx++, ev->health_status);
+ sqlite3_bind_int(priv->stmt_cxl_memory_module_event, idx++, ev->media_status);
+ sqlite3_bind_int(priv->stmt_cxl_memory_module_event, idx++, ev->life_used);
+ sqlite3_bind_int(priv->stmt_cxl_memory_module_event, idx++, ev->dirty_shutdown_cnt);
+ sqlite3_bind_int(priv->stmt_cxl_memory_module_event, idx++, ev->cor_vol_err_cnt);
+ sqlite3_bind_int(priv->stmt_cxl_memory_module_event, idx++, ev->cor_per_err_cnt);
+ sqlite3_bind_int(priv->stmt_cxl_memory_module_event, idx++, ev->device_temp);
+ sqlite3_bind_int(priv->stmt_cxl_memory_module_event, idx++, ev->add_status);
rc = sqlite3_step(priv->stmt_cxl_memory_module_event);
if (rc != SQLITE_OK && rc != SQLITE_DONE)
--
2.43.0
next prev parent reply other threads:[~2025-01-10 12:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-10 12:26 [PATCH v2 00/14] rasdaemon: cxl: Update CXL event logging and recording to CXL spec rev 3.1 shiju.jose
2025-01-10 12:26 ` [PATCH v2 01/14] rasdaemon: Fix for parsing error when trace event's format file is larger than PAGE_SIZE shiju.jose
2025-01-10 16:02 ` Jonathan Cameron
2025-01-10 16:11 ` Shiju Jose
2025-01-10 12:26 ` [PATCH v2 02/14] rasdaemon: cxl: Fix logging of memory event type of DRAM trace event shiju.jose
2025-01-10 12:26 ` [PATCH v2 03/14] rasdaemon: cxl: Fix mismatch in region field's name with kernel " shiju.jose
2025-01-10 12:26 ` shiju.jose [this message]
2025-01-10 12:26 ` [PATCH v2 05/14] rasdaemon: cxl: Update common event to CXL spec rev 3.1 shiju.jose
2025-01-10 12:26 ` [PATCH v2 06/14] rasdaemon: cxl: Add Component Identifier formatting for " shiju.jose
2025-01-10 12:26 ` [PATCH v2 07/14] rasdaemon: cxl: Update CXL general media event to " shiju.jose
2025-01-10 12:26 ` [PATCH v2 08/14] rasdaemon: cxl: Update CXL DRAM " shiju.jose
2025-01-10 12:26 ` [PATCH v2 09/14] rasdaemon: cxl: Update memory module " shiju.jose
2025-01-10 12:26 ` [PATCH v2 10/14] rasdaemon: ras-mc-ctl: Fix logging of memory event type in CXL DRAM error table shiju.jose
2025-01-10 12:26 ` [PATCH v2 11/14] rasdaemon: ras-mc-ctl: Update logging of common event data to align with CXL spec rev 3.1 shiju.jose
2025-01-10 12:26 ` [PATCH v2 12/14] rasdaemon: ras-mc-ctl: Update logging of CXL general media " shiju.jose
2025-01-10 12:26 ` [PATCH v2 13/14] rasdaemon: ras-mc-ctl: Update logging of CXL DRAM " shiju.jose
2025-01-10 12:26 ` [PATCH v2 14/14] rasdaemon: ras-mc-ctl: Update logging of CXL memory module " shiju.jose
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250110122641.1668-5-shiju.jose@huawei.com \
--to=shiju.jose@huawei.com \
--cc=alison.schofield@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dave@stgolabs.net \
--cc=ira.weiny@intel.com \
--cc=jonathan.cameron@huawei.com \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mchehab@kernel.org \
--cc=nifan.cxl@gmail.com \
--cc=prime.zeng@hisilicon.com \
--cc=tanxiaofei@huawei.com \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox