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

Commit ad8e66b4 authored by Israel Rukshin's avatar Israel Rukshin Committed by Doug Ledford
Browse files

IB/srp: fix mr allocation when the device supports sg gaps 



If the device support arbitrary sg list mapping (device cap
IB_DEVICE_SG_GAPS_REG set) we allocate the memory regions with
IB_MR_TYPE_SG_GAPS.

Fixes: 509c5f33 ("IB/srp: Prevent mapping failures")
Cc: <stable@vger.kernel.org> # 4.7+
Signed-off-by: default avatarIsrael Rukshin <israelr@mellanox.com>
Signed-off-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Reviewed-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 3bcf96e0

drivers/infiniband/ulp/srp/ib_srp.c

+7 −2
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static struct srp_fr_pool *srp_create_fr_pool(struct ib_device *device, 
	struct srp_fr_desc *d;

	struct ib_mr *mr;

	int i, ret = -EINVAL;

	enum ib_mr_type mr_type;



	if (pool_size <= 0)

		goto err;
@@ -384,9 +385,13 @@ static struct srp_fr_pool *srp_create_fr_pool(struct ib_device *device, 
	spin_lock_init(&pool->lock);

	INIT_LIST_HEAD(&pool->free_list);



	if (device->attrs.device_cap_flags & IB_DEVICE_SG_GAPS_REG)

		mr_type = IB_MR_TYPE_SG_GAPS;

	else

		mr_type = IB_MR_TYPE_MEM_REG;



	for (i = 0, d = &pool->desc[0]; i < pool->size; i++, d++) {

		mr = ib_alloc_mr(pd, IB_MR_TYPE_MEM_REG,

				 max_page_list_len);

		mr = ib_alloc_mr(pd, mr_type, max_page_list_len);

		if (IS_ERR(mr)) {

			ret = PTR_ERR(mr);

			if (ret == -ENOMEM)