From patchwork Wed Jul 8 02:16:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gui Jianfeng X-Patchwork-Id: 34533 Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n682HhW4029436 for ; Wed, 8 Jul 2009 02:17:44 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 9DC9C619D4F; Tue, 7 Jul 2009 22:17:42 -0400 (EDT) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n682HaAO018155 for ; Tue, 7 Jul 2009 22:17:36 -0400 Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n682HVbL008658; Tue, 7 Jul 2009 22:17:31 -0400 Received: from song.cn.fujitsu.com (cn.fujitsu.com [222.73.24.84] (may be forged)) by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id n682HHhs001376; Tue, 7 Jul 2009 22:17:18 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 5431417012D; Wed, 8 Jul 2009 10:28:32 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n682jO10021789; Wed, 8 Jul 2009 10:45:25 +0800 Received: from [127.0.0.1] (unknown [10.167.141.226]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id CF05FD4032; Wed, 8 Jul 2009 10:16:45 +0800 (CST) Message-ID: <4A54018C.5090804@cn.fujitsu.com> Date: Wed, 08 Jul 2009 10:16:44 +0800 From: Gui Jianfeng User-Agent: Thunderbird 2.0.0.5 (Windows/20070716) MIME-Version: 1.0 To: Vivek Goyal References: <1246564917-19603-1-git-send-email-vgoyal@redhat.com> <1246564917-19603-12-git-send-email-vgoyal@redhat.com> In-Reply-To: <1246564917-19603-12-git-send-email-vgoyal@redhat.com> X-RedHat-Spam-Score: -0.731 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32 X-loop: dm-devel@redhat.com Cc: dhaval@linux.vnet.ibm.com, snitzer@redhat.com, peterz@infradead.org, dm-devel@redhat.com, dpshah@google.com, jens.axboe@oracle.com, agk@redhat.com, balbir@linux.vnet.ibm.com, paolo.valente@unimore.it, fernando@oss.ntt.co.jp, mikew@google.com, jmoyer@redhat.com, nauman@google.com, m-ikeda@ds.jp.nec.com, lizf@cn.fujitsu.com, fchecconi@gmail.com, akpm@linux-foundation.org, jbaron@redhat.com, linux-kernel@vger.kernel.org, s-uchida@ap.jp.nec.com, righi.andrea@gmail.com, containers@lists.linux-foundation.org Subject: [dm-devel] Re: [PATCH 11/25] io-controller: Export disk time used and nr sectors dipatched through cgroups X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Vivek Goyal wrote: ... > > +static int io_cgroup_disk_time_read(struct cgroup *cgroup, > + struct cftype *cftype, struct seq_file *m) > +{ > + struct io_cgroup *iocg; > + struct io_group *iog; > + struct hlist_node *n; > + > + if (!cgroup_lock_live_group(cgroup)) > + return -ENODEV; > + > + iocg = cgroup_to_io_cgroup(cgroup); > + > + rcu_read_lock(); > + hlist_for_each_entry_rcu(iog, n, &iocg->group_data, group_node) { > + /* > + * There might be groups which are not functional and > + * waiting to be reclaimed upon cgoup deletion. > + */ > + if (iog->key) { > + seq_printf(m, "%u %u %lu\n", MAJOR(iog->dev), > + MINOR(iog->dev), > + iog->entity.total_service); Hi Vivek, Let io.disk_*'s outputs conform with io.policy's. Signed-off-by: Gui Jianfeng --- block/elevator-fq.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block/elevator-fq.c b/block/elevator-fq.c index 7c83d1e..29392e7 100644 --- a/block/elevator-fq.c +++ b/block/elevator-fq.c @@ -1631,7 +1631,7 @@ static int io_cgroup_disk_time_read(struct cgroup *cgroup, * waiting to be reclaimed upon cgoup deletion. */ if (iog->key) { - seq_printf(m, "%u %u %lu\n", MAJOR(iog->dev), + seq_printf(m, "%u:%u %lu\n", MAJOR(iog->dev), MINOR(iog->dev), iog->entity.total_service); } @@ -1661,7 +1661,7 @@ static int io_cgroup_disk_sectors_read(struct cgroup *cgroup, * waiting to be reclaimed upon cgoup deletion. */ if (iog->key) { - seq_printf(m, "%u %u %lu\n", MAJOR(iog->dev), + seq_printf(m, "%u:%u %lu\n", MAJOR(iog->dev), MINOR(iog->dev), iog->entity.total_sector_service); } @@ -1692,7 +1692,7 @@ static int io_cgroup_disk_queue_read(struct cgroup *cgroup, * waiting to be reclaimed upon cgoup deletion. */ if (iog->key) { - seq_printf(m, "%u %u %lu %lu\n", MAJOR(iog->dev), + seq_printf(m, "%u:%u %lu %lu\n", MAJOR(iog->dev), MINOR(iog->dev), iog->queue, iog->queue_duration); } @@ -1722,7 +1722,7 @@ static int io_cgroup_disk_dequeue_read(struct cgroup *cgroup, * waiting to be reclaimed upon cgoup deletion. */ if (iog->key) { - seq_printf(m, "%u %u %lu\n", MAJOR(iog->dev), + seq_printf(m, "%u:%u %lu\n", MAJOR(iog->dev), MINOR(iog->dev), iog->dequeue); } }