d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mlx4: replace LinuxKPI macros with ifnet functions

Browse Source 
The LinuxKPI net_device actually is an ifnet;  in order to further
clean that up so we can extend "net_device" replace the few macros
inline in mlx4.

Sponsored by:	The FreeBSD Foundation
MFC after:	12 days
Reviewed by:	kib
Differential Revision: https://reviews.freebsd.org/D30476
This commit is contained in:
Bjoern A. Zeeb 2021-05-26 17:47:02 +00:00
parent 16fa3dcba0
commit 60afad6fc3
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/mlx4/mlx4_ib/mlx4_ib_ah.c
View File

@ -98,7 +98,7 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr
if (gid_attr.ndev) { if (gid_attr.ndev) {
vlan_tag = rdma_vlan_dev_vlan_id(gid_attr.ndev); vlan_tag = rdma_vlan_dev_vlan_id(gid_attr.ndev);
memcpy(ah->av.eth.s_mac, IF_LLADDR(gid_attr.ndev), ETH_ALEN); memcpy(ah->av.eth.s_mac, IF_LLADDR(gid_attr.ndev), ETH_ALEN);
dev_put(gid_attr.ndev); if_rele(gid_attr.ndev);
} }
if (vlan_tag < 0x1000) if (vlan_tag < 0x1000)
vlan_tag |= (ah_attr->sl & 7) << 13; vlan_tag |= (ah_attr->sl & 7) << 13;

21
sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
View File

@ -156,7 +156,7 @@ static struct net_device *mlx4_ib_get_netdev(struct ib_device *device, u8 port_n
} }
#endif #endif
if (dev) if (dev)
dev_hold(dev); if_ref(dev);
rcu_read_unlock(); rcu_read_unlock();
return dev; return dev;
@ -415,7 +415,7 @@ int mlx4_ib_gid_index_to_real_index(struct mlx4_ib_dev *ibdev,
return ret; return ret;
if (attr.ndev) if (attr.ndev)
dev_put(attr.ndev); if_rele(attr.ndev);
if (!memcmp(&gid, &zgid, sizeof(gid))) if (!memcmp(&gid, &zgid, sizeof(gid)))
return -EINVAL; return -EINVAL;
@ -736,7 +736,8 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port,
tmp = iboe_get_mtu(ndev->if_mtu); tmp = iboe_get_mtu(ndev->if_mtu);
props->active_mtu = tmp ? min(props->max_mtu, tmp) : IB_MTU_256; props->active_mtu = tmp ? min(props->max_mtu, tmp) : IB_MTU_256;
props->state = (netif_running(ndev) && netif_carrier_ok(ndev)) ? props->state = ((ndev->if_drv_flags & IFF_DRV_RUNNING) != 0 &&
ndev->if_link_state == LINK_STATE_UP) ?
IB_PORT_ACTIVE : IB_PORT_DOWN; IB_PORT_ACTIVE : IB_PORT_DOWN;
props->phys_state = state_to_phys_state(props->state); props->phys_state = state_to_phys_state(props->state);
out_unlock: out_unlock:
@ -1356,12 +1357,12 @@ int mlx4_ib_add_mc(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp,
spin_lock_bh(&mdev->iboe.lock); spin_lock_bh(&mdev->iboe.lock);
ndev = mdev->iboe.netdevs[mqp->port - 1]; ndev = mdev->iboe.netdevs[mqp->port - 1];
if (ndev) if (ndev)
dev_hold(ndev); if_ref(ndev);
spin_unlock_bh(&mdev->iboe.lock); spin_unlock_bh(&mdev->iboe.lock);
if (ndev) { if (ndev) {
ret = 1; ret = 1;
dev_put(ndev); if_rele(ndev);
} }
return ret; return ret;
@ -2002,10 +2003,10 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
spin_lock_bh(&mdev->iboe.lock); spin_lock_bh(&mdev->iboe.lock);
ndev = ge->added ? mdev->iboe.netdevs[ge->port - 1] : NULL; ndev = ge->added ? mdev->iboe.netdevs[ge->port - 1] : NULL;
if (ndev) if (ndev)
dev_hold(ndev); if_ref(ndev);
spin_unlock_bh(&mdev->iboe.lock); spin_unlock_bh(&mdev->iboe.lock);
if (ndev) if (ndev)
dev_put(ndev); if_rele(ndev);
list_del(&ge->list); list_del(&ge->list);
kfree(ge); kfree(ge);
} else } else
@ -2372,7 +2373,7 @@ static int mlx4_ib_netdev_event(struct notifier_block *this,
struct net_device *dev = netdev_notifier_info_to_dev(ptr); struct net_device *dev = netdev_notifier_info_to_dev(ptr);
struct mlx4_ib_dev *ibdev; struct mlx4_ib_dev *ibdev;
if (!net_eq(dev_net(dev), &init_net)) if (dev->if_vnet != &init_net)
return NOTIFY_DONE; return NOTIFY_DONE;
ibdev = container_of(this, struct mlx4_ib_dev, iboe.nb); ibdev = container_of(this, struct mlx4_ib_dev, iboe.nb);
@ -3111,8 +3112,8 @@ static void handle_bonded_port_state_event(struct work_struct *work)
continue; continue;
curr_port_state = curr_port_state =
(netif_running(curr_netdev) && ((curr_netdev->if_drv_flags & IFF_DRV_RUNNING) != 0 &&
netif_carrier_ok(curr_netdev)) ? curr_netdev->if_link_state == LINK_STATE_UP) ?
IB_PORT_ACTIVE : IB_PORT_DOWN; IB_PORT_ACTIVE : IB_PORT_DOWN;
bonded_port_state = (bonded_port_state != IB_PORT_ACTIVE) ? bonded_port_state = (bonded_port_state != IB_PORT_ACTIVE) ?

6
sys/dev/mlx4/mlx4_ib/mlx4_ib_qp.c
View File

@ -1783,7 +1783,7 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
if (!status && gid_attr.ndev) { if (!status && gid_attr.ndev) {
vlan = rdma_vlan_dev_vlan_id(gid_attr.ndev); vlan = rdma_vlan_dev_vlan_id(gid_attr.ndev);
memcpy(smac, IF_LLADDR(gid_attr.ndev), ETH_ALEN); memcpy(smac, IF_LLADDR(gid_attr.ndev), ETH_ALEN);
dev_put(gid_attr.ndev); if_rele(gid_attr.ndev);
} }
} }
if (status) if (status)
@ -2471,7 +2471,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_ud_wr *wr,
&gid_attr); &gid_attr);
if (!err) { if (!err) {
if (gid_attr.ndev) if (gid_attr.ndev)
dev_put(gid_attr.ndev); if_rele(gid_attr.ndev);
if (!memcmp(&sgid, &zgid, sizeof(sgid))) if (!memcmp(&sgid, &zgid, sizeof(sgid)))
err = -ENOENT; err = -ENOENT;
} }
@ -2962,7 +2962,7 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
ah->av.ib.gid_index, &gid, ah->av.ib.gid_index, &gid,
&gid_attr)) { &gid_attr)) {
if (gid_attr.ndev) if (gid_attr.ndev)
dev_put(gid_attr.ndev); if_rele(gid_attr.ndev);
qp = (gid_attr.gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) ? qp = (gid_attr.gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) ?
to_mqp(sqp->roce_v2_gsi) : qp; to_mqp(sqp->roce_v2_gsi) : qp;
} else { } else {