From: Lu Jialin lujialin4@huawei.com
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY4S
-------------------------------
deaggregate __cgroup1_get_from_id() function to help cgroup v1 get cgroup through cgroup inode for cgroup v1 has diff Hierarchy,while cgroup_get_from_id for cgroup v2 which unifies Hierarchy
The patch also export cgroup_tryget_css(), which will be used later
Signed-off-by: Lu Jialin lujialin4@huawei.com Signed-off-by: chenridong chenridong@huawei.com --- include/linux/cgroup-defs.h | 2 ++ include/linux/cgroup.h | 1 + kernel/cgroup/cgroup.c | 25 ++++++++++++++++++------- 3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 265da00a1a8b..013ea018cbd4 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -778,6 +778,8 @@ static inline void cgroup_threadgroup_change_end(struct task_struct *tsk) percpu_up_read(&cgroup_threadgroup_rwsem); }
+struct cgroup_subsys_state *cgroup_tryget_css(struct cgroup *cgrp, + struct cgroup_subsys *ss); #else /* CONFIG_CGROUPS */
#define CGROUP_SUBSYS_COUNT 0 diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index b307013b9c6c..41b19d2107fe 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -633,6 +633,7 @@ static inline void cgroup_kthread_ready(void) }
void cgroup_path_from_kernfs_id(u64 id, char *buf, size_t buflen); +struct cgroup *__cgroup_get_from_id(struct cgroup_root *root, u64 id); struct cgroup *cgroup_get_from_id(u64 id); #else /* !CONFIG_CGROUPS */
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 518725b57200..30370c00dc1d 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -3632,7 +3632,6 @@ static int cgroup_stat_show(struct seq_file *seq, void *v) return 0; }
-#ifdef CONFIG_CGROUP_SCHED /** * cgroup_tryget_css - try to get a cgroup's css for the specified subsystem * @cgrp: the cgroup of interest @@ -3641,7 +3640,7 @@ static int cgroup_stat_show(struct seq_file *seq, void *v) * Find and get @cgrp's css associated with @ss. If the css doesn't exist * or is offline, %NULL is returned. */ -static struct cgroup_subsys_state *cgroup_tryget_css(struct cgroup *cgrp, +struct cgroup_subsys_state *cgroup_tryget_css(struct cgroup *cgrp, struct cgroup_subsys *ss) { struct cgroup_subsys_state *css; @@ -3655,6 +3654,7 @@ static struct cgroup_subsys_state *cgroup_tryget_css(struct cgroup *cgrp, return css; }
+#ifdef CONFIG_CGROUP_SCHED static int cgroup_extra_stat_show(struct seq_file *seq, int ssid) { struct cgroup *cgrp = seq_css(seq)->cgroup; @@ -6183,17 +6183,26 @@ void cgroup_path_from_kernfs_id(u64 id, char *buf, size_t buflen) }
/* - * cgroup_get_from_id : get the cgroup associated with cgroup id +* cgroup_get_from_id:get cgrp_dfl_root's cgroup with cgroup id +*/ +struct cgroup *cgroup_get_from_id( u64 id) +{ + return __cgroup_get_from_id(&cgrp_dfl_root, id); +} +EXPORT_SYMBOL_GPL(cgroup_get_from_id); + +/* + * __cgroup_get_from_id : get the cgroup associated with cgroup id * @id: cgroup id * On success return the cgrp or ERR_PTR on failure * Only cgroups within current task's cgroup NS are valid. */ -struct cgroup *cgroup_get_from_id(u64 id) +struct cgroup *__cgroup_get_from_id(struct cgroup_root *root, u64 id) { struct kernfs_node *kn; struct cgroup *cgrp, *root_cgrp;
- kn = kernfs_find_and_get_node_by_id(cgrp_dfl_root.kf_root, id); + kn = kernfs_find_and_get_node_by_id(root->kf_root, id); if (!kn) return ERR_PTR(-ENOENT);
@@ -6214,7 +6223,9 @@ struct cgroup *cgroup_get_from_id(u64 id) if (!cgrp) return ERR_PTR(-ENOENT);
- root_cgrp = current_cgns_cgroup_dfl(); + spin_lock_irq(&css_set_lock); + root_cgrp = current_cgns_cgroup_from_root(root); + spin_unlock_irq(&css_set_lock); if (!cgroup_is_descendant(cgrp, root_cgrp)) { cgroup_put(cgrp); return ERR_PTR(-ENOENT); @@ -6222,7 +6233,7 @@ struct cgroup *cgroup_get_from_id(u64 id)
return cgrp; } -EXPORT_SYMBOL_GPL(cgroup_get_from_id); +EXPORT_SYMBOL_GPL(__cgroup_get_from_id);
/* * proc_cgroup_show()