]> git.baikalelectronics.ru Git - kernel.git/commitdiff
IB: Avoid ib_modify_port() failure for RoCE devices
authorSelvin Xavier <selvin.xavier@broadcom.com>
Wed, 23 Aug 2017 08:08:07 +0000 (01:08 -0700)
committerDoug Ledford <dledford@redhat.com>
Thu, 24 Aug 2017 21:34:57 +0000 (17:34 -0400)
IB CM calls ib_modify_port() irrespective of link layer. If the
failure is returned, the mad agent gets unregistered for those
devices. Recently, modify_port() hook was removed from some of the
low level drivers as it was always returning success. This breaks
rdma connection establishment over those devices.
For ethernet devices, Qkey violation and port capabilities are not
applicable. So returning success for RoCE when modify_port hook is
is not implemented.

Cc: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/core/device.c

index fc6be1175183820e34d5d10a48e158402ec95edd..2466ffc6362de762d0db6035aeb9c274cc3640a5 100644 (file)
@@ -1005,14 +1005,17 @@ int ib_modify_port(struct ib_device *device,
                   u8 port_num, int port_modify_mask,
                   struct ib_port_modify *port_modify)
 {
-       if (!device->modify_port)
-               return -ENOSYS;
+       int rc;
 
        if (!rdma_is_port_valid(device, port_num))
                return -EINVAL;
 
-       return device->modify_port(device, port_num, port_modify_mask,
-                                  port_modify);
+       if (device->modify_port)
+               rc = device->modify_port(device, port_num, port_modify_mask,
+                                          port_modify);
+       else
+               rc = rdma_protocol_roce(device, port_num) ? 0 : -ENOSYS;
+       return rc;
 }
 EXPORT_SYMBOL(ib_modify_port);