From patchwork Tue Feb 2 03:10:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12060503 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 C1C98C433E0 for ; Tue, 2 Feb 2021 03:11:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D51F64E9B for ; Tue, 2 Feb 2021 03:11:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229914AbhBBDLM (ORCPT ); Mon, 1 Feb 2021 22:11:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbhBBDLM (ORCPT ); Mon, 1 Feb 2021 22:11:12 -0500 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 771DCC061756 for ; Mon, 1 Feb 2021 19:10:26 -0800 (PST) Received: by mail-il1-x133.google.com with SMTP id q5so17729231ilc.10 for ; Mon, 01 Feb 2021 19:10:26 -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=IcLy68pClKT3HUrCFRLHi42wvY72+dIr9Wy+hEhBQr4=; b=iiGu5t7gEtp2UHz6+bwWKRLan8rFSd+Jgk25b4q2FY+GEk2WfSBgRkGciokFjLSrd5 kWsh7G2v43Qzqt1cN1/EuqJkl0prgGoUui8wr4WpygvaSZ6tU+nLJe6IkrtvHiG9Maln JVejl+inm3gvcs6o8zW5VK6jKxhakBTnsP4bv0sLuGgQJGs/IOuu2lmEhK6cdxlka1CS G3ZU3nXm8aC3qiBnPerQ/IsWgLZ19FxFczbCAEMNefPH9JlIPC9R8EELqL/krCQUpKCA Anpmoe48EB6DOXQzSSrhTD3VQIkrmDQwJrKIxOM8FJRg1AjFf/F2oM8cw53B9y5t4tEv 3kcQ== 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=IcLy68pClKT3HUrCFRLHi42wvY72+dIr9Wy+hEhBQr4=; b=ohKxAF5+sVVz4XFWY07p2d6HMi0OkDqxzuhUssykSxB6HjgCRXG+R2fFe0mPGIOppW pR/KG2fWLcnZ3ItFz/Fx3ewkegtLS677h7nERUAeOnPqAoULwMGdC4ecVCHHuf1+JiNm Ic/NlGQJXz3KEUe+poQ7Z4/cSS0LOQaQ8vuU15d+ZoZ1AMIH7T/YPZ7/Ua/tlLYTAAq1 LuYBsfdJm/VXrD8gKD5vGXO+UV1UczJ3l0ua5exwTk/NV0YMfAybMM5hWKzj5lb8jqcg 5BfcVTpZFM+bEqtW+HrfOCmgyUswurqcLDzVeucfQXcnYtCgw0PmaK/dFo1vUiWmSRlu Bm0A== X-Gm-Message-State: AOAM531+bOrEQnnv+fGw/GKqqlWYZbrGmKU4UFRhqvj3ynUlaFVAxNvl dM/nen0Q/TThpWoAYinTjQTiwg== X-Google-Smtp-Source: ABdhPJzzByFiP9cMsxlXnrXh51Z9AiGyubKLxPHZ+Jwy0SddFEgbgHKUUk/+tGE5SjUfPibRDo4vEQ== X-Received: by 2002:a05:6e02:1411:: with SMTP id n17mr14834529ilo.61.1612235425030; Mon, 01 Feb 2021 19:10:25 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:c05c:3bba:187c:cddb]) by smtp.gmail.com with ESMTPSA id q5sm9099307ioi.43.2021.02.01.19.10.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 19:10:24 -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 V3 1/3] block: add io_extra_stats node Date: Tue, 2 Feb 2021 04:10:07 +0100 Message-Id: <20210202031009.11584-2-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210202031009.11584-1-guoqing.jiang@cloud.ionos.com> References: <20210202031009.11584-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 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 Tue Feb 2 03:10:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12060501 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 B9D95C433E0 for ; Tue, 2 Feb 2021 03:11:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8352364E9A for ; Tue, 2 Feb 2021 03:11:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229819AbhBBDLK (ORCPT ); Mon, 1 Feb 2021 22:11:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbhBBDLJ (ORCPT ); Mon, 1 Feb 2021 22:11:09 -0500 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C9ACC0613D6 for ; Mon, 1 Feb 2021 19:10:29 -0800 (PST) Received: by mail-il1-x12a.google.com with SMTP id q9so17747124ilo.1 for ; Mon, 01 Feb 2021 19:10:29 -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=f1svkMvq9LBEb6D3mgoD1KYyrCbNxwAeUpEuA4/zYxA=; b=ShhF4A1rw8RCUiq3TleKhNJYz1JZa8AIEeI0BcUSa8ABNauMo8Pa0OYBJG3lruQ+Tk e5X+OrU7yLRZBc/jr5HHPQ0E+uIQb9IYnkpzGQlSQ3FuZzPXFmGSLDxKTXfhPkoJRhJJ gwYyyiO7oPi8gLZxOlTalH/AKNV12tnfu6hyQkOUEGGxvSZm658STGsdAknE4jbBpkff KOf0+N1/CliGQ55stFWrPYZdEpkpEuGgkVGzcABI9cN5gaI2fU9X63xU6MGAnQB2g70G +gU60nK4wwau/8remrJFJLPXjHHwkVKdXWwAihOnR2BgMHSNJx3ZuJ549rhpNSleUNjp NcNw== 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=f1svkMvq9LBEb6D3mgoD1KYyrCbNxwAeUpEuA4/zYxA=; b=YJBQ19oYwr2lG34SS1iUq8TpDYJlzg02pSA441hhOQkYrP3F+KaXHAV8WYTEkxKiiz Yi+JCuhVCA6wHyBOY3++ZN/FT9eYcRdN3ZQPKOebRheeJv1FJLZyL+6EIMQ4fuSvi2I5 YHHQGGmTx0KtNHMAv7LePyNfq2wzRgECRF5I4cRdPUVXpRLnZ8ffOoW9PbKtoYl4vvJk RhyokA0Dgp9feY2HAUzmAbs7Px6xyGQ+kpgnZPIkZKXRizLbbZwtHOQT0kDbB2Mq/NL3 KhBnOqPza7+QUOv+SWlxmkZhSi/NOiWi3BA6p5fIdmPg7nk9d7FnPFtkL2rTHGkHf0Bd 3NmA== X-Gm-Message-State: AOAM532lW/LUQez8tbxtOkuGoeOI4EokcscsQhhdhcn2BdVwk3dosR6k DQUlEJ2KcgtQnogibQykID2LuQ== X-Google-Smtp-Source: ABdhPJw3EyuQSealbOoH4j+/dU6LapsBJDU5ylPO8as55bDQ5kIa0rASlrtKJGbOtJeb/z3z9OF8Tg== X-Received: by 2002:a05:6e02:1a25:: with SMTP id g5mr16116135ile.2.1612235428127; Mon, 01 Feb 2021 19:10:28 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:c05c:3bba:187c:cddb]) by smtp.gmail.com with ESMTPSA id q5sm9099307ioi.43.2021.02.01.19.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 19:10:27 -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 V3 2/3] block: add a statistic table for io latency Date: Tue, 2 Feb 2021 04:10:08 +0100 Message-Id: <20210202031009.11584-3-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210202031009.11584-1-guoqing.jiang@cloud.ionos.com> References: <20210202031009.11584-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 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 Tue Feb 2 03:10:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12060505 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 DB75EC433E6 for ; Tue, 2 Feb 2021 03:11:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB27064EAA for ; Tue, 2 Feb 2021 03:11:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230131AbhBBDLT (ORCPT ); Mon, 1 Feb 2021 22:11:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230073AbhBBDLS (ORCPT ); Mon, 1 Feb 2021 22:11:18 -0500 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF80AC0613ED for ; Mon, 1 Feb 2021 19:10:32 -0800 (PST) Received: by mail-il1-x129.google.com with SMTP id m20so10229053ilj.13 for ; Mon, 01 Feb 2021 19:10:32 -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=Fb8F92S38+WcPP1MG8vZXkUKxqhKNM+lh5T4r/uwaS4=; b=D5HzbILYIm8QqyHkTqc9ZH/3tVmeYBVkJLBH5RaVXLzmCQFhfoGEDT/3jGBA/HLJsx tbRnwKuAZ/mabBhsX9+yeb3GH1C9Fm95Ik1x5HkgSEqAJkNGETVlYZFX95tpJtdtzFqR VYOWsTkjq558Qh4YHkbj2h64cDHORI3d1vaFSLxPDBL/tnZJFSyEj3SmHIrv8ptzMlQM nAh1Ogr1H1wdN3nFg+zZAmrm//Ic621lmQ8DaFLY9pmqOfc23ubuSHYofJiK5Ju07jf2 IMEGrq/Fy0R6ZA9SG4XxvQZaI2PypIZ0MrH+c6uk/CN4UagSNHMcnxlGWlOqvQD3qLEd 5tHw== 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=Fb8F92S38+WcPP1MG8vZXkUKxqhKNM+lh5T4r/uwaS4=; b=S5UUhDwCt5iJmBB/NmzZNcElkjW6qjUzaTafUJbvPPOFWc4Bi/7C2/umf0xoTA3tn/ kwIgkQeXvopdRGULADWljaN1dr6IFeW4O+nZJX9ROalqSshY2Nr3PgEkn/1I0qYXPBrn tRvOOyLd7+KGToOi9DYvKe8Pr92/UI2lSVg8B66RVIBNo+yhjvswTHiKGNcMA9aL+mZV Kra2xbh9iSdpMO8ECJsE0hgXE81giCTd+0SUPbXPGrvXj8HQJ0L7FgKKNkRI0yLsUJSY 96THDbM00nyqo+HuHky/QaH6OdKDbU3j53rEvexLgnzeOgETcNAOb915iCYYGpT9IWul K8UQ== X-Gm-Message-State: AOAM530CA4ou7WCLPwJlATS7dpbLLpw6/ZFFcDKKLJ7oJkuNPIxqvFdz TqQkupEXuX3oFuhv+nbeGecRTQ== X-Google-Smtp-Source: ABdhPJz6ZrQzFt2RMat2PUVvurvzQVIHMVG7bZyl6Kc8IbIiyhVNXUo0qsKji4Bup/PFebnFmeFMUA== X-Received: by 2002:a92:2c08:: with SMTP id t8mr15203446ile.59.1612235431015; Mon, 01 Feb 2021 19:10:31 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:c05c:3bba:187c:cddb]) by smtp.gmail.com with ESMTPSA id q5sm9099307ioi.43.2021.02.01.19.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 19:10:30 -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 V3 3/3] block: add a statistic table for io sector Date: Tue, 2 Feb 2021 04:10:09 +0100 Message-Id: <20210202031009.11584-4-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210202031009.11584-1-guoqing.jiang@cloud.ionos.com> References: <20210202031009.11584-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 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]; };