All of lore.kernel.org
 help / color / mirror / Atom feed
From: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
To: axboe@kernel.dk
Cc: linux-block@vger.kernel.org,
	Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Subject: [PATCH RFC V2 4/4] block: call blk_additional_{latency,sector} only when io_extra_stats is true
Date: Mon, 13 Jul 2020 23:13:21 +0200	[thread overview]
Message-ID: <20200713211321.21123-5-guoqing.jiang@cloud.ionos.com> (raw)
In-Reply-To: <20200713211321.21123-1-guoqing.jiang@cloud.ionos.com>

If ADDITIONAL_DISKSTAT is enabled carelessly, then it is bad to people
who don't want the additional overhead.

Now add check before call blk_additional_{latency,sector}, which guarntee
only those who really know about the attribute can account the additional
data.

Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
---
 block/blk-core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index b67aedfbcefc..171e99ed820b 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1458,7 +1458,8 @@ static void blk_account_io_completion(struct request *req, unsigned int bytes)
 		part_stat_lock();
 		part = req->part;
 #ifdef CONFIG_BLK_ADDITIONAL_DISKSTAT
-		blk_additional_sector(part, sgrp, bytes >> SECTOR_SHIFT);
+		if (blk_queue_extra_io_stat(req->q))
+			blk_additional_sector(part, sgrp, bytes >> SECTOR_SHIFT);
 #endif
 		part_stat_add(part, sectors[sgrp], bytes >> 9);
 		part_stat_unlock();
@@ -1482,7 +1483,8 @@ void blk_account_io_done(struct request *req, u64 now)
 
 		update_io_ticks(part, jiffies, true);
 #ifdef CONFIG_BLK_ADDITIONAL_DISKSTAT
-		blk_additional_latency(part, sgrp, req, 0);
+		if (blk_queue_extra_io_stat(req->q))
+			blk_additional_latency(part, sgrp, req, 0);
 #endif
 		part_stat_inc(part, ios[sgrp]);
 		part_stat_add(part, nsecs[sgrp], now - req->start_time_ns);
@@ -1516,7 +1518,8 @@ unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors,
 	part_stat_inc(part, ios[sgrp]);
 	part_stat_add(part, sectors[sgrp], sectors);
 #ifdef CONFIG_BLK_ADDITIONAL_DISKSTAT
-	blk_additional_sector(part, sgrp, sectors);
+	if (blk_queue_extra_io_stat(disk->queue))
+		blk_additional_sector(part, sgrp, sectors);
 #endif
 	part_stat_local_inc(part, in_flight[op_is_write(op)]);
 	part_stat_unlock();
@@ -1536,7 +1539,8 @@ void disk_end_io_acct(struct gendisk *disk, unsigned int op,
 	part_stat_lock();
 	update_io_ticks(part, now, true);
 #ifdef CONFIG_BLK_ADDITIONAL_DISKSTAT
-	blk_additional_latency(part, sgrp, NULL, start_time);
+	if (blk_queue_extra_io_stat(disk->queue))
+		blk_additional_latency(part, sgrp, NULL, start_time);
 #endif
 	part_stat_add(part, nsecs[sgrp], jiffies_to_nsecs(duration));
 	part_stat_local_dec(part, in_flight[op_is_write(op)]);
-- 
2.17.1


      parent reply	other threads:[~2020-07-13 21:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-13 21:13 [PATCH RFC V2 0/4] block: add two statistic tables Guoqing Jiang
2020-07-13 21:13 ` [PATCH RFC V2 1/4] block: add a statistic table for io latency Guoqing Jiang
2020-07-14  7:43   ` Johannes Thumshirn
2020-07-14  8:25     ` Guoqing Jiang
2020-08-11  7:22   ` Danil Kipnis
2020-07-13 21:13 ` [PATCH RFC V2 2/4] block: add a statistic table for io sector Guoqing Jiang
2020-08-11 15:04   ` Aleksei Marov
2020-08-11 15:48     ` Guoqing Jiang
2020-07-13 21:13 ` [PATCH RFC V2 3/4] block: add io_extra_stats node Guoqing Jiang
2020-07-13 21:13 ` Guoqing Jiang [this message]

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=20200713211321.21123-5-guoqing.jiang@cloud.ionos.com \
    --to=guoqing.jiang@cloud.ionos.com \
    --cc=axboe@kernel.dk \
    --cc=linux-block@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: link
Be 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.