nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net/smc: Use rdma_read_gid_l2_fields to L2 fields

Browse source 
Use core provided API to fill the source MAC address and use
rdma_read_gid_attr_ndev_rcu() to get stable netdev.

This is preparation patch to allow gid attribute to become NULL when
associated net device is removed.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Parav Pandit 2019-05-02 10:48:06 +03:00 committed by Jason Gunthorpe
parent dab2175800
commit 5102eca903
1 changed files with 8 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
net/smc/smc_ib.c
View file

@ -146,18 +146,13 @@ int smc_ib_ready_link(struct smc_link *lnk)
static int smc_ib_fill_mac(struct smc_ib_device *smcibdev, u8 ibport) static int smc_ib_fill_mac(struct smc_ib_device *smcibdev, u8 ibport)
{ {
const struct ib_gid_attr *attr; const struct ib_gid_attr *attr;
int rc = 0; int rc;
attr = rdma_get_gid_attr(smcibdev->ibdev, ibport, 0); attr = rdma_get_gid_attr(smcibdev->ibdev, ibport, 0);
if (IS_ERR(attr)) if (IS_ERR(attr))
return -ENODEV; return -ENODEV;
if (attr->ndev) rc = rdma_read_gid_l2_fields(attr, NULL, smcibdev->mac[ibport - 1]);
memcpy(smcibdev->mac[ibport - 1], attr->ndev->dev_addr,
ETH_ALEN);
else
rc = -ENODEV;
rdma_put_gid_attr(attr); rdma_put_gid_attr(attr);
return rc; return rc;
} }
@ -185,6 +180,7 @@ int smc_ib_determine_gid(struct smc_ib_device *smcibdev, u8 ibport,
unsigned short vlan_id, u8 gid[], u8 *sgid_index) unsigned short vlan_id, u8 gid[], u8 *sgid_index)
{ {
const struct ib_gid_attr *attr; const struct ib_gid_attr *attr;
const struct net_device *ndev;
int i; int i;
for (i = 0; i < smcibdev->pattr[ibport - 1].gid_tbl_len; i++) { for (i = 0; i < smcibdev->pattr[ibport - 1].gid_tbl_len; i++) {
@ -192,11 +188,14 @@ int smc_ib_determine_gid(struct smc_ib_device *smcibdev, u8 ibport,
if (IS_ERR(attr)) if (IS_ERR(attr))
continue; continue;
if (attr->ndev && rcu_read_lock();
ndev = rdma_read_gid_attr_ndev_rcu(attr);
if (!IS_ERR(ndev) &&
((!vlan_id && !is_vlan_dev(attr->ndev)) || ((!vlan_id && !is_vlan_dev(attr->ndev)) ||
(vlan_id && is_vlan_dev(attr->ndev) && (vlan_id && is_vlan_dev(attr->ndev) &&
vlan_dev_vlan_id(attr->ndev) == vlan_id)) && vlan_dev_vlan_id(attr->ndev) == vlan_id)) &&
attr->gid_type == IB_GID_TYPE_ROCE) { attr->gid_type == IB_GID_TYPE_ROCE) {
rcu_read_unlock();
if (gid) if (gid)
memcpy(gid, &attr->gid, SMC_GID_SIZE); memcpy(gid, &attr->gid, SMC_GID_SIZE);
if (sgid_index) if (sgid_index)
@ -204,6 +203,7 @@ int smc_ib_determine_gid(struct smc_ib_device *smcibdev, u8 ibport,
rdma_put_gid_attr(attr); rdma_put_gid_attr(attr);
return 0; return 0;
} }
rcu_read_unlock();
rdma_put_gid_attr(attr); rdma_put_gid_attr(attr);
} }
return -ENODEV; return -ENODEV;