Commit dde4fe56 authored by Zhihao Cheng's avatar Zhihao Cheng Committed by Zheng Zengkai
Browse files

kabi: Add kabi reservation for storage module 

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


CVE: NA

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

Introduce kabi for storage module.

Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 800d1646

block/blk-mq-tag.h

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef INT_BLK_MQ_TAG_H

#define INT_BLK_MQ_TAG_H



#include <linux/kabi.h>



/*

 * Tag address space map.

 */
@@ -26,6 +28,11 @@ struct blk_mq_tags { 
	 * request pool

	 */

	spinlock_t lock;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



extern struct blk_mq_tags *blk_mq_init_tags(unsigned int nr_tags,

drivers/nvme/host/nvme.h

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#ifndef _NVME_H

#define _NVME_H



#include <linux/kabi.h>

#include <linux/nvme.h>

#include <linux/cdev.h>

#include <linux/pci.h>
@@ -346,6 +347,11 @@ struct nvme_ctrl { 
	unsigned long discard_page_busy;



	struct nvme_fault_inject fault_inject;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



enum nvme_iopolicy {

include/linux/backing-dev-defs.h

+11 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef __LINUX_BACKING_DEV_DEFS_H

#define __LINUX_BACKING_DEV_DEFS_H



#include <linux/kabi.h>

#include <linux/list.h>

#include <linux/radix-tree.h>

#include <linux/rbtree.h>
@@ -160,6 +161,11 @@ struct bdi_writeback { 
		struct rcu_head rcu;

	};

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



struct backing_dev_info {
@@ -198,6 +204,11 @@ struct backing_dev_info { 
#ifdef CONFIG_DEBUG_FS

	struct dentry *debug_dir;

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



enum {

include/linux/bio.h

+10 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#ifndef __LINUX_BIO_H

#define __LINUX_BIO_H



#include <linux/kabi.h>

#include <linux/highmem.h>

#include <linux/mempool.h>

#include <linux/ioprio.h>
@@ -321,6 +322,10 @@ struct bio_integrity_payload { 
	struct work_struct	bip_work;	/* I/O completion */



	struct bio_vec		*bip_vec;



	KABI_RESERVE(1)

	KABI_RESERVE(2)



	struct bio_vec		bip_inline_vecs[];/* embedded bvec array */

};
@@ -694,6 +699,11 @@ struct bio_set { 
	struct bio_list		rescue_list;

	struct work_struct	rescue_work;

	struct workqueue_struct	*rescue_workqueue;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



struct biovec_slab {

include/linux/blk-cgroup.h

+11 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * 	              Nauman Rafique <nauman@google.com>

 */



#include <linux/kabi.h>

#include <linux/cgroup.h>

#include <linux/percpu.h>

#include <linux/percpu_counter.h>
@@ -58,6 +59,11 @@ struct blkcg { 
#ifdef CONFIG_CGROUP_WRITEBACK

	struct list_head		cgwb_list;

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



struct blkg_iostat {
@@ -169,6 +175,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;