Skip to content

Commit 1a81ea7

Browse files
namjaejeonSteve French
authored andcommitted
Revert "ksmbd: fix missing RDMA-capable flag for IPoIB device in ksmbd_rdma_capable_netdev()"
This reverts commit ecce70c. Revert the GUID trick code causing the layering violation. I will try to allow the users to turn RDMA-capable on/off via sysfs later Cc: Kangjing Huang <huangkangjing@gmail.com> Cc: Leon Romanovsky <leon@kernel.org> Signed-off-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent bab703e commit 1a81ea7

File tree

1 file changed

+10
-30
lines changed

1 file changed

+10
-30
lines changed

fs/smb/server/transport_rdma.c

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2142,7 +2142,8 @@ static int smb_direct_ib_client_add(struct ib_device *ib_dev)
21422142
if (ib_dev->node_type != RDMA_NODE_IB_CA)
21432143
smb_direct_port = SMB_DIRECT_PORT_IWARP;
21442144

2145-
if (!rdma_frwr_is_supported(&ib_dev->attrs))
2145+
if (!ib_dev->ops.get_netdev ||
2146+
!rdma_frwr_is_supported(&ib_dev->attrs))
21462147
return 0;
21472148

21482149
smb_dev = kzalloc(sizeof(*smb_dev), KSMBD_DEFAULT_GFP);
@@ -2242,38 +2243,17 @@ bool ksmbd_rdma_capable_netdev(struct net_device *netdev)
22422243
for (i = 0; i < smb_dev->ib_dev->phys_port_cnt; i++) {
22432244
struct net_device *ndev;
22442245

2245-
if (smb_dev->ib_dev->ops.get_netdev) {
2246-
ndev = smb_dev->ib_dev->ops.get_netdev(
2247-
smb_dev->ib_dev, i + 1);
2248-
if (!ndev)
2249-
continue;
2246+
ndev = smb_dev->ib_dev->ops.get_netdev(smb_dev->ib_dev,
2247+
i + 1);
2248+
if (!ndev)
2249+
continue;
22502250

2251-
if (ndev == netdev) {
2252-
dev_put(ndev);
2253-
rdma_capable = true;
2254-
goto out;
2255-
}
2251+
if (ndev == netdev) {
22562252
dev_put(ndev);
2257-
/* if ib_dev does not implement ops.get_netdev
2258-
* check for matching infiniband GUID in hw_addr
2259-
*/
2260-
} else if (netdev->type == ARPHRD_INFINIBAND) {
2261-
struct netdev_hw_addr *ha;
2262-
union ib_gid gid;
2263-
u32 port_num;
2264-
int ret;
2265-
2266-
netdev_hw_addr_list_for_each(
2267-
ha, &netdev->dev_addrs) {
2268-
memcpy(&gid, ha->addr + 4, sizeof(gid));
2269-
ret = ib_find_gid(smb_dev->ib_dev, &gid,
2270-
&port_num, NULL);
2271-
if (!ret) {
2272-
rdma_capable = true;
2273-
goto out;
2274-
}
2275-
}
2253+
rdma_capable = true;
2254+
goto out;
22762255
}
2256+
dev_put(ndev);
22772257
}
22782258
}
22792259
out:

0 commit comments

Comments
 (0)