* [PATCH] block: improve print_req_error @ 2019-05-20 14:13 Christoph Hellwig 2019-05-20 14:27 ` Hannes Reinecke 2019-05-20 17:15 ` Chaitanya Kulkarni 0 siblings, 2 replies; 4+ messages in thread From: Christoph Hellwig @ 2019-05-20 14:13 UTC (permalink / raw) To: axboe; +Cc: linux-block Print the calling function instead of print_req_error as a prefix, and print the operation and op_flags separately instrad of the whole field. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-core.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 419d600e6637..b1f7e244340e 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -167,18 +167,20 @@ int blk_status_to_errno(blk_status_t status) } EXPORT_SYMBOL_GPL(blk_status_to_errno); -static void print_req_error(struct request *req, blk_status_t status) +static void print_req_error(struct request *req, blk_status_t status, + const char *caller) { 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 flags %x\n", - __func__, blk_errors[idx].name, - req->rq_disk ? req->rq_disk->disk_name : "?", - (unsigned long long)blk_rq_pos(req), - req->cmd_flags); + printk_ratelimited(KERN_ERR + "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x\n", + caller, blk_errors[idx].name, + req->rq_disk ? req->rq_disk->disk_name : "?", + blk_rq_pos(req), req_op(req), + req->cmd_flags & ~REQ_OP_MASK); } static void req_bio_endio(struct request *rq, struct bio *bio, @@ -1418,7 +1420,7 @@ bool blk_update_request(struct request *req, blk_status_t error, if (unlikely(error && !blk_rq_is_passthrough(req) && !(req->rq_flags & RQF_QUIET))) - print_req_error(req, error); + print_req_error(req, error, __func__); blk_account_io_completion(req, nr_bytes); -- 2.20.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] block: improve print_req_error 2019-05-20 14:13 [PATCH] block: improve print_req_error Christoph Hellwig @ 2019-05-20 14:27 ` Hannes Reinecke 2019-05-20 17:15 ` Chaitanya Kulkarni 1 sibling, 0 replies; 4+ messages in thread From: Hannes Reinecke @ 2019-05-20 14:27 UTC (permalink / raw) To: Christoph Hellwig, axboe; +Cc: linux-block On 5/20/19 4:13 PM, Christoph Hellwig wrote: > Print the calling function instead of print_req_error as a prefix, and > print the operation and op_flags separately instrad of the whole field. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/blk-core.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/block/blk-core.c b/block/blk-core.c > index 419d600e6637..b1f7e244340e 100644 > --- a/block/blk-core.c > +++ b/block/blk-core.c > @@ -167,18 +167,20 @@ int blk_status_to_errno(blk_status_t status) > } > EXPORT_SYMBOL_GPL(blk_status_to_errno); > > -static void print_req_error(struct request *req, blk_status_t status) > +static void print_req_error(struct request *req, blk_status_t status, > + const char *caller) > { > 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 flags %x\n", > - __func__, blk_errors[idx].name, > - req->rq_disk ? req->rq_disk->disk_name : "?", > - (unsigned long long)blk_rq_pos(req), > - req->cmd_flags); > + printk_ratelimited(KERN_ERR > + "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x\n", > + caller, blk_errors[idx].name, > + req->rq_disk ? req->rq_disk->disk_name : "?", > + blk_rq_pos(req), req_op(req), > + req->cmd_flags & ~REQ_OP_MASK); > } > > static void req_bio_endio(struct request *rq, struct bio *bio, > @@ -1418,7 +1420,7 @@ bool blk_update_request(struct request *req, blk_status_t error, > > if (unlikely(error && !blk_rq_is_passthrough(req) && > !(req->rq_flags & RQF_QUIET))) > - print_req_error(req, error); > + print_req_error(req, error, __func__); > > blk_account_io_completion(req, nr_bytes); > > Weell ... where's the point of the __func__ argument if there is only one place where it's called from? Can't we just drop it completely? Cheers, Hannes -- Dr. Hannes Reinecke Teamlead Storage & Networking hare@suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg) ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] block: improve print_req_error 2019-05-20 14:13 [PATCH] block: improve print_req_error Christoph Hellwig 2019-05-20 14:27 ` Hannes Reinecke @ 2019-05-20 17:15 ` Chaitanya Kulkarni 2019-05-20 17:34 ` Chaitanya Kulkarni 1 sibling, 1 reply; 4+ messages in thread From: Chaitanya Kulkarni @ 2019-05-20 17:15 UTC (permalink / raw) To: Christoph Hellwig, axboe; +Cc: linux-block Printing separate operations and flags is useful. How about we also add couple of more fields ? Compile tested patch on the top of this patch :- @@ -176,11 +176,14 @@ static void print_req_error(struct request *req, blk_status_t status, return; printk_ratelimited(KERN_ERR - "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x\n", + "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x " + "phys_seg %u prio class %u\n", caller, blk_errors[idx].name, req->rq_disk ? req->rq_disk->disk_name : "?", nit:- extra space after '?', if that is not intentional. blk_rq_pos(req), req_op(req), - req->cmd_flags & ~REQ_OP_MASK); + req->cmd_flags & ~REQ_OP_MASK, + req->nr_phys_segments, + IOPRIO_PRIO_CLASS(req->ioprio)); } On 05/20/2019 07:14 AM, Christoph Hellwig wrote: > Print the calling function instead of print_req_error as a prefix, and > print the operation and op_flags separately instrad of the whole field. Also, s/instrad/instead/. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > block/blk-core.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/block/blk-core.c b/block/blk-core.c > index 419d600e6637..b1f7e244340e 100644 > --- a/block/blk-core.c > +++ b/block/blk-core.c > @@ -167,18 +167,20 @@ int blk_status_to_errno(blk_status_t status) > } > EXPORT_SYMBOL_GPL(blk_status_to_errno); > > -static void print_req_error(struct request *req, blk_status_t status) > +static void print_req_error(struct request *req, blk_status_t status, > + const char *caller) > { > 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 flags %x\n", > - __func__, blk_errors[idx].name, > - req->rq_disk ? req->rq_disk->disk_name : "?", > - (unsigned long long)blk_rq_pos(req), > - req->cmd_flags); > + printk_ratelimited(KERN_ERR > + "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x\n", > + caller, blk_errors[idx].name, > + req->rq_disk ? req->rq_disk->disk_name : "?", > + blk_rq_pos(req), req_op(req), > + req->cmd_flags & ~REQ_OP_MASK); > } > > static void req_bio_endio(struct request *rq, struct bio *bio, > @@ -1418,7 +1420,7 @@ bool blk_update_request(struct request *req, blk_status_t error, > > if (unlikely(error && !blk_rq_is_passthrough(req) && > !(req->rq_flags & RQF_QUIET))) > - print_req_error(req, error); > + print_req_error(req, error, __func__); > > blk_account_io_completion(req, nr_bytes); > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] block: improve print_req_error 2019-05-20 17:15 ` Chaitanya Kulkarni @ 2019-05-20 17:34 ` Chaitanya Kulkarni 0 siblings, 0 replies; 4+ messages in thread From: Chaitanya Kulkarni @ 2019-05-20 17:34 UTC (permalink / raw) To: Christoph Hellwig, axboe; +Cc: linux-block If you are okay, we can print the req_op in string format, compile tested patch on the top of yours below, not that this is needed but it is just a nice way to present debug data:- +static inline const char *req_op_str(struct request *req) +{ + char *ret; + + switch (req_op(req)) { + case REQ_OP_READ: + ret = "read"; + break; + case REQ_OP_WRITE: + ret = "write"; + break; + case REQ_OP_FLUSH: + ret = "flush"; + break; + case REQ_OP_DISCARD: + ret = "discard"; + break; + case REQ_OP_SECURE_ERASE: + ret = "secure_erase"; + break; + case REQ_OP_ZONE_RESET: + ret = "zone_reset"; + break; + case REQ_OP_WRITE_SAME: + ret = "write_same"; + break; + case REQ_OP_WRITE_ZEROES: + ret = "write_zeroes"; + break; + case REQ_OP_SCSI_IN: + ret = "scsi_in"; + break; + case REQ_OP_SCSI_OUT: + ret = "scsi_out"; + break; + case REQ_OP_DRV_IN: + ret = "drv_in"; + break; + case REQ_OP_DRV_OUT: + ret = "drv_out"; + break; + default: + ret = "unknown"; + } + return ret; +} + static void print_req_error(struct request *req, blk_status_t status, const char *caller) { @@ -176,11 +223,14 @@ static void print_req_error(struct request *req, blk_status_t status, return; printk_ratelimited(KERN_ERR - "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x\n", + "%s: %s error, dev %s, 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), - req->cmd_flags & ~REQ_OP_MASK); + blk_rq_pos(req), req_op(req), req_op_str(req), + req->cmd_flags & ~REQ_OP_MASK, + req->nr_phys_segments, + IOPRIO_PRIO_CLASS(req->ioprio)); } static void req_bio_endio(struct request *rq, struct bio *bio, On 05/20/2019 10:16 AM, Chaitanya Kulkarni wrote: > Printing separate operations and flags is useful. > > How about we also add couple of more fields ? > > Compile tested patch on the top of this patch :- > > @@ -176,11 +176,14 @@ static void print_req_error(struct request *req, > blk_status_t status, > return; > > printk_ratelimited(KERN_ERR > - "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x\n", > + "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x " > + "phys_seg %u prio class %u\n", > caller, blk_errors[idx].name, > req->rq_disk ? req->rq_disk->disk_name : "?", > nit:- extra space after '?', if that is not intentional. > blk_rq_pos(req), req_op(req), > - req->cmd_flags & ~REQ_OP_MASK); > + req->cmd_flags & ~REQ_OP_MASK, > + req->nr_phys_segments, > + IOPRIO_PRIO_CLASS(req->ioprio)); > } > > On 05/20/2019 07:14 AM, Christoph Hellwig wrote: >> Print the calling function instead of print_req_error as a prefix, and >> print the operation and op_flags separately instrad of the whole field. > Also, s/instrad/instead/. > >> >> Signed-off-by: Christoph Hellwig <hch@lst.de> >> --- >> block/blk-core.c | 16 +++++++++------- >> 1 file changed, 9 insertions(+), 7 deletions(-) >> >> diff --git a/block/blk-core.c b/block/blk-core.c >> index 419d600e6637..b1f7e244340e 100644 >> --- a/block/blk-core.c >> +++ b/block/blk-core.c >> @@ -167,18 +167,20 @@ int blk_status_to_errno(blk_status_t status) >> } >> EXPORT_SYMBOL_GPL(blk_status_to_errno); >> >> -static void print_req_error(struct request *req, blk_status_t status) >> +static void print_req_error(struct request *req, blk_status_t status, >> + const char *caller) >> { >> 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 flags %x\n", >> - __func__, blk_errors[idx].name, >> - req->rq_disk ? req->rq_disk->disk_name : "?", >> - (unsigned long long)blk_rq_pos(req), >> - req->cmd_flags); >> + printk_ratelimited(KERN_ERR >> + "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x\n", >> + caller, blk_errors[idx].name, >> + req->rq_disk ? req->rq_disk->disk_name : "?", >> + blk_rq_pos(req), req_op(req), >> + req->cmd_flags & ~REQ_OP_MASK); >> } >> >> static void req_bio_endio(struct request *rq, struct bio *bio, >> @@ -1418,7 +1420,7 @@ bool blk_update_request(struct request *req, blk_status_t error, >> >> if (unlikely(error && !blk_rq_is_passthrough(req) && >> !(req->rq_flags & RQF_QUIET))) >> - print_req_error(req, error); >> + print_req_error(req, error, __func__); >> >> blk_account_io_completion(req, nr_bytes); >> >> > > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-20 17:34 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-20 14:13 [PATCH] block: improve print_req_error Christoph Hellwig 2019-05-20 14:27 ` Hannes Reinecke 2019-05-20 17:15 ` Chaitanya Kulkarni 2019-05-20 17:34 ` Chaitanya Kulkarni
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).