Merge branch 'for-6.8-bpf' of... (92411764) · Commits · git / linux-nf

include/linux/cgroup-defs.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -563,6 +563,7 @@ struct cgroup_root {

		/* A list running through the active hierarchies */
		struct list_head root_list;
		struct rcu_head rcu;

		/* Hierarchy-specific flags */
		unsigned int flags;

include/linux/cgroup.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ struct css_task_iter {
		extern struct file_system_type cgroup_fs_type;
		extern struct cgroup_root cgrp_dfl_root;
		extern struct css_set init_css_set;
		extern spinlock_t css_set_lock;

		#define SUBSYS(_x) extern struct cgroup_subsys _x ## _cgrp_subsys;
		#include <linux/cgroup_subsys.h>
		@@ -386,7 +387,6 @@ static inline void cgroup_unlock(void)
		* as locks used during the cgroup_subsys::attach() methods.
		*/
		#ifdef CONFIG_PROVE_RCU
		extern spinlock_t css_set_lock;
		#define task_css_set_check(task, __c) \
		rcu_dereference_check((task)->cgroups, \
		rcu_read_lock_sched_held() \|\| \
		@@ -853,4 +853,6 @@ static inline void cgroup_bpf_put(struct cgroup *cgrp) {}

		#endif /* CONFIG_CGROUP_BPF */

		struct cgroup task_get_cgroup1(struct task_struct tsk, int hierarchy_id);

		#endif /* _LINUX_CGROUP_H */

kernel/cgroup/cgroup-internal.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -164,13 +164,13 @@ struct cgroup_mgctx {
		#define DEFINE_CGROUP_MGCTX(name) \
		struct cgroup_mgctx name = CGROUP_MGCTX_INIT(name)

		extern spinlock_t css_set_lock;
		extern struct cgroup_subsys *cgroup_subsys[];
		extern struct list_head cgroup_roots;

		/* iterate across the hierarchies */
		#define for_each_root(root) \
		list_for_each_entry((root), &cgroup_roots, root_list)
		list_for_each_entry_rcu((root), &cgroup_roots, root_list, \
		lockdep_is_held(&cgroup_mutex))

		/**
		* for_each_subsys - iterate all enabled cgroup subsystems

kernel/cgroup/cgroup-v1.c

+34 −0

Original line number	Diff line number	Diff line
		@@ -1262,6 +1262,40 @@ int cgroup1_get_tree(struct fs_context *fc)
		return ret;
		}

		/**
		* task_get_cgroup1 - Acquires the associated cgroup of a task within a
		* specific cgroup1 hierarchy. The cgroup1 hierarchy is identified by its
		* hierarchy ID.
		* @tsk: The target task
		* @hierarchy_id: The ID of a cgroup1 hierarchy
		*
		* On success, the cgroup is returned. On failure, ERR_PTR is returned.
		* We limit it to cgroup1 only.
		*/
		struct cgroup task_get_cgroup1(struct task_struct tsk, int hierarchy_id)
		{
		struct cgroup *cgrp = ERR_PTR(-ENOENT);
		struct cgroup_root *root;
		unsigned long flags;

		rcu_read_lock();
		for_each_root(root) {
		/* cgroup1 only*/
		if (root == &cgrp_dfl_root)
		continue;
		if (root->hierarchy_id != hierarchy_id)
		continue;
		spin_lock_irqsave(&css_set_lock, flags);
		cgrp = task_cgroup_from_root(tsk, root);
		if (!cgrp \|\| !cgroup_tryget(cgrp))
		cgrp = ERR_PTR(-ENOENT);
		spin_unlock_irqrestore(&css_set_lock, flags);
		break;
		}
		rcu_read_unlock();
		return cgrp;
		}

		static int __init cgroup1_wq_init(void)
		{
		/*

kernel/cgroup/cgroup.c

+30 −15

Original line number	Diff line number	Diff line
		@@ -1315,7 +1315,7 @@ static void cgroup_exit_root_id(struct cgroup_root *root)

		void cgroup_free_root(struct cgroup_root *root)
		{
		kfree(root);
		kfree_rcu(root, rcu);
		}

		static void cgroup_destroy_root(struct cgroup_root *root)
		@@ -1347,10 +1347,9 @@ static void cgroup_destroy_root(struct cgroup_root *root)

		spin_unlock_irq(&css_set_lock);

		if (!list_empty(&root->root_list)) {
		list_del(&root->root_list);
		WARN_ON_ONCE(list_empty(&root->root_list));
		list_del_rcu(&root->root_list);
		cgroup_root_count--;
		}

		if (!have_favordynmods)
		cgroup_favor_dynmods(root, false);
		@@ -1390,7 +1389,15 @@ static inline struct cgroup __cset_cgroup_from_root(struct css_set cset,
		}
		}

		BUG_ON(!res_cgroup);
		/*
		* If cgroup_mutex is not held, the cgrp_cset_link will be freed
		* before we remove the cgroup root from the root_list. Consequently,
		* when accessing a cgroup root, the cset_link may have already been
		* freed, resulting in a NULL res_cgroup. However, by holding the
		* cgroup_mutex, we ensure that res_cgroup can't be NULL.
		* If we don't hold cgroup_mutex in the caller, we must do the NULL
		* check.
		*/
		return res_cgroup;
		}

		@@ -1413,6 +1420,11 @@ current_cgns_cgroup_from_root(struct cgroup_root *root)

		rcu_read_unlock();

		/*
		* The namespace_sem is held by current, so the root cgroup can't
		* be umounted. Therefore, we can ensure that the res is non-NULL.
		*/
		WARN_ON_ONCE(!res);
		return res;
		}

		@@ -1449,7 +1461,6 @@ static struct cgroup *current_cgns_cgroup_dfl(void)
		static struct cgroup cset_cgroup_from_root(struct css_set cset,
		struct cgroup_root *root)
		{
		lockdep_assert_held(&cgroup_mutex);
		lockdep_assert_held(&css_set_lock);

		return __cset_cgroup_from_root(cset, root);
		@@ -1457,7 +1468,9 @@ static struct cgroup cset_cgroup_from_root(struct css_set cset,

		/*
		* Return the cgroup for "task" from the given hierarchy. Must be
		* called with cgroup_mutex and css_set_lock held.
		* called with css_set_lock held to prevent task's groups from being modified.
		* Must be called with either cgroup_mutex or rcu read lock to prevent the
		* cgroup root from being destroyed.
		*/
		struct cgroup task_cgroup_from_root(struct task_struct task,
		struct cgroup_root *root)
		@@ -2032,7 +2045,7 @@ void init_cgroup_root(struct cgroup_fs_context *ctx)
		struct cgroup_root *root = ctx->root;
		struct cgroup *cgrp = &root->cgrp;

		INIT_LIST_HEAD(&root->root_list);
		INIT_LIST_HEAD_RCU(&root->root_list);
		atomic_set(&root->nr_cgrps, 1);
		cgrp->root = root;
		init_cgroup_housekeeping(cgrp);
		@@ -2115,7 +2128,7 @@ int cgroup_setup_root(struct cgroup_root *root, u16 ss_mask)
		* care of subsystems' refcounts, which are explicitly dropped in
		* the failure exit path.
		*/
		list_add(&root->root_list, &cgroup_roots);
		list_add_rcu(&root->root_list, &cgroup_roots);
		cgroup_root_count++;

		/*
		@@ -6277,7 +6290,7 @@ int proc_cgroup_show(struct seq_file m, struct pid_namespace ns,
		if (!buf)
		goto out;

		cgroup_lock();
		rcu_read_lock();
		spin_lock_irq(&css_set_lock);

		for_each_root(root) {
		@@ -6288,6 +6301,11 @@ int proc_cgroup_show(struct seq_file m, struct pid_namespace ns,
		if (root == &cgrp_dfl_root && !READ_ONCE(cgrp_dfl_visible))
		continue;

		cgrp = task_cgroup_from_root(tsk, root);
		/* The root has already been unmounted. */
		if (!cgrp)
		continue;

		seq_printf(m, "%d:", root->hierarchy_id);
		if (root != &cgrp_dfl_root)
		for_each_subsys(ss, ssid)
		@@ -6298,9 +6316,6 @@ int proc_cgroup_show(struct seq_file m, struct pid_namespace ns,
		seq_printf(m, "%sname=%s", count ? "," : "",
		root->name);
		seq_putc(m, ':');

		cgrp = task_cgroup_from_root(tsk, root);

		/*
		* On traditional hierarchies, all zombie tasks show up as
		* belonging to the root cgroup. On the default hierarchy,
		@@ -6332,7 +6347,7 @@ int proc_cgroup_show(struct seq_file m, struct pid_namespace ns,
		retval = 0;
		out_unlock:
		spin_unlock_irq(&css_set_lock);
		cgroup_unlock();
		rcu_read_unlock();
		kfree(buf);
		out:
		return retval;