2020-10-26 21:00:10

by Tony Asleson

Subject: [PATCH] print_req_error: Use dev_err_ratelimited

Replace printk_ratelimited with dev_err_ratelimited which
adds dev_printk meta data. This is used by journald to
add disk ID information to the journal entry.

Signed-off-by: Tony Asleson <[email protected]>
---
block/blk-core.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index 10c08ac50697..ee5d63e54a11 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -216,16 +216,18 @@ EXPORT_SYMBOL_GPL(blk_status_to_errno);
static void print_req_error(struct request *req, blk_status_t status,
const char *caller)
{
+ struct device *dev;
int idx = (__force int)status;

if (WARN_ON_ONCE(idx >= ARRAY_SIZE(blk_errors)))
return;

- printk_ratelimited(KERN_ERR
- "%s: %s error, dev %s, sector %llu op 0x%x:(%s) flags 0x%x "
+ dev = req->rq_disk ? disk_to_dev(req->rq_disk) : NULL;
+
+ dev_err_ratelimited(dev,
+ "%s: %s error, sector %llu op 0x%x:(%s) flags 0x%x "
"phys_seg %u prio class %u\n",
caller, blk_errors[idx].name,
- req->rq_disk ? req->rq_disk->disk_name : "?",
blk_rq_pos(req), req_op(req), blk_op_str(req_op(req)),
req->cmd_flags & ~REQ_OP_MASK,
req->nr_phys_segments,

base-commit: bbf5c979011a099af5dc76498918ed7df445635b
--
2.26.2

2020-11-17 20:45:50

by Tony Asleson

Subject: Re: [PATCH] print_req_error: Use dev_err_ratelimited

Any thoughts on this?

Getting all the error paths to go through dev_printk is
quite useful.


On 10/26/20 11:05 AM, Tony Asleson wrote:
> Replace printk_ratelimited with dev_err_ratelimited which
> adds dev_printk meta data. This is used by journald to
> add disk ID information to the journal entry.
>
> Signed-off-by: Tony Asleson <[email protected]>
> ---
> block/blk-core.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/block/blk-core.c b/block/blk-core.c
> index 10c08ac50697..ee5d63e54a11 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -216,16 +216,18 @@ EXPORT_SYMBOL_GPL(blk_status_to_errno);
> static void print_req_error(struct request *req, blk_status_t status,
> const char *caller)
> {
> + struct device *dev;
> int idx = (__force int)status;
>
> if (WARN_ON_ONCE(idx >= ARRAY_SIZE(blk_errors)))
> return;
>
> - printk_ratelimited(KERN_ERR
> - "%s: %s error, dev %s, sector %llu op 0x%x:(%s) flags 0x%x "
> + dev = req->rq_disk ? disk_to_dev(req->rq_disk) : NULL;
> +
> + dev_err_ratelimited(dev,
> + "%s: %s error, sector %llu op 0x%x:(%s) flags 0x%x "
> "phys_seg %u prio class %u\n",
> caller, blk_errors[idx].name,
> - req->rq_disk ? req->rq_disk->disk_name : "?",
> blk_rq_pos(req), req_op(req), blk_op_str(req_op(req)),
> req->cmd_flags & ~REQ_OP_MASK,
> req->nr_phys_segments,
>
> base-commit: bbf5c979011a099af5dc76498918ed7df445635b
>