netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] cls_cgroup: Fix rcu lockdep warning
@ 2010-09-03  1:42 Li Zefan
  2010-09-03 16:55 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Li Zefan @ 2010-09-03  1:42 UTC (permalink / raw)
  To: David Miller
  Cc: Herbert Xu, Dave Jones, netdev, LKML, Peter Zijlstra, Paul Menage

Dave reported an rcu lockdep warning on 2.6.35.4 kernel

task->cgroups and task->cgroups->subsys[i] are protected by RCU.
So we avoid accessing invalid pointers here. This might happen,
for example, when you are deref-ing those pointers while someone
move @task from one cgroup to another.

Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 include/net/cls_cgroup.h |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h
index dd1fdb8..a4dc5b0 100644
--- a/include/net/cls_cgroup.h
+++ b/include/net/cls_cgroup.h
@@ -27,11 +27,17 @@ struct cgroup_cls_state
 #ifdef CONFIG_NET_CLS_CGROUP
 static inline u32 task_cls_classid(struct task_struct *p)
 {
+	int classid;
+
 	if (in_interrupt())
 		return 0;
 
-	return container_of(task_subsys_state(p, net_cls_subsys_id),
-			    struct cgroup_cls_state, css)->classid;
+	rcu_read_lock();
+	classid = container_of(task_subsys_state(p, net_cls_subsys_id),
+			       struct cgroup_cls_state, css)->classid;
+	rcu_read_unlock();
+
+	return classid;
 }
 #else
 extern int net_cls_subsys_id;
-- 
1.6.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] cls_cgroup: Fix rcu lockdep warning
  2010-09-03  1:42 [PATCH v2] cls_cgroup: Fix rcu lockdep warning Li Zefan
@ 2010-09-03 16:55 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-09-03 16:55 UTC (permalink / raw)
  To: lizf; +Cc: herbert, davej, netdev, linux-kernel, peterz, menage

From: Li Zefan <lizf@cn.fujitsu.com>
Date: Fri, 03 Sep 2010 09:42:43 +0800

> Dave reported an rcu lockdep warning on 2.6.35.4 kernel
> 
> task->cgroups and task->cgroups->subsys[i] are protected by RCU.
> So we avoid accessing invalid pointers here. This might happen,
> for example, when you are deref-ing those pointers while someone
> move @task from one cgroup to another.
> 
> Reported-by: Dave Jones <davej@redhat.com>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-09-03 16:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-03  1:42 [PATCH v2] cls_cgroup: Fix rcu lockdep warning Li Zefan
2010-09-03 16:55 ` David Miller

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).