drm/amd/ras: report how far a CPER record query got
Subsystems (2)
PATCH 1/2 drm/amd/ras: report how far a CPER record query got
The caller walks the log with cper_start_id and resumes at cper_start_id + real_cper_num, but the reply only counts the ids that held a record. A batch id that holds nothing therefore never moves the caller forward, and every such id makes it read the next populated batch one more time. Count the ids covered instead.
The rewind to the last populated batch when the query starts at the end has the same effect once the caller has drained the log, and the latest id is already reported by the snapshot query, so drop it.
--- drivers/gpu/drm/amd/ras/core/cmd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/ras/core/cmd.c +7 -5
@@ -206,7 +206,7 @@ static int ras_cmd_get_cper_records(struct ras_core_context *ras_core,uint32_t offset =0 , real_data_len =0 ;u64 batch_id, start_batch_id;uint8_t *buf_ptr = (uint8_t *)(uintptr_t )req->buf_ptr; -int ret =0 , i, count, valid_batch_count =0 ; +int ret =0 , i, count, read_batch_count =0 ;if ((cmd->input_size !=sizeof (struct ras_cmd_cper_record_req )) || (cmd->output_buf_size <sizeof (*rsp)))
@@ -225,8 +225,6 @@ static int ras_cmd_get_cper_records(struct ras_core_context *ras_core,ras_log_ring_get_batch_overview (ras_core, &overview); start_batch_id = req->cper_start_id; -if (overview.logged_batch_count && start_batch_id == overview.last_batch_id) - start_batch_id = overview.last_batch_id -1 ;for (i =0 ; i < req->cper_num; i++) { batch_id = start_batch_id + i;
@@ -246,9 +244,13 @@ static int ras_cmd_get_cper_records(struct ras_core_context *ras_core,if (ret)break ; - valid_batch_count++; offset += real_data_len; } + +/* The caller resumes at cper_start_id + real_cper_num, so an id +* that held nothing still has to be counted here. +*/ + read_batch_count++; }if ((ret && (ret != -ENOMEM ))) {
@@ -257,7 +259,7 @@ static int ras_cmd_get_cper_records(struct ras_core_context *ras_core, } rsp->real_data_size = offset; - rsp->real_cper_num = valid_batch_count; + rsp->real_cper_num = read_batch_count; rsp->remain_num = (ret == -ENOMEM ) ? (req->cper_num - i) :0 ; rsp->version =0 ;
Signature · 1 line
2.34.1
PATCH 2/2 drm/amd/ras: take a log batch id only once there is something to log
The id is claimed before the banks are read, so a poll that ends up logging nothing still burns one and leaves a gap that every reader of the log then has to walk over. Claim it when the first record of the batch is about to go in.
--- drivers/gpu/drm/amd/ras/core/aca.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/ras/core/aca.c +4 -4
@@ -394,10 +394,6 @@ static int aca_banks_update(struct ras_core_context *ras_core,if (!count) goto out; -/* Only one MCE error is logged for each batch */ -if (ecc_type !=RAS_ERR_TYPE__MCE ) - batch_tag =ras_log_ring_create_batch_tag (ras_core); -for (i =0 ; i < count; i++) {memset (&bank,0 ,sizeof (bank)); ret =aca_dump_bank (ras_core, ecc_type, i, &bank);
@@ -420,6 +416,10 @@ static int aca_banks_update(struct ras_core_context *ras_core, bank.seq_no =aca_get_bank_seqno (ras_core, ecc_type, aca_blk, &bank_ecc); +/* Only one MCE error is logged for each batch */ +if (ecc_type !=RAS_ERR_TYPE__MCE && !batch_tag) + batch_tag =ras_log_ring_create_batch_tag (ras_core); +aca_log_bank_data (ras_core, &bank, &bank_ecc, batch_tag);aca_bank_log (ras_core, i, count, &bank, &bank_ecc);
Signature · 1 line
2.34.1
RE: [PATCH 2/2] drm/amd/ras: take a log batch id only once there is something to log
AMD General
Series is
Regards,
Hawking
-----Original Message-----
From: Liu, Xiang(Dean) <[email protected]>
Sent: Wednesday, August 26, 2026 6:28 PM
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Yang, Stanley <[email protected]>; Chai, Thomas <[email protected]>; Liu, Xiang(Dean) <[email protected]>
Subject: [PATCH 2/2] drm/amd/ras: take a log batch id only once there is something to log
The id is claimed before the banks are read, so a poll that ends up logging nothing still burns one and leaves a gap that every reader of the log then has to walk over. Claim it when the first record of the batch is about to go in.
--- drivers/gpu/drm/amd/ras/core/aca.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/ras/core/aca.c +0 -4
@@ -394,10 +394,6 @@ static int aca_banks_update(struct ras_core_context *ras_core,if (!count) goto out; -/* Only one MCE error is logged for each batch */ -if (ecc_type !=RAS_ERR_TYPE__MCE ) - batch_tag =ras_log_ring_create_batch_tag (ras_core); -for (i =0 ; i < count; i++) {memset (&bank,0 ,sizeof (bank)); ret = aca_dump_bank(ras_core, ecc_type, i, &bank); @@ -420,6 +416,10 @@ static int aca_banks_update(struct ras_core_context *ras_core,
bank.seq_no = aca_get_bank_seqno(ras_core, ecc_type, aca_blk, &bank_ecc);
+ /* Only one MCE error is logged for each batch */
+ if (ecc_type != RAS_ERR_TYPE__MCE && !batch_tag)
+ batch_tag = ras_log_ring_create_batch_tag(ras_core);
+
aca_log_bank_data(ras_core, &bank, &bank_ecc, batch_tag);
aca_bank_log(ras_core, i, count, &bank, &bank_ecc);--
2.34.1