| Message ID | 20211017013748.76461-6-axboe@kernel.dk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Various block layer optimizations | expand |
On Sat, Oct 16, 2021 at 07:37:39PM -0600, Jens Axboe wrote: > We only need to call it to resolve the blk_status_t -> errno mapping > if the status is different than BLK_STS_OK. Check that it is before > doing so. > > Suggested-by: Christoph Hellwig <hch@infradead.org> > Signed-off-by: Jens Axboe <axboe@kernel.dk> > --- Actually what I had in mind was something like this: --- From 371ccad84c28127ff0ce8a09106505986532b5ec Mon Sep 17 00:00:00 2001 From: Christoph Hellwig <hch@lst.de> Date: Mon, 18 Oct 2021 10:45:18 +0200 Subject: block: don't call blk_status_to_errno in blk_update_request We only need to call it to resolve the blk_status_t -> errno mapping for tracing, so move the conversion into the tracepoints that are not called at all when tracing isn't enabled. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-core.c | 2 +- include/trace/events/block.h | 6 +++--- kernel/trace/blktrace.c | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index d5b0258dd218b..007bc2b339c55 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1451,7 +1451,7 @@ bool blk_update_request(struct request *req, blk_status_t error, { int total_bytes; - trace_block_rq_complete(req, blk_status_to_errno(error), nr_bytes); + trace_block_rq_complete(req, error, nr_bytes); if (!req->bio) return false; diff --git a/include/trace/events/block.h b/include/trace/events/block.h index cc5ab96a7471f..a95daa4d4caa2 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -114,7 +114,7 @@ TRACE_EVENT(block_rq_requeue, */ TRACE_EVENT(block_rq_complete, - TP_PROTO(struct request *rq, int error, unsigned int nr_bytes), + TP_PROTO(struct request *rq, blk_status_t error, unsigned int nr_bytes), TP_ARGS(rq, error, nr_bytes), @@ -122,7 +122,7 @@ TRACE_EVENT(block_rq_complete, __field( dev_t, dev ) __field( sector_t, sector ) __field( unsigned int, nr_sector ) - __field( int, error ) + __field( int , error ) __array( char, rwbs, RWBS_LEN ) __dynamic_array( char, cmd, 1 ) ), @@ -131,7 +131,7 @@ TRACE_EVENT(block_rq_complete, __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; __entry->sector = blk_rq_pos(rq); __entry->nr_sector = nr_bytes >> 9; - __entry->error = error; + __entry->error = blk_status_to_errno(error); blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); __get_str(cmd)[0] = '\0'; diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index fa91f398f28b7..1183c88634aa6 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -816,7 +816,7 @@ blk_trace_request_get_cgid(struct request *rq) * Records an action against a request. Will log the bio offset + size. * **/ -static void blk_add_trace_rq(struct request *rq, int error, +static void blk_add_trace_rq(struct request *rq, blk_status_t error, unsigned int nr_bytes, u32 what, u64 cgid) { struct blk_trace *bt; @@ -834,7 +834,8 @@ static void blk_add_trace_rq(struct request *rq, int error, what |= BLK_TC_ACT(BLK_TC_FS); __blk_add_trace(bt, blk_rq_trace_sector(rq), nr_bytes, req_op(rq), - rq->cmd_flags, what, error, 0, NULL, cgid); + rq->cmd_flags, what, blk_status_to_errno(error), 0, + NULL, cgid); rcu_read_unlock(); } @@ -863,7 +864,7 @@ static void blk_add_trace_rq_requeue(void *ignore, struct request *rq) } static void blk_add_trace_rq_complete(void *ignore, struct request *rq, - int error, unsigned int nr_bytes) + blk_status_t error, unsigned int nr_bytes) { blk_add_trace_rq(rq, error, nr_bytes, BLK_TA_COMPLETE, blk_trace_request_get_cgid(rq));
On 10/17/21 01:37, Jens Axboe wrote: > We only need to call it to resolve the blk_status_t -> errno mapping > if the status is different than BLK_STS_OK. Check that it is before > doing so. > > Suggested-by: Christoph Hellwig <hch@infradead.org> > Signed-off-by: Jens Axboe <axboe@kernel.dk> > --- > block/blk-mq.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/block/blk-mq.c b/block/blk-mq.c > index ffccc5f0f66a..fa5b12200404 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -676,9 +676,11 @@ static void blk_account_io_completion(struct request *req, unsigned int bytes) > bool blk_update_request(struct request *req, blk_status_t error, > unsigned int nr_bytes) > { > - int total_bytes; > + int total_bytes, blk_errno = 0; > > - trace_block_rq_complete(req, blk_status_to_errno(error), nr_bytes); > + if (unlikely(error != BLK_STS_OK)) > + blk_errno = blk_status_to_errno(error); > + trace_block_rq_complete(req, blk_errno, nr_bytes); Last time I checked relevant asm, the inference of arguments was done under the trace branch, so no extra work if tracing is not active. > > if (!req->bio) > return false; >
diff --git a/block/blk-mq.c b/block/blk-mq.c index ffccc5f0f66a..fa5b12200404 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -676,9 +676,11 @@ static void blk_account_io_completion(struct request *req, unsigned int bytes) bool blk_update_request(struct request *req, blk_status_t error, unsigned int nr_bytes) { - int total_bytes; + int total_bytes, blk_errno = 0; - trace_block_rq_complete(req, blk_status_to_errno(error), nr_bytes); + if (unlikely(error != BLK_STS_OK)) + blk_errno = blk_status_to_errno(error); + trace_block_rq_complete(req, blk_errno, nr_bytes); if (!req->bio) return false;
We only need to call it to resolve the blk_status_t -> errno mapping if the status is different than BLK_STS_OK. Check that it is before doing so. Suggested-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Jens Axboe <axboe@kernel.dk> --- block/blk-mq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)