RDMA/mana_ib: Adopt robust udata
Subsystems (2)
PATCH v2 1/1 RDMA/mana_ib: Adopt robust udata
From: Konstantin Taranov <[email protected]>
Enable the uverbs robust udata interface in mana_ib by setting uverbs_robust_udata and converting the driver to the new udata handling model.
Signed-off-by Konstantin Taranov <[email protected]>
---
v2: Removed the udata request for alloc ucontext
drivers/infiniband/hw/mana/cq.c | 10 +++++-- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 29 +++++++++++++----- drivers/infiniband/hw/mana/mr.c | 15 +++++++++- drivers/infiniband/hw/mana/qp.c | 46 ++++++++++++++++++++++------- drivers/infiniband/hw/mana/wq.c | 16 ++++++++-- include/uapi/rdma/mana-abi.h | 2 +- 7 files changed, 94 insertions(+), 25 deletions(-)
drivers/infiniband/hw/mana/cq.c +8 -2
@@ -27,7 +27,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, is_rnic_cq =mana_ib_is_rnic (mdev);if (udata) { - err =ib_copy_validate_udata_in (udata, ucmd, buf_addr); + err =ib_copy_validate_udata_in_cm (udata, ucmd, buf_addr, +MANA_IB_CREATE_RNIC_CQ );if (err)return err;
@@ -105,6 +106,11 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata) struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq);struct ib_device *ibdev = ibcq->device;struct mana_ib_dev *mdev; +int err; + + err =ib_is_udata_in_empty (udata); +if (err) +return err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev);
@@ -117,7 +123,7 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)mana_ib_destroy_queue (mdev, &cq->queue); -return 0 ; +return ib_respond_empty_udata (udata); }static void mana_ib_cq_handler (void *ctx,struct gdma_queue *gdma_cq)
drivers/infiniband/hw/mana/device.c +1 -0
@@ -15,6 +15,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .owner = THIS_MODULE, .driver_id = RDMA_DRIVER_MANA, .uverbs_abi_ver = MANA_IB_UVERBS_ABI_VERSION, + .uverbs_robust_udata = true, .add_gid = mana_ib_gd_add_gid, .alloc_mw = mana_ib_alloc_mw,
drivers/infiniband/hw/mana/main.c +21 -8
@@ -101,6 +101,10 @@ int mana_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)struct gdma_context *gc;int err; + err =ib_is_udata_in_empty (udata); +if (err) +return err; + dev = container_of(ibdev, struct mana_ib_dev, ib_dev); gc =mdev_to_gc (dev);
@@ -122,7 +126,7 @@ int mana_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)mutex_init (&pd->vport_mutex); pd->vport_use_count =0 ; -return 0 ; +return ib_respond_empty_udata (udata); }int mana_ib_dealloc_pd (struct ib_pd *ibpd,struct ib_udata *udata)
@@ -133,6 +137,11 @@ int mana_ib_dealloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)struct gdma_destroy_pd_req req = {};struct mana_ib_dev *dev;struct gdma_context *gc; +int err; + + err =ib_is_udata_in_empty (udata); +if (err) +return err; dev = container_of(ibdev, struct mana_ib_dev, ib_dev); gc =mdev_to_gc (dev);
@@ -142,7 +151,11 @@ int mana_ib_dealloc_pd(struct ib_pd *ibpd, struct ib_udata *udata) req.pd_handle = pd->pd_handle; -return mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp); + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp); +if (err) +return err; + +return ib_respond_empty_udata (udata); } static int mana_gd_destroy_doorbell_page(struct gdma_context *gc,
@@ -198,21 +211,21 @@ int mana_ib_alloc_ucontext(struct ib_ucontext *ibcontext,int doorbell_page;int ret; + ret =ib_is_udata_in_empty (udata); +if (ret) +return ret; + mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); gc =mdev_to_gc (mdev);/* Allocate a doorbell page index */ ret =mana_gd_allocate_doorbell_page (gc, &doorbell_page); -if (ret) { -ibdev_dbg (ibdev,"Failed to allocate doorbell page %d\n" , ret); +if (ret)return ret; - } - -ibdev_dbg (ibdev,"Doorbell page allocated %d\n" , doorbell_page); ucontext->doorbell = doorbell_page; -return 0 ; +return ib_respond_empty_udata (udata); }void mana_ib_dealloc_ucontext (struct ib_ucontext *ibcontext)
drivers/infiniband/hw/mana/mr.c +14 -1
@@ -113,6 +113,10 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length,if (dmah)return ERR_PTR (-EOPNOTSUPP ); + err =ib_is_udata_in_empty (udata); +if (err) +return ERR_PTR (err); + dev = container_of(ibdev, struct mana_ib_dev, ib_dev); ibdev_dbg(ibdev,
@@ -327,6 +331,11 @@ int mana_ib_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata) { struct mana_ib_dev *mdev = container_of(ibmw->device, struct mana_ib_dev, ib_dev); struct mana_ib_pd *pd = container_of(ibmw->pd, struct mana_ib_pd, ibpd); +int err; + + err =ib_is_udata_in_empty (udata); +if (err) +return err;return mana_ib_gd_create_mw (mdev, pd, ibmw); }
@@ -346,6 +355,10 @@ int mana_ib_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata)struct mana_ib_dev *dev;int err; + err =ib_is_udata_in_empty (udata); +if (err) +return err; + dev = container_of(ibdev, struct mana_ib_dev, ib_dev); err =mana_ib_gd_destroy_mr (dev, mr->mr_handle);
@@ -357,7 +370,7 @@ int mana_ib_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata)kfree (mr); -return 0 ; +return ib_respond_empty_udata (udata); } static int mana_ib_gd_alloc_dm(struct mana_ib_dev *mdev, struct mana_ib_dm *dm,
drivers/infiniband/hw/mana/qp.c +35 -11
113 lines not on this page · raw message
drivers/infiniband/hw/mana/wq.c +14 -2
@@ -55,6 +55,11 @@ int mana_ib_destroy_wq(struct ib_wq *ibwq, struct ib_udata *udata) struct mana_ib_wq *wq = container_of(ibwq, struct mana_ib_wq, ibwq);struct ib_device *ib_dev = ibwq->device;struct mana_ib_dev *mdev; +int err; + + err =ib_is_udata_in_empty (udata); +if (err) +return err; mdev = container_of(ib_dev, struct mana_ib_dev, ib_dev);
@@ -62,18 +67,25 @@ int mana_ib_destroy_wq(struct ib_wq *ibwq, struct ib_udata *udata)kfree (wq); -return 0 ; +return ib_respond_empty_udata (udata); }int mana_ib_create_rwq_ind_table (struct ib_rwq_ind_table *ib_rwq_ind_table,struct ib_rwq_ind_table_init_attr *init_attr,struct ib_udata *udata) { +int err; + + err =ib_is_udata_in_empty (udata); +if (err) +return err; +/* * There is no additional data in ind_table to be maintained by this * driver, do nothing */ -return 0 ; + +return ib_respond_empty_udata (udata); }int mana_ib_destroy_rwq_ind_table (struct ib_rwq_ind_table *ib_rwq_ind_tbl)
include/uapi/rdma/mana-abi.h +1 -1
@@ -25,7 +25,7 @@ enum mana_ib_create_cq_flags {struct mana_ib_create_cq {__aligned_u64 buf_addr; -__u16 flags; +__u16 comp_mask;__u16 reserved0;__u32 reserved1; };
Signature · 1 line
2.43.0
Quoted 33 lines · Konstantin Taranov
From: Konstantin Taranov <[email protected]>
Enable the uverbs robust udata interface in
mana_ibby settinguverbs_robust_udataand converting the driver to the new udata handling model.Signed-off-by Konstantin Taranov <[email protected]>---
v2: Removed the udata request for alloc ucontextdrivers/infiniband/hw/mana/cq.c | 10 +++++-- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/main.c | 29 +++++++++++++----- drivers/infiniband/hw/mana/mr.c | 15 +++++++++- drivers/infiniband/hw/mana/qp.c | 46 ++++++++++++++++++++++------- drivers/infiniband/hw/mana/wq.c | 16 ++++++++-- include/uapi/rdma/mana-abi.h | 2 +- 7 files changed, 94 insertions(+), 25 deletions(-)drivers/infiniband/hw/mana/cq.c +2
-1@@ -27,7 +27,8 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, is_rnic_cq =mana_ib_is_rnic (mdev);if (udata) { - err =ib_copy_validate_udata_in (udata, ucmd, buf_addr); + err =ib_copy_validate_udata_in_cm (udata, ucmd, buf_addr, +MANA_IB_CREATE_RNIC_CQ );if (err)return err;
drivers/infiniband/hw/mana/cq.c int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata) · line 111
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c +3
-0@@ -105,6 +106,11 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata) struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq);struct ib_device *ibdev = ibcq->device;struct mana_ib_dev *mdev; +int err; + + err =ib_is_udata_in_empty (udata);
You should use ib_no_udata_io() in destroy/modify/resize flows.
Thanks