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

RDMA/nldev: Provide MR statistics 

Add RDMA nldev netlink interface for dumping MR statistics information.

Output example:

$ ./ibv_rc_pingpong -o -P -s 500000000
  local address:  LID 0x0001, QPN 0x00008a, PSN 0xf81096, GID ::

$ rdma stat show mr
dev mlx5_0 mrn 2 page_faults 122071 page_invalidations 0

Link: https://lore.kernel.org/r/20191016062308.11886-5-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 e1b95ae0

drivers/infiniband/core/device.c

+1 −0
Original line number Diff line number Diff line
@@ -2605,6 +2605,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops) 
	SET_DEVICE_OP(dev_ops, drain_sq);

	SET_DEVICE_OP(dev_ops, enable_driver);

	SET_DEVICE_OP(dev_ops, fill_res_entry);

	SET_DEVICE_OP(dev_ops, fill_stat_entry);

	SET_DEVICE_OP(dev_ops, get_dev_fw_str);

	SET_DEVICE_OP(dev_ops, get_dma_mr);

	SET_DEVICE_OP(dev_ops, get_hw_stats);

drivers/infiniband/core/nldev.c

+39 −6
Original line number Diff line number Diff line
@@ -439,6 +439,14 @@ static bool fill_res_entry(struct ib_device *dev, struct sk_buff *msg, 
	return dev->ops.fill_res_entry(msg, res);

}



static bool fill_stat_entry(struct ib_device *dev, struct sk_buff *msg,

			    struct rdma_restrack_entry *res)

{

	if (!dev->ops.fill_stat_entry)

		return false;

	return dev->ops.fill_stat_entry(msg, res);

}



static int fill_res_qp_entry(struct sk_buff *msg, bool has_cap_net_admin,

			     struct rdma_restrack_entry *res, uint32_t port)

{
@@ -739,8 +747,8 @@ static int fill_stat_counter_qps(struct sk_buff *msg, 
	return ret;

}



static int fill_stat_hwcounter_entry(struct sk_buff *msg,

				     const char *name, u64 value)

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

				 u64 value)

{

	struct nlattr *entry_attr;
@@ -762,6 +770,25 @@ static int fill_stat_hwcounter_entry(struct sk_buff *msg, 
	nla_nest_cancel(msg, entry_attr);

	return -EMSGSIZE;

}

EXPORT_SYMBOL(rdma_nl_stat_hwcounter_entry);



static int fill_stat_mr_entry(struct sk_buff *msg, bool has_cap_net_admin,

			      struct rdma_restrack_entry *res, uint32_t port)

{

	struct ib_mr *mr = container_of(res, struct ib_mr, res);

	struct ib_device *dev = mr->pd->device;



	if (nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_MRN, res->id))

		goto err;



	if (fill_stat_entry(dev, msg, res))

		goto err;



	return 0;



err:

	return -EMSGSIZE;

}



static int fill_stat_counter_hwcounters(struct sk_buff *msg,

					struct rdma_counter *counter)
@@ -775,7 +802,7 @@ static int fill_stat_counter_hwcounters(struct sk_buff *msg, 
		return -EMSGSIZE;



	for (i = 0; i < st->num_counters; i++)

		if (fill_stat_hwcounter_entry(msg, st->names[i], st->value[i]))

		if (rdma_nl_stat_hwcounter_entry(msg, st->names[i], st->value[i]))

			goto err;



	nla_nest_end(msg, table_attr);
@@ -1897,7 +1924,7 @@ static int stat_get_doit_default_counter(struct sk_buff *skb, 
	for (i = 0; i < num_cnts; i++) {

		v = stats->value[i] +

			rdma_counter_get_hwstat_value(device, port, i);

		if (fill_stat_hwcounter_entry(msg, stats->names[i], v)) {

		if (rdma_nl_stat_hwcounter_entry(msg, stats->names[i], v)) {

			ret = -EMSGSIZE;

			goto err_table;

		}
@@ -2006,7 +2033,10 @@ static int nldev_stat_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, 
	case RDMA_NLDEV_ATTR_RES_QP:

		ret = stat_get_doit_qp(skb, nlh, extack, tb);

		break;



	case RDMA_NLDEV_ATTR_RES_MR:

		ret = res_get_common_doit(skb, nlh, extack, RDMA_RESTRACK_MR,

					  fill_stat_mr_entry);

		break;

	default:

		ret = -EINVAL;

		break;
@@ -2030,7 +2060,10 @@ static int nldev_stat_get_dumpit(struct sk_buff *skb, 
	case RDMA_NLDEV_ATTR_RES_QP:

		ret = nldev_res_get_counter_dumpit(skb, cb);

		break;



	case RDMA_NLDEV_ATTR_RES_MR:

		ret = res_get_common_dumpit(skb, cb, RDMA_RESTRACK_MR,

					    fill_stat_mr_entry);

		break;

	default:

		ret = -EINVAL;

		break;

drivers/infiniband/hw/mlx5/main.c

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include <rdma/uverbs_std_types.h>

#include <rdma/mlx5_user_ioctl_verbs.h>

#include <rdma/mlx5_user_ioctl_cmds.h>

#include <rdma/ib_umem_odp.h>



#define UVERBS_MODULE_NAME mlx5_ib

#include <rdma/uverbs_named_ioctl.h>
@@ -6272,6 +6273,7 @@ static const struct ib_device_ops mlx5_ib_dev_ops = { 
	.drain_rq = mlx5_ib_drain_rq,

	.drain_sq = mlx5_ib_drain_sq,

	.fill_res_entry = mlx5_ib_fill_res_entry,

	.fill_stat_entry = mlx5_ib_fill_stat_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

+2 −0
Original line number Diff line number Diff line
@@ -1342,6 +1342,8 @@ 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);

int mlx5_ib_fill_stat_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/restrack.c

+42 −0
Original line number Diff line number Diff line
@@ -8,6 +8,39 @@ 
#include <rdma/restrack.h>

#include "mlx5_ib.h"



static int fill_stat_mr_entry(struct sk_buff *msg,

			      struct rdma_restrack_entry *res)

{

	struct ib_mr *ibmr = container_of(res, struct ib_mr, res);

	struct mlx5_ib_mr *mr = to_mmr(ibmr);

	struct nlattr *table_attr;



	if (!(mr->access_flags & IB_ACCESS_ON_DEMAND))

		return 0;



	table_attr = nla_nest_start(msg,

				    RDMA_NLDEV_ATTR_STAT_HWCOUNTERS);



	if (!table_attr)

		goto err;



	if (rdma_nl_stat_hwcounter_entry(msg, "page_faults",

					 atomic64_read(&mr->odp_stats.faults)))

		goto err_table;

	if (rdma_nl_stat_hwcounter_entry(

		    msg, "page_invalidations",

		    atomic64_read(&mr->odp_stats.invalidations)))

		goto err_table;



	nla_nest_end(msg, table_attr);

	return 0;



err_table:

	nla_nest_cancel(msg, table_attr);

err:

	return -EMSGSIZE;

}



static int fill_res_mr_entry(struct sk_buff *msg,

			     struct rdma_restrack_entry *res)

{
@@ -46,3 +79,12 @@ int mlx5_ib_fill_res_entry(struct sk_buff *msg, 


	return 0;

}



int mlx5_ib_fill_stat_entry(struct sk_buff *msg,

			    struct rdma_restrack_entry *res)

{

	if (res->type == RDMA_RESTRACK_MR)

		return fill_stat_mr_entry(msg, res);



	return 0;

}