Linux Container Development
 help / color / mirror / Atom feed
From: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org
Cc: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH 14/23] cgroup: always use cgroup_next_child() to walk the children list
Date: Thu,  1 Aug 2013 17:49:52 -0400	[thread overview]
Message-ID: <1375393801-4817-15-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1375393801-4817-1-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

There are several places where the children list is accessed directly.
This patch converts those places to use cgroup_next_child().  This
will help updating the hierarchy iterators to use @css instead of
@cgrp.

While cgroup_next_child() can be heavy in pathological cases - e.g. a
lot of dead children, this shouldn't cause any noticeable behavior
differences.

Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
 include/linux/cgroup.h | 5 ++---
 kernel/cgroup.c        | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index a91c304..df6ab19 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -801,9 +801,8 @@ struct cgroup *cgroup_next_child(struct cgroup *pos, struct cgroup *cgrp);
  * the start of the next iteration by, for example, bumping the css refcnt.
  */
 #define cgroup_for_each_child(pos, cgrp)				\
-	for ((pos) = list_first_or_null_rcu(&(cgrp)->children,		\
-					    struct cgroup, sibling);	\
-	     (pos); (pos) = cgroup_next_child((pos), (cgrp)))
+	for ((pos) = cgroup_next_child(NULL, (cgrp)); (pos);		\
+	     (pos) = cgroup_next_child((pos), (cgrp)))
 
 struct cgroup *cgroup_next_descendant_pre(struct cgroup *pos,
 					  struct cgroup *cgroup);
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index e88b50e..7b53b58 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3105,7 +3105,7 @@ struct cgroup *cgroup_next_descendant_pre(struct cgroup *pos,
 		pos = cgroup;
 
 	/* visit the first child if exists */
-	next = list_first_or_null_rcu(&pos->children, struct cgroup, sibling);
+	next = cgroup_next_child(NULL, pos);
 	if (next)
 		return next;
 
@@ -3144,7 +3144,7 @@ struct cgroup *cgroup_rightmost_descendant(struct cgroup *pos)
 		last = pos;
 		/* ->prev isn't RCU safe, walk ->next till the end */
 		pos = NULL;
-		list_for_each_entry_rcu(tmp, &last->children, sibling)
+		cgroup_for_each_child(tmp, last)
 			pos = tmp;
 	} while (pos);
 
@@ -3158,8 +3158,7 @@ static struct cgroup *cgroup_leftmost_descendant(struct cgroup *pos)
 
 	do {
 		last = pos;
-		pos = list_first_or_null_rcu(&pos->children, struct cgroup,
-					     sibling);
+		pos = cgroup_next_child(NULL, pos);
 	} while (pos);
 
 	return last;
