From patchwork Wed Feb 3 15:10:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12064569 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1BF5C433DB for ; Wed, 3 Feb 2021 15:13:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9052164E4E for ; Wed, 3 Feb 2021 15:13:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232761AbhBCPMb (ORCPT ); Wed, 3 Feb 2021 10:12:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234081AbhBCPLa (ORCPT ); Wed, 3 Feb 2021 10:11:30 -0500 Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFF6DC061786 for ; Wed, 3 Feb 2021 07:10:50 -0800 (PST) Received: by mail-io1-xd2b.google.com with SMTP id j5so191223iog.11 for ; Wed, 03 Feb 2021 07:10:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dzaJa3Etccl8JcjQv8dbYH5nAqdNSqE8WXoX6JBC4yw=; b=TJo1Gl6hS7K5oorQvDzO7xqQCDkxI9l0Q9rundtz6o6TdMGxRscj8FoiRyz+kSRVjB HQWq1WZ0Uygl0/ZmX8+v/LXU4IacNvCZQOF1KW9wGR0gRRX8zbTT2/zaMGRYuLOEn9Sb i8MbILlSUNHetsbp9HeJoJIuYTHiwfzYCWycpe64UFYBNhC3W95q8zmmoUTaCEUkIPkH OMUva76qb7gj7EAQITpT25jL+sTKaq5lE+l1FqEXB+aDoQsV52gPkysDSCppSl7gfdLT sGD1XgThwD/SfJceA3RFruQU7oHA8NaaZGp+E4tkHgA8zD+qfqISHza3aLqMkJOjp8AT iIpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dzaJa3Etccl8JcjQv8dbYH5nAqdNSqE8WXoX6JBC4yw=; b=JH89gK+zGhGn+g3LOTXnb8JAlIvxH9uBIy9EAPsTnV7BDR4HUmSQg3tsckqHzMoU7Q bXDUqWa33zwS69gMb+kH9c41fSOKDgF8/xRuZzXCkNtiNCV/TzlZP/L2rqyZM+/3pCd9 5DdsUvLepq+gb3Zh0mglSvVsN9+JB4iYIIeWOwRevInqCVcw7rxULIBkJQp8yQxjRfJ1 J8Hpz4QjYJ3fxTquKAkpRGLgls9F0z15SuUdwM1SAfTvGAFox/vyLltKBhusrIdjd8+w 8e7R88brS4iRWTeoZv5pPlJ0pvTCKa7ZXYfN5KM5dTDP0s9UzRh8xqZbDTMBlo8y0sTX gAaA== X-Gm-Message-State: AOAM5303y/3j3dkTu+7ZWKSeq5CWSu84gEei3XKbIhrfneUPjtuONgjP ZFEXrbBXBC8enLIy4zrFGi/qwg== X-Google-Smtp-Source: ABdhPJwyQbU6Fs/WT/ms2SaE2i72NAXlJo4jRScdXICFHxbqwvHQzUDxTC083zesYcYZUZzJ+nD0IQ== X-Received: by 2002:a5d:9c4a:: with SMTP id 10mr2814768iof.145.1612365049320; Wed, 03 Feb 2021 07:10:49 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:fd01:c087:775e:21aa]) by smtp.gmail.com with ESMTPSA id e15sm1201962iog.24.2021.02.03.07.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 07:10:48 -0800 (PST) From: Guoqing Jiang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, danil.kipnis@cloud.ionos.com, jinpu.wang@cloud.ionos.com, Guoqing Jiang Subject: [PATCH V4 1/3] block: add io_extra_stats node Date: Wed, 3 Feb 2021 16:10:17 +0100 Message-Id: <20210203151019.27036-2-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210203151019.27036-1-guoqing.jiang@cloud.ionos.com> References: <20210203151019.27036-1-guoqing.jiang@cloud.ionos.com> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org We will track the size and latency of each io, which could make people suffer from the additional overhead if they don't need the statistics. So introduce a specific sysfs node to enable/disable the tracking. Reviewed-by: Jack Wang Reviewed-by: Johannes Thumshirn Signed-off-by: Guoqing Jiang --- Documentation/ABI/testing/sysfs-block | 9 +++++++++ Documentation/block/queue-sysfs.rst | 5 +++++ block/blk-sysfs.c | 3 +++ include/linux/blkdev.h | 2 ++ 4 files changed, 19 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block index e34cdeeeb9d4..503314efec13 100644 --- a/Documentation/ABI/testing/sysfs-block +++ b/Documentation/ABI/testing/sysfs-block @@ -316,3 +316,12 @@ Description: does not complete in this time then the block driver timeout handler is invoked. That timeout handler can decide to retry the request, to fail it or to start a device recovery strategy. + +What: /sys/block//queue/io_extra_stats +Date: January 2021 +Contact: Guoqing Jiang +Description: + Indicates if people want to know the extra statistics (I/O + size and I/O latency) from /sys/block//io_latency + and /sys/block//io_size. The value is 0 by default, + set if the extra statistics are needed. diff --git a/Documentation/block/queue-sysfs.rst b/Documentation/block/queue-sysfs.rst index 2638d3446b79..28ffce653eb1 100644 --- a/Documentation/block/queue-sysfs.rst +++ b/Documentation/block/queue-sysfs.rst @@ -99,6 +99,11 @@ iostats (RW) This file is used to control (on/off) the iostats accounting of the disk. +io_extra_stats (RW) +------------------- +This file is used to control (on/off) the additional accounting of the +io size and io latency of disk. + logical_block_size (RO) ----------------------- This is the logical block size of the device, in bytes. diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index b513f1683af0..ed31938e89fe 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -287,6 +287,7 @@ queue_##name##_store(struct request_queue *q, const char *page, size_t count) \ QUEUE_SYSFS_BIT_FNS(nonrot, NONROT, 1); QUEUE_SYSFS_BIT_FNS(random, ADD_RANDOM, 0); QUEUE_SYSFS_BIT_FNS(iostats, IO_STAT, 0); +QUEUE_SYSFS_BIT_FNS(io_extra_stats, IO_EXTRA_STAT, 0); QUEUE_SYSFS_BIT_FNS(stable_writes, STABLE_WRITES, 0); #undef QUEUE_SYSFS_BIT_FNS @@ -613,6 +614,7 @@ static struct queue_sysfs_entry queue_hw_sector_size_entry = { QUEUE_RW_ENTRY(queue_nonrot, "rotational"); QUEUE_RW_ENTRY(queue_iostats, "iostats"); +QUEUE_RW_ENTRY(queue_io_extra_stats, "io_extra_stats"); QUEUE_RW_ENTRY(queue_random, "add_random"); QUEUE_RW_ENTRY(queue_stable_writes, "stable_writes"); @@ -647,6 +649,7 @@ static struct attribute *queue_attrs[] = { &queue_nomerges_entry.attr, &queue_rq_affinity_entry.attr, &queue_iostats_entry.attr, + &queue_io_extra_stats_entry.attr, &queue_stable_writes_entry.attr, &queue_random_entry.attr, &queue_poll_entry.attr, diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 0dea268bd61b..62881db2004f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -621,6 +621,7 @@ struct request_queue { #define QUEUE_FLAG_RQ_ALLOC_TIME 27 /* record rq->alloc_time_ns */ #define QUEUE_FLAG_HCTX_ACTIVE 28 /* at least one blk-mq hctx is active */ #define QUEUE_FLAG_NOWAIT 29 /* device supports NOWAIT */ +#define QUEUE_FLAG_IO_EXTRA_STAT 30 /* extra IO accounting for size and latency */ #define QUEUE_FLAG_MQ_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_SAME_COMP) | \ @@ -641,6 +642,7 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q); #define blk_queue_stable_writes(q) \ test_bit(QUEUE_FLAG_STABLE_WRITES, &(q)->queue_flags) #define blk_queue_io_stat(q) test_bit(QUEUE_FLAG_IO_STAT, &(q)->queue_flags) +#define blk_queue_io_extra_stat(q) test_bit(QUEUE_FLAG_IO_EXTRA_STAT, &(q)->queue_flags) #define blk_queue_add_random(q) test_bit(QUEUE_FLAG_ADD_RANDOM, &(q)->queue_flags) #define blk_queue_discard(q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags) #define blk_queue_zone_resetall(q) \ From patchwork Wed Feb 3 15:10:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12064571 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF594C433DB for ; Wed, 3 Feb 2021 15:13:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5304764E4E for ; Wed, 3 Feb 2021 15:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233593AbhBCPMq (ORCPT ); Wed, 3 Feb 2021 10:12:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234132AbhBCPLe (ORCPT ); Wed, 3 Feb 2021 10:11:34 -0500 Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BB33C061788 for ; Wed, 3 Feb 2021 07:10:54 -0800 (PST) Received: by mail-io1-xd2d.google.com with SMTP id n201so1229574iod.12 for ; Wed, 03 Feb 2021 07:10:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JRarvTsQ8A9ZrX9B3OvlkmPSiGLylKTPswcU/6ClOBw=; b=bqvp61+ewCAk47R4+9B4LbIpGuubhDyb0kMQVkiHqv6WpvxtbHHwC130PHK5mpwtza N2aH2FY3c2tnG5U0yjW2hnbmZq4V+/Mv8SlKlygIc3P8LR0dWNSXuxuEjR80sx4vdDPp N6qoXtIbeX5XmGSdZXTNsT7cO/KdqaWBXPs6haKRd8SDLclNMuh+3IrVP1cceS+gMisz 46gw/2uLh3GDt771N9BRmb1TsDamO0/wj4WnR0tMvKLOdtIYar6x/gCWnUu1vFTK/NIa hq8tzGuszswpX2RmHCpaIAlHqnB7Xmsq2PI9eMf2M8ZmtMjJrf5DpNHGtZxCZXGpXGOX ID0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JRarvTsQ8A9ZrX9B3OvlkmPSiGLylKTPswcU/6ClOBw=; b=mx1gKJ4WolBjJyAo5ouVU+y9D7/F9bO7R0oq2WvtzW/uctVoLYjJajatEOv/qIweSY +Nt/GnbejReBmRFVD6ufMkZfLAmObXPC3D4XzhEZs1bQTmHV4g4811UeRQXYTNYAPrqA +vYQ9hQGgGLH9F/yk1P3xlqiKGU/GKpArsoBxR1Mf4uprOuXTJ659OfylDMn7hGb0R/G 7ts0U/HgDlsKZPE/9A83xIauqIIIY1yJdVnM/jj7gf8SV8c/DbMC81eJKFE19DotWfYP L0f00C0OJUG2HO5TPT+/Q6O6F6n8R4cqeB4H2Voyxl2wBqCCAe+UyGIHeqA9QlaEki80 FUUw== X-Gm-Message-State: AOAM5329mreNTtm4kbnWrXJhOhL3kCGyFr3d5Ekpyrt4ZTutwMr2H7te bx8mi3aoYzQNmrW65O6cAF0E5g== X-Google-Smtp-Source: ABdhPJySSe3jEil3tZjoEUaXN4FPCkaNTRiFjObloc5CHRaFVUOp4odrxBIMtOCZnVKJY93uq78w1w== X-Received: by 2002:a02:cf24:: with SMTP id s4mr3394979jar.130.1612365052656; Wed, 03 Feb 2021 07:10:52 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:fd01:c087:775e:21aa]) by smtp.gmail.com with ESMTPSA id e15sm1201962iog.24.2021.02.03.07.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 07:10:51 -0800 (PST) From: Guoqing Jiang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, danil.kipnis@cloud.ionos.com, jinpu.wang@cloud.ionos.com, Guoqing Jiang Subject: [PATCH V4 2/3] block: add a statistic table for io latency Date: Wed, 3 Feb 2021 16:10:18 +0100 Message-Id: <20210203151019.27036-3-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210203151019.27036-1-guoqing.jiang@cloud.ionos.com> References: <20210203151019.27036-1-guoqing.jiang@cloud.ionos.com> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Usually, we get the status of block device by cat stat file, but we can only know the total time with that file. And we would like to know more accurate statistic, such as each latency range, which helps people to diagnose if there is issue about the hardware. This change is based on our internal patch from Florian-Ewald Mueller (florian-ewald.mueller@cloud.ionos.com). Reviewed-by: Jack Wang Reviewed-by: Johannes Thumshirn Signed-off-by: Guoqing Jiang --- Documentation/ABI/testing/sysfs-block | 8 ++++++ block/blk-core.c | 24 +++++++++++++++++ block/genhd.c | 37 +++++++++++++++++++++++++++ include/linux/part_stat.h | 5 ++++ 4 files changed, 74 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block index 503314efec13..c4db84c507dd 100644 --- a/Documentation/ABI/testing/sysfs-block +++ b/Documentation/ABI/testing/sysfs-block @@ -27,6 +27,14 @@ Description: For more details refer Documentation/admin-guide/iostats.rst +What: /sys/block//io_latency +Date: January 2021 +Contact: Guoqing Jiang +Description: + The /sys/block//io_latency files displays the I/O + latency of disk . With it, it is convenient to know + the statistics of I/O latency for each type (read, write, + discard and flush) which have happened to the disk. What: /sys/block///stat Date: February 2008 diff --git a/block/blk-core.c b/block/blk-core.c index 5e752840b41a..1adc9f17e8b7 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1264,6 +1264,26 @@ static void update_io_ticks(struct block_device *part, unsigned long now, } } +static void blk_additional_latency(struct block_device *part, const int sgrp, + struct request_queue *q, + unsigned long duration) +{ + unsigned int idx; + + if (!blk_queue_io_extra_stat(q)) + return; + + duration /= NSEC_PER_MSEC; + duration /= HZ_TO_MSEC_NUM; + if (likely(duration > 0)) { + idx = ilog2(duration); + if (idx > ADD_STAT_NUM - 1) + idx = ADD_STAT_NUM - 1; + } else + idx = 0; + part_stat_inc(part, latency_table[idx][sgrp]); +} + static void blk_account_io_completion(struct request *req, unsigned int bytes) { if (req->part && blk_do_io_stat(req)) { @@ -1288,6 +1308,8 @@ void blk_account_io_done(struct request *req, u64 now) part_stat_lock(); update_io_ticks(req->part, jiffies, true); + blk_additional_latency(req->part, sgrp, req->q, + now - req->start_time_ns); part_stat_inc(req->part, ios[sgrp]); part_stat_add(req->part, nsecs[sgrp], now - req->start_time_ns); part_stat_unlock(); @@ -1354,6 +1376,8 @@ static void __part_end_io_acct(struct block_device *part, unsigned int op, part_stat_lock(); update_io_ticks(part, now, true); + blk_additional_latency(part, sgrp, part->bd_disk->queue, + jiffies_to_nsecs(duration)); part_stat_add(part, nsecs[sgrp], jiffies_to_nsecs(duration)); part_stat_local_dec(part, in_flight[op_is_write(op)]); part_stat_unlock(); diff --git a/block/genhd.c b/block/genhd.c index 304f8dcc9a9b..09cb177421e0 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1146,6 +1146,42 @@ static struct device_attribute dev_attr_fail_timeout = __ATTR(io-timeout-fail, 0644, part_timeout_show, part_timeout_store); #endif +static ssize_t io_latency_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct block_device *bdev = dev_to_bdev(dev); + size_t count = 0; + int i, sgrp; + + for (i = 0; i < ADD_STAT_NUM; i++) { + unsigned int from, to; + + if (i == ADD_STAT_NUM - 1) { + count += scnprintf(buf + count, PAGE_SIZE - count, " >= %5d ms: ", + (2 << (i - 2)) * HZ_TO_MSEC_NUM); + } else { + if (i < 2) { + from = i; + to = i + 1; + } else { + from = 2 << (i - 2); + to = 2 << (i - 1); + } + count += scnprintf(buf + count, PAGE_SIZE - count, "[%5d - %-5d) ms: ", + from * HZ_TO_MSEC_NUM, to * HZ_TO_MSEC_NUM); + } + + for (sgrp = 0; sgrp < NR_STAT_GROUPS; sgrp++) + count += scnprintf(buf + count, PAGE_SIZE - count, "%lu ", + part_stat_read(bdev, latency_table[i][sgrp])); + count += scnprintf(buf + count, PAGE_SIZE - count, "\n"); + } + + return count; +} + +static struct device_attribute dev_attr_io_latency = + __ATTR(io_latency, 0444, io_latency_show, NULL); + static struct attribute *disk_attrs[] = { &dev_attr_range.attr, &dev_attr_ext_range.attr, @@ -1165,6 +1201,7 @@ static struct attribute *disk_attrs[] = { #ifdef CONFIG_FAIL_IO_TIMEOUT &dev_attr_fail_timeout.attr, #endif + &dev_attr_io_latency.attr, NULL }; diff --git a/include/linux/part_stat.h b/include/linux/part_stat.h index d2558121d48c..e2bde5160de4 100644 --- a/include/linux/part_stat.h +++ b/include/linux/part_stat.h @@ -9,6 +9,11 @@ struct disk_stats { unsigned long sectors[NR_STAT_GROUPS]; unsigned long ios[NR_STAT_GROUPS]; unsigned long merges[NR_STAT_GROUPS]; + /* + * We measure latency (ms) for 1, 2, ..., 1024 and >=1024. + */ +#define ADD_STAT_NUM 12 + unsigned long latency_table[ADD_STAT_NUM][NR_STAT_GROUPS]; unsigned long io_ticks; local_t in_flight[2]; }; From patchwork Wed Feb 3 15:10:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12064573 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF174C433DB for ; Wed, 3 Feb 2021 15:13:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6084564E4B for ; Wed, 3 Feb 2021 15:13:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233860AbhBCPMz (ORCPT ); Wed, 3 Feb 2021 10:12:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233795AbhBCPLi (ORCPT ); Wed, 3 Feb 2021 10:11:38 -0500 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82238C06178A for ; Wed, 3 Feb 2021 07:10:57 -0800 (PST) Received: by mail-il1-x12e.google.com with SMTP id p15so21964690ilq.8 for ; Wed, 03 Feb 2021 07:10:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zH5fC+ciSX7YgHu+7XP7ttYm6qPjAwGMLCnv6M0eLAM=; b=A/mGCpnSj6KsjKC1sBeZYbC6WEDG6LLsq45NooDQL7Q1yhQ1Seq01dku5nrcXlcajc UXvNLX0KnTUodIj17b3QO231lcMGwwNbIm+t+Rs/Tt2Jz8pBr3wKdKwJTjj3NB4T60AG Eoc6dNTHIIwf957Om2AHfgiDOtCOntixKLvncHu0scDHSsvpwXT4ZEQvSxlM5ZM54k3g bzildv/7hTWNbGgvHatIlVqSvRj7ldAeemDMqie3wT7mrVBgAQsHtib3tu4OPL/d3eCE gSEC0pVf4F0Os87QW1/O2i/TxA4Y3+FjI1TGn0f1S1szPmO8svg02AF/JfNVuAST2Jc2 4OaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zH5fC+ciSX7YgHu+7XP7ttYm6qPjAwGMLCnv6M0eLAM=; b=GEw5+2sJDg+RFbTYOmWu8yLpviloIR0VXRPuH0OXU/x1DqdghOp/DpPWCnALRA6nJ5 GOvEt23Yx3t85w3BctLdsE/McZqY0O6HvEx+Mx59pGmR8xLFXlbSJ/7mA/f+VeYPwk24 uEh4OZXmMQB/BkT3+tcOQpWbbG7CpnB83lS2CR4/hpNSIwM2Iq/eB5gz+bSQYqh6zVhq qLhW1CgvUO1gO6/eUaMrle5mXTKrwDQYcA3enJw9Ejbn4qzsQBpGouemcKE+o+BSYocV XJnkDeW9Bff69drtTR0u1Ufd7KWqIC/hRtyXjrt81MZSs6FQL3/YRR9UCZYHxobR/NPV o54w== X-Gm-Message-State: AOAM531To3vsE3foSP4OzLrK41kDmc/FaoqX9cOPLCaHp9439dYcRqam T1p9W88yyr3Y5qaKcXuon72uZw== X-Google-Smtp-Source: ABdhPJwZA3kkVLMAgLbehHVu0UXfjS7qyzTwWBbQbq2aDs7EgXMjR/AUu/T4nGpdH9td7Gb5yGgQLQ== X-Received: by 2002:a05:6e02:5c6:: with SMTP id l6mr3043347ils.136.1612365055734; Wed, 03 Feb 2021 07:10:55 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:fd01:c087:775e:21aa]) by smtp.gmail.com with ESMTPSA id e15sm1201962iog.24.2021.02.03.07.10.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 07:10:55 -0800 (PST) From: Guoqing Jiang To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, danil.kipnis@cloud.ionos.com, jinpu.wang@cloud.ionos.com, Guoqing Jiang Subject: [PATCH V4 3/3] block: add a statistic table for io sector Date: Wed, 3 Feb 2021 16:10:19 +0100 Message-Id: <20210203151019.27036-4-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210203151019.27036-1-guoqing.jiang@cloud.ionos.com> References: <20210203151019.27036-1-guoqing.jiang@cloud.ionos.com> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org With the sector table, so we can know the distribution of different IO size from upper layer, which means we could have the opportunity to tune the performance based on the mostly issued IOs. This change is based on our internal patch from Florian-Ewald Mueller (florian-ewald.mueller@cloud.ionos.com). Reviewed-by: Jack Wang Reviewed-by: Johannes Thumshirn Signed-off-by: Guoqing Jiang --- Documentation/ABI/testing/sysfs-block | 9 +++++++ block/blk-core.c | 19 ++++++++++++++ block/genhd.c | 37 +++++++++++++++++++++++++++ include/linux/part_stat.h | 3 ++- 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block index c4db84c507dd..e1611c62a3e1 100644 --- a/Documentation/ABI/testing/sysfs-block +++ b/Documentation/ABI/testing/sysfs-block @@ -36,6 +36,15 @@ Description: the statistics of I/O latency for each type (read, write, discard and flush) which have happened to the disk. +What: /sys/block//io_size +Date: January 2021 +Contact: Guoqing Jiang +Description: + The /sys/block//io_size files displays the I/O + size of disk . With it, it is convenient to know + the statistics of I/O size for each type (read, write, + discard and flush) which have happened to the disk. + What: /sys/block///stat Date: February 2008 Contact: Jerome Marchand diff --git a/block/blk-core.c b/block/blk-core.c index 1adc9f17e8b7..a44684033382 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1284,12 +1284,30 @@ static void blk_additional_latency(struct block_device *part, const int sgrp, part_stat_inc(part, latency_table[idx][sgrp]); } +static void blk_additional_sector(struct block_device *part, const int sgrp, + struct request_queue *q, unsigned int sectors) +{ + unsigned int idx; + + if (!blk_queue_io_extra_stat(q)) + return; + + if (sectors == 1) + idx = 0; + else + idx = ilog2(sectors); + + idx = (idx > (ADD_STAT_NUM - 1)) ? (ADD_STAT_NUM - 1) : idx; + part_stat_inc(part, size_table[idx][sgrp]); +} + static void blk_account_io_completion(struct request *req, unsigned int bytes) { if (req->part && blk_do_io_stat(req)) { const int sgrp = op_stat_group(req_op(req)); part_stat_lock(); + blk_additional_sector(req->part, sgrp, req->q, bytes >> SECTOR_SHIFT); part_stat_add(req->part, sectors[sgrp], bytes >> 9); part_stat_unlock(); } @@ -1342,6 +1360,7 @@ static unsigned long __part_start_io_acct(struct block_device *part, update_io_ticks(part, now, false); part_stat_inc(part, ios[sgrp]); part_stat_add(part, sectors[sgrp], sectors); + blk_additional_sector(part, sgrp, part->bd_disk->queue, sectors); part_stat_local_inc(part, in_flight[op_is_write(op)]); part_stat_unlock(); diff --git a/block/genhd.c b/block/genhd.c index 09cb177421e0..f43574d9dc8c 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1182,6 +1182,42 @@ static ssize_t io_latency_show(struct device *dev, struct device_attribute *attr static struct device_attribute dev_attr_io_latency = __ATTR(io_latency, 0444, io_latency_show, NULL); +static ssize_t io_size_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct block_device *bdev = dev_to_bdev(dev); + size_t count = 0; + int i, sgrp; + + for (i = 0; i < ADD_STAT_NUM; i++) { + unsigned int from, to; + + if (i == ADD_STAT_NUM - 1) { + from = 2 << (i - 2); + count += scnprintf(buf + count, PAGE_SIZE - count, + " >=%5d KB: ", from); + } else { + if (i < 2) { + from = i; + to = i + 1; + } else { + from = 2 << (i - 2); + to = 2 << (i - 1); + } + count += scnprintf(buf + count, PAGE_SIZE - count, + "[%5d - %-5d) KB: ", from, to); + } + for (sgrp = 0; sgrp < NR_STAT_GROUPS; sgrp++) + count += scnprintf(buf + count, PAGE_SIZE - count, "%lu ", + part_stat_read(bdev, size_table[i][sgrp])); + count += scnprintf(buf + count, PAGE_SIZE - count, "\n"); + } + + return count; +} + +static struct device_attribute dev_attr_io_size = + __ATTR(io_size, 0444, io_size_show, NULL); + static struct attribute *disk_attrs[] = { &dev_attr_range.attr, &dev_attr_ext_range.attr, @@ -1202,6 +1238,7 @@ static struct attribute *disk_attrs[] = { &dev_attr_fail_timeout.attr, #endif &dev_attr_io_latency.attr, + &dev_attr_io_size.attr, NULL }; diff --git a/include/linux/part_stat.h b/include/linux/part_stat.h index e2bde5160de4..221fb3a884b2 100644 --- a/include/linux/part_stat.h +++ b/include/linux/part_stat.h @@ -10,10 +10,11 @@ struct disk_stats { unsigned long ios[NR_STAT_GROUPS]; unsigned long merges[NR_STAT_GROUPS]; /* - * We measure latency (ms) for 1, 2, ..., 1024 and >=1024. + * We measure latency (ms) and size (KB) for 1, 2, ..., 1024 and >=1024. */ #define ADD_STAT_NUM 12 unsigned long latency_table[ADD_STAT_NUM][NR_STAT_GROUPS]; + unsigned long size_table[ADD_STAT_NUM][NR_STAT_GROUPS]; unsigned long io_ticks; local_t in_flight[2]; };