| Message ID | 20180115151255.30167-4-leon@kernel.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
> From: Leon Romanovsky <leonro@mellanox.com> > > Update all callers to provide owner name through QP attribute > structure and connect create_qp with helper which supports > resource tracking. > > Reviewed-by: Mark Bloch <markb@mellanox.com> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com> > Reviewed-by: Steve Wise <swise@opengridcomputing.com> > --- > drivers/infiniband/core/cma.c | 1 + > drivers/infiniband/core/mad.c | 1 + > drivers/infiniband/core/uverbs_cmd.c | 3 +-- > drivers/infiniband/core/verbs.c | 4 ++-- > drivers/infiniband/hw/mlx4/mad.c | 1 + > drivers/infiniband/hw/mlx4/qp.c | 1 + > drivers/infiniband/hw/mlx5/gsi.c | 2 ++ > drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +++- > drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 1 + > drivers/infiniband/ulp/srp/ib_srp.c | 1 + > drivers/infiniband/ulp/srpt/ib_srpt.c | 1 + > net/smc/smc_ib.c | 1 + > 12 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c > index 30d1c32a816f..3810716ea65e 100644 > --- a/drivers/infiniband/core/cma.c > +++ b/drivers/infiniband/core/cma.c > @@ -858,6 +858,7 @@ int rdma_create_qp(struct rdma_cm_id *id, struct > ib_pd *pd, > return -EINVAL; > > qp_init_attr->port_num = id->port_num; > + strncpy(qp_init_attr->comm, "rdma-cm", TASK_COMM_LEN); I think the above strncpy should be done only if the caller of rdma_create_qp() didn't fill in qp_init_attr->comm. IE if the caller ULP fills it out, we want to see it. Otherwise all kernel ULPs end up being "rdma-cm"... Stevo -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jan 16, 2018 at 05:03:56PM -0600, Steve Wise wrote: > > > From: Leon Romanovsky <leonro@mellanox.com> > > > > Update all callers to provide owner name through QP attribute > > structure and connect create_qp with helper which supports > > resource tracking. > > > > Reviewed-by: Mark Bloch <markb@mellanox.com> > > Signed-off-by: Leon Romanovsky <leonro@mellanox.com> > > Reviewed-by: Steve Wise <swise@opengridcomputing.com> > > --- > > drivers/infiniband/core/cma.c | 1 + > > drivers/infiniband/core/mad.c | 1 + > > drivers/infiniband/core/uverbs_cmd.c | 3 +-- > > drivers/infiniband/core/verbs.c | 4 ++-- > > drivers/infiniband/hw/mlx4/mad.c | 1 + > > drivers/infiniband/hw/mlx4/qp.c | 1 + > > drivers/infiniband/hw/mlx5/gsi.c | 2 ++ > > drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +++- > > drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 1 + > > drivers/infiniband/ulp/srp/ib_srp.c | 1 + > > drivers/infiniband/ulp/srpt/ib_srpt.c | 1 + > > net/smc/smc_ib.c | 1 + > > 12 files changed, 16 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c > > index 30d1c32a816f..3810716ea65e 100644 > > --- a/drivers/infiniband/core/cma.c > > +++ b/drivers/infiniband/core/cma.c > > @@ -858,6 +858,7 @@ int rdma_create_qp(struct rdma_cm_id *id, struct > > ib_pd *pd, > > return -EINVAL; > > > > qp_init_attr->port_num = id->port_num; > > + strncpy(qp_init_attr->comm, "rdma-cm", TASK_COMM_LEN); > > > I think the above strncpy should be done only if the caller of > rdma_create_qp() didn't fill in qp_init_attr->comm. IE if the caller ULP > fills it out, we want to see it. Otherwise all kernel ULPs end up being > "rdma-cm"... Thanks Steve, This patch won't be needed in next revision, I found a way to use compiler to generate the kernel name. > > Stevo >
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 30d1c32a816f..3810716ea65e 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -858,6 +858,7 @@ int rdma_create_qp(struct rdma_cm_id *id, struct ib_pd *pd, return -EINVAL; qp_init_attr->port_num = id->port_num; + strncpy(qp_init_attr->comm, "rdma-cm", TASK_COMM_LEN); qp = ib_create_qp(pd, qp_init_attr); if (IS_ERR(qp)) return PTR_ERR(qp); diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index c50596f7f98a..f73551fc5a02 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c @@ -3103,6 +3103,7 @@ static int create_mad_qp(struct ib_mad_qp_info *qp_info, qp_init_attr.port_num = qp_info->port_priv->port_num; qp_init_attr.qp_context = qp_info; qp_init_attr.event_handler = qp_event_handler; + strncpy(qp_init_attr.comm, "rdma-mad", TASK_COMM_LEN); qp_info->qp = ib_create_qp(qp_info->port_priv->pd, &qp_init_attr); if (IS_ERR(qp_info->qp)) { dev_err(&qp_info->port_priv->device->dev, diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index c216d98bb816..62b3c5d71cce 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -1514,7 +1514,7 @@ static int create_qp(struct ib_uverbs_file *file, if (cmd->qp_type == IB_QPT_XRC_TGT) qp = ib_create_qp(pd, &attr); else - qp = device->create_qp(pd, &attr, uhw); + qp = _ib_create_qp(device, pd, &attr, uhw); if (IS_ERR(qp)) { ret = PTR_ERR(qp); @@ -1527,7 +1527,6 @@ static int create_qp(struct ib_uverbs_file *file, goto err_cb; qp->real_qp = qp; - qp->device = device; qp->pd = pd; qp->send_cq = attr.send_cq; qp->recv_cq = attr.recv_cq; diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index 15dd26cab5d8..8522639cd315 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -882,7 +882,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, if (qp_init_attr->cap.max_rdma_ctxs) rdma_rw_init_qp(device, qp_init_attr); - qp = device->create_qp(pd, qp_init_attr, NULL); + qp = _ib_create_qp(device, pd, qp_init_attr, NULL); if (IS_ERR(qp)) return qp; @@ -892,7 +892,6 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, return ERR_PTR(ret); } - qp->device = device; qp->real_qp = qp; qp->uobject = NULL; qp->qp_type = qp_init_attr->qp_type; @@ -1520,6 +1519,7 @@ int ib_destroy_qp(struct ib_qp *qp) if (!qp->uobject) rdma_rw_cleanup_mrs(qp); + rdma_restrack_del(&qp->res, RDMA_RESTRACK_QP); ret = qp->device->destroy_qp(qp); if (!ret) { if (pd) diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 0793a21d76f4..f816df420fb9 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c @@ -1834,6 +1834,7 @@ static int create_pv_sqp(struct mlx4_ib_demux_pv_ctx *ctx, qp_init_attr.init_attr.port_num = ctx->port; qp_init_attr.init_attr.qp_context = ctx; qp_init_attr.init_attr.event_handler = pv_qp_event_handler; + strncpy(qp_init_attr.init_attr.comm, "mlx4-sriov", TASK_COMM_LEN); tun_qp->qp = ib_create_qp(ctx->pd, &qp_init_attr.init_attr); if (IS_ERR(tun_qp->qp)) { ret = PTR_ERR(tun_qp->qp); diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c index f045491f2c14..ebdfac3eb673 100644 --- a/drivers/infiniband/hw/mlx4/qp.c +++ b/drivers/infiniband/hw/mlx4/qp.c @@ -1689,6 +1689,7 @@ struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd, if (is_eth && dev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_ROCE_V1_V2) { init_attr->create_flags |= MLX4_IB_QP_CREATE_ROCE_V2_GSI; + strncpy(init_attr->comm, "mlx4-gsi", TASK_COMM_LEN); sqp->roce_v2_gsi = ib_create_qp(pd, init_attr); if (IS_ERR(sqp->roce_v2_gsi)) { diff --git a/drivers/infiniband/hw/mlx5/gsi.c b/drivers/infiniband/hw/mlx5/gsi.c index 79e6309460dc..b1b177d1a0dd 100644 --- a/drivers/infiniband/hw/mlx5/gsi.c +++ b/drivers/infiniband/hw/mlx5/gsi.c @@ -184,6 +184,7 @@ struct ib_qp *mlx5_ib_gsi_create_qp(struct ib_pd *pd, hw_init_attr.cap.max_send_sge = 0; hw_init_attr.cap.max_inline_data = 0; } + strncpy(hw_init_attr.comm, "mlx5-gsi", TASK_COMM_LEN); gsi->rx_qp = ib_create_qp(pd, &hw_init_attr); if (IS_ERR(gsi->rx_qp)) { mlx5_ib_warn(dev, "unable to create hardware GSI QP. error %ld\n", @@ -264,6 +265,7 @@ static struct ib_qp *create_gsi_ud_qp(struct mlx5_ib_gsi_qp *gsi) .sq_sig_type = gsi->sq_sig_type, .qp_type = IB_QPT_UD, .create_flags = mlx5_ib_create_qp_sqpn_qp1(), + .comm = "mlx5-gsi", }; return ib_create_qp(pd, &init_attr); diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index dfbb8fdda5f6..d165b3a25340 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -263,6 +263,7 @@ static struct ib_qp *ipoib_cm_create_rx_qp(struct net_device *dev, .sq_sig_type = IB_SIGNAL_ALL_WR, .qp_type = IB_QPT_RC, .qp_context = p, + .comm = "ipoib-cm", }; if (!ipoib_cm_has_srq(dev)) { @@ -1062,7 +1063,8 @@ static struct ib_qp *ipoib_cm_create_tx_qp(struct net_device *dev, struct ipoib_ .sq_sig_type = IB_SIGNAL_ALL_WR, .qp_type = IB_QPT_RC, .qp_context = tx, - .create_flags = 0 + .create_flags = 0, + .comm = "ipoib-cm", }; struct ib_qp *tx_qp; diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c index 984a88096f39..d41d85f8ac7e 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c @@ -206,6 +206,7 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca) if (priv->hca_caps & IB_DEVICE_MANAGED_FLOW_STEERING) init_attr.create_flags |= IB_QP_CREATE_NETIF_QP; + strncpy(init_attr.comm, "ipoib-verbs", TASK_COMM_LEN); priv->qp = ib_create_qp(priv->pd, &init_attr); if (IS_ERR(priv->qp)) { pr_warn("%s: failed to create QP\n", ca->name); diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 62d88212c1b0..fb8be6b2ddfb 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -521,6 +521,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch) init_attr->send_cq = send_cq; init_attr->recv_cq = recv_cq; + strncpy(init_attr->comm, "srp", TASK_COMM_LEN); qp = ib_create_qp(dev->pd, init_attr); if (IS_ERR(qp)) { ret = PTR_ERR(qp); diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index d78f60dcc2ba..3724132a266e 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -1726,6 +1726,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch) qp_init->cap.max_recv_sge = qp_init->cap.max_send_sge; } + strncpy(qp_init->comm, "srpt", TASK_COMM_LEN); ch->qp = ib_create_qp(sdev->pd, qp_init); if (IS_ERR(ch->qp)) { ret = PTR_ERR(ch->qp); diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c index 90f1a7f9085c..9f5bca333cce 100644 --- a/net/smc/smc_ib.c +++ b/net/smc/smc_ib.c @@ -243,6 +243,7 @@ int smc_ib_create_queue_pair(struct smc_link *lnk) }, .sq_sig_type = IB_SIGNAL_REQ_WR, .qp_type = IB_QPT_RC, + .comm = "sec-ib", }; int rc;