-- 
1.8.3.1

  parent reply	other threads:[~2013-08-01 21:49 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1375393801-4817-1-git-send-email-tj@kernel.org>
     [not found] ` <1375393801-4817-1-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-01 21:49   ` [PATCH 01/23] cgroup: s/cgroup_subsys_state/cgroup_css/ s/task_subsys_state/task_css/ Tejun Heo
2013-08-01 21:49   ` [PATCH 02/23] cpuset: drop "const" qualifiers from struct cpuset instances Tejun Heo
2013-08-01 21:49   ` [PATCH 03/23] netprio_cgroup: pass around @css instead of @cgroup and kill struct cgroup_netprio_state Tejun Heo
     [not found]     ` <1375393801-4817-4-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-01 22:07       ` David Miller
2013-08-02 11:42       ` Neil Horman
2013-08-01 21:49   ` [PATCH 04/23] hugetlb_cgroup: pass around @hugetlb_cgroup instead of @cgroup Tejun Heo
     [not found]     ` <1375393801-4817-5-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-02  4:35       ` Aneesh Kumar K.V
2013-08-02 13:10       ` Michal Hocko
2013-08-01 21:49   ` [PATCH 05/23] cgroup: add subsystem pointer to cgroup_subsys_state Tejun Heo
2013-08-01 21:49   ` [PATCH 06/23] cgroup: add/update accessors which obtain subsys specific data from css Tejun Heo
2013-08-01 21:49   ` [PATCH 07/23] cgroup: add css_parent() Tejun Heo
2013-08-01 21:49   ` [PATCH 08/23] cgroup: pass around cgroup_subsys_state instead of cgroup in subsystem methods Tejun Heo
2013-08-01 21:49   ` [PATCH 09/23] cgroup: add subsys backlink pointer to cftype Tejun Heo
2013-08-01 21:49   ` [PATCH 10/23] cgroup: pin cgroup_subsys_state when opening a cgroupfs file Tejun Heo
2013-08-01 21:49   ` [PATCH 11/23] cgroup: add cgroup->dummy_css Tejun Heo
2013-08-01 21:49   ` [PATCH 12/23] cgroup: pass around cgroup_subsys_state instead of cgroup in file methods Tejun Heo
     [not found]     ` <1375393801-4817-13-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-02 13:27       ` Michal Hocko
2013-08-05 14:19       ` Vivek Goyal
2013-08-05 18:04       ` Aristeu Rozanski
2013-08-06  6:48       ` Daniel Wagner
2013-08-01 21:49   ` [PATCH 13/23] cgroup: convert cgroup_next_sibling() to cgroup_next_child() Tejun Heo
2013-08-01 21:49   ` Tejun Heo [this message]
2013-08-01 21:49   ` [PATCH 15/23] cgroup: make hierarchy iterators deal with cgroup_subsys_state instead of cgroup Tejun Heo
     [not found]     ` <1375393801-4817-16-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-02 13:32       ` Michal Hocko
2013-08-05 14:25       ` Vivek Goyal
2013-08-05 18:10       ` Aristeu Rozanski
2013-08-01 21:49   ` [PATCH 16/23] cgroup: relocate cgroup_advance_iter() Tejun Heo
     [not found]     ` <1375393801-4817-17-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-02  3:25       ` Li Zefan
     [not found]         ` <51FB26C6.2020100-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2013-08-02 19:35           ` Tejun Heo
2013-08-01 21:49   ` [PATCH 17/23] cgroup: rename cgroup_iter to cgroup_task_iter Tejun Heo
     [not found]     ` <1375393801-4817-18-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-02 13:35       ` Michal Hocko
2013-08-01 21:49   ` [PATCH 18/23] cgroup: make cgroup_task_iter remember the cgroup being iterated Tejun Heo
     [not found]     ` <1375393801-4817-19-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-02 13:38       ` Michal Hocko
2013-08-01 21:49   ` [PATCH 19/23] cgroup: remove struct cgroup_scanner Tejun Heo
2013-08-01 21:49   ` [PATCH 20/23] cgroup: make task iterators deal with cgroup_subsys_state instead of cgroup Tejun Heo
2013-08-01 21:49   ` [PATCH 21/23] cgroup: make cftype->[un]register_event() " Tejun Heo
2013-08-01 21:50   ` [PATCH 22/23] cgroup: make cgroup_taskset " Tejun Heo
2013-08-01 21:50   ` [PATCH 23/23] cgroup: unexport cgroup_css() Tejun Heo
2013-08-02  3:24   ` [PATCHSET cgroup/for-3.12] cgroup: use cgroup_subsys_state as the primary subsystem interface handle Li Zefan
2013-08-09  0:12   ` Tejun Heo
     [not found] ` <1375393801-4817-9-git-send-email-tj@kernel.org>
     [not found]   ` <1375393801-4817-9-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-02  3:54     ` [PATCH 08/23] cgroup: pass around cgroup_subsys_state instead of cgroup in subsystem methods Li Zefan
     [not found]       ` <51FB2D70.3040208-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2013-08-02 19:36         ` Tejun Heo
2013-08-02  4:02     ` Li Zefan
     [not found]       ` <51FB2F3D.5050904-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2013-08-02 19:41         ` Tejun Heo
2013-08-02 13:19     ` Michal Hocko
2013-08-02 20:24     ` [PATCH v2 " Tejun Heo
2013-08-05 12:44     ` [PATCH " Vivek Goyal
2013-08-05 17:57     ` Aristeu Rozanski
     [not found]   ` <20130802131901.GB25432@dhcp22.suse.cz>
     [not found]     ` <20130802131901.GB25432-2MMpYkNvuYDjFM9bn6wA6Q@public.gmane.org>
2013-08-02 13:43       ` Michal Hocko
2013-08-02 19:38       ` Tejun Heo
     [not found]     ` <20130802134305.GI25432@dhcp22.suse.cz>
     [not found]       ` <20130802134305.GI25432-2MMpYkNvuYDjFM9bn6wA6Q@public.gmane.org>
2013-08-02 19:52         ` Tejun Heo
     [not found]   ` <20130802202408.GH29736@mtj.dyndns.org>
     [not found]     ` <20130802202408.GH29736-9pTldWuhBndy/B6EtB590w@public.gmane.org>
2013-08-06  7:19       ` [PATCH v2 " Daniel Wagner
     [not found] ` <1375393801-4817-21-git-send-email-tj@kernel.org>
     [not found]   ` <1375393801-4817-21-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-02 13:40     ` [PATCH 20/23] cgroup: make task iterators deal with cgroup_subsys_state instead of cgroup Michal Hocko
     [not found] ` <1375393801-4817-22-git-send-email-tj@kernel.org>
     [not found]   ` <51FB30D3.9030900@huawei.com>
     [not found]     ` <51FB30D3.9030900-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2013-08-02 19:44       ` [PATCH 21/23] cgroup: make cftype->[un]register_event() " Tejun Heo
     [not found]   ` <1375393801-4817-22-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-02  4:08     ` Li Zefan
2013-08-02 13:42     ` Michal Hocko
2013-08-02 20:24     ` [PATCH v2 " Tejun Heo
     [not found] ` <1375393801-4817-10-git-send-email-tj@kernel.org>
     [not found]   ` <1375393801-4817-10-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-05 12:49     ` [PATCH 09/23] cgroup: add subsys backlink pointer to cftype Vivek Goyal
     [not found] ` <1375393801-4817-23-git-send-email-tj@kernel.org>
     [not found]   ` <1375393801-4817-23-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-08-06  6:53     ` [PATCH 22/23] cgroup: make cgroup_taskset deal with cgroup_subsys_state instead of cgroup Daniel Wagner

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=1375393801-4817-15-git-send-email-tj@kernel.org \
    --to=tj-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
    --cc=cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox