Skip to content

Commit f443452

Browse files
Maor Gottliebjgunthorpe
Maor Gottlieb
authored and
jgunthorpe
committed
RDMA: Add dedicated MR resource tracker function
In order to avoid double multiplexing of the resource when it is a MR, add a dedicated callback function. Link: https://lore.kernel.org/r/20200623113043.1228482-5-leon@kernel.org Signed-off-by: Maor Gottlieb <maorg@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1 parent 24fd6d6 commit f443452

File tree

9 files changed

+19
-51
lines changed

9 files changed

+19
-51
lines changed

‎drivers/infiniband/core/device.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2618,7 +2618,8 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)
26182618
SET_DEVICE_OP(dev_ops, drain_sq);
26192619
SET_DEVICE_OP(dev_ops, enable_driver);
26202620
SET_DEVICE_OP(dev_ops, fill_res_entry);
2621-
SET_DEVICE_OP(dev_ops, fill_stat_entry);
2621+
SET_DEVICE_OP(dev_ops, fill_res_mr_entry);
2622+
SET_DEVICE_OP(dev_ops, fill_stat_mr_entry);
26222623
SET_DEVICE_OP(dev_ops, get_dev_fw_str);
26232624
SET_DEVICE_OP(dev_ops, get_dma_mr);
26242625
SET_DEVICE_OP(dev_ops, get_hw_stats);

‎drivers/infiniband/core/nldev.c‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,6 @@ static bool fill_res_entry(struct ib_device *dev, struct sk_buff *msg,
454454
return dev->ops.fill_res_entry(msg, res);
455455
}
456456

