Unverified Commit 00050b41 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4527 v3 block: kabi: KABI reservation for blk-cgroup 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3GFMXFLQOO5B5O223O2T5LHHC4TU2FUC/ 
 
https://gitee.com/openeuler/kernel/issues/I9110C 
 
Link:https://gitee.com/openeuler/kernel/pulls/4527

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 40f62c4f 2b91b98c

block/blk-cgroup.h

+30 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ enum blkg_iostat_type { 
	BLKG_IOSTAT_READ,

	BLKG_IOSTAT_WRITE,

	BLKG_IOSTAT_DISCARD,

	BLKG_IOSTAT_KABI_RESERVE,



	BLKG_IOSTAT_NR,

};
@@ -49,6 +50,12 @@ struct blkg_iostat_set { 
	int				lqueued;	/* queued in llist */

	struct blkg_iostat		cur;

	struct blkg_iostat		last;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

};



/* association between a blk cgroup and a request queue */
@@ -88,6 +95,12 @@ struct blkcg_gq { 
	int				last_use;



	struct rcu_head			rcu_head;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

};



struct blkcg {
@@ -117,6 +130,12 @@ struct blkcg { 
#ifdef CONFIG_CGROUP_V1_WRITEBACK

	struct list_head		memcg_list;

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

};



static inline struct blkcg *css_to_blkcg(struct cgroup_subsys_state *css)
@@ -140,6 +159,9 @@ struct blkg_policy_data { 
	struct blkcg_gq			*blkg;

	int				plid;

	bool				online;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/*
@@ -153,6 +175,9 @@ struct blkcg_policy_data { 
	/* the blkcg and policy id this per-policy data belongs to */

	struct blkcg			*blkcg;

	int				plid;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



typedef struct blkcg_policy_data *(blkcg_pol_alloc_cpd_fn)(gfp_t gfp);
@@ -186,6 +211,11 @@ struct blkcg_policy { 
	blkcg_pol_free_pd_fn		*pd_free_fn;

	blkcg_pol_reset_pd_stats_fn	*pd_reset_stats_fn;

	blkcg_pol_stat_pd_fn		*pd_stat_fn;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



extern struct blkcg blkcg_root;

include/linux/blkdev.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ extern struct class block_class; 
 * Maximum number of blkcg policies allowed to be registered concurrently.

 * Defined here to simplify include dependency.

 */

#define BLKCG_MAX_POLS		6

#define BLKCG_MAX_POLS		10



#define DISK_MAX_PARTS			256

#define DISK_NAME_LEN			32