Commit 83fec3f1 authored by Aharon Landau's avatar Aharon Landau Committed by Leon Romanovsky
Browse files

RDMA/mlx5: Replace struct mlx5_core_mkey by u32 key 



In mlx5_core and vdpa there is no use of mlx5_core_mkey members except
for the key itself.

As preparation for moving mlx5_core_mkey to mlx5_ib, the occurrences of
struct mlx5_core_mkey in all modules except for mlx5_ib are replaced by
a u32 key.

Signed-off-by: default avatarAharon Landau <aharonl@nvidia.com>
Reviewed-by: default avatarShay Drory <shayd@nvidia.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent c6467416

drivers/infiniband/hw/mlx5/mr.c

+14 −7
Original line number Diff line number Diff line
@@ -104,8 +104,14 @@ static int 
mlx5_ib_create_mkey(struct mlx5_ib_dev *dev, struct mlx5_core_mkey *mkey,

		    u32 *in, int inlen)

{

	int ret;



	assign_mkey_variant(dev, mkey, in);

	return mlx5_core_create_mkey(dev->mdev, mkey, in, inlen);

	ret = mlx5_core_create_mkey(dev->mdev, &mkey->key, in, inlen);

	if (!ret)

		init_waitqueue_head(&mkey->wait);



	return ret;

}



static int
@@ -133,7 +139,7 @@ static int destroy_mkey(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr) 
{

	WARN_ON(xa_load(&dev->odp_mkeys, mlx5_base_mkey(mr->mmkey.key)));



	return mlx5_core_destroy_mkey(dev->mdev, &mr->mmkey);

	return mlx5_core_destroy_mkey(dev->mdev, mr->mmkey.key);

}



static void create_mkey_callback(int status, struct mlx5_async_work *context)
@@ -260,10 +266,11 @@ static struct mlx5_ib_mr *create_cache_mr(struct mlx5_cache_ent *ent) 
		goto free_in;

	}



	err = mlx5_core_create_mkey(ent->dev->mdev, &mr->mmkey, in, inlen);

	err = mlx5_core_create_mkey(ent->dev->mdev, &mr->mmkey.key, in, inlen);

	if (err)

		goto free_mr;



	init_waitqueue_head(&mr->mmkey.wait);

	mr->mmkey.type = MLX5_MKEY_MR;

	WRITE_ONCE(ent->dev->cache.last_add, jiffies);

	spin_lock_irq(&ent->lock);
@@ -290,7 +297,7 @@ static void remove_cache_mr_locked(struct mlx5_cache_ent *ent) 
	ent->available_mrs--;

	ent->total_mrs--;

	spin_unlock_irq(&ent->lock);

	mlx5_core_destroy_mkey(ent->dev->mdev, &mr->mmkey);

	mlx5_core_destroy_mkey(ent->dev->mdev, mr->mmkey.key);

	kfree(mr);

	spin_lock_irq(&ent->lock);

}
@@ -658,7 +665,7 @@ static void clean_keys(struct mlx5_ib_dev *dev, int c) 
		ent->available_mrs--;

		ent->total_mrs--;

		spin_unlock_irq(&ent->lock);

		mlx5_core_destroy_mkey(dev->mdev, &mr->mmkey);

		mlx5_core_destroy_mkey(dev->mdev, mr->mmkey.key);

	}



	list_for_each_entry_safe(mr, tmp_mr, &del_list, list) {
@@ -2326,7 +2333,7 @@ int mlx5_ib_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata) 
	return 0;



free_mkey:

	mlx5_core_destroy_mkey(dev->mdev, &mw->mmkey);

	mlx5_core_destroy_mkey(dev->mdev, mw->mmkey.key);

free:

	kfree(in);

	return err;
@@ -2345,7 +2352,7 @@ int mlx5_ib_dealloc_mw(struct ib_mw *mw) 
		 */

		mlx5r_deref_wait_odp_mkey(&mmw->mmkey);



	return mlx5_core_destroy_mkey(dev->mdev, &mmw->mmkey);

	return mlx5_core_destroy_mkey(dev->mdev, mmw->mmkey.key);

}



