Skip to contentSkip to conversation

UAPI cleanup and fix to cxgb3 removal

PATCH Applied Leon Romanovsky 3 participants 5 messages Oct 15, 2019 – Oct 17, 2019 InfiniBand

lore
Share & tools
lore

Leon Romanovsky

author
#0 lore raw

cover UAPI cleanup and fix to cxgb3 removal

From: Leon Romanovsky <[email protected]>

Chagelog:
v0->v1: https://lore.kernel.org/linux-rdma/[email protected]
* Split one patch to two.
* Added RDMA_DRIVER_CXGB3 back instead of mangling with rdma_driver_id.

Thanks

Yishai Hadas (2):
RDMA/uapi: Fix and re-organize the usage of rdma_driver_id RDMA/uapi: Drop the dependency of ib_user_ioctl_verbs.h on
ib_user_verbs.h

 include/uapi/rdma/ib_user_ioctl_verbs.h  | 48 +++++++++++++++++++++++-
 include/uapi/rdma/ib_user_verbs.h        | 25 ------------
 include/uapi/rdma/rdma_user_ioctl_cmds.h | 21 -----------
 3 files changed, 47 insertions(+), 47 deletions(-)

--
2.20.1

author
#1 lore raw

PATCH 1/2 RDMA/uapi: Fix and re-organize the usage of rdma_driver_id

From: Yishai Hadas <[email protected]>

Fix 'enum rdma_driver_id' to preserve other driver values before that RDMA_DRIVER_CXGB3 was deleted. As this value is UAPI we can't affect other values as of a deletion of one driver id.

Fixes 30e0f6cf5acb ("RDMA/iw_cxgb3: Remove the iw_cxgb3 module from kernel")
Signed-off-by Yishai Hadas <[email protected]>
Signed-off-by Leon Romanovsky <[email protected]>
---
 include/uapi/rdma/ib_user_ioctl_verbs.h  | 22 ++++++++++++++++++++++
 include/uapi/rdma/rdma_user_ioctl_cmds.h | 21 ---------------------
 2 files changed, 22 insertions(+), 21 deletions(-)
include/uapi/rdma/ib_user_ioctl_verbs.h +22 -0
index 72c7fc75f960..9019b2d906ea 100644
@@ -173,4 +173,26 @@ struct ib_uverbs_query_port_resp_ex {
 	__u8  reserved[6];
 };
 
+enum rdma_driver_id {
+	RDMA_DRIVER_UNKNOWN,
+	RDMA_DRIVER_MLX5,
+	RDMA_DRIVER_MLX4,
+	RDMA_DRIVER_CXGB3,
+	RDMA_DRIVER_CXGB4,
+	RDMA_DRIVER_MTHCA,
+	RDMA_DRIVER_BNXT_RE,
+	RDMA_DRIVER_OCRDMA,
+	RDMA_DRIVER_NES,
+	RDMA_DRIVER_I40IW,
+	RDMA_DRIVER_VMW_PVRDMA,
+	RDMA_DRIVER_QEDR,
+	RDMA_DRIVER_HNS,
+	RDMA_DRIVER_USNIC,
+	RDMA_DRIVER_RXE,
+	RDMA_DRIVER_HFI1,
+	RDMA_DRIVER_QIB,
+	RDMA_DRIVER_EFA,
+	RDMA_DRIVER_SIW,
+};
+
 #endif
include/uapi/rdma/rdma_user_ioctl_cmds.h +0 -21
index b2680051047a..7b1ec806f8f9 100644
@@ -84,25 +84,4 @@ struct ib_uverbs_ioctl_hdr {
 	struct ib_uverbs_attr  attrs[0];
 };
 
-enum rdma_driver_id {
-	RDMA_DRIVER_UNKNOWN,
-	RDMA_DRIVER_MLX5,
-	RDMA_DRIVER_MLX4,
-	RDMA_DRIVER_CXGB4,
-	RDMA_DRIVER_MTHCA,
-	RDMA_DRIVER_BNXT_RE,
-	RDMA_DRIVER_OCRDMA,
-	RDMA_DRIVER_NES,
-	RDMA_DRIVER_I40IW,
-	RDMA_DRIVER_VMW_PVRDMA,
-	RDMA_DRIVER_QEDR,
-	RDMA_DRIVER_HNS,
-	RDMA_DRIVER_USNIC,
-	RDMA_DRIVER_RXE,
-	RDMA_DRIVER_HFI1,
-	RDMA_DRIVER_QIB,
-	RDMA_DRIVER_EFA,
-	RDMA_DRIVER_SIW,
-};
-
 #endif
