Commit e1b95ae0 authored by Erez Alfasi's avatar Erez Alfasi Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Return ODP type per MR 

Provide an ODP explicit/implicit type as part of 'rdma -dd resource show
mr' dump.

For example:

$ rdma -dd resource show mr
dev mlx5_0 mrn 1 rkey 0xa99a lkey 0xa99a mrlen 50000000
pdn 9 pid 7372 comm ibv_rc_pingpong drv_odp explicit

For non-ODP MRs, we won't print "drv_odp ..." at all.

Link: https://lore.kernel.org/r/20191016062308.11886-4-leon@kernel.org


Signed-off-by: default avatarErez Alfasi <ereza@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent fb910690

drivers/infiniband/core/nldev.c

+13 −0
Original line number Diff line number Diff line
@@ -183,6 +183,19 @@ static int _rdma_nl_put_driver_u64(struct sk_buff *msg, const char *name, 
	return 0;

}



int rdma_nl_put_driver_string(struct sk_buff *msg, const char *name,

			      const char *str)

{

	if (put_driver_name_print_type(msg, name,

				       RDMA_NLDEV_PRINT_TYPE_UNSPEC))

		return -EMSGSIZE;

	if (nla_put_string(msg, RDMA_NLDEV_ATTR_DRIVER_STRING, str))

		return -EMSGSIZE;



	return 0;

}

EXPORT_SYMBOL(rdma_nl_put_driver_string);



int rdma_nl_put_driver_u32(struct sk_buff *msg, const char *name, u32 value)

{

	return _rdma_nl_put_driver_u32(msg, name, RDMA_NLDEV_PRINT_TYPE_UNSPEC,

drivers/infiniband/hw/mlx5/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-$(CONFIG_MLX5_INFINIBAND) += mlx5_ib.o 


mlx5_ib-y :=	main.o cq.o doorbell.o qp.o mem.o srq_cmd.o \

		srq.o mr.o ah.o mad.o gsi.o ib_virt.o cmd.o \

		cong.o

		cong.o restrack.o

mlx5_ib-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += odp.o

mlx5_ib-$(CONFIG_MLX5_ESWITCH) += ib_rep.o

mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += devx.o

drivers/infiniband/hw/mlx5/main.c

+1 −0
Original line number Diff line number Diff line
@@ -6271,6 +6271,7 @@ static const struct ib_device_ops mlx5_ib_dev_ops = { 
	.disassociate_ucontext = mlx5_ib_disassociate_ucontext,

	.drain_rq = mlx5_ib_drain_rq,

	.drain_sq = mlx5_ib_drain_sq,

	.fill_res_entry = mlx5_ib_fill_res_entry,

	.get_dev_fw_str = get_dev_fw_str,

	.get_dma_mr = mlx5_ib_get_dma_mr,

	.get_link_layer = mlx5_ib_port_link_layer,

drivers/infiniband/hw/mlx5/mlx5_ib.h

+3 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ struct mlx5_ib_mr { 
	struct mlx5_async_work  cb_work;

	atomic_t		num_pending_prefetch;

	struct ib_odp_counters	odp_stats;

	bool			is_odp_implicit;

};



static inline bool is_odp_mr(struct mlx5_ib_mr *mr)
@@ -1339,6 +1340,8 @@ struct mlx5_core_dev *mlx5_ib_get_native_port_mdev(struct mlx5_ib_dev *dev, 
						   u8 *native_port_num);

void mlx5_ib_put_native_port_mdev(struct mlx5_ib_dev *dev,

				  u8 port_num);

int mlx5_ib_fill_res_entry(struct sk_buff *msg,

			   struct rdma_restrack_entry *res);



#if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS)

int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, bool is_user);

drivers/infiniband/hw/mlx5/odp.c

+2 −0
Original line number Diff line number Diff line
@@ -543,6 +543,8 @@ struct mlx5_ib_mr *mlx5_ib_alloc_implicit_mr(struct mlx5_ib_pd *pd, 
	atomic_set(&imr->num_leaf_free, 0);

	atomic_set(&imr->num_pending_prefetch, 0);



	imr->is_odp_implicit = true;



	return imr;

}