From patchwork Thu Apr 8 13:58:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haris Iqbal X-Patchwork-Id: 12191199 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,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 7FAE0C433B4 for ; Thu, 8 Apr 2021 13:59:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4468B610E5 for ; Thu, 8 Apr 2021 13:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231370AbhDHN7K (ORCPT ); Thu, 8 Apr 2021 09:59:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbhDHN7K (ORCPT ); Thu, 8 Apr 2021 09:59:10 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AFD5C061760 for ; Thu, 8 Apr 2021 06:58:59 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id y124-20020a1c32820000b029010c93864955so2986605wmy.5 for ; Thu, 08 Apr 2021 06:58:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OGkKjDaEi/KlYshNQeyrH0VKuXivN67iK6qcTUlbAeE=; b=L+LiQImweCmjfT9yazHjBb6m/FjhIML4xUsbIShJPBSWgqB6hvkDxnvJLPZ41lzXTE UqSRcPpkZYTn0GaHgdQE2JULUafFWco1o/KfwN83IYKeI+SWHMwgKMHj1MoZGUAr0GT9 r1aLgIuEKYWIKjx7QThWEexs8m2M7/gu3BCDrjkJe6m42W2pR9wv/XW8EXXMMPzY0fg8 0syAZitlij8IjXBPjxqM63/VZIjQbX8mgHZF1qNA3ZqJ7+iddH/ECKNMB3wZ1QxCsFoR 73PGeqUcU6IfjBa0bBEjc1RCJ7L5iyYuRNgyBWBXnjcT1rkPcNM5AJ0/K0vP6tCMgF/E luSw== 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:mime-version:content-transfer-encoding; bh=OGkKjDaEi/KlYshNQeyrH0VKuXivN67iK6qcTUlbAeE=; b=GnGTW+wPSV+KLVFYhRpLfk5cEoJW8iTRnsNlbDW97fA2bSovTGw5brOxby/ag4Tfyx 5Q0HMgkFI/bJaqjrGobn2tcDta45HbhYFWhaLFpkFFcbULNV8Q6Msh2KggpB+vVnn5YK jLZFlSvo5rIjbiCgHPdZ2Z5ayzFijogj+aRcb7R7SolTBjmhJwsUACLxFx54EytyKDET gsliktHwOSb5wlvbk3IwEhlWIALkZkKOBFfifueDvmSksSNmZbETquEvjO7ONxxNW8qh ccG6u4DQgEt9EC5jPJFHVTADZife9lpGc6wJAKkM9OFGbK5x6TTImanNGBdOILXPM1HS Ht7w== X-Gm-Message-State: AOAM533UuqjgwjrdB0tPbBsDLY1699G/ufqN+5LyDFfZstPU9La9a4uH Dk8jSVqZa9v0WoYLT+3Y3e9YUg== X-Google-Smtp-Source: ABdhPJw43U/Viwtqw6YZSs6x5OM5Vvj+LcdyCv5oehnSvid/lJDDmj+WaTClnA3ZzY04Ncskgd269A== X-Received: by 2002:a7b:c003:: with SMTP id c3mr8576422wmb.59.1617890337976; Thu, 08 Apr 2021 06:58:57 -0700 (PDT) Received: from nb01533.pb.local ([2001:1438:4010:2540:5dfa:e648:2da1:1094]) by smtp.gmail.com with ESMTPSA id c6sm45080294wri.32.2021.04.08.06.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 06:58:57 -0700 (PDT) From: Md Haris Iqbal To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, jinpu.wang@ionos.com, danil.kipnis@ionos.com, Guoqing Jiang , Johannes Thumshirn , Guoqing Jiang , Md Haris Iqbal Subject: [PATCH V5 1/3] block: add io_extra_stats node Date: Thu, 8 Apr 2021 15:58:38 +0200 Message-Id: <20210408135840.386076-2-haris.iqbal@ionos.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210408135840.386076-1-haris.iqbal@ionos.com> References: <20210408135840.386076-1-haris.iqbal@ionos.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Guoqing Jiang 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 Cc: Guoqing Jiang Signed-off-by: Md Haris Iqbal --- 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..aee7464b35da 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: March 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 4dc7f0d499a8..5b24c552e3f6 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 e03bedf180ab..848ed6449eca 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -298,6 +298,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 @@ -629,6 +630,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"); @@ -664,6 +666,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 43c4a2d04ea2..b95279494cfa 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 Thu Apr 8 13:58:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haris Iqbal X-Patchwork-Id: 12191201 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.7 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 EC4F5C433B4 for ; Thu, 8 Apr 2021 13:59:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0FFA610FA for ; Thu, 8 Apr 2021 13:59:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231526AbhDHN7T (ORCPT ); Thu, 8 Apr 2021 09:59:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbhDHN7S (ORCPT ); Thu, 8 Apr 2021 09:59:18 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49CD3C061760 for ; Thu, 8 Apr 2021 06:59:07 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id y124-20020a1c32820000b029010c93864955so2986659wmy.5 for ; Thu, 08 Apr 2021 06:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oqJ3OgsOwwcseCNm8ByCG5mwhmpA16wMdBXpRAizjEU=; b=OD8pStMHlAlNbmzsQgs+UaLl343LNe5Qulp18rFV0UJXKCSwFjzTbpM14Ut/2UafQk NPGvGxsPjosL/gCk99rYVgXUqCtu+fxjt/CzkUVSAgODLR8EJDGoIdvIoARSZMnQoDDi 6LF1G3nddsY0LJOiQJq0kUXG2VHAC+UcJcKD1oA+fU32UPUvT7U65YWiO6HHwXa1OTY3 eXwcIPzkN9C6vFtAkyuDbgAIoicA+4bQ/WUSc59OtUnGj5+BsB0ZZGwSqdfdJ1EL+zsJ j1f2kAQOpkX2fdPa/mpVPJXTlDgTrAfoLT+ef4nkaWS12lriU+o8MkWQDnDtQsdcq+rI ufSA== 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:mime-version:content-transfer-encoding; bh=oqJ3OgsOwwcseCNm8ByCG5mwhmpA16wMdBXpRAizjEU=; b=fyr23Ox/0AyK/h8j+s3qZXfX9fwL0n06DZwGhR8Pu7qMoC/6QFnDD9X9WEVsqNlbis 7QrOt7GQu0YC93dVxLi3FwBGYHwDBtouqJcvM9G7mSr9CJn9Ynll7HJk2l0n9Ro1rpj9 eY9aStn+DGsV0DKuiI0I+XUtTO8bKJSp6j+oYGUkY7P9Pe9LgiBktpqreanSifvHN6I6 ZWv9bUu8JyTz8vBsWjqwEAOCB3b+MK9XCtS8QYnERgasovL2BLZpjpOVp7NVc1qZLPSd K8fvPiXUducAvJP4nw/1Ws0dOTTJAw/CW1izD9o6fHO9BKmsfZoTwHtF7+ormzU+wNei Ublg== X-Gm-Message-State: AOAM5325JEuHR+VKzLhopOz0ewRCn5RGQS6tiR+HE3V8lzHhf28sZNeK aG9bATpIBE+r/YIdKBoZVbAgFA== X-Google-Smtp-Source: ABdhPJxeJEvo0VF531mJMt26VONV5Cywn1Zzfzf0fLZGPzApyNrNFvrW5vrCqv7d032knlGM7HGbMA== X-Received: by 2002:a05:600c:378c:: with SMTP id o12mr8760791wmr.69.1617890339679; Thu, 08 Apr 2021 06:58:59 -0700 (PDT) Received: from nb01533.pb.local ([2001:1438:4010:2540:5dfa:e648:2da1:1094]) by smtp.gmail.com with ESMTPSA id c6sm45080294wri.32.2021.04.08.06.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 06:58:59 -0700 (PDT) From: Md Haris Iqbal To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, jinpu.wang@ionos.com, danil.kipnis@ionos.com, Guoqing Jiang , Johannes Thumshirn , Guoqing Jiang , Md Haris Iqbal Subject: [PATCH V5 2/3] block: add a statistic table for io latency Date: Thu, 8 Apr 2021 15:58:39 +0200 Message-Id: <20210408135840.386076-3-haris.iqbal@ionos.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210408135840.386076-1-haris.iqbal@ionos.com> References: <20210408135840.386076-1-haris.iqbal@ionos.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Guoqing Jiang 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@ionos.com). Reviewed-by: Jack Wang Reviewed-by: Johannes Thumshirn Signed-off-by: Guoqing Jiang Cc: Guoqing Jiang Signed-off-by: Md Haris Iqbal --- 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 aee7464b35da..a027e5afc35a 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: March 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 9bcdae93f6d4..0895d5eddc1f 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1263,6 +1263,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)) { @@ -1287,6 +1307,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(); @@ -1353,6 +1375,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 8c8f543572e6..e054dc5ac9c4 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1144,6 +1144,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, @@ -1163,6 +1199,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 Thu Apr 8 13:58:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haris Iqbal X-Patchwork-Id: 12191203 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,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 A3491C433B4 for ; Thu, 8 Apr 2021 13:59:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6FDB0610E5 for ; Thu, 8 Apr 2021 13:59:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231655AbhDHN7Y (ORCPT ); Thu, 8 Apr 2021 09:59:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbhDHN7X (ORCPT ); Thu, 8 Apr 2021 09:59:23 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A395C061760 for ; Thu, 8 Apr 2021 06:59:12 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id a6so2258397wrw.8 for ; Thu, 08 Apr 2021 06:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SeX/zeEODTwsXUjbwigq5L5/TmzwrBx3BRSe6uCkKDs=; b=Q4Ixc54Qts/ZWP8TnhI/wsxUnnWrsgrFcbitajvlVjCUmVbpwY8EQBxD3Vc7memn9w lYB7Gy4D4rwm4aCgIJSLH9sJgu9c64/HgrpPD7/AkbC9dihV1dnTHlOgEJWH1CHIrP7L L5Hkf0Lb/zBK8Vnf6ppEP5Ntm5ljwCaxSmjegZ/eDO83a/XvMgjlaTpTQu7pxTd3g+iZ N6d1h22jj1WCAVejqg22gw9vLIF7ibj0nU8RKVmKb1IaO+FBZQCVYysu2oiiB0+Padg1 3vm1eh3q/DPz5gBcK4UtqkgiDO0TUR6UEyEyBzifn403hlEdFQLs2T0s/KngLqDw4hc+ XAPw== 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:mime-version:content-transfer-encoding; bh=SeX/zeEODTwsXUjbwigq5L5/TmzwrBx3BRSe6uCkKDs=; b=SymdED0jquDQCkhDIV0Pv9RszB3o9cJ16reQBkG8GbVcNjaNKs06k1LL4rKAwZHW4K xHZzKgPzqrxopbqWdY0ONMZkIX/TWQuefQ/+c4ISdeEsip2bCTzcsiL+nAVhxv+Fpeda cQ6Bfndl5n93UPDL+CQTiNwaIuOUxHM2l69S0Nhn9FoK+NNgTNZVYlUc00VNahWZf4ay 3KsReRH+cNzkhZgq+8pCvAhxWXs/Nz+3IJPbzF5S8d3+eWmdzgzTkx91VhWs6uH7tFDi 9VgP1o89Pj6Kx+iPivfFtV4WeOXcvhVJQ7PEgFm8VyF78Jw3jhbJ9fU+HU8DxLt74NUu aRcA== X-Gm-Message-State: AOAM530QCO3cW6ZqBWyJoPNeCMtquh1HYVgXZGbW+m1C8xFS+GJWmivQ 4TjaAYNhU7XtJuj5oMpH1e97yrmlZN5MNQ== X-Google-Smtp-Source: ABdhPJyxkBT5fhfJV3UOR1mv3EmU2WHiyNcVi9tRdf97xu8V8VtFXi82tEb7c2LSNQ5RD1CbwoT3Pg== X-Received: by 2002:a5d:5542:: with SMTP id g2mr11531503wrw.3.1617890351326; Thu, 08 Apr 2021 06:59:11 -0700 (PDT) Received: from nb01533.pb.local ([2001:1438:4010:2540:5dfa:e648:2da1:1094]) by smtp.gmail.com with ESMTPSA id c6sm45080294wri.32.2021.04.08.06.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 06:59:11 -0700 (PDT) From: Md Haris Iqbal To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, jinpu.wang@ionos.com, danil.kipnis@ionos.com, Guoqing Jiang , Johannes Thumshirn , Guoqing Jiang , Md Haris Iqbal Subject: [PATCH V5 3/3] block: add a statistic table for io sector Date: Thu, 8 Apr 2021 15:58:40 +0200 Message-Id: <20210408135840.386076-4-haris.iqbal@ionos.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210408135840.386076-1-haris.iqbal@ionos.com> References: <20210408135840.386076-1-haris.iqbal@ionos.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Guoqing Jiang 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@ionos.com). Reviewed-by: Jack Wang Reviewed-by: Johannes Thumshirn Signed-off-by: Guoqing Jiang Cc: Guoqing Jiang Signed-off-by: Md Haris Iqbal --- 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 a027e5afc35a..78f84cd44bf0 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: March 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 0895d5eddc1f..899b0b08f92d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1283,12 +1283,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(); } @@ -1341,6 +1359,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 e054dc5ac9c4..94a692785fed 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1180,6 +1180,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, @@ -1200,6 +1236,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]; };