457-
static bool fill_stat_entry(struct ib_device *dev, struct sk_buff *msg,
458-
struct rdma_restrack_entry *res)
459-
{
460-
if (!dev->ops.fill_stat_entry)
461-
return false;
462-
return dev->ops.fill_stat_entry(msg, res);
463-
}
464-
465457
static int fill_res_qp_entry(struct sk_buff *msg, bool has_cap_net_admin,
466458
struct rdma_restrack_entry *res, uint32_t port)
467459
{
@@ -641,9 +633,8 @@ static int fill_res_mr_entry(struct sk_buff *msg, bool has_cap_net_admin,
641633
if (fill_res_name_pid(msg, res))
642634
goto err;
643635

644-
if (fill_res_entry(dev, msg, res))
645-
goto err;
646-
636+
if (dev->ops.fill_res_mr_entry)
637+
return dev->ops.fill_res_mr_entry(msg, mr);
647638
return 0;
648639

649640
err: return -EMSGSIZE;
@@ -786,9 +777,8 @@ static int fill_stat_mr_entry(struct sk_buff *msg, bool has_cap_net_admin,
786777
if (nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_MRN, res->id))
787778
goto err;
788779

789-
if (fill_stat_entry(dev, msg, res))
790-
goto err;
791-
780+
if (dev->ops.fill_stat_mr_entry)
781+
return dev->ops.fill_stat_mr_entry(msg, mr);
792782
return 0;
793783

794784
err:

‎drivers/infiniband/hw/cxgb4/iw_cxgb4.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,7 @@ struct c4iw_wr_wait *c4iw_alloc_wr_wait(gfp_t gfp);
10551055

10561056
typedef int c4iw_restrack_func(struct sk_buff *msg,
10571057
struct rdma_restrack_entry *res);
1058+
int c4iw_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ibmr);
10581059
extern c4iw_restrack_func *c4iw_restrack_funcs[RDMA_RESTRACK_MAX];
10591060

10601061
#endif

‎drivers/infiniband/hw/cxgb4/provider.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ static const struct ib_device_ops c4iw_dev_ops = {
486486
.destroy_qp = c4iw_destroy_qp,
487487
.destroy_srq = c4iw_destroy_srq,
488488
.fill_res_entry = fill_res_entry,
489+
.fill_res_mr_entry = c4iw_fill_res_mr_entry,
489490
.get_dev_fw_str = get_dev_fw_str,
490491
.get_dma_mr = c4iw_get_dma_mr,
491492
.get_hw_stats = c4iw_get_mib,

‎drivers/infiniband/hw/cxgb4/restrack.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,8 @@ static int fill_res_cq_entry(struct sk_buff *msg,
433433
return -EMSGSIZE;
434434
}
435435

436-
static int fill_res_mr_entry(struct sk_buff *msg,
437-
struct rdma_restrack_entry *res)
436+
int c4iw_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ibmr)
438437
{
439-
struct ib_mr *ibmr = container_of(res, struct ib_mr, res);
440438
struct c4iw_mr *mhp = to_c4iw_mr(ibmr);
441439
struct c4iw_dev *dev = mhp->rhp;
442440
u32 stag = mhp->attr.stag;
@@ -497,5 +495,4 @@ c4iw_restrack_func *c4iw_restrack_funcs[RDMA_RESTRACK_MAX] = {
497495
[RDMA_RESTRACK_QP] = fill_res_qp_entry,
498496
[RDMA_RESTRACK_CM_ID] = fill_res_ep_entry,
499497
[RDMA_RESTRACK_CQ] = fill_res_cq_entry,
500-
[RDMA_RESTRACK_MR] = fill_res_mr_entry,
501498
};

‎drivers/infiniband/hw/mlx5/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6598,8 +6598,8 @@ static const struct ib_device_ops mlx5_ib_dev_ops = {
65986598
.drain_rq = mlx5_ib_drain_rq,
65996599
.drain_sq = mlx5_ib_drain_sq,
66006600
.enable_driver = mlx5_ib_enable_driver,
6601-
.fill_res_entry = mlx5_ib_fill_res_entry,
6602-
.fill_stat_entry = mlx5_ib_fill_stat_entry,
6601+
.fill_res_mr_entry = mlx5_ib_fill_res_mr_entry,
6602+
.fill_stat_mr_entry = mlx5_ib_fill_stat_mr_entry,
66036603
.get_dev_fw_str = get_dev_fw_str,
66046604
.get_dma_mr = mlx5_ib_get_dma_mr,
66056605
.get_link_layer = mlx5_ib_port_link_layer,

‎drivers/infiniband/hw/mlx5/mlx5_ib.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,10 +1375,8 @@ struct mlx5_core_dev *mlx5_ib_get_native_port_mdev(struct mlx5_ib_dev *dev,
13751375
u8 *native_port_num);
13761376
void mlx5_ib_put_native_port_mdev(struct mlx5_ib_dev *dev,
13771377
u8 port_num);
1378-
int mlx5_ib_fill_res_entry(struct sk_buff *msg,
1379-
struct rdma_restrack_entry *res);
1380-
int mlx5_ib_fill_stat_entry(struct sk_buff *msg,
1381-
struct rdma_restrack_entry *res);
1378+
int mlx5_ib_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ib_mr);
1379+
int mlx5_ib_fill_stat_mr_entry(struct sk_buff *msg, struct ib_mr *ib_mr);
13821380

13831381
extern const struct uapi_definition mlx5_ib_devx_defs[];
13841382
extern const struct uapi_definition mlx5_ib_flow_defs[];

‎drivers/infiniband/hw/mlx5/restrack.c‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
#include <rdma/restrack.h>
99
#include "mlx5_ib.h"
1010

11-
static int fill_stat_mr_entry(struct sk_buff *msg,
12-
struct rdma_restrack_entry *res)
11+
int mlx5_ib_fill_stat_mr_entry(struct sk_buff *msg,
12+
struct ib_mr *ibmr)
1313
{
14-
struct ib_mr *ibmr = container_of(res, struct ib_mr, res);
1514
struct mlx5_ib_mr *mr = to_mmr(ibmr);
1615
struct nlattr *table_attr;
1716

@@ -41,10 +40,9 @@ static int fill_stat_mr_entry(struct sk_buff *msg,
4140
return -EMSGSIZE;
4241
}
4342

44-
static int fill_res_mr_entry(struct sk_buff *msg,
45-
struct rdma_restrack_entry *res)
43+
int mlx5_ib_fill_res_mr_entry(struct sk_buff *msg,
44+
struct ib_mr *ibmr)
4645
{
47-
struct ib_mr *ibmr = container_of(res, struct ib_mr, res);
4846
struct mlx5_ib_mr *mr = to_mmr(ibmr);
4947
struct nlattr *table_attr;
5048

@@ -70,21 +68,3 @@ static int fill_res_mr_entry(struct sk_buff *msg,
7068
nla_nest_cancel(msg, table_attr);
7169
return -EMSGSIZE;
7270
}
73-
74-
int mlx5_ib_fill_res_entry(struct sk_buff *msg,
75-
struct rdma_restrack_entry *res)
76-
{
77-
if (res->type == RDMA_RESTRACK_MR)
78-
return fill_res_mr_entry(msg, res);
79-
80-
return 0;
81-
}
82-
83-
int mlx5_ib_fill_stat_entry(struct sk_buff *msg,
84-
struct rdma_restrack_entry *res)
85-
{
86-
if (res->type == RDMA_RESTRACK_MR)
87-
return fill_stat_mr_entry(msg, res);
88-
89-
return 0;
90-
}

‎include/rdma/ib_verbs.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2583,6 +2583,7 @@ struct ib_device_ops {
25832583
*/
25842584
int (*fill_res_entry)(struct sk_buff *msg,
25852585
struct rdma_restrack_entry *entry);
2586+
int (*fill_res_mr_entry)(struct sk_buff *msg, struct ib_mr *ibmr);
25862587

25872588
/* Device lifecycle callbacks */
25882589
/*
@@ -2637,8 +2638,7 @@ struct ib_device_ops {
26372638
* Allows rdma drivers to add their own restrack attributes
26382639
* dumped via 'rdma stat' iproute2 command.
26392640
*/
2640-
int (*fill_stat_entry)(struct sk_buff *msg,
2641-
struct rdma_restrack_entry *entry);
2641+
int (*fill_stat_mr_entry)(struct sk_buff *msg, struct ib_mr *ibmr);
26422642

26432643
DECLARE_RDMA_OBJ_SIZE(ib_ah);
26442644
DECLARE_RDMA_OBJ_SIZE(ib_cq);

0 commit comments

Comments
 (0)