Signature · 1 line
2.20.1
author
#3 lore raw

PATCH 2/2 RDMA/uapi: Drop the dependency of ib_user_ioctl_verbs.h on ib_user_verbs.h

In reply to Leon Romanovsky

From: Yishai Hadas <[email protected]>

Drop the dependency of ib_user_ioctl_verbs.h on ib_user_verbs.h which is not really required.

Signed-off-by Yishai Hadas <[email protected]>
Signed-off-by Leon Romanovsky <[email protected]>
---
 include/uapi/rdma/ib_user_ioctl_verbs.h | 26 ++++++++++++++++++++++++-
 include/uapi/rdma/ib_user_verbs.h       | 25 ------------------------
 2 files changed, 25 insertions(+), 26 deletions(-)
include/uapi/rdma/ib_user_ioctl_verbs.h +25 -1
index 9019b2d906ea..8bdfdd4ef8b5 100644
@@ -35,7 +35,6 @@
 #define IB_USER_IOCTL_VERBS_H
 
 #include <linux/types.h>
-#include <rdma/ib_user_verbs.h>
 
 #ifndef RDMA_UAPI_PTR
 #define RDMA_UAPI_PTR(_type, _name)	__aligned_u64 _name

@@ -167,6 +166,31 @@ enum ib_uverbs_advise_mr_flag {
 	IB_UVERBS_ADVISE_MR_FLAG_FLUSH = 1 << 0,
 };
 
