All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vivek Goyal <vgoyal@redhat.com>
To: linux-kernel@vger.kernel.org, jaxboe@fusionio.com, axboe@kernel.dk
Cc: dpshah@google.com, vgoyal@redhat.com
Subject: [PATCH 02/13] blk-cgroup: move some fields of unaccounted_time file under right config option
Date: Thu, 19 May 2011 15:38:20 -0400	[thread overview]
Message-ID: <1305833911-7717-3-git-send-email-vgoyal@redhat.com> (raw)
In-Reply-To: <1305833911-7717-1-git-send-email-vgoyal@redhat.com>

cgroup unaccounted_time file is created only if CONFIG_DEBUG_BLK_CGROUP=y.
there are some fields which are out side this config option. Fix that.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 block/blk-cgroup.c |    2 ++
 block/blk-cgroup.h |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 471fdcc..b0592bc 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -385,7 +385,9 @@ void blkiocg_update_timeslice_used(struct blkio_group *blkg, unsigned long time,
 
 	spin_lock_irqsave(&blkg->stats_lock, flags);
 	blkg->stats.time += time;
+#ifdef CONFIG_DEBUG_BLK_CGROUP
 	blkg->stats.unaccounted_time += unaccounted_time;
+#endif
 	spin_unlock_irqrestore(&blkg->stats_lock, flags);
 }
 EXPORT_SYMBOL_GPL(blkiocg_update_timeslice_used);
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index c774930..63f1ef4 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -49,9 +49,9 @@ enum stat_type {
 	/* All the single valued stats go below this */
 	BLKIO_STAT_TIME,
 	BLKIO_STAT_SECTORS,
+#ifdef CONFIG_DEBUG_BLK_CGROUP
 	/* Time not charged to this cgroup */
 	BLKIO_STAT_UNACCOUNTED_TIME,
-#ifdef CONFIG_DEBUG_BLK_CGROUP
 	BLKIO_STAT_AVG_QUEUE_SIZE,
 	BLKIO_STAT_IDLE_TIME,
 	BLKIO_STAT_EMPTY_TIME,
@@ -117,10 +117,11 @@ struct blkio_group_stats {
 	/* total disk time and nr sectors dispatched by this group */
 	uint64_t time;
 	uint64_t sectors;
-	/* Time not charged to this cgroup */
-	uint64_t unaccounted_time;
 	uint64_t stat_arr[BLKIO_STAT_QUEUED + 1][BLKIO_STAT_TOTAL];
 #ifdef CONFIG_DEBUG_BLK_CGROUP
+	/* Time not charged to this cgroup */
+	uint64_t unaccounted_time;
+
 	/* Sum of number of IOs queued across all samples */
 	uint64_t avg_queue_size_sum;
 	/* Count of samples taken for average */
-- 
1.7.4.4


  parent reply	other threads:[~2011-05-19 19:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-19 19:38 [PATCH 00/13] blk-throttle: lockless bio processing for no throttle rule group [V2] Vivek Goyal
2011-05-19 19:38 ` [PATCH 01/13] blk-throttle: Do the new group initialization with the help of a function Vivek Goyal
2011-05-19 19:38 ` Vivek Goyal [this message]
2011-05-19 19:38 ` [PATCH 03/13] cfq-iosched: Get rid of redundant function parameter "create" Vivek Goyal
2011-05-19 19:38 ` [PATCH 04/13] cfq-iosched: Fix a possible race with cfq cgroup removal code Vivek Goyal
2011-05-19 19:38 ` [PATCH 05/13] blk-cgroup: Allow sleeping while dynamically allocating a group Vivek Goyal
2011-05-19 19:38 ` [PATCH 06/13] blk-throttle: Dynamically allocate root group Vivek Goyal
2011-05-19 19:38 ` [PATCH 07/13] blk-throttle: Introduce a helper function to fill in device details Vivek Goyal
2011-05-19 19:38 ` [PATCH 08/13] blk-throttle: Use helper function to add root throtl group to lists Vivek Goyal
2011-05-19 19:38 ` [PATCH 09/13] blk-throttle: Free up a group only after one rcu grace period Vivek Goyal
2011-05-19 19:38 ` [PATCH 10/13] blk-throttle: Make dispatch stats per cpu Vivek Goyal
2011-05-19 19:38 ` [PATCH 11/13] blk-cgroup: Make 64bit per cpu stats safe on 32bit arch Vivek Goyal
2011-05-19 19:38 ` [PATCH 12/13] blk-cgroup: Make cgroup stat reset path blkg->lock free for dispatch stats Vivek Goyal
2011-05-19 19:38 ` [PATCH 13/13] blk-throttle: Make no throttling rule group processing lockless Vivek Goyal
2011-05-19 19:58 ` [PATCH 00/13] blk-throttle: lockless bio processing for no throttle rule group [V2] 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=1305833911-7717-3-git-send-email-vgoyal@redhat.com \
    --to=vgoyal@redhat.com \
    --cc=axboe@kernel.dk \
    --cc=dpshah@google.com \
    --cc=jaxboe@fusionio.com \
    --cc=linux-kernel@vger.kernel.org \
    /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.