From 88c94504962ad0a8b4ffadf3b1190815d785afe2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 13 May 2014 16:54:08 -0700 Subject: [PATCH] 3.10-stable patches added patches: blktrace-fix-accounting-of-partially-completed-requests.patch --- ...ting-of-partially-completed-requests.patch | 181 ++++++++++++++++++ queue-3.10/series | 1 + 2 files changed, 182 insertions(+) create mode 100644 queue-3.10/blktrace-fix-accounting-of-partially-completed-requests.patch diff --git a/queue-3.10/blktrace-fix-accounting-of-partially-completed-requests.patch b/queue-3.10/blktrace-fix-accounting-of-partially-completed-requests.patch new file mode 100644 index 00000000000..7dd9890da30 --- /dev/null +++ b/queue-3.10/blktrace-fix-accounting-of-partially-completed-requests.patch @@ -0,0 +1,181 @@ +From af5040da01ef980670b3741b3e10733ee3e33566 Mon Sep 17 00:00:00 2001 +From: Roman Pen +Date: Tue, 4 Mar 2014 23:13:10 +0900 +Subject: blktrace: fix accounting of partially completed requests + +From: Roman Pen + +commit af5040da01ef980670b3741b3e10733ee3e33566 upstream. + +trace_block_rq_complete does not take into account that request can +be partially completed, so we can get the following incorrect output +of blkparser: + + C R 232 + 240 [0] + C R 240 + 232 [0] + C R 248 + 224 [0] + C R 256 + 216 [0] + +but should be: + + C R 232 + 8 [0] + C R 240 + 8 [0] + C R 248 + 8 [0] + C R 256 + 8 [0] + +Also, the whole output summary statistics of completed requests and +final throughput will be incorrect. + +This patch takes into account real completion size of the request and +fixes wrong completion accounting. + +Signed-off-by: Roman Pen +CC: Steven Rostedt +CC: Frederic Weisbecker +CC: Ingo Molnar +CC: linux-kernel@vger.kernel.org +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + block/blk-core.c | 2 +- + include/trace/events/block.h | 33 ++++++++++++++++++++++++++++++--- + kernel/trace/blktrace.c | 20 +++++++++++--------- + 3 files changed, 42 insertions(+), 13 deletions(-) + +--- a/block/blk-core.c ++++ b/block/blk-core.c +@@ -2299,7 +2299,7 @@ bool blk_update_request(struct request * + if (!req->bio) + return false; + +- trace_block_rq_complete(req->q, req); ++ trace_block_rq_complete(req->q, req, nr_bytes); + + /* + * For fs requests, rq is just carrier of independent bio's +--- a/include/trace/events/block.h ++++ b/include/trace/events/block.h +@@ -132,6 +132,7 @@ DEFINE_EVENT(block_rq_with_error, block_ + * block_rq_complete - block IO operation completed by device driver + * @q: queue containing the block operation request + * @rq: block operations request ++ * @nr_bytes: number of completed bytes + * + * The block_rq_complete tracepoint event indicates that some portion + * of operation request has been completed by the device driver. If +@@ -139,11 +140,37 @@ DEFINE_EVENT(block_rq_with_error, block_ + * do for the request. If @rq->bio is non-NULL then there is + * additional work required to complete the request. + */ +-DEFINE_EVENT(block_rq_with_error, block_rq_complete, ++TRACE_EVENT(block_rq_complete, + +- TP_PROTO(struct request_queue *q, struct request *rq), ++ TP_PROTO(struct request_queue *q, struct request *rq, ++ unsigned int nr_bytes), + +- TP_ARGS(q, rq) ++ TP_ARGS(q, rq, nr_bytes), ++ ++ TP_STRUCT__entry( ++ __field( dev_t, dev ) ++ __field( sector_t, sector ) ++ __field( unsigned int, nr_sector ) ++ __field( int, errors ) ++ __array( char, rwbs, RWBS_LEN ) ++ __dynamic_array( char, cmd, blk_cmd_buf_len(rq) ) ++ ), ++ ++ TP_fast_assign( ++ __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; ++ __entry->sector = blk_rq_pos(rq); ++ __entry->nr_sector = nr_bytes >> 9; ++ __entry->errors = rq->errors; ++ ++ blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, nr_bytes); ++ blk_dump_cmd(__get_str(cmd), rq); ++ ), ++ ++ TP_printk("%d,%d %s (%s) %llu + %u [%d]", ++ MAJOR(__entry->dev), MINOR(__entry->dev), ++ __entry->rwbs, __get_str(cmd), ++ (unsigned long long)__entry->sector, ++ __entry->nr_sector, __entry->errors) + ); + + DECLARE_EVENT_CLASS(block_rq, +--- a/kernel/trace/blktrace.c ++++ b/kernel/trace/blktrace.c +@@ -685,6 +685,7 @@ void blk_trace_shutdown(struct request_q + * blk_add_trace_rq - Add a trace for a request oriented action + * @q: queue the io is for + * @rq: the source request ++ * @nr_bytes: number of completed bytes + * @what: the action + * + * Description: +@@ -692,7 +693,7 @@ void blk_trace_shutdown(struct request_q + * + **/ + static void blk_add_trace_rq(struct request_queue *q, struct request *rq, +- u32 what) ++ unsigned int nr_bytes, u32 what) + { + struct blk_trace *bt = q->blk_trace; + +@@ -701,11 +702,11 @@ static void blk_add_trace_rq(struct requ + + if (rq->cmd_type == REQ_TYPE_BLOCK_PC) { + what |= BLK_TC_ACT(BLK_TC_PC); +- __blk_add_trace(bt, 0, blk_rq_bytes(rq), rq->cmd_flags, ++ __blk_add_trace(bt, 0, nr_bytes, rq->cmd_flags, + what, rq->errors, rq->cmd_len, rq->cmd); + } else { + what |= BLK_TC_ACT(BLK_TC_FS); +- __blk_add_trace(bt, blk_rq_pos(rq), blk_rq_bytes(rq), ++ __blk_add_trace(bt, blk_rq_pos(rq), nr_bytes, + rq->cmd_flags, what, rq->errors, 0, NULL); + } + } +@@ -713,33 +714,34 @@ static void blk_add_trace_rq(struct requ + static void blk_add_trace_rq_abort(void *ignore, + struct request_queue *q, struct request *rq) + { +- blk_add_trace_rq(q, rq, BLK_TA_ABORT); ++ blk_add_trace_rq(q, rq, blk_rq_bytes(rq), BLK_TA_ABORT); + } + + static void blk_add_trace_rq_insert(void *ignore, + struct request_queue *q, struct request *rq) + { +- blk_add_trace_rq(q, rq, BLK_TA_INSERT); ++ blk_add_trace_rq(q, rq, blk_rq_bytes(rq), BLK_TA_INSERT); + } + + static void blk_add_trace_rq_issue(void *ignore, + struct request_queue *q, struct request *rq) + { +- blk_add_trace_rq(q, rq, BLK_TA_ISSUE); ++ blk_add_trace_rq(q, rq, blk_rq_bytes(rq), BLK_TA_ISSUE); + } + + static void blk_add_trace_rq_requeue(void *ignore, + struct request_queue *q, + struct request *rq) + { +- blk_add_trace_rq(q, rq, BLK_TA_REQUEUE); ++ blk_add_trace_rq(q, rq, blk_rq_bytes(rq), BLK_TA_REQUEUE); + } + + static void blk_add_trace_rq_complete(void *ignore, + struct request_queue *q, +- struct request *rq) ++ struct request *rq, ++ unsigned int nr_bytes) + { +- blk_add_trace_rq(q, rq, BLK_TA_COMPLETE); ++ blk_add_trace_rq(q, rq, nr_bytes, BLK_TA_COMPLETE); + } + + /** diff --git a/queue-3.10/series b/queue-3.10/series index 3ec2493366e..c55da04f36c 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -1,3 +1,4 @@ scsi-fix-our-current-target-reap-infrastructure.patch scsi-dual-scan-thread-bug-fix.patch scsi-megaraid-missing-bounds-check-in-mimd_to_kioc.patch +blktrace-fix-accounting-of-partially-completed-requests.patch -- 2.47.3