hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8SA3O CVE: N/A
-----------------------
kabi: reserve space for cgroup frame
Signed-off-by: Chen Ridong chenridong@huawei.com --- include/linux/cgroup-defs.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 2921ddb732ac..b464733c2b20 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -21,6 +21,7 @@ #include <linux/workqueue.h> #include <linux/bpf-cgroup-defs.h> #include <linux/psi_types.h> +#include <linux/kabi.h>
#ifdef CONFIG_CGROUPS
@@ -143,6 +144,9 @@ struct cgroup_file { struct kernfs_node *kn; unsigned long notified_at; struct timer_list notify_timer; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
/* @@ -200,6 +204,11 @@ struct cgroup_subsys_state { * fields of the containing structure. */ struct cgroup_subsys_state *parent; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
/* @@ -297,6 +306,11 @@ struct css_set {
/* For RCU-protected deletion */ struct rcu_head rcu_head; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
struct cgroup_base_stat { @@ -368,6 +382,8 @@ struct cgroup_rstat_cpu { */ struct cgroup *updated_children; /* terminated by self cgroup */ struct cgroup *updated_next; /* NULL iff not on the list */ + + KABI_RESERVE(1) };
struct cgroup_freezer_state { @@ -525,6 +541,11 @@ struct cgroup { struct bpf_local_storage __rcu *bpf_cgrp_storage; #endif
+ KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) /* All ancestors including self */ struct cgroup *ancestors[]; }; @@ -570,6 +591,11 @@ struct cgroup_root {
/* The name for this hierarchy - may be empty */ char name[MAX_CGROUP_ROOT_NAMELEN]; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
/* @@ -659,6 +685,7 @@ struct cftype { __poll_t (*poll)(struct kernfs_open_file *of, struct poll_table_struct *pt);
+ KABI_RESERVE(1) #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lock_class_key lockdep_key; #endif @@ -693,6 +720,11 @@ struct cgroup_subsys { void (*release)(struct task_struct *task); void (*bind)(struct cgroup_subsys_state *root_css);
+ KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + bool early_init:1;
/*