Skip to contentSkip to conversation

RDMA: modify_port improvements

PATCH Applied Kamal Heib 2 participants 6 messages Oct 28, 2019 – Nov 6, 2019

Subsystems (4)
lore
Share & tools
lore

Kamal Heib

author
#0 lore raw

v4 cover RDMA: modify_port improvements

Changelog:
v4: Allow only IB_PORT_CM_SUP fake manipulation for RoCE providers.
v3: Improve [patch 1/4].
v2: Include fixes lines.

This series includes three patches which fix the return values from modify_port() callbacks when they aren't supported.

Kamal Heib (4):
RDMA/core: Fix return code when modify_port isn't supported RDMA/hns: Remove unsupported modify_port callback RDMA/ocrdma: Remove unsupported modify_port callback RDMA/qedr: Remove unsupported modify_port callback

 drivers/infiniband/core/device.c            | 6 +++++-
 drivers/infiniband/hw/hns/hns_roce_main.c   | 7 -------
 drivers/infiniband/hw/ocrdma/ocrdma_main.c  | 1 -
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 ------
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 2 --
 drivers/infiniband/hw/qedr/main.c           | 1 -
 drivers/infiniband/hw/qedr/verbs.c          | 6 ------
 drivers/infiniband/hw/qedr/verbs.h          | 2 --
 8 files changed, 5 insertions(+), 26 deletions(-)
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH v4 1/4 RDMA/core: Fix return code when modify_port isn't supported

Improving return code from ib_modify_port() by doing the following:
1- Use "-EOPNOTSUPP" instead "-ENOSYS" which is the proper return code. 2- Allow only IB_PORT_CM_SUP fake manipulation for RoCE providers that
didn't implement the modify_port callback, otherwise return "-EOPNOTSUPP".

Fixes 61e0962d5221 ("IB: Avoid ib_modify_port() failure for RoCE devices")
---
 drivers/infiniband/core/device.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/infiniband/core/device.c +5 -1
index eb35b663a742..ee5fe20bd8b0 100644
@@ -2395,8 +2395,12 @@ int ib_modify_port(struct ib_device *device,
 		rc = device->ops.modify_port(device, port_num,
 					     port_modify_mask,
 					     port_modify);
+	else if (rdma_protocol_roce(device, port_num) &&
+		 ((port_modify->set_port_cap_mask & ~IB_PORT_CM_SUP) == 0 ||
+		  (port_modify->clr_port_cap_mask & ~IB_PORT_CM_SUP) == 0))
+		rc = 0;
 	else
-		rc = rdma_protocol_roce(device, port_num) ? 0 : -ENOSYS;
+		rc = -EOPNOTSUPP;
 	return rc;
 }
 EXPORT_SYMBOL(ib_modify_port);
Signature · 1 line
2.20.1
author
#2 lore raw

PATCH v4 2/4 RDMA/hns: Remove unsupported modify_port callback

In reply to Kamal Heib

There is no need to return always zero for function which is not supported.

Fixes 9a4435375cd1 ("IB/hns: Add driver files for hns RoCE driver")
---
 drivers/infiniband/hw/hns/hns_roce_main.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/infiniband/hw/hns/hns_roce_main.c +0 -7
index b5d196c119ee..b241f74a7e3b 100644
@@ -301,12 +301,6 @@ static int hns_roce_modify_device(struct ib_device *ib_dev, int mask,
 	return 0;
 }
 
