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