From patchwork Tue May 29 21:17:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10437149 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 BE092602BF for ; Tue, 29 May 2018 21:20:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0FE92893D for ; Tue, 29 May 2018 21:20:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF33A289B0; Tue, 29 May 2018 21:20:58 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, 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 9158428994 for ; Tue, 29 May 2018 21:20:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967134AbeE2VUd (ORCPT ); Tue, 29 May 2018 17:20:33 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:36778 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967103AbeE2VRc (ORCPT ); Tue, 29 May 2018 17:17:32 -0400 Received: by mail-qk0-f195.google.com with SMTP id a195-v6so10163945qkg.3 for ; Tue, 29 May 2018 14:17:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZEQhu3WT2vrLlb25BDJ81qDNzncILk6QIrMc35SIdhE=; b=R2GbRWyYGljhw+xZUkDdu2tAceCVGfM3u403a6pJoT2Hxo+wEJXn9afo9tERKc8RGU KjD40vAZNS0BmxGN6AYvA6U0puU76/m8dMIutyoV422lJIdGAAfRBQsKxpndmPaCXl42 tEGbY+Sy+jH3yrgLu8rTLEVXzAcoUgNML9y2Shwr1KItgi+3DBYgMC3HDshNmjk+FOPP fUFdT1L6ALa4CrlWbUHfzMm1y0T0WG2vvJnS5AVbnArxaTy7mjJJ8EB74cl8AZHJv/fK XvJMW8R3fNCG+LHDsqu9Rl3ktZZMsBzfc7D7+OlmwNPVxGy2M7UvOX9pcUbQsTOpS2MU r+jg== 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=ZEQhu3WT2vrLlb25BDJ81qDNzncILk6QIrMc35SIdhE=; b=aeclGZ92F2sOhOzofZspYD0DCq0o5gYpNUlg+wjV1Kq3nb8HQ4Z+VVDwHW4/I8lFU8 wpI7hg96BjZ0+RAL6WHvA24cyWA5m2JNMm96xeEPbfbot5G57LQ4OKMcu/JPV5Tg5/sn NCYfJxEtS/ZT46Pn7J38PC/4Rf6wBxoL5cY1fwbqog3Is3AdSXqF0xv7NAz5Npmsgppq opVd88iEDkc0trNMjbxLTnv+ywuh39fH5MuR7SzMJsZLWNlmkwEAoMFb6iDdmxUWAtWo mwIFWEJL1ynLWai4+7ZIMh39in8RLKldPG9w82jfs0tH7JZhwDZOoxWib0XcIIvw7tH3 IVvw== X-Gm-Message-State: APt69E3gGLZ7a2/FyYRegAW6c+9Bw2bWwt8i0Lesas7RNecsMPc1401r 3Fa/bTS4mNV74hZs4QQT/Qmz2xvrAZ4= X-Google-Smtp-Source: ADUXVKLMnDmPk/RWV1FW8yuYFHneMOc44iW8G2K7SDgynYfAML7OndSO/LoIPX21kGYZ2VBFGJ6K+g== X-Received: by 2002:a37:2545:: with SMTP id x66-v6mr85417qkg.190.1527628652161; Tue, 29 May 2018 14:17:32 -0700 (PDT) Received: from localhost (cpe-2606-A000-4381-1201-225-22FF-FEB3-E51A.dyn6.twc.com. [2606:a000:4381:1201:225:22ff:feb3:e51a]) by smtp.gmail.com with ESMTPSA id u192-v6sm23559749qka.55.2018.05.29.14.17.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 14:17:31 -0700 (PDT) From: Josef Bacik To: axboe@kernel.dk, kernel-team@fb.com, linux-block@vger.kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, tj@kernel.org, linux-fsdevel@vger.kernel.org Cc: Josef Bacik Subject: [PATCH 03/13] blk-cgroup: allow controllers to output their own stats Date: Tue, 29 May 2018 17:17:14 -0400 Message-Id: <20180529211724.4531-4-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180529211724.4531-1-josef@toxicpanda.com> References: <20180529211724.4531-1-josef@toxicpanda.com> 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 From: Josef Bacik blk-iolatency has a few stats that it would like to print out, and instead of adding a bunch of crap to the generic code just provide a helper so that controllers can add stuff to the stat line if they want to. Signed-off-by: Josef Bacik --- block/blk-cgroup.c | 52 +++++++++++++++++++++++++++++++++++++++++++--- include/linux/blk-cgroup.h | 3 +++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index eb85cb87c40f..9e767e4a852d 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -954,13 +954,28 @@ static int blkcg_print_stat(struct seq_file *sf, void *v) hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) { const char *dname; + char *buf; struct blkg_rwstat rwstat; u64 rbytes, wbytes, rios, wios; + size_t size = seq_get_buf(sf, &buf), count = 0, total = 0; + int i; dname = blkg_dev_name(blkg); if (!dname) continue; + /* + * Hooray string manipulation, count is the size written NOT + * INCLUDING THE \0, so size is now count+1 less than what we + * had before, but we want to start writing the next bit from + * the \0 so we only add count to buf. + */ + count = snprintf(buf, size, "%s ", dname); + if (count >= size) + continue; + buf += count; + size -= count + 1; + spin_lock_irq(blkg->q->queue_lock); rwstat = blkg_rwstat_recursive_sum(blkg, NULL, @@ -975,9 +990,40 @@ static int blkcg_print_stat(struct seq_file *sf, void *v) spin_unlock_irq(blkg->q->queue_lock); - if (rbytes || wbytes || rios || wios) - seq_printf(sf, "%s rbytes=%llu wbytes=%llu rios=%llu wios=%llu\n", - dname, rbytes, wbytes, rios, wios); + if (rbytes || wbytes || rios || wios) { + total += count; + count = snprintf(buf, size, + "rbytes=%llu wbytes=%llu rios=%llu wios=%llu", + rbytes, wbytes, rios, wios); + if (count >= size) + continue; + buf += count; + total += count; + size -= count + 1; + } + + mutex_lock(&blkcg_pol_mutex); + for (i = 0; i < BLKCG_MAX_POLS; i++) { + struct blkcg_policy *pol = blkcg_policy[i]; + + if (!blkg->pd[i] || !pol->pd_stat_fn) + continue; + + count = pol->pd_stat_fn(blkg->pd[i], buf, size); + if (count >= size) + continue; + buf += count; + total += count; + size -= count + 1; + } + mutex_unlock(&blkcg_pol_mutex); + if (total) { + count = snprintf(buf, size, "\n"); + if (count >= size) + continue; + total += count; + seq_commit(sf, total); + } } rcu_read_unlock(); diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h index 69aa71dc0c04..b41292726c0f 100644 --- a/include/linux/blk-cgroup.h +++ b/include/linux/blk-cgroup.h @@ -148,6 +148,8 @@ typedef void (blkcg_pol_online_pd_fn)(struct blkg_policy_data *pd); typedef void (blkcg_pol_offline_pd_fn)(struct blkg_policy_data *pd); typedef void (blkcg_pol_free_pd_fn)(struct blkg_policy_data *pd); typedef void (blkcg_pol_reset_pd_stats_fn)(struct blkg_policy_data *pd); +typedef size_t (blkcg_pol_stat_pd_fn)(struct blkg_policy_data *pd, char *buf, + size_t size); struct blkcg_policy { int plid; @@ -167,6 +169,7 @@ struct blkcg_policy { blkcg_pol_offline_pd_fn *pd_offline_fn; blkcg_pol_free_pd_fn *pd_free_fn; blkcg_pol_reset_pd_stats_fn *pd_reset_stats_fn; + blkcg_pol_stat_pd_fn *pd_stat_fn; }; extern struct blkcg blkcg_root;