From patchwork Wed Jun 14 19:05:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9787261 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 DFFCA60325 for ; Wed, 14 Jun 2017 19:05:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3A9624B44 for ; Wed, 14 Jun 2017 19:05:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C84D12625B; Wed, 14 Jun 2017 19:05:46 +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 6B5CE24B44 for ; Wed, 14 Jun 2017 19:05:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751902AbdFNTFn (ORCPT ); Wed, 14 Jun 2017 15:05:43 -0400 Received: from mail-io0-f170.google.com ([209.85.223.170]:36347 "EHLO mail-io0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751732AbdFNTFl (ORCPT ); Wed, 14 Jun 2017 15:05:41 -0400 Received: by mail-io0-f170.google.com with SMTP id y77so6267018ioe.3 for ; Wed, 14 Jun 2017 12:05:40 -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=kKBRdq+g7N1CjPnhaTUbo9D4XVvR/+yxtcLTDV/k1Y3ije9xmqtVPGvljbBNHm7tdi cd8+xI0hNEYNOhO8wKQuvWqQ4kqW9phwJeXySWtZyH/yQ+JQzgZqDULf75BYwna28ADy lBLWYaiBMYW+2QZRMSKZ1qjrIxpznETGe2oIyd254Dp6JuQ7ODO3VCDaYoIcjIIhnX4T 9C+SRNt2Dcphre8Jyr5ps4H1FMI11z6Nl35nG6MjURNNIO+NPXzbNmLDcHGMsIJeCARe O4xlgxu4Hofe7qYvCGj5fqvJOZYoXw/uP+MP0fkLRXdq/YRyAiIUQo7+RCS5olI9DjZl aLXw== 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=RI86OatTrJvlUJ4fG1CXvlW+A97pnqCFT16T6aTbLro+0rnSsPMu/D36GqoXn45WEe r3lsnG4btKsqfr5pIVBaja9yD08swGw4dBKNKDXKiBnXNGnJPPXrixTVOiNmSXUGEe0L yvbfyCB4dFkdvnVTDsjSo2qNhNBYYBEYwWlFjrnH7p3yaHwndFcesnub31Zta5So3GYz xtIB3VTjBC95GD3KaK/XPxJBIxCZeSPbzMfivJ5SkPUHJ+BVzH+vNn2vjpLMIanifEf0 fIpf8EigFo3VybyyUzNUYfeAhRiChzEuIEokxtIuAkf9uY7WnCbpQfW36aSGe1te68FW oaYw== X-Gm-Message-State: AKS2vOx+GmG6g9hwL8sk56YvvACSDbMQMYeX9y4+KmjlebzZqQIhYEd3 kVRXq9PGmTqkq9fjpyZ/2w== X-Received: by 10.107.53.24 with SMTP id c24mr1561973ioa.75.1497467140164; Wed, 14 Jun 2017 12:05:40 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id h67sm380361itb.19.2017.06.14.12.05.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jun 2017 12:05:39 -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/11] blk-mq: expose stream write stats through debugfs Date: Wed, 14 Jun 2017 13:05:25 -0600 Message-Id: <1497467134-6323-3-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497467134-6323-1-git-send-email-axboe@kernel.dk> References: <1497467134-6323-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. 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 */