Re: [PATCH mlx5-next 6/7] RDMA/mlx5: Move struct mlx5_core_mkey to mlx5_ib

[Jason Gunthorpe <jgg@nvidia.com>]

On Tue, Oct 12, 2021 at 01:26:34PM +0300, Leon Romanovsky wrote:
> From: Aharon Landau <aharonl@nvidia.com>
> 
> Move mlx5_core_mkey struct to mlx5_ib, as the mlx5_core doesn't use it
> at this point.
> 
> Signed-off-by: Aharon Landau <aharonl@nvidia.com>
> Reviewed-by: Shay Drory <shayd@nvidia.com>
> Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
>  drivers/infiniband/hw/mlx5/devx.c    |  2 +-
>  drivers/infiniband/hw/mlx5/mlx5_ib.h | 25 +++++++++++++++++++------
>  drivers/infiniband/hw/mlx5/mr.c      | 12 +++++-------
>  drivers/infiniband/hw/mlx5/odp.c     |  8 ++++----
>  include/linux/mlx5/driver.h          | 13 -------------
>  5 files changed, 29 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
> index 465ea835f854..2778b10ffd48 100644
> +++ b/drivers/infiniband/hw/mlx5/devx.c
> @@ -1293,7 +1293,7 @@ static int devx_handle_mkey_indirect(struct devx_obj *obj,
>  				     void *in, void *out)
>  {
>  	struct mlx5_ib_devx_mr *devx_mr = &obj->devx_mr;
> -	struct mlx5_core_mkey *mkey;
> +	struct mlx5_ib_mkey *mkey;
>  	void *mkc;
>  	u8 key;
>  
> diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
> index cf8b0653f0ce..ef6087a9f93b 100644
> +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
> @@ -628,6 +628,19 @@ struct mlx5_user_mmap_entry {
>  	u32 page_idx;
>  };
>  
> +enum mlx5_mkey_type {
> +	MLX5_MKEY_MR = 1,
> +	MLX5_MKEY_MW,
> +	MLX5_MKEY_INDIRECT_DEVX,
> +};
> +
> +struct mlx5_ib_mkey {
> +	u32			key;
> +	enum mlx5_mkey_type	type;
> +	struct wait_queue_head wait;
> +	refcount_t usecount;
> +};

Please drop the horizontal whitespace when you move the struct

Jason