From: Jason Gunthorpe <jgg@mellanox.com>
Date: Wed, 4 Jul 2018 19:19:46 +0000 (-0600)
Subject: Merge branch 'mlx5-dump-fill-mkey' into rdma.git for-next
X-Git-Tag: v4.19~309^2~211
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8193abb6a8171c775503acd041eb957cc7e9e7f4;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'mlx5-dump-fill-mkey' into rdma.git for-next

For dependencies, branch based on 'mellanox/mlx5-next' of
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git

Pull Dump and fill MKEY from Leon Romanovsky:

====================
MLX5 IB HCA offers the memory key, dump_fill_mkey to increase performance,
when used in a send or receive operations.

It is used to force local HCA operations to skip the PCI bus access, while
keeping track of the processed length in the ibv_sge handling.

In this three patch series, we expose various bits in our HW spec
file (mlx5_ifc.h), move unneeded for mlx5_core FW command and export such
memory key to user space thought our mlx5-abi header file.
====================

Botched auto-merge in mlx5_ib_alloc_ucontext() resolved by hand.

* branch 'mlx5-dump-fill-mkey':
  IB/mlx5: Expose dump and fill memory key
  net/mlx5: Add hardware definitions for dump_fill_mkey
  net/mlx5: Limit scope of dump_fill_mkey function
  net/mlx5: Rate limit errors in command interface

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
---

8193abb6a8171c775503acd041eb957cc7e9e7f4
diff --cc drivers/infiniband/hw/mlx5/main.c
index 0f3649ae,bd40269..d386728
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@@ -1727,22 -1756,18 +1728,28 @@@ static struct ib_ucontext *mlx5_ib_allo
  	context->ibucontext.invalidate_range = &mlx5_ib_invalidate_range;
  #endif
  
 -	if (MLX5_CAP_GEN(dev->mdev, log_max_transport_domain)) {
 -		err = mlx5_ib_alloc_transport_domain(dev, &context->tdn);
 +	err = mlx5_ib_alloc_transport_domain(dev, &context->tdn);
 +	if (err)
 +		goto out_uars;
 +
 +	if (req.flags & MLX5_IB_ALLOC_UCTX_DEVX) {
 +		/* Block DEVX on Infiniband as of SELinux */
 +		if (mlx5_ib_port_link_layer(ibdev, 1) != IB_LINK_LAYER_ETHERNET) {
 +			err = -EPERM;
 +			goto out_td;
 +		}
 +
 +		err = mlx5_ib_devx_create(dev, context);
  		if (err)
 -			goto out_uars;
 +			goto out_td;
  	}
  
+ 	if (MLX5_CAP_GEN(dev->mdev, dump_fill_mkey)) {
+ 		err = mlx5_cmd_dump_fill_mkey(dev->mdev, &dump_fill_mkey);
+ 		if (err)
 -			goto out_td;
++			goto out_mdev;
+ 	}
+ 
  	INIT_LIST_HEAD(&context->vma_private_list);
  	mutex_init(&context->vma_private_list_mutex);
  	INIT_LIST_HEAD(&context->db_page_list);
@@@ -1801,9 -1826,18 +1808,18 @@@
  		resp.response_length += sizeof(resp.num_dyn_bfregs);
  	}
  
+ 	if (field_avail(typeof(resp), dump_fill_mkey, udata->outlen)) {
+ 		if (MLX5_CAP_GEN(dev->mdev, dump_fill_mkey)) {
+ 			resp.dump_fill_mkey = dump_fill_mkey;
+ 			resp.comp_mask |=
+ 				MLX5_IB_ALLOC_UCONTEXT_RESP_MASK_DUMP_FILL_MKEY;
+ 		}
+ 		resp.response_length += sizeof(resp.dump_fill_mkey);
+ 	}
+ 
  	err = ib_copy_to_udata(udata, &resp, resp.response_length);
  	if (err)
 -		goto out_td;
 +		goto out_mdev;
  
  	bfregi->ver = ver;
  	bfregi->num_low_latency_bfregs = req.num_low_latency_bfregs;