Pull smb server fixes from Steve French: - More safely detect RDMA capable devices correctly * tag 'v6.18-rc4-smb-server-fixes' of git://git.samba.org/ksmbd: ksmbd: detect RDMA capable netdevs include IPoIB ksmbd: detect RDMA capable lower devices when bridge and vlan netdev is used
Unified · Split
| @@ -2606,7 +2606,7 @@ void ksmbd_rdma_destroy(void) · 2605 unmodified lines | ||
| 2606 | 2606 | } |
| 2607 | 2607 | } |
| 2608 | 2608 | |
| 2609 | −bool ksmbd_rdma_capable_netdev(struct net_device *netdev) | |
| 2609 | +static bool ksmbd_find_rdma_capable_netdev(struct net_device *netdev) | |
| 2610 | 2610 | { |
| 2611 | 2611 | struct smb_direct_device *smb_dev; |
| 2612 | 2612 | int i; |
| @@ -2648,6 +2648,28 @@ out: · 35 unmodified lines | ||
| 2648 | 2648 | return rdma_capable; |
| 2649 | 2649 | } |
| 2650 | 2650 | |
| 2651 | +bool ksmbd_rdma_capable_netdev(struct net_device *netdev) | |
| 2652 | +{ | |
| 2653 | + struct net_device *lower_dev; | |
| 2654 | + struct list_head *iter; | |
| 2655 | + | |
| 2656 | + if (ksmbd_find_rdma_capable_netdev(netdev)) | |
| 2657 | + return true; | |
| 2658 | + | |
| 2659 | + /* check if netdev is bridge or VLAN */ | |
| 2660 | + if (netif_is_bridge_master(netdev) || | |
| 2661 | + netdev->priv_flags & IFF_802_1Q_VLAN) | |
| 2662 | + netdev_for_each_lower_dev(netdev, lower_dev, iter) | |
| 2663 | + if (ksmbd_find_rdma_capable_netdev(lower_dev)) | |
| 2664 | + return true; | |
| 2665 | + | |
| 2666 | + /* check if netdev is IPoIB safely without layer violation */ | |
| 2667 | + if (netdev->type == ARPHRD_INFINIBAND) | |
| 2668 | + return true; | |
| 2669 | + | |
| 2670 | + return false; | |
| 2671 | +} | |
| 2672 | + | |
| 2651 | 2673 | static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { |
| 2652 | 2674 | .prepare = smb_direct_prepare, |
| 2653 | 2675 | .disconnect = smb_direct_disconnect, |