block tracepoint cleanups v2
Subsystems (7)
Christoph Hellwig
maintainerHi Jens,
this series cleans up the block layer tracepoints by removing unused tracepoints or tracepoint arguments and consolidating the implementation of various bio based tracepoints.
Changes since v1:
- a few commit log typo fixes and improvements
Diffstat:
block/blk-core.c | 4 block/blk-merge.c | 8 - block/blk-mq-sched.c | 2 block/blk-mq.c | 10 - block/bounce.c | 2 drivers/md/dm-rq.c | 2 drivers/md/dm.c | 5 drivers/md/md-linear.c | 3 drivers/md/md.c | 5 drivers/md/raid0.c | 4 drivers/md/raid1.c | 7 - drivers/md/raid10.c | 6 - drivers/md/raid5.c | 15 +- drivers/nvme/host/multipath.c | 3 drivers/s390/scsi/zfcp_fsf.c | 3 include/linux/blktrace_api.h | 5 include/trace/events/block.h | 228 +++++++++--------------------------------- kernel/trace/blktrace.c | 126 ++++++----------------- 18 files changed, 125 insertions(+), 313 deletions(-)
Christoph Hellwig
maintainerPATCH 1/5 block: remove the unused block_sleeprq tracepoint
The block_sleeprq tracepoint was only used by the legacy request code. Remove it now that the legacy request code is gone.
--- include/trace/events/block.h | 18 ------------------ kernel/trace/blktrace.c | 22 ---------------------- 2 files changed, 40 deletions(-)
include/trace/events/block.h +0 -18
@@ -441,24 +441,6 @@ DEFINE_EVENT(block_get_rq, block_getrq,TP_ARGS (q, bio, rw) ); -/** -* block_sleeprq - waiting to get a free request entry in queue for block IO operation -* @q: queue for operation -* @bio: pending block IO operation (can be %NULL) -* @rw: low bit indicates a read (%0) or a write (%1) -* -* In the case where a request struct cannot be provided for queue @q -* the process needs to wait for an request struct to become -* available. This tracepoint event is generated each time the -* process goes to sleep waiting for request struct become available. -*/ -DEFINE_EVENT (block_get_rq, block_sleeprq, - - TP_PROTO(struct request_queue *q, struct bio *bio, int rw), - -TP_ARGS (q, bio, rw) -); -/** * block_plug - keep operations requests in request queue * @q: request queue to plug
kernel/trace/blktrace.c +0 -22
@@ -959,25 +959,6 @@ static void blk_add_trace_getrq(void *ignore, } } - -static void blk_add_trace_sleeprq (void *ignore, -struct request_queue *q, -struct bio *bio,int rw) -{ -if (bio) -blk_add_trace_bio (q, bio,BLK_TA_SLEEPRQ ,0 ); -else { -struct blk_trace *bt; - -rcu_read_lock (); - bt =rcu_dereference (q->blk_trace); -if (bt) -__blk_add_trace (bt,0 ,0 , rw,0 ,BLK_TA_SLEEPRQ , -0 ,0 ,NULL ,0 ); -rcu_read_unlock (); - } -} -static void blk_add_trace_plug (void *ignore,struct request_queue *q) {struct blk_trace *bt;
@@ -1164,8 +1145,6 @@ static void blk_register_tracepoints(void)WARN_ON (ret); ret =register_trace_block_getrq (blk_add_trace_getrq,NULL );WARN_ON (ret); - ret =register_trace_block_sleeprq (blk_add_trace_sleeprq,NULL ); -WARN_ON (ret); ret =register_trace_block_plug (blk_add_trace_plug,NULL );WARN_ON (ret); ret =register_trace_block_unplug (blk_add_trace_unplug,NULL );
@@ -1185,7 +1164,6 @@ static void blk_unregister_tracepoints(void)unregister_trace_block_split (blk_add_trace_split,NULL );unregister_trace_block_unplug (blk_add_trace_unplug,NULL );unregister_trace_block_plug (blk_add_trace_plug,NULL ); -unregister_trace_block_sleeprq (blk_add_trace_sleeprq,NULL );unregister_trace_block_getrq (blk_add_trace_getrq,NULL );unregister_trace_block_bio_queue (blk_add_trace_bio_queue,NULL );unregister_trace_block_bio_frontmerge (blk_add_trace_bio_frontmerge,NULL );
Signature · 1 line
2.29.2
Re: [PATCH 1/5] block: remove the unused block_sleeprq tracepoint
Quoted 6 lines · Christoph Hellwig
The
block_sleeprqtracepoint was only used by the legacy request code. Remove it now that the legacy request code is gone.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Thanks.
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 1/5] block: remove the unused block_sleeprq tracepoint
In reply to Christoph HellwigQuoted 6 lines · Christoph Hellwig
The
block_sleeprqtracepoint was only used by the legacy request code. Remove it now that the legacy request code is gone.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Looks good.
--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 2/5 block: simplify and extend the block_bio_merge tracepoint class
In reply to Christoph HellwigThe block_bio_merge tracepoint class can be reused for most bio-based tracepoints. For that it just needs to lose the superfluous q and rq parameters.
--- block/blk-core.c | 2 +- block/blk-merge.c | 4 +- block/blk-mq.c | 2 +- block/bounce.c | 2 +- include/trace/events/block.h | 158 ++++++++--------------------------- kernel/trace/blktrace.c | 41 +++------ 6 files changed, 48 insertions(+), 161 deletions(-)
block/blk-core.c +1 -1
@@ -907,7 +907,7 @@ static noinline_for_stack bool submit_bio_checks(struct bio *bio)blkcg_bio_issue_init (bio);if (!bio_flagged (bio,BIO_TRACE_COMPLETION )) { -trace_block_bio_queue (q, bio); +trace_block_bio_queue (bio);/* Now that enqueuing has been traced, we need to trace * completion as well. */
block/blk-merge.c +2 -2
@@ -922,7 +922,7 @@ static enum bio_merge_status bio_attempt_back_merge(struct request *req,if (!ll_back_merge_fn (req, bio, nr_segs))return BIO_MERGE_FAILED ; -trace_block_bio_backmerge (req->q, req, bio); +trace_block_bio_backmerge (bio);rq_qos_merge (req->q, req, bio);if ((req->cmd_flags &REQ_FAILFAST_MASK ) != ff)
@@ -946,7 +946,7 @@ static enum bio_merge_status bio_attempt_front_merge(struct request *req,if (!ll_front_merge_fn (req, bio, nr_segs))return BIO_MERGE_FAILED ; -trace_block_bio_frontmerge (req->q, req, bio); +trace_block_bio_frontmerge (bio);rq_qos_merge (req->q, req, bio);if ((req->cmd_flags &REQ_FAILFAST_MASK ) != ff)
block/blk-mq.c +1 -1
@@ -2184,7 +2184,7 @@ blk_qc_t blk_mq_submit_bio(struct bio *bio) goto queue_exit; } -trace_block_getrq (q, bio, bio->bi_opf); +trace_block_getrq (bio);rq_qos_track (q, rq, bio);
block/bounce.c +1 -1
@@ -340,7 +340,7 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, } } -trace_block_bio_bounce (q, *bio_orig); +trace_block_bio_bounce (*bio_orig); bio->bi_flags |= (1 <<BIO_BOUNCED );
include/trace/events/block.h +33 -125
205 lines not on this page · raw message
kernel/trace/blktrace.c +10 -31
64 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 2/5] block: simplify and extend the block_bio_merge tracepoint class
Quoted 7 lines · Christoph Hellwig
The
block_bio_mergetracepoint class can be reused for most bio-based tracepoints. For that it just needs to lose the superfluous q and rq parameters.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Thanks.
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 2/5] block: simplify and extend the block_bio_merge tracepoint class
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
The
block_bio_mergetracepoint class can be reused for most bio-based tracepoints. For that it just needs to lose the superfluous q and rq parameters.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Looks good.
--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 3/5 block: remove the request_queue argument to the block_split tracepoint
In reply to Christoph HellwigThe request_queue can trivially be derived from the bio.
--- block/blk-merge.c | 2 +- drivers/md/dm.c | 2 +- include/trace/events/block.h | 14 ++++++-------- kernel/trace/blktrace.c | 5 ++--- 4 files changed, 10 insertions(+), 13 deletions(-)
block/blk-merge.c +1 -1
@@ -338,7 +338,7 @@ void __blk_queue_split(struct bio **bio, unsigned int *nr_segs) split->bi_opf |=REQ_NOMERGE ;bio_chain (split, *bio); -trace_block_split (q, split, (*bio)->bi_iter.bi_sector); +trace_block_split (split, (*bio)->bi_iter.bi_sector);submit_bio_noacct (*bio); *bio = split; }
drivers/md/dm.c +1 -1
@@ -1612,7 +1612,7 @@ static blk_qc_t __split_and_process_bio(struct mapped_device *md,part_stat_unlock ();bio_chain (b, bio); -trace_block_split (md->queue, b, bio->bi_iter.bi_sector); +trace_block_split (b, bio->bi_iter.bi_sector); ret =submit_bio_noacct (bio);break ; }
include/trace/events/block.h +6 -8
@@ -411,21 +411,19 @@ DEFINE_EVENT(block_unplug, block_unplug,/** * block_split - split a single bio struct into two bio structs -* @q: queue containing the bio * @bio: block operation being split * @new_sector: The starting sector for the new bio * -* The bio request @bio in request queue @q needs to be split into two -* bio requests. The newly created @bio request starts at -* @new_sector. This split may be required due to hardware limitation -* such as operation crossing device boundaries in a RAID system. +* The bio request @bio needs to be split into two bio requests. The newly +* created @bio request starts at @new_sector. This split may be required due to +* hardware limitations such as operation crossing device boundaries in a RAID +* system. */ TRACE_EVENT(block_split, - TP_PROTO(struct request_queue *q, struct bio *bio, - unsigned int new_sector), + TP_PROTO(struct bio *bio, unsigned int new_sector), - TP_ARGS(q, bio, new_sector), + TP_ARGS(bio, new_sector), TP_STRUCT__entry( __field( dev_t, dev )
kernel/trace/blktrace.c +2 -3
@@ -970,10 +970,9 @@ static void blk_add_trace_unplug(void *ignore, struct request_queue *q,rcu_read_unlock (); } -static void blk_add_trace_split (void *ignore, -struct request_queue *q,struct bio *bio, -unsigned int pdu) +static void blk_add_trace_split (void *ignore,struct bio *bio,unsigned int pdu) { +struct request_queue *q = bio->bi_disk->queue;struct blk_trace *bt;rcu_read_lock ();
Signature · 1 line
2.29.2
Re: [PATCH 3/5] block: remove the request_queue argument to the block_split tracepoint
Quoted 5 lines · Christoph Hellwig
The
request_queuecan trivially be derived from the bio.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 3/5] block: remove the request_queue argument to the block_split tracepoint
In reply to Christoph HellwigQuoted 6 lines · Christoph Hellwig
The
request_queuecan trivially be derived from the bio.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>---
Looks good.
Christoph Hellwig
maintainerPATCH 4/5 block: remove the request_queue argument to the block_bio_remap tracepoint
In reply to Christoph HellwigThe request_queue can trivially be derived from the bio.
--- block/blk-core.c | 2 +- drivers/md/dm.c | 3 +-- drivers/md/md-linear.c | 3 +-- drivers/md/md.c | 5 ++--- drivers/md/raid0.c | 4 ++-- drivers/md/raid1.c | 7 +++---- drivers/md/raid10.c | 6 ++---- drivers/md/raid5.c | 15 +++++++-------- drivers/nvme/host/multipath.c | 3 +-- include/trace/events/block.h | 8 +++----- kernel/trace/blktrace.c | 14 +++++--------- 11 files changed, 28 insertions(+), 42 deletions(-)
block/blk-core.c +1 -1
@@ -758,7 +758,7 @@ static inline int blk_partition_remap(struct bio *bio)if (bio_check_eod (bio,bdev_nr_sectors (p))) goto out; bio->bi_iter.bi_sector += p->bd_start_sect; -trace_block_bio_remap (bio->bi_disk->queue, bio, p->bd_dev, +trace_block_bio_remap (bio, p->bd_dev, bio->bi_iter.bi_sector - p->bd_start_sect); }
drivers/md/dm.c +1 -2
@@ -1276,8 +1276,7 @@ static blk_qc_t __map_bio(struct dm_target_io *tio)break ;case DM_MAPIO_REMAPPED :/* the bio has been remapped so dispatch it */ -trace_block_bio_remap (clone->bi_disk->queue, clone, -bio_dev (io->orig_bio), sector); +trace_block_bio_remap (clone,bio_dev (io->orig_bio), sector); ret =submit_bio_noacct (clone);break ;case DM_MAPIO_KILL :
drivers/md/md-linear.c +1 -2
@@ -257,8 +257,7 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio)bio_endio (bio); }else {if (mddev->gendisk) -trace_block_bio_remap (bio->bi_disk->queue, - bio,disk_devt (mddev->gendisk), +trace_block_bio_remap (bio,disk_devt (mddev->gendisk), bio_sector);mddev_check_writesame (mddev, bio);mddev_check_write_zeroes (mddev, bio);
drivers/md/md.c +2 -3
@@ -8591,9 +8591,8 @@ void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev,bio_chain (discard_bio, bio);bio_clone_blkg_association (discard_bio, bio);if (mddev->gendisk) -trace_block_bio_remap (bdev_get_queue (rdev->bdev), - discard_bio,disk_devt (mddev->gendisk), - bio->bi_iter.bi_sector); +trace_block_bio_remap (discard_bio,disk_devt (mddev->gendisk), + bio->bi_iter.bi_sector);submit_bio_noacct (discard_bio); }EXPORT_SYMBOL (md_submit_discard_bio);
drivers/md/raid0.c +2 -2
@@ -571,8 +571,8 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio) tmp_dev->data_offset;if (mddev->gendisk) -trace_block_bio_remap (bio->bi_disk->queue, bio, -disk_devt (mddev->gendisk), bio_sector); +trace_block_bio_remap (bio,disk_devt (mddev->gendisk), + bio_sector);mddev_check_writesame (mddev, bio);mddev_check_write_zeroes (mddev, bio);submit_bio_noacct (bio);
drivers/md/raid1.c +3 -4
@@ -1305,8 +1305,8 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio, read_bio->bi_private = r1_bio;if (mddev->gendisk) -trace_block_bio_remap (read_bio->bi_disk->queue, read_bio, -disk_devt (mddev->gendisk), r1_bio->sector); +trace_block_bio_remap (read_bio,disk_devt (mddev->gendisk), + r1_bio->sector);submit_bio_noacct (read_bio); }
@@ -1517,8 +1517,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,atomic_inc (&r1_bio->remaining);if (mddev->gendisk) -trace_block_bio_remap (mbio->bi_disk->queue, - mbio,disk_devt (mddev->gendisk), +trace_block_bio_remap (mbio,disk_devt (mddev->gendisk), r1_bio->sector);/* flush_pending_writes() needs access to the rdev so...*/ mbio->bi_disk = (void *)conf->mirrors[i].rdev;
drivers/md/raid10.c +2 -4
@@ -1200,8 +1200,7 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio, read_bio->bi_private = r10_bio;if (mddev->gendisk) -trace_block_bio_remap (read_bio->bi_disk->queue, - read_bio,disk_devt (mddev->gendisk), +trace_block_bio_remap (read_bio,disk_devt (mddev->gendisk), r10_bio->sector);submit_bio_noacct (read_bio);return ;
@@ -1250,8 +1249,7 @@ static void raid10_write_one_disk(struct mddev *mddev, struct r10bio *r10_bio, mbio->bi_private = r10_bio;if (conf->mddev->gendisk) -trace_block_bio_remap (mbio->bi_disk->queue, - mbio,disk_devt (conf->mddev->gendisk), +trace_block_bio_remap (mbio,disk_devt (conf->mddev->gendisk), r10_bio->sector);/* flush_pending_writes() needs access to the rdev so...*/ mbio->bi_disk = (void *)rdev;
drivers/md/raid5.c +7 -8
@@ -1222,9 +1222,9 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)set_bit (R5_DOUBLE_LOCKED , &sh->dev[i].flags);if (conf->mddev->gendisk) -trace_block_bio_remap (bi->bi_disk->queue, - bi,disk_devt (conf->mddev->gendisk), - sh->dev[i].sector); +trace_block_bio_remap (bi, +disk_devt (conf->mddev->gendisk), + sh->dev[i].sector);if (should_defer &&op_is_write (op))bio_list_add (&pending_bios, bi);else
@@ -1272,9 +1272,9 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)if (op ==REQ_OP_DISCARD ) rbi->bi_vcnt =0 ;if (conf->mddev->gendisk) -trace_block_bio_remap (rbi->bi_disk->queue, - rbi,disk_devt (conf->mddev->gendisk), - sh->dev[i].sector); +trace_block_bio_remap (rbi, +disk_devt (conf->mddev->gendisk), + sh->dev[i].sector);if (should_defer &&op_is_write (op))bio_list_add (&pending_bios, rbi);else
@@ -5468,8 +5468,7 @@ static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio)spin_unlock_irq (&conf->device_lock);if (mddev->gendisk) -trace_block_bio_remap (align_bi->bi_disk->queue, - align_bi,disk_devt (mddev->gendisk), +trace_block_bio_remap (align_bi,disk_devt (mddev->gendisk), raid_bio->bi_iter.bi_sector);submit_bio_noacct (align_bi);return 1 ;
drivers/nvme/host/multipath.c +1 -2
@@ -312,8 +312,7 @@ blk_qc_t nvme_ns_head_submit_bio(struct bio *bio)if (likely (ns)) { bio->bi_disk = ns->disk; bio->bi_opf |=REQ_NVME_MPATH ; -trace_block_bio_remap (bio->bi_disk->queue, bio, -disk_devt (ns->head->disk), +trace_block_bio_remap (bio,disk_devt (ns->head->disk), bio->bi_iter.bi_sector); ret =submit_bio_noacct (bio); }else if (nvme_available_path (head)) {
include/trace/events/block.h +3 -5
@@ -450,9 +450,8 @@ TRACE_EVENT(block_split,/** * block_bio_remap - map request for a logical device to the raw device -* @q: queue holding the operation * @bio: revised operation -* @dev: device for the operation +* @dev: original device for the operation * @from: original sector for the operation * * An operation for a logical device has been mapped to the
@@ -460,10 +459,9 @@ TRACE_EVENT(block_split,*/ TRACE_EVENT(block_bio_remap, - TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, - sector_t from), + TP_PROTO(struct bio *bio, dev_t dev, sector_t from), - TP_ARGS(q, bio, dev, from), + TP_ARGS(bio, dev, from), TP_STRUCT__entry( __field( dev_t, dev )
kernel/trace/blktrace.c +5 -9
@@ -993,20 +993,16 @@ static void blk_add_trace_split(void *ignore, struct bio *bio, unsigned int pdu)/** * blk_add_trace_bio_remap - Add a trace for a bio-remap operation * @ignore: trace callback data parameter (not used) -* @q: queue the io is for * @bio: the source bio -* @dev: target device +* @dev: source device * @from: source sector * -* Description: -* Device mapper or raid target sometimes need to split a bio because -* it spans a stripe (or similar). Add a trace for that action. -* +* Called after a bio is remapped to a different device and/or sector. **/ -static void blk_add_trace_bio_remap (void *ignore, -struct request_queue *q,struct bio *bio, -dev_t dev,sector_t from) +static void blk_add_trace_bio_remap (void *ignore,struct bio *bio,dev_t dev, +sector_t from) { +struct request_queue *q = bio->bi_disk->queue;struct blk_trace *bt;struct blk_io_trace_remap r;
Signature · 1 line
2.29.2
Re: [PATCH 4/5] block: remove the request_queue argument to the block_bio_remap tracepoint
Quoted 5 lines · Christoph Hellwig
The
request_queuecan trivially be derived from the bio.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 4/5] block: remove the request_queue argument to the block_bio_remap tracepoint
In reply to Christoph HellwigQuoted 6 lines · Christoph Hellwig
The
request_queuecan trivially be derived from the bio.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>---
Looks good.
Christoph Hellwig
maintainerPATCH 5/5 block: remove the request_queue to argument request based tracepoints
In reply to Christoph HellwigThe request_queue can trivially be derived from the request.
--- block/blk-merge.c | 2 +- block/blk-mq-sched.c | 2 +- block/blk-mq.c | 8 +++---- drivers/md/dm-rq.c | 2 +- drivers/s390/scsi/zfcp_fsf.c | 3 +-- include/linux/blktrace_api.h | 5 ++-- include/trace/events/block.h | 30 ++++++++++-------------- kernel/trace/blktrace.c | 44 ++++++++++++++---------------------- 8 files changed, 39 insertions(+), 57 deletions(-)
block/blk-merge.c +1 -1
@@ -799,7 +799,7 @@ static struct request *attempt_merge(struct request_queue *q,*/ blk_account_io_merge_request (next); -trace_block_rq_merge (q, next); +trace_block_rq_merge (next);/* * ownership of bio passed from next to req, return 'next' for
block/blk-mq-sched.c +1 -1
@@ -386,7 +386,7 @@ EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge);void blk_mq_sched_request_inserted (struct request *rq) { -trace_block_rq_insert (rq->q, rq); +trace_block_rq_insert (rq); }EXPORT_SYMBOL_GPL (blk_mq_sched_request_inserted);
block/blk-mq.c +4 -4
@@ -733,7 +733,7 @@ void blk_mq_start_request(struct request *rq) {struct request_queue *q = rq->q; -trace_block_rq_issue (q, rq); +trace_block_rq_issue (rq);if (test_bit (QUEUE_FLAG_STATS , &q->queue_flags)) { rq->io_start_time_ns =ktime_get_ns ();
@@ -760,7 +760,7 @@ static void __blk_mq_requeue_request(struct request *rq)blk_mq_put_driver_tag (rq); -trace_block_rq_requeue (q, rq); +trace_block_rq_requeue (rq);rq_qos_requeue (q, rq);if (blk_mq_request_started (rq)) {
@@ -1821,7 +1821,7 @@ static inline void __blk_mq_insert_req_list(struct blk_mq_hw_ctx *hctx,lockdep_assert_held (&ctx->lock); -trace_block_rq_insert (hctx->queue, rq); +trace_block_rq_insert (rq);if (at_head)list_add (&rq->queuelist, &ctx->rq_lists[type]);
@@ -1878,7 +1878,7 @@ void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,*/ list_for_each_entry (rq, list, queuelist) {BUG_ON (rq->mq_ctx != ctx); -trace_block_rq_insert (hctx->queue, rq); +trace_block_rq_insert (rq); }spin_lock (&ctx->lock);
drivers/md/dm-rq.c +1 -1
@@ -397,7 +397,7 @@ static int map_request(struct dm_rq_target_io *tio) }/* The target has remapped the I/O so dispatch it */ -trace_block_rq_remap (clone->q, clone,disk_devt (dm_disk (md)), +trace_block_rq_remap (clone,disk_devt (dm_disk (md)),blk_rq_pos (rq)); ret =dm_dispatch_clone_request (clone, rq);if (ret ==BLK_STS_RESOURCE || ret ==BLK_STS_DEV_RESOURCE ) {
drivers/s390/scsi/zfcp_fsf.c +1 -2
@@ -2359,8 +2359,7 @@ static void zfcp_fsf_req_trace(struct zfcp_fsf_req *req, struct scsi_cmnd *scsi) } } -blk_add_driver_data (scsi->request->q, scsi->request, &blktrc, -sizeof (blktrc)); +blk_add_driver_data (scsi->request, &blktrc,sizeof (blktrc)); }/**
include/linux/blktrace_api.h +2 -3
@@ -75,8 +75,7 @@ static inline bool blk_trace_note_message_enabled(struct request_queue *q)return ret; } -extern void blk_add_driver_data (struct request_queue *q,struct request *rq, -void *data,size_t len); +extern void blk_add_driver_data (struct request *rq,void *data,size_t len);extern int blk_trace_setup (struct request_queue *q,char *name,dev_t dev,struct block_device *bdev,char __user *arg);
@@ -90,7 +89,7 @@ extern struct attribute_group blk_trace_attr_group;#else /* !CONFIG_BLK_DEV_IO_TRACE */ # define blk_trace_ioctl (bdev, cmd, arg) (-ENOTTY)# define blk_trace_shutdown (q) do { } while (0) -# define blk_add_driver_data (q, rq, data, len) do {} while (0) +# define blk_add_driver_data (rq, data, len) do {} while (0)# define blk_trace_setup (q, name, dev, bdev, arg) (-ENOTTY)# define blk_trace_startstop (q, start) (-ENOTTY)# define blk_trace_remove (q) (-ENOTTY)
include/trace/events/block.h +12 -18
@@ -64,7 +64,6 @@ DEFINE_EVENT(block_buffer, block_dirty_buffer,/** * block_rq_requeue - place block IO request back on a queue -* @q: queue holding operation * @rq: block IO operation request * * The block operation request @rq is being placed back into queue
@@ -73,9 +72,9 @@ DEFINE_EVENT(block_buffer, block_dirty_buffer,*/ TRACE_EVENT(block_rq_requeue, - TP_PROTO(struct request_queue *q, struct request *rq), + TP_PROTO(struct request *rq), - TP_ARGS(q, rq), + TP_ARGS(rq), TP_STRUCT__entry( __field( dev_t, dev )
@@ -147,9 +146,9 @@ TRACE_EVENT(block_rq_complete, DECLARE_EVENT_CLASS(block_rq, - TP_PROTO(struct request_queue *q, struct request *rq), + TP_PROTO(struct request *rq), - TP_ARGS(q, rq), + TP_ARGS(rq), TP_STRUCT__entry( __field( dev_t, dev )
@@ -181,7 +180,6 @@ DECLARE_EVENT_CLASS(block_rq,/** * block_rq_insert - insert block operation request into queue -* @q: target queue * @rq: block IO operation request * * Called immediately before block operation request @rq is inserted
@@ -191,14 +189,13 @@ DECLARE_EVENT_CLASS(block_rq,*/ DEFINE_EVENT (block_rq, block_rq_insert, - TP_PROTO(struct request_queue *q, struct request *rq), + TP_PROTO(struct request *rq), -TP_ARGS (q, rq) +TP_ARGS (rq) );/** * block_rq_issue - issue pending block IO request operation to device driver -* @q: queue holding operation * @rq: block IO operation operation request * * Called when block operation request @rq from queue @q is sent to a
@@ -206,14 +203,13 @@ DEFINE_EVENT(block_rq, block_rq_insert,*/ DEFINE_EVENT (block_rq, block_rq_issue, - TP_PROTO(struct request_queue *q, struct request *rq), + TP_PROTO(struct request *rq), -TP_ARGS (q, rq) +TP_ARGS (rq) );/** * block_rq_merge - merge request with another one in the elevator -* @q: queue holding operation * @rq: block IO operation operation request * * Called when block operation request @rq from queue @q is merged to another
@@ -221,9 +217,9 @@ DEFINE_EVENT(block_rq, block_rq_issue,*/ DEFINE_EVENT (block_rq, block_rq_merge, - TP_PROTO(struct request_queue *q, struct request *rq), + TP_PROTO(struct request *rq), -TP_ARGS (q, rq) +TP_ARGS (rq) );/**
@@ -491,7 +487,6 @@ TRACE_EVENT(block_bio_remap,/** * block_rq_remap - map request for a block operation request -* @q: queue holding the operation * @rq: block IO operation request * @dev: device for the operation * @from: original sector for the operation
@@ -502,10 +497,9 @@ TRACE_EVENT(block_bio_remap,*/ TRACE_EVENT(block_rq_remap, - TP_PROTO(struct request_queue *q, struct request *rq, dev_t dev, - sector_t from), + TP_PROTO(struct request *rq, dev_t dev, sector_t from), - TP_ARGS(q, rq, dev, from), + TP_ARGS(rq, dev, from), TP_STRUCT__entry( __field( dev_t, dev )
kernel/trace/blktrace.c +17 -27
119 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 5/5] block: remove the request_queue to argument request based tracepoints
Quoted 5 lines · Christoph Hellwig
The
request_queuecan trivially be derived from the request.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Thanks!
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 5/5] block: remove the request_queue to argument request based tracepoints
In reply to Christoph HellwigQuoted 6 lines · Christoph Hellwig
The
request_queuecan trivially be derived from the request.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>---
Looks good.
--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel
Quoted 5 lines · Christoph Hellwig
Hi Jens,
this series cleans up the block layer tracepoints by removing unused tracepoints or tracepoint arguments and consolidating the implementation of various bio based tracepoints.
Applied, thanks.
Signature · 6 lines
Jens Axboe -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel