From patchwork Wed Jun 14 04:01:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9785281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E4B96038E for ; Wed, 14 Jun 2017 04:02:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87ADC283BD for ; Wed, 14 Jun 2017 04:02:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C4DE28589; Wed, 14 Jun 2017 04:02:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CDF52844E for ; Wed, 14 Jun 2017 04:02:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750714AbdFNECL (ORCPT ); Wed, 14 Jun 2017 00:02:11 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:35244 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750732AbdFNECH (ORCPT ); Wed, 14 Jun 2017 00:02:07 -0400 Received: by mail-pf0-f181.google.com with SMTP id l89so77520426pfi.2 for ; Tue, 13 Jun 2017 21:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fDdVfpHaoR4UiV+pnCfGGJQzDkySHlDVKHFz2nIeO1c=; b=CxM6gsQi3A3MyMfOWxpgdJiNfPDMX8K/ZEFA6HFecHpaMdoOjp++3zmyKrnCdThABS pKkNqjKUu6vuGu5kTyVl1VgNRshANWWbaXhKIaaGYAu0EzTVgqWocuKMImi19eCanrwF qdoJzHthjiwq7DZt4NngJUcYGJyrudrYBH3sgL//7HMfhGpy5kRxCkCqJByCpCfNIOBq kuet3rANd30dJukAN7v7jtj/LkqHvJyxovk+PQmKpPlAuWQWd+l1AJKKmeTuvrqxpmOh F/BRwPXF/pWO+LNY0PpIRGHtfHu2crFr0qzP/FNQCd9yKqOkGBlrZpViAG0WLx1JtnBy OjTA== 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=fDdVfpHaoR4UiV+pnCfGGJQzDkySHlDVKHFz2nIeO1c=; b=XxtXfOdquNrQ786XZwcoGmEffFo2n6Du/BEboAlhKuYYRTa4bMXUIlxB+oGx+yO+xG oAA+5bKNqTfCgzebB+rK+M3/YSLCOwj6liqw1lmuBRdZKVMnFFW+/jeGyecjtomao0xs mT4HyCaXFjX7w6Sy0Eh0BOqq/vgRlrvqrSskIVLZuqRMOgAsWImJH+sRCml6mcoI1sdV 0ndlOaBrWZYRplAbQp1slCVX/kf+utBL9A0Otx6gc9lAvCy5m6LZ3yJPK6q7W87E07u9 t7limVzC3I9c+Y+OUOUMxuH2ms71WZVKX2/QwCuzzx9pFYYuNG1TsSRYavSH5Eo6Oh7f MmxA== X-Gm-Message-State: AKS2vOyKoIH++ihtGFhE7cu4RtcvwbPKwu41Yua0vmcIClYgkGaYwdM2 pknIMGD6RkOne8BKbmmqaQ== X-Received: by 10.84.236.66 with SMTP id h2mr2828113pln.233.1497412926912; Tue, 13 Jun 2017 21:02:06 -0700 (PDT) Received: from localhost.localdomain (66.29.164.166.static.utbb.net. [66.29.164.166]) by smtp.gmail.com with ESMTPSA id f8sm30914083pfc.14.2017.06.13.21.02.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Jun 2017 21:02:06 -0700 (PDT) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: adilger@dilger.ca, Jens Axboe Subject: [PATCH 02/10] blk-mq: expose stream write stats through debugfs Date: Tue, 13 Jun 2017 22:01:51 -0600 Message-Id: <1497412919-19400-3-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497412919-19400-1-git-send-email-axboe@kernel.dk> References: <1497412919-19400-1-git-send-email-axboe@kernel.dk> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Useful to verify that things are working the way they should. Reading the file will return number of kb written to each stream. Writing the file will reset the statistics. No care is taken to ensure that we don't race on updates. Signed-off-by: Jens Axboe Reviewed-by: Andreas Dilger --- block/blk-core.c | 5 +++++ block/blk-mq-debugfs.c | 24 ++++++++++++++++++++++++ include/linux/blkdev.h | 3 +++ 3 files changed, 32 insertions(+) diff --git a/block/blk-core.c b/block/blk-core.c index a7421b772d0e..81051e24b5dd 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2057,6 +2057,11 @@ blk_qc_t generic_make_request(struct bio *bio) do { struct request_queue *q = bdev_get_queue(bio->bi_bdev); + if (bio_stream(bio) < BLK_MAX_STREAM) { + q->stream_writes[bio_stream(bio)] += + bio->bi_iter.bi_size >> 9; + } + if (likely(blk_queue_enter(q, false) == 0)) { struct bio_list lower, same; diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 803aed4d7221..0a37c848961d 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -133,6 +133,29 @@ static void print_stat(struct seq_file *m, struct blk_rq_stat *stat) } } +static int queue_streams_show(void *data, struct seq_file *m) +{ + struct request_queue *q = data; + int i; + + for (i = 0; i < BLK_MAX_STREAM; i++) + seq_printf(m, "stream%d: %llu\n", i, q->stream_writes[i]); + + return 0; +} + +static ssize_t queue_streams_store(void *data, const char __user *buf, + size_t count, loff_t *ppos) +{ + struct request_queue *q = data; + int i; + + for (i = 0; i < BLK_MAX_STREAM; i++) + q->stream_writes[i] = 0; + + return count; +} + static int queue_poll_stat_show(void *data, struct seq_file *m) { struct request_queue *q = data; @@ -656,6 +679,7 @@ const struct file_operations blk_mq_debugfs_fops = { static const struct blk_mq_debugfs_attr blk_mq_debugfs_queue_attrs[] = { {"poll_stat", 0400, queue_poll_stat_show}, {"state", 0600, queue_state_show, queue_state_write}, + {"streams", 0600, queue_streams_show, queue_streams_store}, {}, }; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ab92c4ea138b..88719c6f3edf 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -586,6 +586,9 @@ struct request_queue { size_t cmd_size; void *rq_alloc_data; + +#define BLK_MAX_STREAM 5 + u64 stream_writes[BLK_MAX_STREAM]; }; #define QUEUE_FLAG_QUEUED 1 /* uses generic tag queueing */