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

RDMA/mlx5: Remove pd from struct mlx5_core_mkey 



There is no read of mkey->pd, only write. Remove it.

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 062fd731

drivers/infiniband/hw/mlx5/devx.c

+0 −1
Original line number Diff line number Diff line
@@ -1303,7 +1303,6 @@ static int devx_handle_mkey_indirect(struct devx_obj *obj, 
	mkey->key = mlx5_idx_to_mkey(

			MLX5_GET(create_mkey_out, out, mkey_index)) | key;

	mkey->type = MLX5_MKEY_INDIRECT_DEVX;

	mkey->pd = MLX5_GET(mkc, mkc, pd);

	devx_mr->ndescs = MLX5_GET(mkc, mkc, translations_octword_size);

	init_waitqueue_head(&mkey->wait);

drivers/infiniband/hw/mlx5/mr.c

+0 −3
Original line number Diff line number Diff line
@@ -975,7 +975,6 @@ static struct mlx5_ib_mr *alloc_cacheable_mr(struct ib_pd *pd, 


	mr->ibmr.pd = pd;

	mr->umem = umem;

	mr->mmkey.pd = to_mpd(pd)->pdn;

	mr->page_shift = order_base_2(page_size);

	set_mr_fields(dev, mr, umem->length, access_flags, iova);
@@ -1708,7 +1707,6 @@ static int umr_rereg_pd_access(struct mlx5_ib_mr *mr, struct ib_pd *pd, 
		return err;



	mr->access_flags = access_flags;

	mr->mmkey.pd = to_mpd(pd)->pdn;

	return 0;

}
@@ -1753,7 +1751,6 @@ static int umr_rereg_pas(struct mlx5_ib_mr *mr, struct ib_pd *pd, 


	if (flags & IB_MR_REREG_PD) {

		mr->ibmr.pd = pd;

		mr->mmkey.pd = to_mpd(pd)->pdn;

		upd_flags |= MLX5_IB_UPD_XLT_PD;

	}

	if (flags & IB_MR_REREG_ACCESS) {

drivers/net/ethernet/mellanox/mlx5/core/mr.c

+0 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ int mlx5_core_create_mkey(struct mlx5_core_dev *dev, 
{

	u32 lout[MLX5_ST_SZ_DW(create_mkey_out)] = {};

	u32 mkey_index;

	void *mkc;

	int err;



	MLX5_SET(create_mkey_in, in, opcode, MLX5_CMD_OP_CREATE_MKEY);
@@ -50,10 +49,8 @@ int mlx5_core_create_mkey(struct mlx5_core_dev *dev, 
	if (err)

		return err;



	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);

	mkey_index = MLX5_GET(create_mkey_out, lout, mkey_index);

	mkey->key = (u32)mlx5_mkey_variant(mkey->key) | mlx5_idx_to_mkey(mkey_index);

	mkey->pd = MLX5_GET(mkc, mkc, pd);

	init_waitqueue_head(&mkey->wait);



	mlx5_core_dbg(dev, "out 0x%x, mkey 0x%x\n", mkey_index, mkey->key);

drivers/vdpa/mlx5/core/resources.c

+0 −3
Original line number Diff line number Diff line
@@ -203,7 +203,6 @@ int mlx5_vdpa_create_mkey(struct mlx5_vdpa_dev *mvdev, struct mlx5_core_mkey *mk 
{

	u32 lout[MLX5_ST_SZ_DW(create_mkey_out)] = {};

	u32 mkey_index;

	void *mkc;

	int err;



	MLX5_SET(create_mkey_in, in, opcode, MLX5_CMD_OP_CREATE_MKEY);
@@ -213,10 +212,8 @@ int mlx5_vdpa_create_mkey(struct mlx5_vdpa_dev *mvdev, struct mlx5_core_mkey *mk 
	if (err)

		return err;



	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);

	mkey_index = MLX5_GET(create_mkey_out, lout, mkey_index);

	mkey->key |= mlx5_idx_to_mkey(mkey_index);

	mkey->pd = MLX5_GET(mkc, mkc, pd);

	return 0;

}

include/linux/mlx5/driver.h

+0 −1
Original line number Diff line number Diff line
@@ -365,7 +365,6 @@ enum { 


struct mlx5_core_mkey {

	u32			key;

	u32			pd;

	u32			type;

	struct wait_queue_head wait;

	refcount_t usecount;