From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: dm-devel@redhat.com, linux-block@vger.kernel.org, linux-raid@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH 1/5] block: remove the unused block_sleeprq tracepoint Date: Mon, 30 Nov 2020 18:58:50 +0100 [thread overview] Message-ID: <20201130175854.982460-2-hch@lst.de> (raw) In-Reply-To: <20201130175854.982460-1-hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/trace/events/block.h | 18 ------------------ kernel/trace/blktrace.c | 22 ---------------------- 2 files changed, 40 deletions(-) diff --git a/include/trace/events/block.h b/include/trace/events/block.h index 34d64ca306b1c7..76459cf750e14d 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -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 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index a482a37848bff7..ced589df304b57 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -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); -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: linux-block@vger.kernel.org, linux-raid@vger.kernel.org, dm-devel@redhat.com, linux-s390@vger.kernel.org Subject: [dm-devel] [PATCH 1/5] block: remove the unused block_sleeprq tracepoint Date: Mon, 30 Nov 2020 18:58:50 +0100 [thread overview] Message-ID: <20201130175854.982460-2-hch@lst.de> (raw) In-Reply-To: <20201130175854.982460-1-hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/trace/events/block.h | 18 ------------------ kernel/trace/blktrace.c | 22 ---------------------- 2 files changed, 40 deletions(-) diff --git a/include/trace/events/block.h b/include/trace/events/block.h index 34d64ca306b1c7..76459cf750e14d 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -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 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index a482a37848bff7..ced589df304b57 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -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); -- 2.29.2 -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2020-11-30 18:04 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-30 17:58 block tracepoint cleanups Christoph Hellwig 2020-11-30 17:58 ` [dm-devel] " Christoph Hellwig 2020-11-30 17:58 ` Christoph Hellwig [this message] 2020-11-30 17:58 ` [dm-devel] [PATCH 1/5] block: remove the unused block_sleeprq tracepoint Christoph Hellwig 2020-12-03 8:46 ` Damien Le Moal 2020-12-03 8:46 ` Damien Le Moal 2020-12-03 12:43 ` Hannes Reinecke 2020-12-03 12:43 ` [dm-devel] " Hannes Reinecke 2020-11-30 17:58 ` [PATCH 2/5] block: simplify and extended the block_bio_merge tracepoint class Christoph Hellwig 2020-11-30 17:58 ` [dm-devel] " Christoph Hellwig 2020-12-03 8:56 ` Damien Le Moal 2020-12-03 8:56 ` Damien Le Moal 2020-12-03 12:46 ` Hannes Reinecke 2020-12-03 12:46 ` [dm-devel] " Hannes Reinecke 2020-11-30 17:58 ` [PATCH 3/5] block: remove the request_queue argument to the block_split tracepoint Christoph Hellwig 2020-11-30 17:58 ` [dm-devel] " Christoph Hellwig 2020-12-03 8:59 ` Damien Le Moal 2020-12-03 8:59 ` [dm-devel] " Damien Le Moal 2020-12-03 12:47 ` Hannes Reinecke 2020-12-03 12:47 ` [dm-devel] " Hannes Reinecke 2020-11-30 17:58 ` [PATCH 4/5] block: remove the request_queue argument to the block_bio_remap tracepoint Christoph Hellwig 2020-11-30 17:58 ` [dm-devel] " Christoph Hellwig 2020-12-03 9:02 ` Damien Le Moal 2020-12-03 9:02 ` Damien Le Moal 2020-12-03 12:49 ` Hannes Reinecke 2020-12-03 12:49 ` [dm-devel] " Hannes Reinecke 2020-11-30 17:58 ` [PATCH 5/5] block: remove the request_queue to argument request based tracepoints Christoph Hellwig 2020-11-30 17:58 ` [dm-devel] " Christoph Hellwig 2020-12-03 9:06 ` Damien Le Moal 2020-12-03 9:06 ` Damien Le Moal 2020-12-03 12:49 ` Hannes Reinecke 2020-12-03 12:49 ` [dm-devel] " Hannes Reinecke 2020-12-03 8:25 ` block tracepoint cleanups Christoph Hellwig 2020-12-03 8:25 ` [dm-devel] " Christoph Hellwig 2020-12-03 15:38 ` Tejun Heo 2020-12-03 15:38 ` [dm-devel] " Tejun Heo 2020-12-03 16:21 block tracepoint cleanups v2 Christoph Hellwig 2020-12-03 16:21 ` [PATCH 1/5] block: remove the unused block_sleeprq tracepoint Christoph Hellwig 2020-12-03 19:45 ` Tejun Heo 2020-12-04 3:25 ` Chaitanya Kulkarni
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201130175854.982460-2-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=dm-devel@redhat.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-raid@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.