int mlx5_ib_check_mr_status(struct ib_mr *ibmr, u32 check_mask,

drivers/infiniband/hw/mlx5/odp.c

+1 −1
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ static int pagefault_single_data_segment(struct mlx5_ib_dev *dev, 
		pklm = (struct mlx5_klm *)MLX5_ADDR_OF(query_mkey_out, out,

						       bsf0_klm0_pas_mtt0_1);



		ret = mlx5_core_query_mkey(dev->mdev, mmkey, out, outlen);

		ret = mlx5_core_query_mkey(dev->mdev, mmkey->key, out, outlen);

		if (ret)

			goto end;

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+3 −3
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ static int mlx5_fw_tracer_set_mtrc_conf(struct mlx5_fw_tracer *tracer) 
	MLX5_SET(mtrc_conf, in, trace_mode, TRACE_TO_MEMORY);

	MLX5_SET(mtrc_conf, in, log_trace_buffer_size,

		 ilog2(TRACER_BUFFER_PAGE_NUM));

	MLX5_SET(mtrc_conf, in, trace_mkey, tracer->buff.mkey.key);

	MLX5_SET(mtrc_conf, in, trace_mkey, tracer->buff.mkey);



	err = mlx5_core_access_reg(dev, in, sizeof(in), out, sizeof(out),

				   MLX5_REG_MTRC_CONF, 0, 1);
@@ -1028,7 +1028,7 @@ int mlx5_fw_tracer_init(struct mlx5_fw_tracer *tracer) 


err_notifier_unregister:

	mlx5_eq_notifier_unregister(dev, &tracer->nb);

	mlx5_core_destroy_mkey(dev, &tracer->buff.mkey);

	mlx5_core_destroy_mkey(dev, tracer->buff.mkey);

err_dealloc_pd:

	mlx5_core_dealloc_pd(dev, tracer->buff.pdn);

err_cancel_work:
@@ -1051,7 +1051,7 @@ void mlx5_fw_tracer_cleanup(struct mlx5_fw_tracer *tracer) 
	if (tracer->owner)

		mlx5_fw_tracer_ownership_release(tracer);



	mlx5_core_destroy_mkey(tracer->dev, &tracer->buff.mkey);

	mlx5_core_destroy_mkey(tracer->dev, tracer->buff.mkey);

	mlx5_core_dealloc_pd(tracer->dev, tracer->buff.pdn);

}

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ struct mlx5_fw_tracer { 
		void *log_buf;

		dma_addr_t dma;

		u32 size;

		struct mlx5_core_mkey mkey;

		u32 mkey;

		u32 consumer_index;

	} buff;

drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static const char *const mlx5_rsc_sgmt_name[] = { 


struct mlx5_rsc_dump {

	u32 pdn;

	struct mlx5_core_mkey mkey;

	u32 mkey;

	u16 fw_segment_type[MLX5_SGMT_TYPE_NUM];

};
@@ -89,7 +89,7 @@ static int mlx5_rsc_dump_trigger(struct mlx5_core_dev *dev, struct mlx5_rsc_dump 
		return -ENOMEM;



	in_seq_num = MLX5_GET(resource_dump, cmd->cmd, seq_num);

	MLX5_SET(resource_dump, cmd->cmd, mkey, rsc_dump->mkey.key);

	MLX5_SET(resource_dump, cmd->cmd, mkey, rsc_dump->mkey);

	MLX5_SET64(resource_dump, cmd->cmd, address, dma);



	err = mlx5_core_access_reg(dev, cmd->cmd, sizeof(cmd->cmd), cmd->cmd,
@@ -202,7 +202,7 @@ static int mlx5_rsc_dump_menu(struct mlx5_core_dev *dev) 
}



static int mlx5_rsc_dump_create_mkey(struct mlx5_core_dev *mdev, u32 pdn,

				     struct mlx5_core_mkey *mkey)

				     u32 *mkey)

{

	int inlen = MLX5_ST_SZ_BYTES(create_mkey_in);

	void *mkc;
@@ -276,7 +276,7 @@ int mlx5_rsc_dump_init(struct mlx5_core_dev *dev) 
	return err;



destroy_mkey:

	mlx5_core_destroy_mkey(dev, &rsc_dump->mkey);

	mlx5_core_destroy_mkey(dev, rsc_dump->mkey);

free_pd:

	mlx5_core_dealloc_pd(dev, rsc_dump->pdn);

	return err;
@@ -287,6 +287,6 @@ void mlx5_rsc_dump_cleanup(struct mlx5_core_dev *dev) 
	if (IS_ERR_OR_NULL(dev->rsc_dump))

		return;



	mlx5_core_destroy_mkey(dev, &dev->rsc_dump->mkey);

	mlx5_core_destroy_mkey(dev, dev->rsc_dump->mkey);

	mlx5_core_dealloc_pd(dev, dev->rsc_dump->pdn);

}