Commit 2b20083c authored by Wang Hai's avatar Wang Hai Committed by Zhengchao Shao
Browse files

kabi: net: reserve space for net rdma subsystem related structure 

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



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

Reserve some fields beforehand for net rdma framework related
structures prone to change.

Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
parent bb2f65e5

include/rdma/ib_addr.h

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <rdma/ib_verbs.h>

#include <rdma/ib_pack.h>

#include <net/net_namespace.h>

#include <linux/kabi.h>



/**

 * struct rdma_dev_addr - Contains resolved RDMA hardware addresses
@@ -44,6 +45,9 @@ struct rdma_dev_addr { 
	const struct ib_gid_attr *sgid_attr;

	enum rdma_network_type network;

	int hoplimit;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/**

include/rdma/rdma_cm.h

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <rdma/ib_addr.h>

#include <rdma/ib_sa.h>

#include <uapi/rdma/rdma_user_cm.h>

#include <linux/kabi.h>



/*

 * Upon receiving a device removal event, users must destroy the associated
@@ -77,6 +78,9 @@ struct rdma_conn_param { 
	u8 srq;

	u32 qp_num;

	u32 qkey;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



struct rdma_ud_param {
@@ -95,6 +99,9 @@ struct rdma_cm_event { 
		struct rdma_ud_param	ud;

	} param;

	struct rdma_ucm_ece ece;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



struct rdma_cm_id;
@@ -119,6 +126,9 @@ struct rdma_cm_id { 
	enum ib_qp_type		 qp_type;

	u32			 port_num;

	struct work_struct net_work;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



struct rdma_cm_id *

include/rdma/rdma_counter.h

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <rdma/restrack.h>

#include <rdma/rdma_netlink.h>

#include <linux/kabi.h>



struct ib_device;

struct ib_qp;
@@ -41,6 +42,9 @@ struct rdma_counter { 
	struct mutex			lock;

	struct rdma_hw_stats		*stats;

	u32				port;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



void rdma_counter_init(struct ib_device *dev);

include/rdma/rdma_netlink.h

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <linux/netlink.h>

#include <uapi/rdma/rdma_netlink.h>

#include <linux/kabi.h>



enum {

	RDMA_NLDEV_ATTR_EMPTY_STRING = 1,
@@ -114,6 +115,9 @@ struct rdma_link_ops { 
	struct list_head list;

	const char *type;

	int (*newlink)(const char *ibdev_name, struct net_device *ndev);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



void rdma_link_register(struct rdma_link_ops *ops);

include/rdma/rdma_vt.h

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <rdma/ib_verbs.h>

#include <rdma/ib_mad.h>

#include <rdma/rdmavt_mr.h>

#include <linux/kabi.h>



#define RVT_MAX_PKEY_VALUES 16
@@ -105,6 +106,9 @@ struct rvt_ibport { 
	 */

	struct trap_list trap_lists[RVT_MAX_TRAP_LISTS];

	struct timer_list trap_timer;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



#define RVT_CQN_MAX 16 /* maximum length of cq name */
@@ -426,6 +430,9 @@ struct rvt_dev_info { 


	/* Memory Working Set Size */

	struct rvt_wss *wss;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/**