Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91bc482e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rcu: create rcu_my_thread_group_empty() wrapper
  memcg: css_id() must be called under rcu_read_lock()
  cgroup: Check task_lock in task_subsys_state()
  sched: Fix an RCU warning in print_task()
  cgroup: Fix an RCU warning in alloc_css_id()
  cgroup: Fix an RCU warning in cgroup_path()
  KEYS: Fix an RCU warning in the reading of user keys
  KEYS: Fix an RCU warning
parents e8e8fade ee84b824

include/linux/cgroup.h

+1 −0
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ static inline struct cgroup_subsys_state *task_subsys_state( 
{

	return rcu_dereference_check(task->cgroups->subsys[subsys_id],

				     rcu_read_lock_held() ||

				     lockdep_is_held(&task->alloc_lock) ||

				     cgroup_lock_is_held());

}

include/linux/rcupdate.h

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ static inline int rcu_read_lock_sched_held(void) 


#ifdef CONFIG_PROVE_RCU



extern int rcu_my_thread_group_empty(void);



/**

 * rcu_dereference_check - rcu_dereference with debug checking

 * @p: The pointer to read, prior to dereferencing

kernel/cgroup.c

+11 −5
Original line number Diff line number Diff line
@@ -1646,7 +1646,9 @@ static inline struct cftype *__d_cft(struct dentry *dentry) 
int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen)

{

	char *start;

	struct dentry *dentry = rcu_dereference(cgrp->dentry);

	struct dentry *dentry = rcu_dereference_check(cgrp->dentry,

						      rcu_read_lock_held() ||

						      cgroup_lock_is_held());



	if (!dentry || cgrp == dummytop) {

		/*
@@ -1662,13 +1664,17 @@ int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen) 
	*--start = '\0';

	for (;;) {

		int len = dentry->d_name.len;



		if ((start -= len) < buf)

			return -ENAMETOOLONG;

		memcpy(start, cgrp->dentry->d_name.name, len);

		memcpy(start, dentry->d_name.name, len);

		cgrp = cgrp->parent;

		if (!cgrp)

			break;

		dentry = rcu_dereference(cgrp->dentry);



		dentry = rcu_dereference_check(cgrp->dentry,

					       rcu_read_lock_held() ||

					       cgroup_lock_is_held());

		if (!cgrp->parent)

			continue;

		if (--start < buf)
@@ -4555,13 +4561,13 @@ static int alloc_css_id(struct cgroup_subsys *ss, struct cgroup *parent, 
{

	int subsys_id, i, depth = 0;

	struct cgroup_subsys_state *parent_css, *child_css;

	struct css_id *child_id, *parent_id = NULL;

	struct css_id *child_id, *parent_id;



	subsys_id = ss->subsys_id;

	parent_css = parent->subsys[subsys_id];

	child_css = child->subsys[subsys_id];

	depth = css_depth(parent_css) + 1;

	parent_id = parent_css->id;

	depth = parent_id->depth;



	child_id = get_new_cssid(ss, depth);

	if (IS_ERR(child_id))

kernel/rcupdate.c

+11 −0
Original line number Diff line number Diff line
@@ -122,3 +122,14 @@ void wakeme_after_rcu(struct rcu_head *head) 
	rcu = container_of(head, struct rcu_synchronize, head);

	complete(&rcu->completion);

}



#ifdef CONFIG_PROVE_RCU

/*

 * wrapper function to avoid #include problems.

 */

int rcu_my_thread_group_empty(void)

{

	return thread_group_empty(current);

}

EXPORT_SYMBOL_GPL(rcu_my_thread_group_empty);

#endif /* #ifdef CONFIG_PROVE_RCU */

kernel/sched_debug.c

+2 −0
Original line number Diff line number Diff line
@@ -114,7 +114,9 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p) 
	{

		char path[64];



		rcu_read_lock();

		cgroup_path(task_group(p)->css.cgroup, path, sizeof(path));

		rcu_read_unlock();

		SEQ_printf(m, " %s", path);

	}

#endif