| Message ID | 20190801104354.11417-1-galpress@amazon.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 52e0a118a20308dd6aa531e20a5ab5907d2264c8 |
| Headers | show |
| Series | [for-rc,v3] RDMA/restrack: Track driver QP types in resource tracker | expand |
On Thu, Aug 01, 2019 at 01:43:54PM +0300, Gal Pressman wrote: > The check for QP type different than XRC has excluded driver QP > types from the resource tracker. > As a result, "rdma resource show" user command would not show opened > driver QPs which does not reflect the real state of the system. > > Check QP type explicitly instead of assuming enum values/ordering. > > Fixes: 40909f664d27 ("RDMA/efa: Add EFA verbs implementation") > Signed-off-by: Gal Pressman <galpress@amazon.com> > --- > v3: > * Reword commit message > * Change the commit in Fixes: line > > v2: > * Improve commit message > --- > drivers/infiniband/core/core_priv.h | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > Please don't forget rdmatool patch. Thanks, Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
On Thu, 2019-08-01 at 15:12 +0300, Leon Romanovsky wrote: > On Thu, Aug 01, 2019 at 01:43:54PM +0300, Gal Pressman wrote: > > The check for QP type different than XRC has excluded driver QP > > types from the resource tracker. > > As a result, "rdma resource show" user command would not show opened > > driver QPs which does not reflect the real state of the system. > > > > Check QP type explicitly instead of assuming enum values/ordering. > > > > Fixes: 40909f664d27 ("RDMA/efa: Add EFA verbs implementation") > > Signed-off-by: Gal Pressman <galpress@amazon.com> > > --- > > v3: > > * Reword commit message > > * Change the commit in Fixes: line > > > > v2: > > * Improve commit message > > --- > > drivers/infiniband/core/core_priv.h | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > Please don't forget rdmatool patch. > > Thanks, > Reviewed-by: Leon Romanovsky <leonro@mellanox.com> Thanks, applied to for-rc.
diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h index 589ed805e0ad..3a8b0911c3bc 100644 --- a/drivers/infiniband/core/core_priv.h +++ b/drivers/infiniband/core/core_priv.h @@ -321,7 +321,9 @@ static inline struct ib_qp *_ib_create_qp(struct ib_device *dev, struct ib_udata *udata, struct ib_uobject *uobj) { + enum ib_qp_type qp_type = attr->qp_type; struct ib_qp *qp; + bool is_xrc; if (!dev->ops.create_qp) return ERR_PTR(-EOPNOTSUPP); @@ -339,7 +341,8 @@ static inline struct ib_qp *_ib_create_qp(struct ib_device *dev, * and more importantly they are created internaly by driver, * see mlx5 create_dev_resources() as an example. */ - if (attr->qp_type < IB_QPT_XRC_INI) { + is_xrc = qp_type == IB_QPT_XRC_INI || qp_type == IB_QPT_XRC_TGT; + if ((qp_type < IB_QPT_MAX && !is_xrc) || qp_type == IB_QPT_DRIVER) { qp->res.type = RDMA_RESTRACK_QP; if (uobj) rdma_restrack_uadd(&qp->res);
The check for QP type different than XRC has excluded driver QP types from the resource tracker. As a result, "rdma resource show" user command would not show opened driver QPs which does not reflect the real state of the system. Check QP type explicitly instead of assuming enum values/ordering. Fixes: 40909f664d27 ("RDMA/efa: Add EFA verbs implementation") Signed-off-by: Gal Pressman <galpress@amazon.com> --- v3: * Reword commit message * Change the commit in Fixes: line v2: * Improve commit message --- drivers/infiniband/core/core_priv.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)