From 8779ea3cf3f1d80a29951b217f8c6a454f0a2c5a Mon Sep 17 00:00:00 2001

From: Yishai Hadas <yishaih@mellanox.com>

Date: Sun, 10 Feb 2019 10:43:12 +0200

Subject: [PATCH rdma-core 1/2] Update kernel headers

To commit 2c1619edef61 ("IB/cma: Define option to set ack timeout and

pack tos_set")

Signed-off-by: Yishai Hadas <yishaih@mellanox.com>

---

 kernel-headers/rdma/bnxt_re-abi.h   | 11 ++++++

 kernel-headers/rdma/ib_user_verbs.h |  2 ++

 kernel-headers/rdma/rdma_netlink.h  | 54 +++++++++++++++++++++--------

 kernel-headers/rdma/rdma_user_cm.h  |  4 +++

 kernel-headers/rdma/rdma_user_rxe.h |  3 +-

 5 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/kernel-headers/rdma/bnxt_re-abi.h b/kernel-headers/rdma/bnxt_re-abi.h

index a7a6111e..dc52e3cf 100644

--- a/kernel-headers/rdma/bnxt_re-abi.h

+++ b/kernel-headers/rdma/bnxt_re-abi.h

@@ -44,6 +44,14 @@

 #define BNXT_RE_ABI_VERSION	1

+#define BNXT_RE_CHIP_ID0_CHIP_NUM_SFT		0x00

+#define BNXT_RE_CHIP_ID0_CHIP_REV_SFT		0x10

+#define BNXT_RE_CHIP_ID0_CHIP_MET_SFT		0x18

+

+enum {

+	BNXT_RE_UCNTX_CMASK_HAVE_CCTX = 0x1ULL

+};

+

 struct bnxt_re_uctx_resp {

 	__u32 dev_id;

 	__u32 max_qp;

@@ -51,6 +59,9 @@ struct bnxt_re_uctx_resp {

 	__u32 cqe_sz;

 	__u32 max_cqd;

 	__u32 rsvd;

+	__aligned_u64 comp_mask;

+	__u32 chip_id0;

+	__u32 chip_id1;

 };

 /*

diff --git a/kernel-headers/rdma/ib_user_verbs.h b/kernel-headers/rdma/ib_user_verbs.h

index 480d9a60..0474c740 100644

--- a/kernel-headers/rdma/ib_user_verbs.h

+++ b/kernel-headers/rdma/ib_user_verbs.h

@@ -270,6 +270,8 @@ struct ib_uverbs_ex_query_device_resp {

 	struct ib_uverbs_tm_caps tm_caps;

 	struct ib_uverbs_cq_moderation_caps cq_moderation_caps;

 	__aligned_u64 max_dm_size;

+	__u32 xrc_odp_caps;

+	__u32 reserved;

 };

 struct ib_uverbs_query_port {

diff --git a/kernel-headers/rdma/rdma_netlink.h b/kernel-headers/rdma/rdma_netlink.h

index 2e18b77a..3a9e681e 100644

--- a/kernel-headers/rdma/rdma_netlink.h

+++ b/kernel-headers/rdma/rdma_netlink.h

@@ -5,8 +5,7 @@

 #include <linux/types.h>

 enum {

-	RDMA_NL_RDMA_CM = 1,

-	RDMA_NL_IWCM,

+	RDMA_NL_IWCM = 2,

 	RDMA_NL_RSVD,

 	RDMA_NL_LS,	/* RDMA Local Services */

 	RDMA_NL_NLDEV,	/* RDMA device interface */

@@ -14,8 +13,7 @@ enum {

 };

 enum {

-	RDMA_NL_GROUP_CM = 1,

-	RDMA_NL_GROUP_IWPM,

+	RDMA_NL_GROUP_IWPM = 2,

 	RDMA_NL_GROUP_LS,

 	RDMA_NL_NUM_GROUPS

 };

@@ -24,15 +22,17 @@ enum {

 #define RDMA_NL_GET_OP(type) (type & ((1 << 10) - 1))

 #define RDMA_NL_GET_TYPE(client, op) ((client << 10) + op)

-enum {

-	RDMA_NL_RDMA_CM_ID_STATS = 0,

-	RDMA_NL_RDMA_CM_NUM_OPS

-};

+/* The minimum version that the iwpm kernel supports */

+#define IWPM_UABI_VERSION_MIN	3

+/* The latest version that the iwpm kernel supports */

+#define IWPM_UABI_VERSION	4

+

+/* iwarp port mapper message flags */

 enum {

-	RDMA_NL_RDMA_CM_ATTR_SRC_ADDR = 1,

-	RDMA_NL_RDMA_CM_ATTR_DST_ADDR,

-	RDMA_NL_RDMA_CM_NUM_ATTR,

+

+	/* Do not map the port for this IWPM request */

+	IWPM_FLAGS_NO_PORT_MAP = (1 << 0),

 };

 /* iwarp port mapper op-codes */

@@ -45,6 +45,7 @@ enum {

 	RDMA_NL_IWPM_HANDLE_ERR,

 	RDMA_NL_IWPM_MAPINFO,

 	RDMA_NL_IWPM_MAPINFO_NUM,

+	RDMA_NL_IWPM_HELLO,

 	RDMA_NL_IWPM_NUM_OPS

 };

@@ -83,20 +84,38 @@ enum {

 	IWPM_NLA_MANAGE_MAPPING_UNSPEC = 0,

 	IWPM_NLA_MANAGE_MAPPING_SEQ,

 	IWPM_NLA_MANAGE_ADDR,

-	IWPM_NLA_MANAGE_MAPPED_LOC_ADDR,

+	IWPM_NLA_MANAGE_FLAGS,

+	IWPM_NLA_MANAGE_MAPPING_MAX

+};

+

+enum {

+	IWPM_NLA_RMANAGE_MAPPING_UNSPEC = 0,

+	IWPM_NLA_RMANAGE_MAPPING_SEQ,

+	IWPM_NLA_RMANAGE_ADDR,

+	IWPM_NLA_RMANAGE_MAPPED_LOC_ADDR,

+	/* The following maintains bisectability of rdma-core */

+	IWPM_NLA_MANAGE_MAPPED_LOC_ADDR = IWPM_NLA_RMANAGE_MAPPED_LOC_ADDR,

 	IWPM_NLA_RMANAGE_MAPPING_ERR,

 	IWPM_NLA_RMANAGE_MAPPING_MAX

 };

-#define IWPM_NLA_MANAGE_MAPPING_MAX 3

-#define IWPM_NLA_QUERY_MAPPING_MAX  4

 #define IWPM_NLA_MAPINFO_SEND_MAX   3

+#define IWPM_NLA_REMOVE_MAPPING_MAX 3

 enum {

 	IWPM_NLA_QUERY_MAPPING_UNSPEC = 0,

 	IWPM_NLA_QUERY_MAPPING_SEQ,

 	IWPM_NLA_QUERY_LOCAL_ADDR,

 	IWPM_NLA_QUERY_REMOTE_ADDR,

+	IWPM_NLA_QUERY_FLAGS,

+	IWPM_NLA_QUERY_MAPPING_MAX,

+};

+

+enum {

+	IWPM_NLA_RQUERY_MAPPING_UNSPEC = 0,

+	IWPM_NLA_RQUERY_MAPPING_SEQ,

+	IWPM_NLA_RQUERY_LOCAL_ADDR,

+	IWPM_NLA_RQUERY_REMOTE_ADDR,

 	IWPM_NLA_RQUERY_MAPPED_LOC_ADDR,

 	IWPM_NLA_RQUERY_MAPPED_REM_ADDR,

 	IWPM_NLA_RQUERY_MAPPING_ERR,

@@ -114,6 +133,7 @@ enum {

 	IWPM_NLA_MAPINFO_UNSPEC = 0,

 	IWPM_NLA_MAPINFO_LOCAL_ADDR,

 	IWPM_NLA_MAPINFO_MAPPED_ADDR,

+	IWPM_NLA_MAPINFO_FLAGS,

 	IWPM_NLA_MAPINFO_MAX

 };

@@ -132,6 +152,12 @@ enum {

 	IWPM_NLA_ERR_MAX

 };

+enum {

+	IWPM_NLA_HELLO_UNSPEC = 0,

+	IWPM_NLA_HELLO_ABI_VERSION,

+	IWPM_NLA_HELLO_MAX

+};

+

 /*

  * Local service operations:

  *   RESOLVE - The client requests the local service to resolve a path.

diff --git a/kernel-headers/rdma/rdma_user_cm.h b/kernel-headers/rdma/rdma_user_cm.h

index 0d1e78eb..e42940a2 100644

--- a/kernel-headers/rdma/rdma_user_cm.h

+++ b/kernel-headers/rdma/rdma_user_cm.h

@@ -300,6 +300,10 @@ enum {

 	RDMA_OPTION_ID_TOS	 = 0,

 	RDMA_OPTION_ID_REUSEADDR = 1,

 	RDMA_OPTION_ID_AFONLY	 = 2,

+	RDMA_OPTION_ID_ACK_TIMEOUT = 3

+};

+

+enum {

 	RDMA_OPTION_IB_PATH	 = 1

 };

diff --git a/kernel-headers/rdma/rdma_user_rxe.h b/kernel-headers/rdma/rdma_user_rxe.h

index 44ef6a3b..aae2e696 100644

--- a/kernel-headers/rdma/rdma_user_rxe.h

+++ b/kernel-headers/rdma/rdma_user_rxe.h

@@ -58,8 +58,7 @@ struct rxe_global_route {

 struct rxe_av {

 	__u8			port_num;

 	__u8			network_type;

-	__u16			reserved1;

-	__u32			reserved2;

+	__u8			dmac[6];

 	struct rxe_global_route	grh;

 	union {

 		struct sockaddr_in	_sockaddr_in;

-- 

2.20.1