diff options
| author | Yishai Hadas <yishaih@mellanox.com> | 2018-07-23 15:25:08 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-07-24 13:34:55 -0600 |
| commit | 6cd080a674a7adce97c0189c4579cf40782c2770 (patch) | |
| tree | e6c74c8907fe3e551b4c20cc33e30159ee0c16d3 | |
| parent | fd44e3853c0155fa82314f341f476d4793415cd2 (diff) | |
| download | linux-6cd080a674a7adce97c0189c4579cf40782c2770.tar.bz2 | |
IB: Support ib_flow creation in drivers
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 <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
| -rw-r--r-- | drivers/infiniband/core/uverbs_cmd.c | 4 | ||||
| -rw-r--r-- | drivers/infiniband/core/uverbs_std_types.c | 5 | ||||
| -rw-r--r-- | 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 bd6eefaecbd6..987ee38ab4b3 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -2771,6 +2771,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); @@ -3585,6 +3588,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 08348e53082c..24d6ec38feea 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -2081,6 +2081,7 @@ struct ib_flow_attr { struct ib_flow { struct ib_qp *qp; + struct ib_device *device; struct ib_uobject *uobject; }; |