From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nina Schiff <ninasc@fb.com>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the cgroup tree with Linus' tree
Date: Mon, 7 Dec 2015 10:20:32 -0500 [thread overview]
Message-ID: <20151207152032.GC9175@mtj.duckdns.org> (raw)
In-Reply-To: <20151207173605.37fe583d@canb.auug.org.au>
Hello,
Resolved from cgroup/for-4.4-fixes side.
Thanks.
------ 8< ------
commit 0b98f0c04245877ae0b625a7f0aa55b8ff98e0c4
Merge: 67cde9c 527e931
Author: Tejun Heo <tj@kernel.org>
Date: Mon Dec 7 10:09:03 2015 -0500
Merge branch 'master' into for-4.4-fixes
The following commit which went into mainline through networking tree
3b13758f51de ("cgroups: Allow dynamically changing net_classid")
conflicts in net/core/netclassid_cgroup.c with the following pending
fix in cgroup/for-4.4-fixes.
1f7dd3e5a6e4 ("cgroup: fix handling of multi-destination migration from subtree_control enabling")
The former separates out update_classid() from cgrp_attach() and
updates it to walk all fds of all tasks in the target css so that it
can be used from both migration and config change paths. The latter
drops @css from cgrp_attach().
Resolve the conflict by making cgrp_attach() call update_classid()
with the css from the first task. We can revive @tset walking in
cgrp_attach() but given that net_cls is v1 only where there always is
only one target css during migration, this is fine.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nina Schiff <ninasc@fb.com>
diff --cc net/core/netclassid_cgroup.c
index 81cb3c7,2e4df84..d9ee8d0
--- a/net/core/netclassid_cgroup.c
+++ b/net/core/netclassid_cgroup.c
@@@ -67,19 -67,25 +67,27 @@@ static int update_classid_sock(const vo
return 0;
}
- static void cgrp_attach(struct cgroup_taskset *tset)
+ static void update_classid(struct cgroup_subsys_state *css, void *v)
{
+ struct css_task_iter it;
struct task_struct *p;
- struct cgroup_subsys_state *css;
-
- cgroup_taskset_for_each(p, css, tset) {
- struct cgroup_cls_state *cs = css_cls_state(css);
- void *v = (void *)(unsigned long)cs->classid;
+ css_task_iter_start(css, &it);
+ while ((p = css_task_iter_next(&it))) {
task_lock(p);
- iterate_fd(p->files, 0, update_classid, v);
+ iterate_fd(p->files, 0, update_classid_sock, v);
task_unlock(p);
}
+ css_task_iter_end(&it);
+ }
+
-static void cgrp_attach(struct cgroup_subsys_state *css,
- struct cgroup_taskset *tset)
++static void cgrp_attach(struct cgroup_taskset *tset)
+ {
++ struct cgroup_subsys_state *css;
++
++ cgroup_taskset_first(tset, &css);
+ update_classid(css,
+ (void *)(unsigned long)css_cls_state(css)->classid);
}
static u64 read_classid(struct cgroup_subsys_state *css, struct cftype *cft)
next prev parent reply other threads:[~2015-12-07 15:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 6:36 linux-next: manual merge of the cgroup tree with Linus' tree Stephen Rothwell
2015-12-07 15:20 ` Tejun Heo [this message]
2015-12-07 20:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-06-17 6:06 Stephen Rothwell
2019-07-08 23:25 ` Stephen Rothwell
2014-05-26 7:45 Stephen Rothwell
2013-03-14 2:31 Stephen Rothwell
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=20151207152032.GC9175@mtj.duckdns.org \
--to=tj@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ninasc@fb.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).