All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tejun Heo <tj@kernel.org>
To: lizefan@huawei.com, axboe@kernel.dk, vgoyal@redhat.com
Cc: containers@lists.linux-foundation.org, cgroups@vger.kernel.org,
	linux-kernel@vger.kernel.org, ctalbott@google.com,
	rni@google.com, Tejun Heo <tj@kernel.org>
Subject: [PATCH 22/24] cfq-iosched: separate out cfqg_stats_reset() from cfq_pd_reset_stats()
Date: Fri, 28 Dec 2012 12:35:44 -0800	[thread overview]
Message-ID: <1356726946-26037-23-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1356726946-26037-1-git-send-email-tj@kernel.org>

Separate out cfqg_stats_reset() which takes struct cfqg_stats * from
cfq_pd_reset_stats() and move the latter to where other pd methods are
defined.  cfqg_stats_reset() will be used to implement hierarchical
stats.

Signed-off-by: Tejun Heo <tj@kernel.org>
---
 block/cfq-iosched.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index d43145cc..f8b34bb 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -688,11 +688,9 @@ static inline void cfqg_stats_update_completion(struct cfq_group *cfqg,
 				io_start_time - start_time);
 }
 
-static void cfq_pd_reset_stats(struct blkcg_gq *blkg)
+/* @stats = 0 */
+static void cfqg_stats_reset(struct cfqg_stats *stats)
 {
-	struct cfq_group *cfqg = blkg_to_cfqg(blkg);
-	struct cfqg_stats *stats = &cfqg->stats;
-
 	/* queued stats shouldn't be cleared */
 	blkg_rwstat_reset(&stats->service_bytes);
 	blkg_rwstat_reset(&stats->serviced);
@@ -1477,6 +1475,13 @@ static void cfq_pd_init(struct blkcg_gq *blkg)
 	cfqg->leaf_weight = blkg->blkcg->cfq_leaf_weight;
 }
 
+static void cfq_pd_reset_stats(struct blkcg_gq *blkg)
+{
+	struct cfq_group *cfqg = blkg_to_cfqg(blkg);
+
+	cfqg_stats_reset(&cfqg->stats);
+}
+
 /*
  * Search for the cfq group current task belongs to. request_queue lock must
  * be held.
-- 
1.8.0.2

  parent reply	other threads:[~2012-12-28 20:35 UTC|newest]

Thread overview: 130+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-28 20:35 [PATCHSET] block: implement blkcg hierarchy support in cfq, take#2 Tejun Heo
2012-12-28 20:35 ` Tejun Heo
2012-12-28 20:35 ` [PATCH 11/24] cfq-iosched: add leaf_weight Tejun Heo
     [not found]   ` <1356726946-26037-12-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-08 15:34     ` Vivek Goyal
2013-01-08 15:34       ` Vivek Goyal
     [not found]       ` <20130108153448.GB29635-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-01-08 17:24         ` Tejun Heo
2013-01-08 17:24         ` Tejun Heo
2013-01-08 17:24           ` Tejun Heo
2012-12-28 20:35 ` [PATCH 12/24] cfq-iosched: implement cfq_group->nr_active and ->children_weight Tejun Heo
     [not found]   ` <1356726946-26037-13-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-08 15:51     ` Vivek Goyal
2013-01-08 15:51       ` Vivek Goyal
2012-12-28 20:35 ` [PATCH 14/24] cfq-iosched: convert cfq_group_slice() to use cfqg->vfraction Tejun Heo
     [not found]   ` <1356726946-26037-15-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-08 16:42     ` Vivek Goyal
2013-01-08 16:42     ` Vivek Goyal
2013-01-08 16:42       ` Vivek Goyal
2012-12-28 20:35 ` [PATCH 15/24] cfq-iosched: enable full blkcg hierarchy support Tejun Heo
     [not found]   ` <1356726946-26037-16-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-07 16:34     ` [PATCH UPDATED " Tejun Heo
2013-01-07 16:34       ` Tejun Heo
     [not found]       ` <20130107163405.GE3926-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
2013-01-08 14:42         ` Vivek Goyal
2013-01-08 14:42           ` Vivek Goyal
     [not found]           ` <20130108144240.GA29635-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-01-08 17:19             ` Tejun Heo
2013-01-08 17:19               ` Tejun Heo
2012-12-28 20:35 ` [PATCH 16/24] blkcg: add blkg_policy_data->plid Tejun Heo
     [not found]   ` <1356726946-26037-17-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-08 16:51     ` Vivek Goyal
2013-01-08 16:51       ` Vivek Goyal
2013-01-08 16:51     ` Vivek Goyal
2012-12-28 20:35 ` [PATCH 19/24] blkcg: implement blkg_[rw]stat_recursive_sum() and blkg_[rw]stat_merge() Tejun Heo
     [not found]   ` <1356726946-26037-20-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-08 18:03     ` Vivek Goyal
2013-01-08 18:03       ` Vivek Goyal
     [not found] ` <1356726946-26037-1-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2012-12-28 20:35   ` [PATCH 01/24] cfq-iosched: Properly name all references to IO class Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 02/24] cfq-iosched: More renaming to better represent wl_class and wl_type Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 03/24] cfq-iosched: Rename "service_tree" to "st" at some places Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 04/24] cfq-iosched: Rename few functions related to selecting workload Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 05/24] cfq-iosched: Get rid of unnecessary local variable Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 06/24] cfq-iosched: Print sync-noidle information in blktrace messages Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 07/24] blkcg: fix minor bug in blkg_alloc() Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 08/24] blkcg: reorganize blkg_lookup_create() and friends Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 09/24] blkcg: cosmetic updates to blkg_create() Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 10/24] blkcg: make blkcg_gq's hierarchical Tejun Heo
2012-12-28 20:35     ` Tejun Heo
2012-12-28 20:35   ` [PATCH 11/24] cfq-iosched: add leaf_weight Tejun Heo
2012-12-28 20:35   ` [PATCH 12/24] cfq-iosched: implement cfq_group->nr_active and ->children_weight Tejun Heo
2012-12-28 20:35   ` [PATCH 13/24] cfq-iosched: implement hierarchy-ready cfq_group charge scaling Tejun Heo
2012-12-28 20:35     ` Tejun Heo
     [not found]     ` <1356726946-26037-14-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-08 16:16       ` Vivek Goyal
2013-01-08 16:16         ` Vivek Goyal
2012-12-28 20:35   ` [PATCH 14/24] cfq-iosched: convert cfq_group_slice() to use cfqg->vfraction Tejun Heo
2012-12-28 20:35   ` [PATCH 15/24] cfq-iosched: enable full blkcg hierarchy support Tejun Heo
2012-12-28 20:35   ` [PATCH 16/24] blkcg: add blkg_policy_data->plid Tejun Heo
2012-12-28 20:35   ` [PATCH 17/24] blkcg: implement blkcg_policy->on/offline_pd_fn() and blkcg_gq->online Tejun Heo
2012-12-28 20:35     ` Tejun Heo
     [not found]     ` <1356726946-26037-18-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-02 19:38       ` Vivek Goyal
2013-01-02 19:38         ` Vivek Goyal
     [not found]         ` <20130102193828.GE4306-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-01-02 20:37           ` Tejun Heo
2013-01-02 20:37             ` Tejun Heo
2013-01-02 20:37           ` Tejun Heo
2013-01-02 19:38       ` Vivek Goyal
2013-01-08 16:58       ` Vivek Goyal
2013-01-08 16:58         ` Vivek Goyal
2012-12-28 20:35   ` [PATCH 18/24] blkcg: s/blkg_rwstat_sum()/blkg_rwstat_total()/ Tejun Heo
2012-12-28 20:35     ` Tejun Heo
     [not found]     ` <1356726946-26037-19-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-08 16:59       ` Vivek Goyal
2013-01-08 16:59         ` Vivek Goyal
2013-01-08 16:59       ` Vivek Goyal
2012-12-28 20:35   ` [PATCH 19/24] blkcg: implement blkg_[rw]stat_recursive_sum() and blkg_[rw]stat_merge() Tejun Heo
2012-12-28 20:35   ` [PATCH 20/24] block: RCU free request_queue Tejun Heo
2012-12-28 20:35   ` [PATCH 21/24] blkcg: make blkcg_print_blkgs() grab q locks instead of blkcg lock Tejun Heo
2012-12-28 20:35     ` Tejun Heo
     [not found]     ` <1356726946-26037-22-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-02 19:27       ` Vivek Goyal
2013-01-02 19:27         ` Vivek Goyal
     [not found]         ` <20130102192700.GA9552-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-01-02 20:45           ` Tejun Heo
2013-01-02 20:45           ` Tejun Heo
2013-01-02 20:45             ` Tejun Heo
2013-01-02 19:27       ` Vivek Goyal
2013-01-08 18:08       ` Vivek Goyal
2013-01-08 18:08         ` Vivek Goyal
2013-01-08 18:08       ` Vivek Goyal
2012-12-28 20:35   ` [PATCH 22/24] cfq-iosched: separate out cfqg_stats_reset() from cfq_pd_reset_stats() Tejun Heo
2012-12-28 20:35   ` [PATCH 23/24] cfq-iosched: collect stats from dead cfqgs Tejun Heo
2012-12-28 20:35   ` [PATCH 24/24] cfq-iosched: add hierarchical cfq_group statistics Tejun Heo
2012-12-28 23:18   ` [PATCH 18.5/24] blkcg: export __blkg_prfill_rwstat() take#2 Tejun Heo
2012-12-28 23:18     ` Tejun Heo
2012-12-28 23:18   ` Tejun Heo
2013-01-02 18:20   ` [PATCHSET] block: implement blkcg hierarchy support in cfq, take#2 Vivek Goyal
2013-01-02 18:20     ` Vivek Goyal
     [not found]     ` <20130102182037.GC4306-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-01-07 16:34       ` Tejun Heo
2013-01-07 16:34         ` Tejun Heo
     [not found]         ` <20130107163437.GF3926-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
2013-01-08 18:28           ` Vivek Goyal
2013-01-08 18:28             ` Vivek Goyal
2013-01-07 16:34       ` Tejun Heo
2013-01-02 18:20   ` Vivek Goyal
2012-12-28 20:35 ` [PATCH 20/24] block: RCU free request_queue Tejun Heo
     [not found]   ` <1356726946-26037-21-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-02 18:48     ` Vivek Goyal
2013-01-02 18:48       ` Vivek Goyal
     [not found]       ` <20130102184814.GD4306-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-01-02 20:43         ` Tejun Heo
2013-01-02 20:43           ` Tejun Heo
2013-01-08 18:05     ` Vivek Goyal
2013-01-08 18:05     ` Vivek Goyal
2013-01-08 18:05       ` Vivek Goyal
2012-12-28 20:35 ` Tejun Heo [this message]
     [not found]   ` <1356726946-26037-23-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-08 18:09     ` [PATCH 22/24] cfq-iosched: separate out cfqg_stats_reset() from cfq_pd_reset_stats() Vivek Goyal
2013-01-08 18:09       ` Vivek Goyal
2012-12-28 20:35 ` [PATCH 23/24] cfq-iosched: collect stats from dead cfqgs Tejun Heo
     [not found]   ` <1356726946-26037-24-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-02 16:24     ` Vivek Goyal
2013-01-02 16:24     ` Vivek Goyal
2013-01-02 16:24       ` Vivek Goyal
     [not found]       ` <20130102162415.GA4306-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-01-02 16:30         ` Tejun Heo
2013-01-02 16:30         ` Tejun Heo
2013-01-02 16:30           ` Tejun Heo
     [not found]           ` <20130102163010.GC11220-9pTldWuhBndy/B6EtB590w@public.gmane.org>
2013-01-02 16:44             ` Vivek Goyal
2013-01-02 16:44               ` Vivek Goyal
     [not found]               ` <20130102164415.GB4306-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-01-02 16:52                 ` Tejun Heo
2013-01-02 16:52                   ` Tejun Heo
2013-01-02 16:52                 ` Tejun Heo
2013-01-08 18:12     ` Vivek Goyal
2013-01-08 18:12       ` Vivek Goyal
2013-01-08 18:12     ` Vivek Goyal
2012-12-28 20:35 ` [PATCH 24/24] cfq-iosched: add hierarchical cfq_group statistics Tejun Heo
     [not found]   ` <1356726946-26037-25-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-01-08 18:27     ` Vivek Goyal
2013-01-08 18:27       ` Vivek Goyal
2013-01-08 18:27     ` Vivek Goyal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1356726946-26037-23-git-send-email-tj@kernel.org \
    --to=tj@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=cgroups@vger.kernel.org \
    --cc=containers@lists.linux-foundation.org \
    --cc=ctalbott@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=rni@google.com \
    --cc=vgoyal@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.