+struct ib_uverbs_query_port_resp {
+	__u32 port_cap_flags;		/* see ib_uverbs_query_port_cap_flags */
+	__u32 max_msg_sz;
+	__u32 bad_pkey_cntr;
+	__u32 qkey_viol_cntr;
+	__u32 gid_tbl_len;
+	__u16 pkey_tbl_len;
+	__u16 lid;
+	__u16 sm_lid;
+	__u8  state;
+	__u8  max_mtu;
+	__u8  active_mtu;
+	__u8  lmc;
+	__u8  max_vl_num;
+	__u8  sm_sl;
+	__u8  subnet_timeout;
+	__u8  init_type_reply;
+	__u8  active_width;
+	__u8  active_speed;
+	__u8  phys_state;
+	__u8  link_layer;
+	__u8  flags;			/* see ib_uverbs_query_port_flags */
+	__u8  reserved;
+};
+
 struct ib_uverbs_query_port_resp_ex {
 	struct ib_uverbs_query_port_resp legacy_resp;
 	__u16 port_cap_flags2;
include/uapi/rdma/ib_user_verbs.h +0 -25
index 0474c7400268..37450f133a07 100644
@@ -281,31 +281,6 @@ struct ib_uverbs_query_port {
 	__aligned_u64 driver_data[0];
 };
 
-struct ib_uverbs_query_port_resp {
-	__u32 port_cap_flags;		/* see ib_uverbs_query_port_cap_flags */
-	__u32 max_msg_sz;
-	__u32 bad_pkey_cntr;
-	__u32 qkey_viol_cntr;
-	__u32 gid_tbl_len;
-	__u16 pkey_tbl_len;
-	__u16 lid;
-	__u16 sm_lid;
-	__u8  state;
-	__u8  max_mtu;
-	__u8  active_mtu;
-	__u8  lmc;
-	__u8  max_vl_num;
-	__u8  sm_sl;
-	__u8  subnet_timeout;
-	__u8  init_type_reply;
-	__u8  active_width;
-	__u8  active_speed;
-	__u8  phys_state;
-	__u8  link_layer;
-	__u8  flags;			/* see ib_uverbs_query_port_flags */
-	__u8  reserved;
-};
-
 struct ib_uverbs_alloc_pd {
 	__aligned_u64 response;
 	__aligned_u64 driver_data[0];
Signature · 1 line
2.20.1
#4 lore raw

Re: [PATCH rdma-next v1 2/2] RDMA/uapi: Drop the dependency of ib_user_ioctl_verbs.h on ib_user_verbs.h

Quoted 40 lines · Leon Romanovsky

From: Yishai Hadas <[email protected]>

Drop the dependency of ib_user_ioctl_verbs.h on ib_user_verbs.h which is not really required.

Signed-off-by Yishai Hadas <[email protected]>
Signed-off-by Leon Romanovsky <[email protected]>
 include/uapi/rdma/ib_user_ioctl_verbs.h | 26 ++++++++++++++++++++++++-
 include/uapi/rdma/ib_user_verbs.h       | 25 ------------------------
 2 files changed, 25 insertions(+), 26 deletions(-)
include/uapi/rdma/ib_user_ioctl_verbs.h +15 -1
index 9019b2d906ea..8bdfdd4ef8b5 100644
+++ b/include/uapi/rdma/ib_user_ioctl_verbs.h

@@ -35,7 +35,6 @@
 #define IB_USER_IOCTL_VERBS_H
 
 #include <linux/types.h>
-#include <rdma/ib_user_verbs.h>
 
 #ifndef RDMA_UAPI_PTR
 #define RDMA_UAPI_PTR(_type, _name)	__aligned_u64 _name

@@ -167,6 +166,31 @@ enum ib_uverbs_advise_mr_flag {
 	IB_UVERBS_ADVISE_MR_FLAG_FLUSH = 1 << 0,
 };
 
+struct ib_uverbs_query_port_resp {
+	__u32 port_cap_flags;		/* see ib_uverbs_query_port_cap_flags */
+	__u32 max_msg_sz;
+	__u32 bad_pkey_cntr;
+	__u32 qkey_viol_cntr;
+	__u32 gid_tbl_len;
+	__u16 pkey_tbl_len;
+	__u16 lid;
+	__u16 sm_lid;
+	__u8  state;
+	__u8  max_mtu;
+	__u8  active_mtu;
+	__u8  lmc;
+	__u8  max_vl_num;

include/uapi/rdma/ib_user_ioctl_verbs.h enum ib_uverbs_advise_mr_flag { · line 192

Quoted 10 lines
include/uapi/rdma/ib_user_ioctl_verbs.h +10 -0
+	__u8  sm_sl;
+	__u8  subnet_timeout;
+	__u8  init_type_reply;
+	__u8  active_width;
+	__u8  active_speed;
+	__u8  phys_state;
+	__u8  link_layer;
+	__u8  flags;			/* see ib_uverbs_query_port_flags */
+	__u8  reserved;
+};

Still don't understand why this is being moved here, not this one:

include/uapi/rdma/ib_user_ioctl_verbs.h enum ib_uverbs_advise_mr_flag { · line 196

Quoted 3 lines
include/uapi/rdma/ib_user_ioctl_verbs.h +0 -0
 struct ib_uverbs_query_port_resp_ex {
 	struct ib_uverbs_query_port_resp legacy_resp;
 	__u16 port_cap_flags2;

Moved to its proper place

Neither of these belong in this header

Jason

Applied
#2 lore raw

Re: [PATCH rdma-next v1 1/2] RDMA/uapi: Fix and re-organize the usage of rdma_driver_id

In reply to Leon Romanovsky
Quoted 10 lines · Leon Romanovsky

From: Yishai Hadas <[email protected]>

Fix 'enum rdma_driver_id' to preserve other driver values before that RDMA_DRIVER_CXGB3 was deleted. As this value is UAPI we can't affect other values as of a deletion of one driver id.

Fixes 30e0f6cf5acb ("RDMA/iw_cxgb3: Remove the iw_cxgb3 module from

kernel")

Signed-off-by Yishai Hadas <[email protected]>
Signed-off-by Leon Romanovsky <[email protected]>

Thanks, applied to for-next.

Signature · 3 lines
Doug Ledford <[email protected]>
    GPG KeyID: B826A3330E572FDD
    Fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD