Commit 5e51524e authored by Chen Ridong's avatar Chen Ridong
Browse files

cgroup: kabi: reserve space for cgroup frame 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8SA3O


CVE: N/A

-----------------------

kabi: reserve space for cgroup frame

Signed-off-by: default avatarChen Ridong <chenridong@huawei.com>
parent 2eea44c9

include/linux/cgroup-defs.h

+38 −0
Original line number Diff line number Diff line
@@ -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,10 @@ struct cgroup_file { 
	struct kernfs_node *kn;

	unsigned long notified_at;

	struct timer_list notify_timer;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

};



/*
@@ -200,6 +205,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 +307,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 +383,11 @@ 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)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



struct cgroup_freezer_state {
@@ -525,6 +545,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 +595,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 +689,9 @@ struct cftype { 
	__poll_t (*poll)(struct kernfs_open_file *of,

			 struct poll_table_struct *pt);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

#ifdef CONFIG_DEBUG_LOCK_ALLOC

	struct lock_class_key	lockdep_key;

#endif
@@ -693,6 +726,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;



	/*