Reviewed-by: Yuval Shaia <yuval.shaia@xxxxxxxxxx>
On Wed, Dec 28, 2016 at 12:48:28PM +0200, Max Gurtovoy wrote:
> From: Israel Rukshin <israelr@xxxxxxxxxxxx>
>
> 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: 509c5f33f4f6 ("IB/srp: Prevent mapping failures")
> Cc: <stable@xxxxxxxxxxxxxxx> [4.7+]
> Signed-off-by: Israel Rukshin <israelr@xxxxxxxxxxxx>
> Signed-off-by: Max Gurtovoy <maxg@xxxxxxxxxxxx>
> Reviewed-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
> Reviewed-by: Mark Bloch <markb@xxxxxxxxxxxx>
> ---
> drivers/infiniband/ulp/srp/ib_srp.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
> index 8ddc071..0f67cf9 100644
> --- a/drivers/infiniband/ulp/srp/ib_srp.c
> +++ b/drivers/infiniband/ulp/srp/ib_srp.c
> @@ -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)
> --
> 1.8.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
