From patchwork Mon Feb 1 01:27:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12057873 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 1F5BAC433DB for ; Mon, 1 Feb 2021 01:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D742064E11 for ; Mon, 1 Feb 2021 01:28:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229840AbhBAB22 (ORCPT ); Sun, 31 Jan 2021 20:28:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229656AbhBAB2V (ORCPT ); Sun, 31 Jan 2021 20:28:21 -0500 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 729ADC061574 for ; Sun, 31 Jan 2021 17:27:41 -0800 (PST) Received: by mail-il1-x132.google.com with SMTP id p8so14118392ilg.3 for ; Sun, 31 Jan 2021 17:27:41 -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=gPA07TApmYgMe/+ATzhrdATR+t0VSsYJgvpytsoCLm4=; b=UWaeGcFSD6KuiJsogqTTKnzj3Mny08ILREV9xkOYnAu2nU4QP9ycwRKv9rPbxrVrbw pddrhBAhIG8QMLqrRCKuFzYHb1ch6i+Sp3QklKwjcONlV9FCsvyt7tUYinonWbSFndto pJE550yq+iz3eUxOgkcJtRskEoiZ9y6SvYyc3p2A14DTMvPAvXZP3uwef20varjltFIG z8ovYftP38zBnUiqZs+qHjSmkobZmrezCC8EMOXZs6BXYtDsNMO6abBzy3OJ8OchMnjM 9NZhSkqV2TKyssmA5dfwtwO+Lvxz+kJ3tqnDu3HpM82J+JvMDSXslTNE1q9r8537lQmk 2oGQ== 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=gPA07TApmYgMe/+ATzhrdATR+t0VSsYJgvpytsoCLm4=; b=ZI6PD4BZRLMesGJ/CvZx0Ba/vn+Y4V85jIxSo+ZNoyuK0MFalqplMxYArWyY+MMaxh Pd9OvJy/s2Y1/F49hPOM67NKIvF7vj0LY78RmFCwJ9dhEx7uHigfBMnoVMs5g86iNjWq RQM3i2wXK2+uT7xvqP9D7d8xTVLN0cbPjR0CDrpbRkxIIrmA0ajqbhvYYimLMB6nWFN+ V+ZRtfly6iuo/c4aKzz8D49ZjzWt1qSRIvAdTsXxvZrV67o/e+t5odvTMpDtT+PWFslt 5xOZpgnFpk8ALh4nldAimJELVIsJCir+HRL9WTBjFRhw4Zi0ivBUTtKa+il9YQBVr73s +cqA== X-Gm-Message-State: AOAM5332Q6dV+xcB5OJTBJ/G3z2x/FhLhm4A8QvHtPhrJK5u6bsMTEI3 +uBSjUU0aksBgefpPznVj7/nvvaewd0grjtK X-Google-Smtp-Source: ABdhPJy1EqmrlDVQ2rJZUMIezRZsQXXmf6prYcRd6oWf20cXge5yP3QPjUvxb/aShSmCH/AvuxnqzQ== X-Received: by 2002:a05:6e02:1c05:: with SMTP id l5mr11333526ilh.6.1612142859621; Sun, 31 Jan 2021 17:27:39 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:994d:fb60:3536:26f]) by smtp.gmail.com with ESMTPSA id c19sm8539627ile.17.2021.01.31.17.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 17:27:39 -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, hch@infradead.org, Guoqing Jiang Subject: [PATCH V2 1/4] block: add a statistic table for io latency Date: Mon, 1 Feb 2021 02:27:24 +0100 Message-Id: <20210201012727.28305-2-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210201012727.28305-1-guoqing.jiang@cloud.ionos.com> References: <20210201012727.28305-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 | 19 ++++++++++++++ block/genhd.c | 37 +++++++++++++++++++++++++++ include/linux/part_stat.h | 5 ++++ 4 files changed, 69 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block index e34cdeeeb9d4..4371a0f2cb5e 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..92933d39ded2 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1264,6 +1264,22 @@ static void update_io_ticks(struct block_device *part, unsigned long now, } } +static void blk_additional_latency(struct block_device *part, const int sgrp, + unsigned long duration) +{ + unsigned int idx; + + 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 +1304,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, + 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 +1372,7 @@ 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, 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 Mon Feb 1 01:27:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12057875 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 3AEBDC433E6 for ; Mon, 1 Feb 2021 01:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0A2B64E28 for ; Mon, 1 Feb 2021 01:28:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229656AbhBAB2c (ORCPT ); Sun, 31 Jan 2021 20:28:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229769AbhBAB2Y (ORCPT ); Sun, 31 Jan 2021 20:28:24 -0500 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03B0AC06174A for ; Sun, 31 Jan 2021 17:27:44 -0800 (PST) Received: by mail-il1-x131.google.com with SMTP id q9so14106560ilo.1 for ; Sun, 31 Jan 2021 17:27:43 -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=2sb2YhNTJx+ap0nBtkbDq0Po6LTtwAIH2+iATCOudf0=; b=cxNZ8wqO3em+KwoFREwI0HxVnxlMltKwOfYkrHNl0L7NyMoPXtDt8jEKhX1Kh+OqN3 PQU/OyWMrYfbBj7QxjpybXosZgpQHck3zrFg7nD8bWU74i67Mt31zaXlbAy0bQQBi4JF YVOFkrJwIdzNT2U1A0CQYaFPrUN4k0MndyaiXZcPHqvCIkAN8NOQH+drFCsBUHr5nsF+ JSeQQhUeULBr3atYefWoBM2mL/1CF94JI5zaDMIa3vBjHZ0cNhKh/G1/YmlwRU1/raWO c606fPv3Y/rMoJXvMnMl0+f36C+F0zKuBYpt1297QSr3COzErZtHQA8X+rIoGIPo1yWd BPZg== 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=2sb2YhNTJx+ap0nBtkbDq0Po6LTtwAIH2+iATCOudf0=; b=i5gEvkzmxFyi6JRaTXMIOA67l13AIIT0/WfhdRfZRPyyrX6NeXLBbrWlDvHG2z4s/6 Q1CWBF3wUgP9a1IgxKF6E6x32apQs/biOPyBMp71J5LVO2qqJnVviXtaGeiHVr2QA/A7 I9K8FT8yx39LNisNnpSCyawAyvnbr2vp5q4tSt8S9ksXtTFHxEOINv1BgTZqhLTISSBf wyrH4k2QBdH9K1M7wx9p+mlhFTDxOMkEYUW/z1Nwg2i4U2aJ/hvh3mpSbZBIkYL7QyJ6 cmbMfwImGz88fc4ywjIDsu+fhRlhdIJdlzT1hbRphnyNQhoCUNxOkKfGj9m3B5FD5/n7 c6Yw== X-Gm-Message-State: AOAM533KNvML8ALEl2G1U0Hu3R91mjGNgbYn0ueaFstizbOJf0sTaaEd jq2NVRggxdF97Otwd803xuL1qA== X-Google-Smtp-Source: ABdhPJz99FQSyzndb0yebgVu8OusM5j7LZWOVjEpf137AgQPxLCX2HJHYiq6ZGXIv/ii0uQbixERnA== X-Received: by 2002:a05:6e02:1bad:: with SMTP id n13mr10320060ili.260.1612142862588; Sun, 31 Jan 2021 17:27:42 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:994d:fb60:3536:26f]) by smtp.gmail.com with ESMTPSA id c19sm8539627ile.17.2021.01.31.17.27.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 17:27:42 -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, hch@infradead.org, Guoqing Jiang Subject: [PATCH V2 2/4] block: add a statistic table for io sector Date: Mon, 1 Feb 2021 02:27:25 +0100 Message-Id: <20210201012727.28305-3-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210201012727.28305-1-guoqing.jiang@cloud.ionos.com> References: <20210201012727.28305-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 | 16 ++++++++++++ block/genhd.c | 37 +++++++++++++++++++++++++++ include/linux/part_stat.h | 3 ++- 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block index 4371a0f2cb5e..0ffb63469772 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 92933d39ded2..bdd5fe6f92a0 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1280,12 +1280,27 @@ 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, + unsigned int sectors) +{ + unsigned int idx; + + 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, bytes >> SECTOR_SHIFT); part_stat_add(req->part, sectors[sgrp], bytes >> 9); part_stat_unlock(); } @@ -1338,6 +1353,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, 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]; }; From patchwork Mon Feb 1 01:27:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12057877 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 806ACC433DB for ; Mon, 1 Feb 2021 01:28:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 418A964E27 for ; Mon, 1 Feb 2021 01:28:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231153AbhBAB2h (ORCPT ); Sun, 31 Jan 2021 20:28:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229813AbhBAB21 (ORCPT ); Sun, 31 Jan 2021 20:28:27 -0500 Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 179BDC061756 for ; Sun, 31 Jan 2021 17:27:47 -0800 (PST) Received: by mail-io1-xd36.google.com with SMTP id 16so15715734ioz.5 for ; Sun, 31 Jan 2021 17:27:47 -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=DnmVvJKFQMKkEXF9PIlaj5H0fGnNsnzXgo6GctBUifw=; b=gmgD7h9FDJ6oCO+FTYJ3vEr8hosQNKd0zXLxPdsf8RysSJncuUkcC9OgHH4lg8zD1u SoSOZ2VsD0uFT/vlB0uTBJRKytozskom5e/4OjG/grxbrbGQfgJhHU682TscOV6NbRXT DOeeCsY/tOpb7PjobrcAsTIy6FKWHyOgFmLIJ8hpz3TqOPYNrAy3UsMhqeoES9Sab/ih 4BBWK+POGibYMWiSogwF+moX/mR8JBwBZD4J+MeWiTdScaWkWGkHe7Dc7IeGisLf8aD4 98s06/JCCwgnYn2FVcKNtBp7+C/Xlpp6v/Lagfu3TYyMnRz7MKqPcueki1JvNNRzFnCL aI0Q== 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=DnmVvJKFQMKkEXF9PIlaj5H0fGnNsnzXgo6GctBUifw=; b=RYnc4cRnJ5TQX5yG+9Tuj4SO2//MfGq9JZcQLNadLt82Sxjia+Ttp+n2RQ68S1kx4L 6FW0A7SrdDsC/m6YbQt9q7wAAKBq4Os+unlmQn/QVS1lt20RjMRsvt0fv+bOwVcN6dYw qaSTB0eNNpso1D2htW9h3UwdOEhBED2XYQtpwXB4pbZB/vboJWNdfVRUGTFBiyMniz8o uiASlb6dOz9yhm5FrlM1v8my06a9GL7/ToYamUvzrXTSwjGmkjD/1SfMosVhiGdxlxxB nMOLVIiF4Kcjw6tiJV7Mp8vC07ugp3jdsSpB7dmMmpSdks6CoiIWm6FNodDWIOGqKChU sBJw== X-Gm-Message-State: AOAM530GPvNM9Ovg+ESHcQcznm/G7uNRjVSSUo7ThcOqxnu5sjRXS2yo D8mPgYT/A6Efe7zNUza9cZyxYw== X-Google-Smtp-Source: ABdhPJzBsEM3giZuxHNNalaere7k4ITzurzjahMXl5wClYKIX1DlfNq4yV6IJ0HUyvw7DZMNo7LAEg== X-Received: by 2002:a02:3541:: with SMTP id y1mr12987501jae.66.1612142865671; Sun, 31 Jan 2021 17:27:45 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:994d:fb60:3536:26f]) by smtp.gmail.com with ESMTPSA id c19sm8539627ile.17.2021.01.31.17.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 17:27:45 -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, hch@infradead.org, Guoqing Jiang Subject: [PATCH V2 3/4] block: add io_extra_stats node Date: Mon, 1 Feb 2021 02:27:26 +0100 Message-Id: <20210201012727.28305-4-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210201012727.28305-1-guoqing.jiang@cloud.ionos.com> References: <20210201012727.28305-1-guoqing.jiang@cloud.ionos.com> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org If user doesn't care about the size and latency of io, and they could suffer from the additional overhead. So introduce a specific sysfs node to avoid such mistake. 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 0ffb63469772..e1611c62a3e1 100644 --- a/Documentation/ABI/testing/sysfs-block +++ b/Documentation/ABI/testing/sysfs-block @@ -333,3 +333,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 Mon Feb 1 01:27:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoqing Jiang X-Patchwork-Id: 12057879 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 678FFC433E0 for ; Mon, 1 Feb 2021 01:28:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 188E164E22 for ; Mon, 1 Feb 2021 01:28:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231139AbhBAB2m (ORCPT ); Sun, 31 Jan 2021 20:28:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231126AbhBAB2a (ORCPT ); Sun, 31 Jan 2021 20:28:30 -0500 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE9F1C0613D6 for ; Sun, 31 Jan 2021 17:27:49 -0800 (PST) Received: by mail-il1-x131.google.com with SMTP id e7so14087437ile.7 for ; Sun, 31 Jan 2021 17:27:49 -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=TEvXXAsJa+fbqAOogzDUhmQbgub7pRgv5YEZ6rqL9EQ=; b=TXEcvFxYy7au4/4Xe7uwC6ISy73FDyWQjVFOE1W8aU8HQ7epiwfNxhnKh3ICDbwJBg 9FEU0ijiVekZO3YL+5LicuhtzbwFcrbSSv9jgWVT4GSnPauhf6/6t2xcec03afziXdpg XbSe4Oj3jkZugts6wos+PbQe2PtPLvjwnY0yfwON7pEx4pnHIhc7k9K1RhZfNN2eupld KUNGpIMDrs6NpmUHHZ1jnUoJwZhUytgp1Lw1KhwGsVEaFATFeAswULYvNIAiz/jyglkC 5hntTBNuUUSHyNsVUaMje7979A2DQJAxdhv2UJZw2uCGkNv0JvqT5Q3S0CShqKcuUaWG sMAw== 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=TEvXXAsJa+fbqAOogzDUhmQbgub7pRgv5YEZ6rqL9EQ=; b=EQ4ojgWFHqwu6mrqzkfoNb1EywXTE7Jo2x/dRUcgAVcVxDwMywWUBdE8SfJD14nEHJ MfDwOTBgKLXb68V5q/D2uYFQxT6kslwcqPBnVaVckszjDMbiyMrQL5GncGHHqWjvPGpn XZf3YD4FR0qn30wkZKafhHVQeRw9/bVVIiW9+9IXKXrnkl2Lju2phiNBMAnui873+TLT iWrNDttIgnodK+UGqaeqmISo6nIxNd5+DPaXvH/aQWTYeURr+6FMH6NjBsl3py7N85dY RCalZIq+vu4DslRBD4LPWWLmjXaEouXtF+DvdjanQ2jBAPJ+DfsZwWqM2XHH1qwcpVG+ nKFQ== X-Gm-Message-State: AOAM53089di3HKg2KvXCTvQPgPOfOKTBxfti5qGZ3jygkhbt3cJYi261 l0IG+yOgjGCT2H0u8UJ69xxI/w== X-Google-Smtp-Source: ABdhPJxKp3iFDlUaC8m9MO7gIcwzh7Gjyb3KkTbugIJcCFOstiqIhC3yXObeqY71y1Y97kly+F52SQ== X-Received: by 2002:a05:6e02:e87:: with SMTP id t7mr11858960ilj.121.1612142868537; Sun, 31 Jan 2021 17:27:48 -0800 (PST) Received: from ls00508.pb.local ([2001:1438:4010:2540:994d:fb60:3536:26f]) by smtp.gmail.com with ESMTPSA id c19sm8539627ile.17.2021.01.31.17.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 17:27:47 -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, hch@infradead.org, Guoqing Jiang Subject: [PATCH V2 4/4] block: call blk_additional_{latency,sector} only when io_extra_stats is true Date: Mon, 1 Feb 2021 02:27:27 +0100 Message-Id: <20210201012727.28305-5-guoqing.jiang@cloud.ionos.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210201012727.28305-1-guoqing.jiang@cloud.ionos.com> References: <20210201012727.28305-1-guoqing.jiang@cloud.ionos.com> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Now add check before call blk_additional_{latency,sector}, which guarntee only those who really know about the attribute can account the additional data. Reviewed-by: Jack Wang Signed-off-by: Guoqing Jiang --- block/blk-core.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index bdd5fe6f92a0..a44684033382 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1265,10 +1265,14 @@ 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)) { @@ -1281,10 +1285,13 @@ static void blk_additional_latency(struct block_device *part, const int sgrp, } static void blk_additional_sector(struct block_device *part, const int sgrp, - unsigned int sectors) + struct request_queue *q, unsigned int sectors) { unsigned int idx; + if (!blk_queue_io_extra_stat(q)) + return; + if (sectors == 1) idx = 0; else @@ -1300,7 +1307,7 @@ static void blk_account_io_completion(struct request *req, unsigned int bytes) const int sgrp = op_stat_group(req_op(req)); part_stat_lock(); - blk_additional_sector(req->part, sgrp, bytes >> SECTOR_SHIFT); + blk_additional_sector(req->part, sgrp, req->q, bytes >> SECTOR_SHIFT); part_stat_add(req->part, sectors[sgrp], bytes >> 9); part_stat_unlock(); } @@ -1319,7 +1326,7 @@ 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, + 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); @@ -1353,7 +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, 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(); @@ -1388,7 +1395,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, jiffies_to_nsecs(duration)); + 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();