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]; };