Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1285022 > unrolled thread

linux-next: manual merge of the cgroup tree with Linus' tree

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the cgroup tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-07 07:40 +0100
    Re: linux-next: manual merge of the cgroup tree with Linus' tree Tejun Heo <tj@kernel.org> - 2015-12-07 16:30 +0100
      Re: linux-next: manual merge of the cgroup tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-07 21:20 +0100

#1285022 — linux-next: manual merge of the cgroup tree with Linus' tree

Hi Tejun,

Today's linux-next merge of the cgroup tree got a conflict in:

  net/core/netclassid_cgroup.c

between commit:

  3b13758f51de ("cgroups: Allow dynamically changing net_classid")

from Linus' tree and commit:

  1f7dd3e5a6e4 ("cgroup: fix handling of multi-destination migration from subtree_control enabling")

from the cgroup tree.

I couldn't figure out how to fix this up, so I have just dropped the
cgroup tree for today.

Tejun, maybe you could merge Linus' tree (probably -rc4?) and fix this
up yourself?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1285605

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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1285898

Hi Tejun,

On Mon, 7 Dec 2015 10:20:32 -0500 Tejun Heo <tj@kernel.org> wrote:
>
> Resolved from cgroup/for-4.4-fixes side.

Excellent, thanks!

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web