[PATCH rdma-next 5/9] IB: Consider ib_flow creation by the KABI infrastructure

[Leon Romanovsky]

From: Yishai Hadas <yish...@mellanox.com>

This patch considers the case that ib_flow is created by some device
driver with its specific parameters using the KABI infrastructure.

In that case both QP and ib_uflow_resources might not be applicable.
Downstream patches from this series use the above functionality.

Signed-off-by: Yishai Hadas <yish...@mellanox.com>
Signed-off-by: Leon Romanovsky <leo...@mellanox.com>
---
 drivers/infiniband/core/uverbs_cmd.c       | 4 ++++
 drivers/infiniband/core/uverbs_std_types.c | 5 +++--
 include/rdma/ib_verbs.h                    | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/core/uverbs_cmd.c 
b/drivers/infiniband/core/uverbs_cmd.c
index 45fa241df67c..60e6ee5bb5eb 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2748,6 +2748,9 @@ void ib_uverbs_flow_resources_free(struct 
ib_uflow_resources *uflow_res)
 {
        unsigned int i;
 
+       if (!uflow_res)
+               return;
+
        for (i = 0; i < uflow_res->collection_num; i++)
                atomic_dec(&uflow_res->collection[i]->usecnt);
 
@@ -3567,6 +3570,7 @@ int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file,
        }
        atomic_inc(&qp->usecnt);
        flow_id->qp = qp;
+       flow_id->device = qp->device;
        flow_id->uobject = uobj;
        uobj->object = flow_id;
        uflow = container_of(uobj, typeof(*uflow), uobject);
diff --git a/drivers/infiniband/core/uverbs_std_types.c 
b/drivers/infiniband/core/uverbs_std_types.c
index 718c8430d364..c1e0492cc78a 100644
--- a/drivers/infiniband/core/uverbs_std_types.c
+++ b/drivers/infiniband/core/uverbs_std_types.c
@@ -54,9 +54,10 @@ static int uverbs_free_flow(struct ib_uobject *uobject,
        struct ib_qp *qp = flow->qp;
        int ret;
 
-       ret = qp->device->destroy_flow(flow);
+       ret = flow->device->destroy_flow(flow);
        if (!ret) {
-               atomic_dec(&qp->usecnt);
+               if (qp)
+                       atomic_dec(&qp->usecnt);
                ib_uverbs_flow_resources_free(uflow->resources);
        }
 
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 01b9d5a54368..482d07d79656 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -2100,6 +2100,7 @@ struct ib_flow_attr {
 
 struct ib_flow {
        struct ib_qp            *qp;
+       struct ib_device        *device;
        struct ib_uobject       *uobject;
 };
 
-- 
2.14.4