RDMA/mana_ib: Introduce three helper functions to clean mana_ib code
Subsystems (2)
PATCH v3 1/1 RDMA/mana_ib: Introduce three helper functions to clean mana_ib code
From: Konstantin Taranov <[email protected]>
This patch aims to address two issues in mana_ib:
1) Unsafe and inconsistent access to gdma_dev and gdma_context
2) Code repetitions
As a rule of thumb, functions should not access gdma_dev directly
Introduced functions:
1) mdev_to_gc
2) mana_ib_get_netdev
3) mana_ib_install_cq_cb
---v1->v2: Sorry that was sent again, I forgot to add RDMA/mana_ib to the subject v2->v3: missing changes in qp.c
--- drivers/infiniband/hw/mana/cq.c | 23 +++++++- drivers/infiniband/hw/mana/main.c | 40 +++++-------- drivers/infiniband/hw/mana/mana_ib.h | 17 ++++++ drivers/infiniband/hw/mana/mr.c | 13 +--- drivers/infiniband/hw/mana/qp.c | 88 +++++++++------------------- 5 files changed, 82 insertions(+), 99 deletions(-)
drivers/infiniband/hw/mana/cq.c +21 -2
@@ -16,7 +16,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev);if (udata->inlen <sizeof (ucmd))return -EINVAL ;
@@ -81,7 +81,7 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev); err =mana_ib_gd_destroy_dma_region (mdev, cq->gdma_region);if (err) {
@@ -107,3 +107,22 @@ void mana_ib_cq_handler(void *ctx, struct gdma_queue *gdma_cq)if (cq->ibcq.comp_handler) cq->ibcq.comp_handler (&cq->ibcq, cq->ibcq.cq_context); } + +int mana_ib_install_cq_cb (struct mana_ib_dev *mdev,struct mana_ib_cq *cq) +{ +struct gdma_context *gc =mdev_to_gc (mdev); +struct gdma_queue *gdma_cq; + +/* Create CQ table entry */ +WARN_ON (gc->cq_table[cq->id]); + gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); +if (!gdma_cq) +return -ENOMEM ; + + gdma_cq->cq.context = cq; + gdma_cq->type =GDMA_CQ ; + gdma_cq->cq.callback = mana_ib_cq_handler; + gdma_cq->id = cq->id; + gc->cq_table[cq->id] = gdma_cq; +return 0 ; +}
drivers/infiniband/hw/mana/main.c +14 -26
@@ -8,13 +8,10 @@void mana_ib_uncfg_vport (struct mana_ib_dev *dev,struct mana_ib_pd *pd,u32 port) { -struct gdma_dev *gd = &dev->gdma_dev->gdma_context->mana;struct mana_port_context *mpc;struct net_device *ndev; -struct mana_context *mc; - mc = gd->driver_data; - ndev = mc->ports[port]; + ndev =mana_ib_get_netdev (&dev->ib_dev, port); mpc =netdev_priv (ndev);mutex_lock (&pd->vport_mutex);
@@ -31,14 +28,11 @@ void mana_ib_uncfg_vport(struct mana_ib_dev *dev, struct mana_ib_pd *pd,int mana_ib_cfg_vport (struct mana_ib_dev *dev,u32 port,struct mana_ib_pd *pd,u32 doorbell_id) { -struct gdma_dev *mdev = &dev->gdma_dev->gdma_context->mana;struct mana_port_context *mpc; -struct mana_context *mc;struct net_device *ndev;int err; - mc = mdev->driver_data; - ndev = mc->ports[port]; + ndev =mana_ib_get_netdev (&dev->ib_dev, port); mpc =netdev_priv (ndev);mutex_lock (&pd->vport_mutex);
@@ -79,17 +73,17 @@ int mana_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)struct gdma_create_pd_req req = {};enum gdma_pd_flags flags =0 ;struct mana_ib_dev *dev; -struct gdma_dev *mdev; +struct gdma_context *gc;int err; dev = container_of(ibdev, struct mana_ib_dev, ib_dev); - mdev = dev->gdma_dev; + gc =mdev_to_gc (dev);mana_gd_init_req_hdr (&req.hdr,GDMA_CREATE_PD ,sizeof (req),sizeof (resp)); req.flags = flags; - err =mana_gd_send_request (mdev->gdma_context,sizeof (req), &req, + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp);if (err || resp.hdr.status) {
@@ -119,17 +113,17 @@ int mana_ib_dealloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)struct gdma_destory_pd_resp resp = {};struct gdma_destroy_pd_req req = {};struct mana_ib_dev *dev; -struct gdma_dev *mdev; +struct gdma_context *gc;int err; dev = container_of(ibdev, struct mana_ib_dev, ib_dev); - mdev = dev->gdma_dev; + gc =mdev_to_gc (dev);mana_gd_init_req_hdr (&req.hdr,GDMA_DESTROY_PD ,sizeof (req),sizeof (resp)); req.pd_handle = pd->pd_handle; - err =mana_gd_send_request (mdev->gdma_context,sizeof (req), &req, + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp);if (err || resp.hdr.status) {
@@ -206,13 +200,11 @@ int mana_ib_alloc_ucontext(struct ib_ucontext *ibcontext,struct ib_device *ibdev = ibcontext->device;struct mana_ib_dev *mdev;struct gdma_context *gc; -struct gdma_dev *dev;int doorbell_page;int ret; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - dev = mdev->gdma_dev; - gc = dev->gdma_context; + gc =mdev_to_gc (mdev);/* Allocate a doorbell page index */ ret =mana_gd_allocate_doorbell_page (gc, &doorbell_page);
@@ -238,7 +230,7 @@ void mana_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)int ret; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev); ret =mana_gd_destroy_doorbell_page (gc, mana_ucontext->doorbell);if (ret)
@@ -322,15 +314,13 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,size_t max_pgs_create_cmd;struct gdma_context *gc;size_t num_pages_total; -struct gdma_dev *mdev;unsigned long page_sz;unsigned int tail =0 ;u64 *page_addr_list;void *request_buf;int err; - mdev = dev->gdma_dev; - gc = mdev->gdma_context; + gc =mdev_to_gc (dev); hwc = gc->hwc.driver_data;/* Hardware requires dma region to align to chosen page size */
@@ -426,10 +416,8 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,int mana_ib_gd_destroy_dma_region (struct mana_ib_dev *dev,u64 gdma_region) { -struct gdma_dev *mdev = dev->gdma_dev; -struct gdma_context *gc; +struct gdma_context *gc =mdev_to_gc (dev); - gc = mdev->gdma_context;ibdev_dbg (&dev->ib_dev,"destroy dma region 0x%llx\n" , gdma_region);return mana_gd_destroy_dma_region (gc, gdma_region);
@@ -447,7 +435,7 @@ int mana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma)int ret; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev);if (vma->vm_pgoff !=0 ) {ibdev_dbg (ibdev,"Unexpected vm_pgoff %lu\n" , vma->vm_pgoff);
@@ -531,7 +519,7 @@ int mana_ib_gd_query_adapter_caps(struct mana_ib_dev *dev) req.hdr.resp.msg_version =GDMA_MESSAGE_V3 ; req.hdr.dev_id = dev->gdma_dev->dev_id; - err =mana_gd_send_request (dev->gdma_dev->gdma_context,sizeof (req), + err =mana_gd_send_request (mdev_to_gc (dev),sizeof (req), &req,sizeof (resp), &resp);if (err) {
drivers/infiniband/hw/mana/mana_ib.h +17 -0
@@ -142,6 +142,22 @@ struct mana_ib_query_adapter_caps_resp {u32 max_inline_data_size; };/* HW Data */ +static inline struct gdma_context *mdev_to_gc (struct mana_ib_dev *mdev) +{ +return mdev->gdma_dev->gdma_context; +} + +static inline struct net_device *mana_ib_get_netdev (struct ib_device *ibdev,u32 port) +{ + struct mana_ib_dev *mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); +struct gdma_context *gc =mdev_to_gc (mdev); +struct mana_context *mc = gc->mana.driver_data; + +if (port <1 || port > mc->num_ports) +return NULL ; +return mc->ports[port -1 ]; +} +int mana_ib_gd_create_dma_region (struct mana_ib_dev *dev,struct ib_umem *umem,mana_handle_t *gdma_region);
@@ -188,6 +204,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, struct ib_udata *udata);int mana_ib_destroy_cq (struct ib_cq *ibcq,struct ib_udata *udata); +int mana_ib_install_cq_cb (struct mana_ib_dev *mdev,struct mana_ib_cq *cq);int mana_ib_alloc_pd (struct ib_pd *ibpd,struct ib_udata *udata);int mana_ib_dealloc_pd (struct ib_pd *ibpd,struct ib_udata *udata);
drivers/infiniband/hw/mana/mr.c +3 -10
@@ -30,12 +30,9 @@ static int mana_ib_gd_create_mr(struct mana_ib_dev *dev, struct mana_ib_mr *mr, {struct gdma_create_mr_response resp = {};struct gdma_create_mr_request req = {}; -struct gdma_dev *mdev = dev->gdma_dev; -struct gdma_context *gc; +struct gdma_context *gc =mdev_to_gc (dev);int err; - gc = mdev->gdma_context; -mana_gd_init_req_hdr (&req.hdr,GDMA_CREATE_MR ,sizeof (req),sizeof (resp)); req.pd_handle = mr_params->pd_handle;
@@ -77,12 +74,9 @@ static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64 mr_handle) {struct gdma_destroy_mr_response resp = {};struct gdma_destroy_mr_request req = {}; -struct gdma_dev *mdev = dev->gdma_dev; -struct gdma_context *gc; +struct gdma_context *gc =mdev_to_gc (dev);int err; - gc = mdev->gdma_context; -mana_gd_init_req_hdr (&req.hdr,GDMA_DESTROY_MR ,sizeof (req),sizeof (resp));
@@ -164,8 +158,7 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length,return &mr->ibmr; err_dma_region: -mana_gd_destroy_dma_region (dev->gdma_dev->gdma_context, - dma_region_handle); +mana_gd_destroy_dma_region (mdev_to_gc (dev), dma_region_handle); err_umem:ib_umem_release (mr->umem);
drivers/infiniband/hw/mana/qp.c +27 -61
236 lines not on this page · raw message
base-commit: d24b923f1d696ddacb09f0f2d1b1f4f045cfe65e
Signature · 1 line
2.43.0
Quoted 6 lines
From: Konstantin Taranov <[email protected]>
This patch aims to address two issues in
mana_ib:
1) Unsafe and inconsistent access togdma_devandgdma_context
2) Code repetitions
Quoted 6 lines
As a rule of thumb, functions should not access
gdma_devdirectlyIntroduced functions:
1)mdev_to_gc
2)mana_ib_get_netdev
3)mana_ib_install_cq_cb
Overall, the patch looks good but it's hard to review.
As this patch doesn't change any existing behavior. I suggest you break the patch into three patches, one introduces necessary changes for each helper function.
I'm not sure if you need to add a "next" in the patch header.
Long
Quoted 594 lines
Signed-off-by Konstantin Taranov <[email protected]>---
v1->v2: Sorry that was sent again, I forgot to add RDMA/mana_ib to thev1->subjectv2->v3: missing changes inqp.c--- drivers/infiniband/hw/mana/cq.c | 23 +++++++- drivers/infiniband/hw/mana/main.c | 40 +++++-------- drivers/infiniband/hw/mana/mana_ib.h | 17 ++++++ drivers/infiniband/hw/mana/mr.c | 13 +--- drivers/infiniband/hw/mana/qp.c | 88 +++++++++------------------- 5 files changed, 82 insertions(+), 99 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindex83ebd0705..255e74ab7100644drivers/infiniband/hw/mana/cq.c +1
-1@@ -16,7 +16,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structib_cq_init_attr *attr, int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev);if (udata->inlen <sizeof (ucmd))drivers/infiniband/hw/mana/cq.c +1
-1return -EINVAL ;@@ -81,7 +81,7 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev); err =mana_ib_gd_destroy_dma_region (mdev, cq->gdma_region);drivers/infiniband/hw/mana/cq.c +19
-0if (err) {@@ -107,3 +107,22 @@ void mana_ib_cq_handler(void *ctx, struct gdma_queue *gdma_cq)if (cq->ibcq.comp_handler) cq->ibcq.comp_handler (&cq->ibcq, cq->ibcq.cq_context); } + +int mana_ib_install_cq_cb (struct mana_ib_dev *mdev,struct mana_ib_cq +*cq) { +struct gdma_context *gc =mdev_to_gc (mdev); +struct gdma_queue *gdma_cq; + +/* Create CQ table entry */ +WARN_ON (gc->cq_table[cq->id]); + gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); +if (!gdma_cq) +return -ENOMEM ; + + gdma_cq->cq.context = cq; + gdma_cq->type =GDMA_CQ ; + gdma_cq->cq.callback = mana_ib_cq_handler; + gdma_cq->id = cq->id; + gc->cq_table[cq->id] = gdma_cq; +return 0 ; +}drivers/infiniband/hw/mana/main.c +1
-4@@ -8,13 +8,10 @@void mana_ib_uncfg_vport (struct mana_ib_dev *dev,struct mana_ib_pd *pd,u32 port) { -struct gdma_dev *gd = &dev->gdma_dev->gdma_context->mana;struct mana_port_context *mpc;struct net_device *ndev; -struct mana_context *mc; - mc = gd->driver_data; - ndev = mc->ports[port]; + ndev =mana_ib_get_netdev (&dev->ib_dev, port); mpc =netdev_priv (ndev);mutex_lock (&pd->vport_mutex);@@ -31,14 +28,11 @@ void mana_ib_uncfg_vport(struct mana_ib_dev *dev,struct
mana_ib_pd*pd, int mana_ib_cfg_vport(structmana_ib_dev*dev, u32 port, structmana_ib_pd*pd,drivers/infiniband/hw/mana/main.c +4
-7u32 doorbell_id) { -struct gdma_dev *mdev = &dev->gdma_dev->gdma_context->mana;struct mana_port_context *mpc; -struct mana_context *mc;struct net_device *ndev;int err; - mc = mdev->driver_data; - ndev = mc->ports[port]; + ndev =mana_ib_get_netdev (&dev->ib_dev, port); mpc =netdev_priv (ndev);mutex_lock (&pd->vport_mutex);@@ -79,17 +73,17 @@ int mana_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)struct gdma_create_pd_req req = {};enum gdma_pd_flags flags =0 ;struct mana_ib_dev *dev; -struct gdma_dev *mdev; +struct gdma_context *gc;int err; dev = container_of(ibdev, struct mana_ib_dev, ib_dev); - mdev = dev->gdma_dev; + gc =mdev_to_gc (dev);mana_gd_init_req_hdr (&req.hdr,GDMA_CREATE_PD ,sizeof (req),sizeof (resp)); req.flags = flags; - err =mana_gd_send_request (mdev->gdma_context,sizeof (req), &req, + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp);drivers/infiniband/hw/mana/main.c +3
-3if (err || resp.hdr.status) {@@ -119,17 +113,17 @@ int mana_ib_dealloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)struct gdma_destory_pd_resp resp = {};struct gdma_destroy_pd_req req = {};struct mana_ib_dev *dev; -struct gdma_dev *mdev; +struct gdma_context *gc;int err; dev = container_of(ibdev, struct mana_ib_dev, ib_dev); - mdev = dev->gdma_dev; + gc =mdev_to_gc (dev);mana_gd_init_req_hdr (&req.hdr,GDMA_DESTROY_PD ,sizeof (req),sizeof (resp)); req.pd_handle = pd->pd_handle; - err =mana_gd_send_request (mdev->gdma_context,sizeof (req), &req, + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp);drivers/infiniband/hw/mana/main.c +1
-3if (err || resp.hdr.status) {@@ -206,13 +200,11 @@ int mana_ib_alloc_ucontext(struct ib_ucontext *ibcontext, struct ib_device *ibdev = ibcontext->device;struct mana_ib_dev *mdev;struct gdma_context *gc; -struct gdma_dev *dev;int doorbell_page;int ret; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - dev = mdev->gdma_dev; - gc = dev->gdma_context; + gc =mdev_to_gc (mdev);/* Allocate a doorbell page index */ ret =
mana_gd_allocate_doorbell_page(gc, &doorbell_page); @@ -
238,7 +230,7 @@ voidmana_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)drivers/infiniband/hw/mana/main.c +1
-1int ret; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev); ret = mana_gd_destroy_doorbell_page(gc, mana_ucontext-Quoted 1 line
doorbell);
drivers/infiniband/hw/mana/main.c +1
-3if (ret)@@ -322,15 +314,13 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, size_t max_pgs_create_cmd;struct gdma_context *gc;size_t num_pages_total; -struct gdma_dev *mdev;unsigned long page_sz;unsigned int tail =0 ;u64 *page_addr_list;void *request_buf;int err; - mdev = dev->gdma_dev; - gc = mdev->gdma_context; + gc =mdev_to_gc (dev); hwc = gc->hwc.driver_data;/* Hardware requires dma region to align to chosen page size */ @@ -
426,10 +416,8 @@ int mana_ib_gd_create_dma_region(structmana_ib_dev*dev, structib_umem*umem,int mana_ib_gd_destroy_dma_region(struct
mana_ib_dev*dev, u64gdma_region) {drivers/infiniband/hw/mana/main.c +1
-3-struct gdma_dev *mdev = dev->gdma_dev; -struct gdma_context *gc; +struct gdma_context *gc =mdev_to_gc (dev); - gc = mdev->gdma_context; ibdev_dbg(&dev->ib_dev, "destroy dma region 0x%llx\n",
gdma_region);return
mana_gd_destroy_dma_region(gc, gdma_region); @@ -447,7
+435,7 @@ intmana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma)drivers/infiniband/hw/mana/main.c +1
-1int ret; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev);if (vma->vm_pgoff !=0 ) { ibdev_dbg(ibdev, "Unexpected vm_pgoff %lu\n", vma-Quoted 1 line
vm_pgoff); @@ -531,7 +519,7 @@ int
mana_ib_gd_query_adapter_caps(struct mana_ib_dev *dev)drivers/infiniband/hw/mana/main.c +0
-1req.hdr.resp.msg_version =GDMA_MESSAGE_V3 ; req.hdr.dev_id = dev->gdma_dev->dev_id; - err = mana_gd_send_request(dev->gdma_dev->gdma_context,sizeof(req),
drivers/infiniband/hw/mana/main.c +1
-0+ err =mana_gd_send_request (mdev_to_gc (dev),sizeof (req), &req,sizeof (resp), &resp);if (err) {drivers/infiniband/hw/mana/mana_ib.h +16
-0@@ -142,6 +142,22 @@ struct mana_ib_query_adapter_caps_resp {u32 max_inline_data_size; };/* HW Data */ +static inline struct gdma_context *mdev_to_gc (struct mana_ib_dev *mdev) +{ +return mdev->gdma_dev->gdma_context; +} + +static inline struct net_device *mana_ib_get_netdev (struct ib_device +*ibdev,u32 port) { + struct mana_ib_dev *mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); +struct gdma_context *gc =mdev_to_gc (mdev); +struct mana_context *mc = gc->mana.driver_data; + +if (port <1 || port > mc->num_ports) +return NULL ; +return mc->ports[port -1 ]; +} + int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,drivers/infiniband/hw/mana/mana_ib.h +2
-0mana_handle_t *gdma_region);@@ -188,6 +204,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct ib_cq_init_attr *attr, struct ib_udata *udata);int mana_ib_destroy_cq (struct ib_cq *ibcq,struct ib_udata *udata); +int mana_ib_install_cq_cb (struct mana_ib_dev *mdev,struct mana_ib_cq +*cq);int mana_ib_alloc_pd (struct ib_pd *ibpd,struct ib_udata *udata);int
mana_ib_dealloc_pd(struct ib_pd *ibpd, struct ib_udata *udata); diff --gita/drivers/infiniband/hw/mana/mr.cb/drivers/infiniband/hw/mana/mr.cindex351207c60..ee4d4f834100644drivers/infiniband/hw/mana/mr.c +3
-10@@ -30,12 +30,9 @@ static int mana_ib_gd_create_mr(struct mana_ib_dev *dev, struct mana_ib_mr *mr, {struct gdma_create_mr_response resp = {};struct gdma_create_mr_request req = {}; -struct gdma_dev *mdev = dev->gdma_dev; -struct gdma_context *gc; +struct gdma_context *gc =mdev_to_gc (dev);int err; - gc = mdev->gdma_context; -mana_gd_init_req_hdr (&req.hdr,GDMA_CREATE_MR ,sizeof (req),sizeof (resp)); req.pd_handle = mr_params->pd_handle;@@ -77,12 +74,9 @@ static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64 mr_handle) {struct gdma_destroy_mr_response resp = {};struct gdma_destroy_mr_request req = {}; -struct gdma_dev *mdev = dev->gdma_dev; -struct gdma_context *gc; +struct gdma_context *gc =mdev_to_gc (dev);int err; - gc = mdev->gdma_context; -mana_gd_init_req_hdr (&req.hdr,GDMA_DESTROY_MR ,sizeof (req),sizeof (resp));@@ -164,8 +158,7 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length, return &mr->ibmr; err_dma_region: -mana_gd_destroy_dma_region (dev->gdma_dev->gdma_context, - dma_region_handle); +mana_gd_destroy_dma_region (mdev_to_gc (dev), dma_region_handle);
err_umem:drivers/infiniband/hw/mana/mr.c +0
-0ib_umem_release (mr->umem);(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/qp.cindex21ac9fcad..e889c798f100644drivers/infiniband/hw/mana/qp.c +1
-3@@ -17,12 +17,10 @@ static int mana_ib_cfg_vport_steering(structmana_ib_dev *dev, struct mana_cfg_rx_steer_resp resp = {};mana_handle_t *req_indir_tab;struct gdma_context *gc; -struct gdma_dev *mdev;u32 req_buf_size;int i, err; - gc = dev->gdma_dev->gdma_context; - mdev = &gc->mana; + gc =mdev_to_gc (dev); req_buf_size =
sizeof(*req)+sizeof(mana_handle_t)*MANA_INDIRECT_TABLE_SIZE; @@ -39,7 +37,7 @@ static int mana_ib_cfg_vport_steering(structmana_ib_dev*dev,drivers/infiniband/hw/mana/qp.c +2
-5req->rx_enable =1 ; req->update_default_rxobj =1 ; req->default_rxobj = default_rxobj; - req->hdr.dev_id = mdev->dev_id; + req->hdr.dev_id = gc->mana.dev_id;/* If there are more than 1 entries in indirection table, enable RSS */ if (log_ind_tbl_size)@@ -99,20 +97,17 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp,struct ib_pd *pd, struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp);struct mana_ib_dev *mdev = container_of(pd->device, struct mana_ib_dev, ib_dev); +struct gdma_context *gc =mdev_to_gc (mdev);struct ib_rwq_ind_table *ind_tbl = attr->rwq_ind_tbl;struct mana_ib_create_qp_rss_resp resp = {};struct mana_ib_create_qp_rss ucmd = {};struct gdma_queue **gdma_cq_allocated;mana_handle_t *mana_ind_table;struct mana_port_context *mpc; -struct gdma_queue *gdma_cq;unsigned int ind_tbl_size; -struct mana_context *mc;struct net_device *ndev; -struct gdma_context *gc;struct mana_ib_cq *cq;struct mana_ib_wq *wq; -struct gdma_dev *gd;struct mana_eq *eq;drivers/infiniband/hw/mana/qp.c +2
-6struct ib_cq *ibcq;struct ib_wq *ibwq;@@ -120,10 +115,6 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd, u32 port;int ret; - gc = mdev->gdma_dev->gdma_context; - gd = &gc->mana; - mc = gd->driver_data; -if (!udata || udata->inlen <sizeof (ucmd))return -EINVAL ;@@ -166,12 +157,12 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd,/* IB ports start with 1, MANA start with 0 */ port = ucmd.port; -if (port <1 || port > mc->num_ports) { + ndev =mana_ib_get_netdev (pd->device, port); +if (!ndev) {ibdev_dbg (&mdev->ib_dev,"Invalid port %u in creating qp\n", port);return -EINVAL ; } - ndev = mc->ports[port -1 ]; mpc =netdev_priv (ndev);ibdev_dbg(&mdev->ib_dev, "
rx_hash_function%d port %d\n", @@ -
209,7 +200,7 @@ static int mana_ib_create_qp_rss(structib_qp*ibqp, structib_pd*pd,drivers/infiniband/hw/mana/qp.c +1
-1cq_spec.gdma_region = cq->gdma_region; cq_spec.queue_size = cq->cqe *COMP_ENTRY_SIZE ; cq_spec.modr_ctx_id =0 ; - eq = &mc->eqs[cq->comp_vector % gc->max_num_queues]; + eq = &mpc->ac->eqs[cq->comp_vector % gc-Quoted 1 line
max_num_queues];drivers/infiniband/hw/mana/qp.c +0
-0cq_spec.attached_eq = eq->eq->id; ret = mana_create_wq_obj(mpc, mpc->port_handle,
GDMA_RQ, @@ -237,19 +228,11 @@ static int mana_ib_create_qp_rss(structib_qp*ibqp, structib_pd*pd,drivers/infiniband/hw/mana/qp.c +4
-13mana_ind_table[i] = wq->rx_object;/* Create CQ table entry */ -WARN_ON (gc->cq_table[cq->id]); - gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); -if (!gdma_cq) { - ret = -ENOMEM ; + ret =mana_ib_install_cq_cb (mdev, cq); +if (!ret) goto fail; - } - gdma_cq_allocated[i] = gdma_cq; - gdma_cq->cq.context = cq; - gdma_cq->type =GDMA_CQ ; - gdma_cq->cq.callback = mana_ib_cq_handler; - gdma_cq->id = cq->id; - gc->cq_table[cq->id] = gdma_cq; + gdma_cq_allocated[i] = gc->cq_table[cq->id]; } resp.num_entries = i;@@ -306,14 +289,13 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, struct mana_ib_ucontext *mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext, ibucontext); -struct gdma_dev *gd = &mdev->gdma_dev->gdma_context->mana; +struct gdma_context *gc =mdev_to_gc (mdev);struct mana_ib_create_qp_resp resp = {};struct mana_ib_create_qp ucmd = {};struct gdma_queue *gdma_cq =NULL ;struct mana_obj_spec wq_spec = {};struct mana_obj_spec cq_spec = {};struct mana_port_context *mpc; -struct mana_context *mc;struct net_device *ndev;drivers/infiniband/hw/mana/qp.c +0
-7struct ib_umem *umem;struct mana_eq *eq;@@ -321,8 +303,6 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp,struct ib_pd *ibpd, u32 port;int err; - mc = gd->driver_data; -if (!mana_ucontext || udata->inlen <sizeof (ucmd))return -EINVAL ;@@ -333,11 +313,6 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, return err; } -/* IB ports start with 1, MANA Ethernet ports start with 0 */ - port = ucmd.port; -if (port <1 || port > mc->num_ports) -return -EINVAL ; -if (attr->cap.max_send_wr > mdev->adapter_caps.max_qp_wr) { ibdev_dbg(&mdev->ib_dev,drivers/infiniband/hw/mana/qp.c +7
-2"Requested max_send_wr %d exceeding limit\n",@@ -352,11 +327,17 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, return -EINVAL ; } - ndev = mc->ports[port -1 ]; + port = ucmd.port; + ndev =mana_ib_get_netdev (ibpd->device, port); +if (!ndev) { +ibdev_dbg (&mdev->ib_dev,"Invalid port %u in creating qp\n", + port); +return -EINVAL ; + } mpc =netdev_priv (ndev);ibdev_dbg (&mdev->ib_dev,"port %u ndev %p mpc %p\n" , port, ndev, mpc); - err = mana_ib_cfg_vport(mdev, port - 1, pd, mana_ucontext-Quoted 1 line
doorbell);
drivers/infiniband/hw/mana/qp.c +3
-2+ err =mana_ib_cfg_vport (mdev, port, pd, mana_ucontext->doorbell);if (err)return -ENODEV ;@@ -396,8 +377,8 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp,struct ib_pd *ibpd, cq_spec.gdma_region = send_cq->gdma_region; cq_spec.queue_size = send_cq->cqe *COMP_ENTRY_SIZE ; cq_spec.modr_ctx_id =0 ; - eq_vec = send_cq->comp_vector % gd->gdma_context- >max_num_queues; - eq = &mc->eqs[eq_vec]; + eq_vec = send_cq->comp_vector % gc->max_num_queues; + eq = &mpc->ac->eqs[eq_vec]; cq_spec.attached_eq = eq->eq->id;err = mana_create_wq_obj(mpc,
mpc->port_handle,GDMA_SQ,&wq_spec, @@ -417,18 +398,9 @@ static int mana_ib_create_qp_raw(structib_qp*ibqp, structib_pd*ibpd,drivers/infiniband/hw/mana/qp.c +2
-12send_cq->id = cq_spec.queue_index;/* Create CQ table entry */ -WARN_ON (gd->gdma_context->cq_table[send_cq->id]); - gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); -if (!gdma_cq) { - err = -ENOMEM ; + err =mana_ib_install_cq_cb (mdev, send_cq); +if (err) goto err_destroy_wq_obj; - } - - gdma_cq->cq.context = send_cq; - gdma_cq->type =GDMA_CQ ; - gdma_cq->cq.callback = mana_ib_cq_handler; - gdma_cq->id = send_cq->id; - gd->gdma_context->cq_table[send_cq->id] = gdma_cq; ibdev_dbg(&mdev->ib_dev, "ret %d qp->tx_object 0x%llx sq id %llu cq id %llu\n", err, @@ -450,7 +422,7 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp,struct
ib_pd*ibpd,
err_release_gdma_cq:drivers/infiniband/hw/mana/qp.c +2
-1kfree (gdma_cq); - gd->gdma_context->cq_table[send_cq->id] =NULL ; + gc->cq_table[send_cq->id] =NULL ; err_destroy_wq_obj: mana_destroy_wq_obj(mpc, GDMA_SQ, qp->tx_object); @@ -462,7 +434,7 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct
ib_pd*ibpd,drivers/infiniband/hw/mana/qp.c +3
-5ib_umem_release (umem); err_free_vport: -mana_ib_uncfg_vport (mdev, pd, port -1 ); +mana_ib_uncfg_vport (mdev, pd, port);return err; }@@ -500,16 +472,13 @@ static int mana_ib_destroy_qp_rss(struct mana_ib_qp *qp, {struct mana_ib_dev *mdev = container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev); -struct gdma_dev *gd = &mdev->gdma_dev->gdma_context->mana;struct mana_port_context *mpc; -struct mana_context *mc;struct net_device *ndev;struct mana_ib_wq *wq;struct ib_wq *ibwq;int i; - mc = gd->driver_data; - ndev = mc->ports[qp->port -1 ]; + ndev =mana_ib_get_netdev (qp->ibqp.device, qp->port); mpc =netdev_priv (ndev); for (i = 0; i < (1 << ind_tbl->log_ind_tbl_size); i++) { @@ -527,15 +496,12 @@ static int mana_ib_destroy_qp_raw(struct mana_ib_qp *qp,struct
ib_udata*udata) {drivers/infiniband/hw/mana/qp.c +2
-5struct mana_ib_dev *mdev = container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev); -struct gdma_dev *gd = &mdev->gdma_dev->gdma_context->mana;struct ib_pd *ibpd = qp->ibqp.pd;struct mana_port_context *mpc; -struct mana_context *mc;struct net_device *ndev;struct mana_ib_pd *pd; - mc = gd->driver_data; - ndev = mc->ports[qp->port -1 ]; + ndev =mana_ib_get_netdev (qp->ibqp.device, qp->port); mpc =netdev_priv (ndev); pd = container_of(ibpd, struct mana_ib_pd, ibpd);@@ -546,7 +512,7 @@ static int mana_ib_destroy_qp_raw(struct mana_ib_qp *qp, struct ib_udata *udata) ib_umem_release(qp->sq_umem); } -mana_ib_uncfg_vport (mdev, pd, qp->port -1 ); +mana_ib_uncfg_vport (mdev, pd, qp->port);return 0 ;}
base-commit:
d24b923f1d696ddacb09f0f2d1b1f4f045cfe65e--
2.43.0
Quoted 13 lines · Long Li
Quoted 6 lines
From: Konstantin Taranov <[email protected]>
This patch aims to address two issues in
mana_ib:
1) Unsafe and inconsistent access togdma_devandgdma_context
2) Code repetitionsQuoted 6 lines
As a rule of thumb, functions should not access
gdma_devdirectlyIntroduced functions:
1)mdev_to_gc
2)mana_ib_get_netdev
3)mana_ib_install_cq_cb
Quoted 5 lines
Overall, the patch looks good but it's hard to review.
As this patch doesn't change any existing behavior. I suggest you break the patch into three patches, one introduces necessary changes for each helper function.
I'm not sure if you need to add a "next" in the patch header.
He needs to add "rdma-next" in the subject and resend it after merge window ends.
Thanks
Quoted 599 lines
Long
Quoted 594 lines
Signed-off-by Konstantin Taranov <[email protected]>---
v1->v2: Sorry that was sent again, I forgot to add RDMA/mana_ib to thev1->subjectv2->v3: missing changes inqp.c--- drivers/infiniband/hw/mana/cq.c | 23 +++++++- drivers/infiniband/hw/mana/main.c | 40 +++++-------- drivers/infiniband/hw/mana/mana_ib.h | 17 ++++++ drivers/infiniband/hw/mana/mr.c | 13 +--- drivers/infiniband/hw/mana/qp.c | 88 +++++++++------------------- 5 files changed, 82 insertions(+), 99 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindex83ebd0705..255e74ab7100644drivers/infiniband/hw/mana/cq.c +1
-1@@ -16,7 +16,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structib_cq_init_attr *attr, int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev);if (udata->inlen <sizeof (ucmd))drivers/infiniband/hw/mana/cq.c +1
-1return -EINVAL ;@@ -81,7 +81,7 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev); err =mana_ib_gd_destroy_dma_region (mdev, cq->gdma_region);drivers/infiniband/hw/mana/cq.c +19
-0if (err) {@@ -107,3 +107,22 @@ void mana_ib_cq_handler(void *ctx, struct gdma_queue *gdma_cq)if (cq->ibcq.comp_handler) cq->ibcq.comp_handler (&cq->ibcq, cq->ibcq.cq_context); } + +int mana_ib_install_cq_cb (struct mana_ib_dev *mdev,struct mana_ib_cq +*cq) { +struct gdma_context *gc =mdev_to_gc (mdev); +struct gdma_queue *gdma_cq; + +/* Create CQ table entry */ +WARN_ON (gc->cq_table[cq->id]); + gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); +if (!gdma_cq) +return -ENOMEM ; + + gdma_cq->cq.context = cq; + gdma_cq->type =GDMA_CQ ; + gdma_cq->cq.callback = mana_ib_cq_handler; + gdma_cq->id = cq->id; + gc->cq_table[cq->id] = gdma_cq; +return 0 ; +}drivers/infiniband/hw/mana/main.c +1
-4@@ -8,13 +8,10 @@void mana_ib_uncfg_vport (struct mana_ib_dev *dev,struct mana_ib_pd *pd,u32 port) { -struct gdma_dev *gd = &dev->gdma_dev->gdma_context->mana;struct mana_port_context *mpc;struct net_device *ndev; -struct mana_context *mc; - mc = gd->driver_data; - ndev = mc->ports[port]; + ndev =mana_ib_get_netdev (&dev->ib_dev, port); mpc =netdev_priv (ndev);mutex_lock (&pd->vport_mutex);@@ -31,14 +28,11 @@ void mana_ib_uncfg_vport(struct mana_ib_dev *dev,struct
mana_ib_pd*pd, int mana_ib_cfg_vport(structmana_ib_dev*dev, u32 port, structmana_ib_pd*pd,drivers/infiniband/hw/mana/main.c +4
-7u32 doorbell_id) { -struct gdma_dev *mdev = &dev->gdma_dev->gdma_context->mana;struct mana_port_context *mpc; -struct mana_context *mc;struct net_device *ndev;int err; - mc = mdev->driver_data; - ndev = mc->ports[port]; + ndev =mana_ib_get_netdev (&dev->ib_dev, port); mpc =netdev_priv (ndev);mutex_lock (&pd->vport_mutex);@@ -79,17 +73,17 @@ int mana_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)struct gdma_create_pd_req req = {};enum gdma_pd_flags flags =0 ;struct mana_ib_dev *dev; -struct gdma_dev *mdev; +struct gdma_context *gc;int err; dev = container_of(ibdev, struct mana_ib_dev, ib_dev); - mdev = dev->gdma_dev; + gc =mdev_to_gc (dev);mana_gd_init_req_hdr (&req.hdr,GDMA_CREATE_PD ,sizeof (req),sizeof (resp)); req.flags = flags; - err =mana_gd_send_request (mdev->gdma_context,sizeof (req), &req, + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp);drivers/infiniband/hw/mana/main.c +3
-3if (err || resp.hdr.status) {@@ -119,17 +113,17 @@ int mana_ib_dealloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)struct gdma_destory_pd_resp resp = {};struct gdma_destroy_pd_req req = {};struct mana_ib_dev *dev; -struct gdma_dev *mdev; +struct gdma_context *gc;int err; dev = container_of(ibdev, struct mana_ib_dev, ib_dev); - mdev = dev->gdma_dev; + gc =mdev_to_gc (dev);mana_gd_init_req_hdr (&req.hdr,GDMA_DESTROY_PD ,sizeof (req),sizeof (resp)); req.pd_handle = pd->pd_handle; - err =mana_gd_send_request (mdev->gdma_context,sizeof (req), &req, + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp);drivers/infiniband/hw/mana/main.c +1
-3if (err || resp.hdr.status) {@@ -206,13 +200,11 @@ int mana_ib_alloc_ucontext(struct ib_ucontext *ibcontext, struct ib_device *ibdev = ibcontext->device;struct mana_ib_dev *mdev;struct gdma_context *gc; -struct gdma_dev *dev;int doorbell_page;int ret; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - dev = mdev->gdma_dev; - gc = dev->gdma_context; + gc =mdev_to_gc (mdev);/* Allocate a doorbell page index */ ret =
mana_gd_allocate_doorbell_page(gc, &doorbell_page); @@ -
238,7 +230,7 @@ voidmana_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)drivers/infiniband/hw/mana/main.c +1
-1int ret; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev); ret = mana_gd_destroy_doorbell_page(gc, mana_ucontext-Quoted 1 line
doorbell);
drivers/infiniband/hw/mana/main.c +1
-3if (ret)@@ -322,15 +314,13 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, size_t max_pgs_create_cmd;struct gdma_context *gc;size_t num_pages_total; -struct gdma_dev *mdev;unsigned long page_sz;unsigned int tail =0 ;u64 *page_addr_list;void *request_buf;int err; - mdev = dev->gdma_dev; - gc = mdev->gdma_context; + gc =mdev_to_gc (dev); hwc = gc->hwc.driver_data;/* Hardware requires dma region to align to chosen page size */ @@ -
426,10 +416,8 @@ int mana_ib_gd_create_dma_region(structmana_ib_dev*dev, structib_umem*umem,int mana_ib_gd_destroy_dma_region(struct
mana_ib_dev*dev, u64gdma_region) {drivers/infiniband/hw/mana/main.c +1
-3-struct gdma_dev *mdev = dev->gdma_dev; -struct gdma_context *gc; +struct gdma_context *gc =mdev_to_gc (dev); - gc = mdev->gdma_context; ibdev_dbg(&dev->ib_dev, "destroy dma region 0x%llx\n",
gdma_region);return
mana_gd_destroy_dma_region(gc, gdma_region); @@ -447,7
+435,7 @@ intmana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma)drivers/infiniband/hw/mana/main.c +1
-1int ret; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); - gc = mdev->gdma_dev->gdma_context; + gc =mdev_to_gc (mdev);if (vma->vm_pgoff !=0 ) { ibdev_dbg(ibdev, "Unexpected vm_pgoff %lu\n", vma-Quoted 1 line
vm_pgoff); @@ -531,7 +519,7 @@ int
mana_ib_gd_query_adapter_caps(struct mana_ib_dev *dev)drivers/infiniband/hw/mana/main.c +0
-1req.hdr.resp.msg_version =GDMA_MESSAGE_V3 ; req.hdr.dev_id = dev->gdma_dev->dev_id; - err = mana_gd_send_request(dev->gdma_dev->gdma_context,sizeof(req),
drivers/infiniband/hw/mana/main.c +1
-0+ err =mana_gd_send_request (mdev_to_gc (dev),sizeof (req), &req,sizeof (resp), &resp);if (err) {drivers/infiniband/hw/mana/mana_ib.h +16
-0@@ -142,6 +142,22 @@ struct mana_ib_query_adapter_caps_resp {u32 max_inline_data_size; };/* HW Data */ +static inline struct gdma_context *mdev_to_gc (struct mana_ib_dev *mdev) +{ +return mdev->gdma_dev->gdma_context; +} + +static inline struct net_device *mana_ib_get_netdev (struct ib_device +*ibdev,u32 port) { + struct mana_ib_dev *mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); +struct gdma_context *gc =mdev_to_gc (mdev); +struct mana_context *mc = gc->mana.driver_data; + +if (port <1 || port > mc->num_ports) +return NULL ; +return mc->ports[port -1 ]; +} + int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,drivers/infiniband/hw/mana/mana_ib.h +2
-0mana_handle_t *gdma_region);@@ -188,6 +204,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct ib_cq_init_attr *attr, struct ib_udata *udata);int mana_ib_destroy_cq (struct ib_cq *ibcq,struct ib_udata *udata); +int mana_ib_install_cq_cb (struct mana_ib_dev *mdev,struct mana_ib_cq +*cq);int mana_ib_alloc_pd (struct ib_pd *ibpd,struct ib_udata *udata);int
mana_ib_dealloc_pd(struct ib_pd *ibpd, struct ib_udata *udata); diff --gita/drivers/infiniband/hw/mana/mr.cb/drivers/infiniband/hw/mana/mr.cindex351207c60..ee4d4f834100644drivers/infiniband/hw/mana/mr.c +3
-10@@ -30,12 +30,9 @@ static int mana_ib_gd_create_mr(struct mana_ib_dev *dev, struct mana_ib_mr *mr, {struct gdma_create_mr_response resp = {};struct gdma_create_mr_request req = {}; -struct gdma_dev *mdev = dev->gdma_dev; -struct gdma_context *gc; +struct gdma_context *gc =mdev_to_gc (dev);int err; - gc = mdev->gdma_context; -mana_gd_init_req_hdr (&req.hdr,GDMA_CREATE_MR ,sizeof (req),sizeof (resp)); req.pd_handle = mr_params->pd_handle;@@ -77,12 +74,9 @@ static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64 mr_handle) {struct gdma_destroy_mr_response resp = {};struct gdma_destroy_mr_request req = {}; -struct gdma_dev *mdev = dev->gdma_dev; -struct gdma_context *gc; +struct gdma_context *gc =mdev_to_gc (dev);int err; - gc = mdev->gdma_context; -mana_gd_init_req_hdr (&req.hdr,GDMA_DESTROY_MR ,sizeof (req),sizeof (resp));@@ -164,8 +158,7 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length, return &mr->ibmr; err_dma_region: -mana_gd_destroy_dma_region (dev->gdma_dev->gdma_context, - dma_region_handle); +mana_gd_destroy_dma_region (mdev_to_gc (dev), dma_region_handle);
err_umem:drivers/infiniband/hw/mana/mr.c +0
-0ib_umem_release (mr->umem);(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/qp.cindex21ac9fcad..e889c798f100644drivers/infiniband/hw/mana/qp.c +1
-3@@ -17,12 +17,10 @@ static int mana_ib_cfg_vport_steering(structmana_ib_dev *dev, struct mana_cfg_rx_steer_resp resp = {};mana_handle_t *req_indir_tab;struct gdma_context *gc; -struct gdma_dev *mdev;u32 req_buf_size;int i, err; - gc = dev->gdma_dev->gdma_context; - mdev = &gc->mana; + gc =mdev_to_gc (dev); req_buf_size =
sizeof(*req)+sizeof(mana_handle_t)*MANA_INDIRECT_TABLE_SIZE; @@ -39,7 +37,7 @@ static int mana_ib_cfg_vport_steering(structmana_ib_dev*dev,drivers/infiniband/hw/mana/qp.c +2
-5req->rx_enable =1 ; req->update_default_rxobj =1 ; req->default_rxobj = default_rxobj; - req->hdr.dev_id = mdev->dev_id; + req->hdr.dev_id = gc->mana.dev_id;/* If there are more than 1 entries in indirection table, enable RSS */ if (log_ind_tbl_size)@@ -99,20 +97,17 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp,struct ib_pd *pd, struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp);struct mana_ib_dev *mdev = container_of(pd->device, struct mana_ib_dev, ib_dev); +struct gdma_context *gc =mdev_to_gc (mdev);struct ib_rwq_ind_table *ind_tbl = attr->rwq_ind_tbl;struct mana_ib_create_qp_rss_resp resp = {};struct mana_ib_create_qp_rss ucmd = {};struct gdma_queue **gdma_cq_allocated;mana_handle_t *mana_ind_table;struct mana_port_context *mpc; -struct gdma_queue *gdma_cq;unsigned int ind_tbl_size; -struct mana_context *mc;struct net_device *ndev; -struct gdma_context *gc;struct mana_ib_cq *cq;struct mana_ib_wq *wq; -struct gdma_dev *gd;struct mana_eq *eq;drivers/infiniband/hw/mana/qp.c +2
-6struct ib_cq *ibcq;struct ib_wq *ibwq;@@ -120,10 +115,6 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd, u32 port;int ret; - gc = mdev->gdma_dev->gdma_context; - gd = &gc->mana; - mc = gd->driver_data; -if (!udata || udata->inlen <sizeof (ucmd))return -EINVAL ;@@ -166,12 +157,12 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd,/* IB ports start with 1, MANA start with 0 */ port = ucmd.port; -if (port <1 || port > mc->num_ports) { + ndev =mana_ib_get_netdev (pd->device, port); +if (!ndev) {ibdev_dbg (&mdev->ib_dev,"Invalid port %u in creating qp\n", port);return -EINVAL ; } - ndev = mc->ports[port -1 ]; mpc =netdev_priv (ndev);ibdev_dbg(&mdev->ib_dev, "
rx_hash_function%d port %d\n", @@ -
209,7 +200,7 @@ static int mana_ib_create_qp_rss(structib_qp*ibqp, structib_pd*pd,drivers/infiniband/hw/mana/qp.c +1
-1cq_spec.gdma_region = cq->gdma_region; cq_spec.queue_size = cq->cqe *COMP_ENTRY_SIZE ; cq_spec.modr_ctx_id =0 ; - eq = &mc->eqs[cq->comp_vector % gc->max_num_queues]; + eq = &mpc->ac->eqs[cq->comp_vector % gc-Quoted 1 line
max_num_queues];drivers/infiniband/hw/mana/qp.c +0
-0cq_spec.attached_eq = eq->eq->id; ret = mana_create_wq_obj(mpc, mpc->port_handle,
GDMA_RQ, @@ -237,19 +228,11 @@ static int mana_ib_create_qp_rss(structib_qp*ibqp, structib_pd*pd,drivers/infiniband/hw/mana/qp.c +4
-13mana_ind_table[i] = wq->rx_object;/* Create CQ table entry */ -WARN_ON (gc->cq_table[cq->id]); - gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); -if (!gdma_cq) { - ret = -ENOMEM ; + ret =mana_ib_install_cq_cb (mdev, cq); +if (!ret) goto fail; - } - gdma_cq_allocated[i] = gdma_cq; - gdma_cq->cq.context = cq; - gdma_cq->type =GDMA_CQ ; - gdma_cq->cq.callback = mana_ib_cq_handler; - gdma_cq->id = cq->id; - gc->cq_table[cq->id] = gdma_cq; + gdma_cq_allocated[i] = gc->cq_table[cq->id]; } resp.num_entries = i;@@ -306,14 +289,13 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, struct mana_ib_ucontext *mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext, ibucontext); -struct gdma_dev *gd = &mdev->gdma_dev->gdma_context->mana; +struct gdma_context *gc =mdev_to_gc (mdev);struct mana_ib_create_qp_resp resp = {};struct mana_ib_create_qp ucmd = {};struct gdma_queue *gdma_cq =NULL ;struct mana_obj_spec wq_spec = {};struct mana_obj_spec cq_spec = {};struct mana_port_context *mpc; -struct mana_context *mc;struct net_device *ndev;drivers/infiniband/hw/mana/qp.c +0
-7struct ib_umem *umem;struct mana_eq *eq;@@ -321,8 +303,6 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp,struct ib_pd *ibpd, u32 port;int err; - mc = gd->driver_data; -if (!mana_ucontext || udata->inlen <sizeof (ucmd))return -EINVAL ;@@ -333,11 +313,6 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, return err; } -/* IB ports start with 1, MANA Ethernet ports start with 0 */ - port = ucmd.port; -if (port <1 || port > mc->num_ports) -return -EINVAL ; -if (attr->cap.max_send_wr > mdev->adapter_caps.max_qp_wr) { ibdev_dbg(&mdev->ib_dev,drivers/infiniband/hw/mana/qp.c +7
-2"Requested max_send_wr %d exceeding limit\n",@@ -352,11 +327,17 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, return -EINVAL ; } - ndev = mc->ports[port -1 ]; + port = ucmd.port; + ndev =mana_ib_get_netdev (ibpd->device, port); +if (!ndev) { +ibdev_dbg (&mdev->ib_dev,"Invalid port %u in creating qp\n", + port); +return -EINVAL ; + } mpc =netdev_priv (ndev);ibdev_dbg (&mdev->ib_dev,"port %u ndev %p mpc %p\n" , port, ndev, mpc); - err = mana_ib_cfg_vport(mdev, port - 1, pd, mana_ucontext-Quoted 1 line
doorbell);
drivers/infiniband/hw/mana/qp.c +3
-2+ err =mana_ib_cfg_vport (mdev, port, pd, mana_ucontext->doorbell);if (err)return -ENODEV ;@@ -396,8 +377,8 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp,struct ib_pd *ibpd, cq_spec.gdma_region = send_cq->gdma_region; cq_spec.queue_size = send_cq->cqe *COMP_ENTRY_SIZE ; cq_spec.modr_ctx_id =0 ; - eq_vec = send_cq->comp_vector % gd->gdma_context- >max_num_queues; - eq = &mc->eqs[eq_vec]; + eq_vec = send_cq->comp_vector % gc->max_num_queues; + eq = &mpc->ac->eqs[eq_vec]; cq_spec.attached_eq = eq->eq->id;err = mana_create_wq_obj(mpc,
mpc->port_handle,GDMA_SQ,&wq_spec, @@ -417,18 +398,9 @@ static int mana_ib_create_qp_raw(structib_qp*ibqp, structib_pd*ibpd,drivers/infiniband/hw/mana/qp.c +2
-12send_cq->id = cq_spec.queue_index;/* Create CQ table entry */ -WARN_ON (gd->gdma_context->cq_table[send_cq->id]); - gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); -if (!gdma_cq) { - err = -ENOMEM ; + err =mana_ib_install_cq_cb (mdev, send_cq); +if (err) goto err_destroy_wq_obj; - } - - gdma_cq->cq.context = send_cq; - gdma_cq->type =GDMA_CQ ; - gdma_cq->cq.callback = mana_ib_cq_handler; - gdma_cq->id = send_cq->id; - gd->gdma_context->cq_table[send_cq->id] = gdma_cq; ibdev_dbg(&mdev->ib_dev, "ret %d qp->tx_object 0x%llx sq id %llu cq id %llu\n", err, @@ -450,7 +422,7 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp,struct
ib_pd*ibpd,
err_release_gdma_cq:drivers/infiniband/hw/mana/qp.c +2
-1kfree (gdma_cq); - gd->gdma_context->cq_table[send_cq->id] =NULL ; + gc->cq_table[send_cq->id] =NULL ; err_destroy_wq_obj: mana_destroy_wq_obj(mpc, GDMA_SQ, qp->tx_object); @@ -462,7 +434,7 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct
ib_pd*ibpd,drivers/infiniband/hw/mana/qp.c +3
-5ib_umem_release (umem); err_free_vport: -mana_ib_uncfg_vport (mdev, pd, port -1 ); +mana_ib_uncfg_vport (mdev, pd, port);return err; }@@ -500,16 +472,13 @@ static int mana_ib_destroy_qp_rss(struct mana_ib_qp *qp, {struct mana_ib_dev *mdev = container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev); -struct gdma_dev *gd = &mdev->gdma_dev->gdma_context->mana;struct mana_port_context *mpc; -struct mana_context *mc;struct net_device *ndev;struct mana_ib_wq *wq;struct ib_wq *ibwq;int i; - mc = gd->driver_data; - ndev = mc->ports[qp->port -1 ]; + ndev =mana_ib_get_netdev (qp->ibqp.device, qp->port); mpc =netdev_priv (ndev); for (i = 0; i < (1 << ind_tbl->log_ind_tbl_size); i++) { @@ -527,15 +496,12 @@ static int mana_ib_destroy_qp_raw(struct mana_ib_qp *qp,struct
ib_udata*udata) {drivers/infiniband/hw/mana/qp.c +2
-5struct mana_ib_dev *mdev = container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev); -struct gdma_dev *gd = &mdev->gdma_dev->gdma_context->mana;struct ib_pd *ibpd = qp->ibqp.pd;struct mana_port_context *mpc; -struct mana_context *mc;struct net_device *ndev;struct mana_ib_pd *pd; - mc = gd->driver_data; - ndev = mc->ports[qp->port -1 ]; + ndev =mana_ib_get_netdev (qp->ibqp.device, qp->port); mpc =netdev_priv (ndev); pd = container_of(ibpd, struct mana_ib_pd, ibpd);@@ -546,7 +512,7 @@ static int mana_ib_destroy_qp_raw(struct mana_ib_qp *qp, struct ib_udata *udata) ib_umem_release(qp->sq_umem); } -mana_ib_uncfg_vport (mdev, pd, qp->port -1 ); +mana_ib_uncfg_vport (mdev, pd, qp->port);return 0 ;}
base-commit:
d24b923f1d696ddacb09f0f2d1b1f4f045cfe65e--
2.43.0