Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 414448d2 authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

RDMA: Use ib_gid_attr during GID modification 



Now that ib_gid_attr contains device, port and index, simplify the
provider APIs add_gid() and del_gid() to use device, port and index
fields from the ib_gid_attr attributes structure.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 3e44e0ee

drivers/infiniband/core/cache.c

+2 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static void del_roce_gid(struct ib_device *device, u8 port_num, 
		 table->data_vec[ix].gid.raw);



	if (rdma_cap_roce_gid_table(device, port_num))

		device->del_gid(device, port_num, ix,

		device->del_gid(&table->data_vec[ix].attr,

				&table->data_vec[ix].context);

	dev_put(table->data_vec[ix].attr.ndev);

}
@@ -186,8 +186,7 @@ static int add_roce_gid(struct ib_gid_table *table, 
	}



	if (rdma_cap_roce_gid_table(attr->device, attr->port_num)) {

		ret = attr->device->add_gid(attr->device, attr->port_num,

					    ix, gid, attr, &entry->context);

		ret = attr->device->add_gid(gid, attr, &entry->context);

		if (ret) {

			pr_err("%s GID add failed device=%s port=%d index=%d\n",

			       __func__, attr->device->name, attr->port_num,

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+4 −6
Original line number Diff line number Diff line
@@ -314,12 +314,11 @@ int bnxt_re_query_gid(struct ib_device *ibdev, u8 port_num, 
	return rc;

}



int bnxt_re_del_gid(struct ib_device *ibdev, u8 port_num,

		    unsigned int index, void **context)

int bnxt_re_del_gid(const struct ib_gid_attr *attr, void **context)

{

	int rc = 0;

	struct bnxt_re_gid_ctx *ctx, **ctx_tbl;

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(attr->device, ibdev);

	struct bnxt_qplib_sgid_tbl *sgid_tbl = &rdev->qplib_res.sgid_tbl;

	struct bnxt_qplib_gid *gid_to_del;
@@ -365,15 +364,14 @@ int bnxt_re_del_gid(struct ib_device *ibdev, u8 port_num, 
	return rc;

}



int bnxt_re_add_gid(struct ib_device *ibdev, u8 port_num,

		    unsigned int index, const union ib_gid *gid,

int bnxt_re_add_gid(const union ib_gid *gid,

		    const struct ib_gid_attr *attr, void **context)

{

	int rc;

	u32 tbl_idx = 0;

	u16 vlan_id = 0xFFFF;

	struct bnxt_re_gid_ctx *ctx, **ctx_tbl;

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(attr->device, ibdev);

	struct bnxt_qplib_sgid_tbl *sgid_tbl = &rdev->qplib_res.sgid_tbl;



	if ((attr->ndev) && is_vlan_dev(attr->ndev))

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+2 −4
Original line number Diff line number Diff line
@@ -157,10 +157,8 @@ int bnxt_re_get_port_immutable(struct ib_device *ibdev, u8 port_num, 
void bnxt_re_query_fw_str(struct ib_device *ibdev, char *str);

int bnxt_re_query_pkey(struct ib_device *ibdev, u8 port_num,

		       u16 index, u16 *pkey);

int bnxt_re_del_gid(struct ib_device *ibdev, u8 port_num,

		    unsigned int index, void **context);

int bnxt_re_add_gid(struct ib_device *ibdev, u8 port_num,

		    unsigned int index, const union ib_gid *gid,

int bnxt_re_del_gid(const struct ib_gid_attr *attr, void **context);

int bnxt_re_add_gid(const union ib_gid *gid,

		    const struct ib_gid_attr *attr, void **context);

int bnxt_re_query_gid(struct ib_device *ibdev, u8 port_num,

		      int index, union ib_gid *gid);

drivers/infiniband/hw/hns/hns_roce_main.c

+9 −11
Original line number Diff line number Diff line
@@ -74,12 +74,11 @@ static int hns_roce_set_mac(struct hns_roce_dev *hr_dev, u8 port, u8 *addr) 
	return hr_dev->hw->set_mac(hr_dev, phy_port, addr);

}



static int hns_roce_add_gid(struct ib_device *device, u8 port_num,

			    unsigned int index, const union ib_gid *gid,

static int hns_roce_add_gid(const union ib_gid *gid,

			    const struct ib_gid_attr *attr, void **context)

{

	struct hns_roce_dev *hr_dev = to_hr_dev(device);

	u8 port = port_num - 1;

	struct hns_roce_dev *hr_dev = to_hr_dev(attr->device);

	u8 port = attr->port_num - 1;

	unsigned long flags;

	int ret;
@@ -88,21 +87,20 @@ static int hns_roce_add_gid(struct ib_device *device, u8 port_num, 


	spin_lock_irqsave(&hr_dev->iboe.lock, flags);



	ret = hr_dev->hw->set_gid(hr_dev, port, index, (union ib_gid *)gid,

				   attr);

	ret = hr_dev->hw->set_gid(hr_dev, port, attr->index,

				  (union ib_gid *)gid, attr);



	spin_unlock_irqrestore(&hr_dev->iboe.lock, flags);



	return ret;

}



static int hns_roce_del_gid(struct ib_device *device, u8 port_num,

			    unsigned int index, void **context)

static int hns_roce_del_gid(const struct ib_gid_attr *attr, void **context)

{

	struct hns_roce_dev *hr_dev = to_hr_dev(device);

	struct hns_roce_dev *hr_dev = to_hr_dev(attr->device);

	struct ib_gid_attr zattr = { };

	union ib_gid zgid = { {0} };

	u8 port = port_num - 1;

	u8 port = attr->port_num - 1;

	unsigned long flags;

	int ret;
@@ -111,7 +109,7 @@ static int hns_roce_del_gid(struct ib_device *device, u8 port_num, 


	spin_lock_irqsave(&hr_dev->iboe.lock, flags);



	ret = hr_dev->hw->set_gid(hr_dev, port, index, &zgid, &zattr);

	ret = hr_dev->hw->set_gid(hr_dev, port, attr->index, &zgid, &zattr);



	spin_unlock_irqrestore(&hr_dev->iboe.lock, flags);

drivers/infiniband/hw/mlx4/main.c

+12 −18
Original line number Diff line number Diff line
@@ -246,14 +246,11 @@ static int mlx4_ib_update_gids(struct gid_entry *gids, 
	return mlx4_ib_update_gids_v1(gids, ibdev, port_num);

}



static int mlx4_ib_add_gid(struct ib_device *device,

			   u8 port_num,

			   unsigned int index,

			   const union ib_gid *gid,

static int mlx4_ib_add_gid(const union ib_gid *gid,

			   const struct ib_gid_attr *attr,

			   void **context)

{

	struct mlx4_ib_dev *ibdev = to_mdev(device);

	struct mlx4_ib_dev *ibdev = to_mdev(attr->device);

	struct mlx4_ib_iboe *iboe = &ibdev->iboe;

	struct mlx4_port_gid_table   *port_gid_table;

	int free = -1, found = -1;
@@ -262,16 +259,16 @@ static int mlx4_ib_add_gid(struct ib_device *device, 
	int i;

	struct gid_entry *gids = NULL;



	if (!rdma_cap_roce_gid_table(device, port_num))

	if (!rdma_cap_roce_gid_table(attr->device, attr->port_num))

		return -EINVAL;



	if (port_num > MLX4_MAX_PORTS)

	if (attr->port_num > MLX4_MAX_PORTS)

		return -EINVAL;



	if (!context)

		return -EINVAL;



	port_gid_table = &iboe->gids[port_num - 1];

	port_gid_table = &iboe->gids[attr->port_num - 1];

	spin_lock_bh(&iboe->lock);

	for (i = 0; i < MLX4_MAX_PORT_GIDS; ++i) {

		if (!memcmp(&port_gid_table->gids[i].gid, gid, sizeof(*gid)) &&
@@ -318,33 +315,30 @@ static int mlx4_ib_add_gid(struct ib_device *device, 
	spin_unlock_bh(&iboe->lock);



	if (!ret && hw_update) {

		ret = mlx4_ib_update_gids(gids, ibdev, port_num);

		ret = mlx4_ib_update_gids(gids, ibdev, attr->port_num);

		kfree(gids);

	}



	return ret;

}



static int mlx4_ib_del_gid(struct ib_device *device,

			   u8 port_num,

			   unsigned int index,

			   void **context)

static int mlx4_ib_del_gid(const struct ib_gid_attr *attr, void **context)

{

	struct gid_cache_context *ctx = *context;

	struct mlx4_ib_dev *ibdev = to_mdev(device);

	struct mlx4_ib_dev *ibdev = to_mdev(attr->device);

	struct mlx4_ib_iboe *iboe = &ibdev->iboe;

	struct mlx4_port_gid_table   *port_gid_table;

	int ret = 0;

	int hw_update = 0;

	struct gid_entry *gids = NULL;



	if (!rdma_cap_roce_gid_table(device, port_num))

	if (!rdma_cap_roce_gid_table(attr->device, attr->port_num))

		return -EINVAL;



	if (port_num > MLX4_MAX_PORTS)

	if (attr->port_num > MLX4_MAX_PORTS)

		return -EINVAL;



	port_gid_table = &iboe->gids[port_num - 1];

	port_gid_table = &iboe->gids[attr->port_num - 1];

	spin_lock_bh(&iboe->lock);

	if (ctx) {

		ctx->refcount--;
@@ -376,7 +370,7 @@ static int mlx4_ib_del_gid(struct ib_device *device, 
	spin_unlock_bh(&iboe->lock);



	if (!ret && hw_update) {

		ret = mlx4_ib_update_gids(gids, ibdev, port_num);

		ret = mlx4_ib_update_gids(gids, ibdev, attr->port_num);

		kfree(gids);

	}

	return ret;