-static int hns_roce_modify_port(struct ib_device *ib_dev, u8 port_num, int mask,
-				struct ib_port_modify *props)
-{
-	return 0;
-}
-
 static int hns_roce_alloc_ucontext(struct ib_ucontext *uctx,
 				   struct ib_udata *udata)
 {
@@ -438,7 +432,6 @@ static const struct ib_device_ops hns_roce_dev_ops = {
 	.get_port_immutable = hns_roce_port_immutable,
 	.mmap = hns_roce_mmap,
 	.modify_device = hns_roce_modify_device,
-	.modify_port = hns_roce_modify_port,
 	.modify_qp = hns_roce_modify_qp,
 	.query_ah = hns_roce_query_ah,
 	.query_device = hns_roce_query_device,
Signature · 1 line
2.20.1
author
#3 lore raw

PATCH v4 3/4 RDMA/ocrdma: Remove unsupported modify_port callback

In reply to Kamal Heib

There is no need to return always zero for function which is not supported.

Fixes fe2caefcdf58 ("RDMA/ocrdma: Add driver for Emulex OneConnect IBoE RDMAadapter")
---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c  | 1 -
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 ------
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 2 --
 3 files changed, 9 deletions(-)
drivers/infiniband/hw/ocrdma/ocrdma_main.c +0 -1
index c15cfc6cef81..d8c47d24d6d6 100644
@@ -166,7 +166,6 @@ static const struct ib_device_ops ocrdma_dev_ops = {
 	.get_port_immutable = ocrdma_port_immutable,
 	.map_mr_sg = ocrdma_map_mr_sg,
 	.mmap = ocrdma_mmap,
-	.modify_port = ocrdma_modify_port,
 	.modify_qp = ocrdma_modify_qp,
 	.poll_cq = ocrdma_poll_cq,
 	.post_recv = ocrdma_post_recv,
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -6
index e8267e590772..e72050de5734 100644
@@ -190,12 +190,6 @@ int ocrdma_query_port(struct ib_device *ibdev,
 	return 0;
 }
 
-int ocrdma_modify_port(struct ib_device *ibdev, u8 port, int mask,
-		       struct ib_port_modify *props)
-{
-	return 0;
-}
-
 static int ocrdma_add_mmap(struct ocrdma_ucontext *uctx, u64 phy_addr,
 			   unsigned long len)
 {
drivers/infiniband/hw/ocrdma/ocrdma_verbs.h +0 -2
index 32488da1b752..3a5010881be5 100644
@@ -54,8 +54,6 @@ int ocrdma_arm_cq(struct ib_cq *, enum ib_cq_notify_flags flags);
 int ocrdma_query_device(struct ib_device *, struct ib_device_attr *props,
 			struct ib_udata *uhw);
 int ocrdma_query_port(struct ib_device *, u8 port, struct ib_port_attr *props);
-int ocrdma_modify_port(struct ib_device *, u8 port, int mask,
-		       struct ib_port_modify *props);
 
 enum rdma_protocol_type
 ocrdma_query_protocol(struct ib_device *device, u8 port_num);
Signature · 1 line
2.20.1
author
#4 lore raw

PATCH v4 4/4 RDMA/qedr: Remove unsupported modify_port callback

In reply to Kamal Heib

There is no need to return always zero for function which is not supported.

Fixes ac1b36e55a51 ("qedr: Add support for user context verbs")
---
 drivers/infiniband/hw/qedr/main.c  | 1 -
 drivers/infiniband/hw/qedr/verbs.c | 6 ------
 drivers/infiniband/hw/qedr/verbs.h | 2 --
 3 files changed, 9 deletions(-)
drivers/infiniband/hw/qedr/main.c +0 -1
index 5136b835e1ba..e5f36adb0120 100644
@@ -212,7 +212,6 @@ static const struct ib_device_ops qedr_dev_ops = {
 	.get_link_layer = qedr_link_layer,
 	.map_mr_sg = qedr_map_mr_sg,
 	.mmap = qedr_mmap,
-	.modify_port = qedr_modify_port,
 	.modify_qp = qedr_modify_qp,
 	.modify_srq = qedr_modify_srq,
 	.poll_cq = qedr_poll_cq,
drivers/infiniband/hw/qedr/verbs.c +0 -6
index 6f3ce86019b7..fee02ac47f32 100644
@@ -250,12 +250,6 @@ int qedr_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr *attr)
 	return 0;
 }
 
-int qedr_modify_port(struct ib_device *ibdev, u8 port, int mask,
-		     struct ib_port_modify *props)
-{
-	return 0;
-}
-
 static int qedr_add_mmap(struct qedr_ucontext *uctx, u64 phy_addr,
 			 unsigned long len)
 {
drivers/infiniband/hw/qedr/verbs.h +0 -2
index 9aaa90283d6e..d81b81f86f0a 100644
@@ -35,8 +35,6 @@
 int qedr_query_device(struct ib_device *ibdev,
 		      struct ib_device_attr *attr, struct ib_udata *udata);
 int qedr_query_port(struct ib_device *, u8 port, struct ib_port_attr *props);
-int qedr_modify_port(struct ib_device *, u8 port, int mask,
-		     struct ib_port_modify *props);
 
 int qedr_iw_query_gid(struct ib_device *ibdev, u8 port,
 		      int index, union ib_gid *gid);
Signature · 1 line
2.20.1
#5 lore raw
In reply to Kamal Heib
Quoted 5 lines · Kamal Heib

Changelog:
v4: Allow only IB_PORT_CM_SUP fake manipulation for RoCE providers.
v3: Improve [patch 1/4].
v2: Include fixes lines.

Quoted 8 lines

This series includes three patches which fix the return values from modify_port() callbacks when they aren't supported.

Kamal Heib (4):
RDMA/core: Fix return code when modify_port isn't supported RDMA/hns: Remove unsupported modify_port callback RDMA/ocrdma: Remove unsupported modify_port callback RDMA/qedr: Remove unsupported modify_port callback

Applied to for-next, thanks

Jason