From patchwork Thu Jun 15 16:42:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9789261 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 C82B360384 for ; Thu, 15 Jun 2017 16:42:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB80C284F5 for ; Thu, 15 Jun 2017 16:42:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B045428542; Thu, 15 Jun 2017 16:42:19 +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=ham 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 26DDF286C5 for ; Thu, 15 Jun 2017 16:42:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751680AbdFOQmS (ORCPT ); Thu, 15 Jun 2017 12:42:18 -0400 Received: from mail-io0-f175.google.com ([209.85.223.175]:34014 "EHLO mail-io0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835AbdFOQmR (ORCPT ); Thu, 15 Jun 2017 12:42:17 -0400 Received: by mail-io0-f175.google.com with SMTP id i7so15437087ioe.1 for ; Thu, 15 Jun 2017 09:42:16 -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=oGR+UbMfogfFj4SDs8jHc/yfHmj0nOfl8InF9B4o1gM=; b=O2bORqHBjMgl3ZJz85o1YNdNXxANQSRrWErxYhtfzhOaZOt1/F1BAkjeonbAje6S5C ZQ+wG1k2+Q5POrCliybqOCzZPyHcmWoFvM3M8YQ6pJ2vHa8HQQgNMwEiPcfMLGGC4tv7 iFO3WuGkpocf59Wq6FPWqNZTLuiubLfINa6F4Ud/xEqHinGEWQpug/AsyEP0pz/hOZGe SYhdelMBauCwhw668unqHRi1MFOK3ZrSX6FqA42Gpk6/lgkagZs38U4Fy+2iu7YCxj6e YTSPGA85rKrfG9h4uFsy0m52p7pn9sEK3AeCNnnNibytLMn15neiInEjxwu4U2I03iV+ 5vwA== 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=oGR+UbMfogfFj4SDs8jHc/yfHmj0nOfl8InF9B4o1gM=; b=FS/w5Hp33wvXgGjyr5ks9QhA33SE/+6hERRFDpJGmYINI40eruiYkC2Mb+i9mZTaZs rtiX3HBaYxuTPa0CTb8jyrIajySbmEsdSupnv4aBnbQWKcADUQ7kZ4CxRV61cAeOqqqa ys9hD8xASmp63VBc3NzprFvUBFrR+lJ6IEr9dfIPQ2VTiLg3eeqpQG52PLu7ZDlAnh51 i0qNkUUJ/+b8zq1zK5B6s5kCFbTb38Xz9vTuNYTDlbib+Xh2wZVArWarXt/jRGkT10et 6WqPfE5ZB8KE9fGseQHHPwCqT7mnIeqdQryku7eto317L6gTTJNcsxs7JbBmWKoa49zJ Totg== X-Gm-Message-State: AKS2vOw/03jQOzNacayPz1ZQFSDxHtS7XcLB7A+3KN1v98XDzD+CQKVg PgXiZ1oPKhMM6kaD X-Received: by 10.107.19.131 with SMTP id 3mr6177148iot.232.1497544936133; Thu, 15 Jun 2017 09:42:16 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id 97sm313476iot.25.2017.06.15.09.42.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Jun 2017 09:42:15 -0700 (PDT) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: adilger@dilger.ca, hch@infradead.org, martin.petersen@oracle.com, Jens Axboe Subject: [PATCH 02/12] blk-mq: expose stream write stats through debugfs Date: Thu, 15 Jun 2017 10:42:00 -0600 Message-Id: <1497544930-19174-3-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497544930-19174-1-git-send-email-axboe@kernel.dk> References: <1497544930-19174-1-git-send-email-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@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. Drivers will write to q->stream_writes[] if they handle a stream. Reviewed-by: Andreas Dilger Signed-off-by: Jens Axboe --- block/blk-mq-debugfs.c | 24 ++++++++++++++++++++++++ include/linux/blkdev.h | 3 +++ 2 files changed, 27 insertions(+) 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 */