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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20151207152032.GC9175@mtj.duckdns.org>
Date:	Mon, 7 Dec 2015 10:20:32 -0500
From:	Tejun Heo <tj@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nina Schiff <ninasc@...com>,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: linux-next: manual merge of the cgroup tree with Linus' tree

Hello,

Resolved from cgroup/for-4.4-fixes side.

Thanks.

------ 8< ------
commit 0b98f0c04245877ae0b625a7f0aa55b8ff98e0c4
Merge: 67cde9c 527e931
Author: Tejun Heo <tj@...nel.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@...nel.org>
    Reported-by: Stephen Rothwell <sfr@...b.auug.org.au>
    Cc: Nina Schiff <ninasc@...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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/