RDMA/mana_ib: Enable CM for mana_ib
Subsystems (5)
cover RDMA/mana_ib: Enable CM for mana_ib
From: Konstantin Taranov <[email protected]>
This patch series enables GSI QPs and CM on mana_ib.
Konstantin Taranov (13):
RDMA/mana_ib: Allow registration of DMA-mapped memory in PDs RDMA/mana_ib: implement get_dma_mr
RDMA/mana_ib: helpers to allocate kernel queues RDMA/mana_ib: create kernel-level CQs RDMA/mana_ib: Create and destroy UD/GSI QP RDMA/mana_ib: UD/GSI QP creation for kernel RDMA/mana_ib: create/destroy AH
net/mana: fix warning in the writer of client oob RDMA/mana_ib: UD/GSI work requests
RDMA/mana_ib: implement req_notify_cq RDMA/mana_ib: extend mana QP table
RDMA/mana_ib: polling of CQs for GSI/UD RDMA/mana_ib: indicate CM support
drivers/infiniband/hw/mana/Makefile | 2 +- drivers/infiniband/hw/mana/ah.c | 58 +++++ drivers/infiniband/hw/mana/cq.c | 227 ++++++++++++++-- drivers/infiniband/hw/mana/device.c | 18 +- drivers/infiniband/hw/mana/main.c | 95 ++++++- drivers/infiniband/hw/mana/mana_ib.h | 157 ++++++++++- drivers/infiniband/hw/mana/mr.c | 36 +++ drivers/infiniband/hw/mana/qp.c | 245 +++++++++++++++++- drivers/infiniband/hw/mana/shadow_queue.h | 115 ++++++++ drivers/infiniband/hw/mana/wr.c | 168 ++++++++++++ .../net/ethernet/microsoft/mana/gdma_main.c | 7 +- include/net/mana/gdma.h | 6 + 12 files changed, 1096 insertions(+), 38 deletions(-) create mode 100644 drivers/infiniband/hw/mana/ah.c create mode 100644 drivers/infiniband/hw/mana/shadow_queue.h create mode 100644 drivers/infiniband/hw/mana/wr.c
Signature · 1 line
2.43.0
PATCH 1/13 RDMA/mana_ib: Allow registration of DMA-mapped memory in PDs
From: Konstantin Taranov <[email protected]>
Allow the HW to register DMA-mapped memory for kernel-level PDs.
--- drivers/infiniband/hw/mana/main.c | 3 +++ include/net/mana/gdma.h | 1 + 2 files changed, 4 insertions(+)
drivers/infiniband/hw/mana/main.c +3 -0
@@ -82,6 +82,9 @@ int mana_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)mana_gd_init_req_hdr (&req.hdr,GDMA_CREATE_PD ,sizeof (req),sizeof (resp)); +if (!udata) + flags |=GDMA_PD_FLAG_ALLOW_GPA_MR ; + req.flags = flags; err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp);
include/net/mana/gdma.h +1 -0
@@ -775,6 +775,7 @@ struct gdma_destroy_dma_region_req {enum gdma_pd_flags {GDMA_PD_FLAG_INVALID =0 , +GDMA_PD_FLAG_ALLOW_GPA_MR =1 , };struct gdma_create_pd_req {
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 01/13] RDMA/mana_ib: Allow registration of DMA-mapped memory in PDs
Quoted 9 lines
Subject: [PATCH rdma-next 01/13] RDMA/mana_ib: Allow registration of DMA- mapped memory in PDs
From: Konstantin Taranov <[email protected]>
Allow the HW to register DMA-mapped memory for kernel-level PDs.
Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 35 lines
--- drivers/infiniband/hw/mana/main.c | 3 +++ include/net/mana/gdma.h | 1 + 2 files changed, 4 insertions(+)drivers/infiniband/hw/mana/main.c +3
-0@@ -82,6 +82,9 @@ int mana_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata)mana_gd_init_req_hdr (&req.hdr,GDMA_CREATE_PD ,sizeof (req),sizeof (resp)); +if (!udata) + flags |=GDMA_PD_FLAG_ALLOW_GPA_MR ; + req.flags = flags; err = mana_gd_send_request(gc, sizeof(req), &req,drivers/infiniband/hw/mana/main.c +0
-0sizeof(resp), &resp);include/net/mana/gdma.h index renamed from include/net/mana/gdma.h +0
-090f5665..03e1b25 100644
include/net/mana/gdma.h +1
-1@@ -775,6 +775,7 @@ struct gdma_destroy_dma_region_req {enum gdma_pd_flags {GDMA_PD_FLAG_INVALID =0 , +GDMA_PD_FLAG_ALLOW_GPA_MR =1 , };struct gdma_create_pd_req { --2.43.0
PATCH 2/13 RDMA/mana_ib: implement get_dma_mr
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Implement allocation of DMA-mapped memory regions.
--- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/mr.c | 36 +++++++++++++++++++++++++++++ include/net/mana/gdma.h | 5 ++++ 3 files changed, 42 insertions(+)
drivers/infiniband/hw/mana/device.c +1 -0
@@ -32,6 +32,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .destroy_rwq_ind_table = mana_ib_destroy_rwq_ind_table, .destroy_wq = mana_ib_destroy_wq, .disassociate_ucontext = mana_ib_disassociate_ucontext, + .get_dma_mr = mana_ib_get_dma_mr, .get_link_layer = mana_ib_get_link_layer, .get_port_immutable = mana_ib_get_port_immutable, .mmap = mana_ib_mmap,
drivers/infiniband/hw/mana/mr.c +36 -0
@@ -8,6 +8,8 @@#define VALID_MR_FLAGS \ (IB_ACCESS_LOCAL_WRITE | IB_ACCESS_REMOTE_WRITE | IB_ACCESS_REMOTE_READ) +#define VALID_DMA_MR_FLAGS (IB_ACCESS_LOCAL_WRITE) +static enum gdma_mr_access_flags mana_ib_verbs_to_gdma_access_flags (int access_flags) {
@@ -39,6 +41,8 @@ static int mana_ib_gd_create_mr(struct mana_ib_dev *dev, struct mana_ib_mr *mr, req.mr_type = mr_params->mr_type;switch (mr_params->mr_type) { +case GDMA_MR_TYPE_GPA : +break ;case GDMA_MR_TYPE_GVA : req.gva.dma_region_handle = mr_params->gva.dma_region_handle; req.gva.virtual_address = mr_params->gva.virtual_address;
@@ -169,6 +173,38 @@ err_free:return ERR_PTR (err); } +struct ib_mr *mana_ib_get_dma_mr (struct ib_pd *ibpd,int access_flags) +{ + struct mana_ib_pd *pd = container_of(ibpd, struct mana_ib_pd, ibpd); +struct gdma_create_mr_params mr_params = {}; +struct ib_device *ibdev = ibpd->device; +struct mana_ib_dev *dev; +struct mana_ib_mr *mr; +int err; + + dev = container_of(ibdev, struct mana_ib_dev, ib_dev); + +if (access_flags & ~VALID_DMA_MR_FLAGS ) +return ERR_PTR (-EINVAL ); + + mr =kzalloc (sizeof (*mr),GFP_KERNEL ); +if (!mr) +return ERR_PTR (-ENOMEM ); + + mr_params.pd_handle = pd->pd_handle; + mr_params.mr_type =GDMA_MR_TYPE_GPA ; + + err =mana_ib_gd_create_mr (dev, mr, &mr_params); +if (err) + goto err_free; + +return &mr->ibmr; + +err_free: +kfree (mr); +return ERR_PTR (err); +} +int mana_ib_dereg_mr (struct ib_mr *ibmr,struct ib_udata *udata) { struct mana_ib_mr *mr = container_of(ibmr, struct mana_ib_mr, ibmr);
include/net/mana/gdma.h +5 -0
@@ -801,6 +801,11 @@ struct gdma_destory_pd_resp { };/* HW DATA */ enum gdma_mr_type { +/* +* Guest Physical Address - MRs of this type allow access +* to any DMA-mapped memory using bus-logical address +*/ +GDMA_MR_TYPE_GPA =1 ,/* Guest Virtual Address - MRs of this type allow access * to memory mapped by PTEs associated with this MR using a virtual * address that is set up in the MST
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 02/13] RDMA/mana_ib: implement get_dma_mr
Quoted 8 lines
Subject: [PATCH rdma-next 02/13] RDMA/mana_ib: implement
get_dma_mrFrom: Konstantin Taranov <[email protected]>
Implement allocation of DMA-mapped memory regions.
Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 99 lines
--- drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/mr.c | 36 +++++++++++++++++++++++++++++ include/net/mana/gdma.h | 5 ++++ 3 files changed, 42 insertions(+)drivers/infiniband/hw/mana/device.c +1
-0@@ -32,6 +32,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .destroy_rwq_ind_table = mana_ib_destroy_rwq_ind_table, .destroy_wq = mana_ib_destroy_wq, .disassociate_ucontext = mana_ib_disassociate_ucontext, + .get_dma_mr = mana_ib_get_dma_mr, .get_link_layer = mana_ib_get_link_layer, .get_port_immutable = mana_ib_get_port_immutable, .mmap = mana_ib_mmap,drivers/infiniband/hw/mana/mr.c +2
-0@@ -8,6 +8,8 @@#define VALID_MR_FLAGS \ (IB_ACCESS_LOCAL_WRITE | IB_ACCESS_REMOTE_WRITE | IB_ACCESS_REMOTE_READ) +#define VALID_DMA_MR_FLAGS (IB_ACCESS_LOCAL_WRITE) +static enum gdma_mr_access_flags mana_ib_verbs_to_gdma_access_flags(int access_flags) { @@ -39,6 +41,8 @@static int mana_ib_gd_create_mr(struct
mana_ib_dev*dev, structmana_ib_mr*mr,drivers/infiniband/hw/mana/mr.c +2
-0req.mr_type = mr_params->mr_type;switch (mr_params->mr_type) { +case GDMA_MR_TYPE_GPA : +break ;case GDMA_MR_TYPE_GVA : req.gva.dma_region_handle = mr_params-Quoted 1 line
gva.dma_region_handle;
drivers/infiniband/hw/mana/mr.c +32
-1req.gva.virtual_address = mr_params->gva.virtual_address; @@ -169,6 +173,38 @@ err_free:return ERR_PTR (err); } +struct ib_mr *mana_ib_get_dma_mr (struct ib_pd *ibpd,int access_flags) +{ + struct mana_ib_pd *pd = container_of(ibpd, struct mana_ib_pd, ibpd); +struct gdma_create_mr_params mr_params = {}; +struct ib_device *ibdev = ibpd->device; +struct mana_ib_dev *dev; +struct mana_ib_mr *mr; +int err; + + dev = container_of(ibdev, struct mana_ib_dev, ib_dev); + +if (access_flags & ~VALID_DMA_MR_FLAGS ) +return ERR_PTR (-EINVAL ); + + mr =kzalloc (sizeof (*mr),GFP_KERNEL ); +if (!mr) +return ERR_PTR (-ENOMEM ); + + mr_params.pd_handle = pd->pd_handle; + mr_params.mr_type =GDMA_MR_TYPE_GPA ; + + err =mana_ib_gd_create_mr (dev, mr, &mr_params); +if (err) + goto err_free; + +return &mr->ibmr; + +err_free: +kfree (mr); +return ERR_PTR (err); +} +int mana_ib_dereg_mr (struct ib_mr *ibmr,struct ib_udata *udata) { struct mana_ib_mr *mr = container_of(ibmr, struct mana_ib_mr, ibmr);include/net/mana/gdma.h index renamed from include/net/mana/gdma.h +0
-003e1b25..a94b04e 100644
include/net/mana/gdma.h +5
-1@@ -801,6 +801,11 @@ struct gdma_destory_pd_resp { };/* HW DATA */ enum gdma_mr_type { +/* +* Guest Physical Address - MRs of this type allow access +* to any DMA-mapped memory using bus-logical address +*/ +GDMA_MR_TYPE_GPA =1 ,/* Guest Virtual Address - MRs of this type allow access * to memory mapped by PTEs associated with this MR using a virtual * address that is set up in the MST -- 2.43.0
PATCH 3/13 RDMA/mana_ib: helpers to allocate kernel queues
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Introduce helpers to allocate queues for kernel-level use.
--- drivers/infiniband/hw/mana/main.c | 23 +++++++++++++++++++ drivers/infiniband/hw/mana/mana_ib.h | 3 +++ .../net/ethernet/microsoft/mana/gdma_main.c | 1 + 3 files changed, 27 insertions(+)
drivers/infiniband/hw/mana/main.c +23 -0
@@ -240,6 +240,27 @@ void mana_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)ibdev_dbg (ibdev,"Failed to destroy doorbell page %d\n" , ret); } +int mana_ib_create_kernel_queue (struct mana_ib_dev *mdev,u32 size,enum gdma_queue_type type, +struct mana_ib_queue *queue) +{ +struct gdma_context *gc =mdev_to_gc (mdev); +struct gdma_queue_spec spec = {}; +int err; + + queue->id =INVALID_QUEUE_ID ; + queue->gdma_region =GDMA_INVALID_DMA_REGION ; + spec.type = type; + spec.monitor_avl_buf = false; + spec.queue_size = size; + err =mana_gd_create_mana_wq_cq (&gc->mana_ib, &spec, &queue->kmem); +if (err) +return err; +/* take ownership into mana_ib from mana */ + queue->gdma_region = queue->kmem->mem_info.dma_region_handle; + queue->kmem->mem_info.dma_region_handle =GDMA_INVALID_DMA_REGION ; +return 0 ; +} +int mana_ib_create_queue (struct mana_ib_dev *mdev,u64 addr,u32 size,struct mana_ib_queue *queue) {
@@ -279,6 +300,8 @@ void mana_ib_destroy_queue(struct mana_ib_dev *mdev, struct mana_ib_queue *queue*/ mana_ib_gd_destroy_dma_region (mdev, queue->gdma_region);ib_umem_release (queue->umem); +if (queue->kmem) +mana_gd_destroy_queue (mdev_to_gc (mdev), queue->kmem); } static int
drivers/infiniband/hw/mana/mana_ib.h +3 -0
@@ -52,6 +52,7 @@ struct mana_ib_adapter_caps {struct mana_ib_queue {struct ib_umem *umem; +struct gdma_queue *kmem;u64 gdma_region;u64 id; };
@@ -388,6 +389,8 @@ int mana_ib_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,int mana_ib_gd_destroy_dma_region (struct mana_ib_dev *dev,mana_handle_t gdma_region); +int mana_ib_create_kernel_queue (struct mana_ib_dev *mdev,u32 size,enum gdma_queue_type type, +struct mana_ib_queue *queue);int mana_ib_create_queue (struct mana_ib_dev *mdev,u64 addr,u32 size,struct mana_ib_queue *queue);void mana_ib_destroy_queue (struct mana_ib_dev *mdev,struct mana_ib_queue *queue);
drivers/net/ethernet/microsoft/mana/gdma_main.c +1 -0
@@ -867,6 +867,7 @@ free_q:kfree (queue);return err; } +EXPORT_SYMBOL_NS (mana_gd_create_mana_wq_cq,NET_MANA );void mana_gd_destroy_queue (struct gdma_context *gc,struct gdma_queue *queue) {
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 03/13] RDMA/mana_ib: helpers to allocate kernel queues
Quoted 9 lines
Subject: [PATCH rdma-next 03/13] RDMA/mana_ib: helpers to allocate kernel queues
From: Konstantin Taranov <[email protected]>
Introduce helpers to allocate queues for kernel-level use.
Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 92 lines
--- drivers/infiniband/hw/mana/main.c | 23 +++++++++++++++++++ drivers/infiniband/hw/mana/mana_ib.h | 3 +++ .../net/ethernet/microsoft/mana/gdma_main.c | 1 + 3 files changed, 27 insertions(+)drivers/infiniband/hw/mana/main.c +21
-0@@ -240,6 +240,27 @@ void mana_ib_dealloc_ucontext(struct ib_ucontext *ibcontext)ibdev_dbg (ibdev,"Failed to destroy doorbell page %d\n" , ret); } +int mana_ib_create_kernel_queue (struct mana_ib_dev *mdev,u32 size,enum gdma_queue_type type, +struct mana_ib_queue *queue) +{ +struct gdma_context *gc =mdev_to_gc (mdev); +struct gdma_queue_spec spec = {}; +int err; + + queue->id =INVALID_QUEUE_ID ; + queue->gdma_region =GDMA_INVALID_DMA_REGION ; + spec.type = type; + spec.monitor_avl_buf = false; + spec.queue_size = size; + err =mana_gd_create_mana_wq_cq (&gc->mana_ib, &spec, &queue- >kmem); +if (err) +return err; +/* take ownership into mana_ib from mana */ + queue->gdma_region = queue->kmem->mem_info.dma_region_handle; + queue->kmem->mem_info.dma_region_handle =GDMA_INVALID_DMA_REGION ; +return 0 ; +} +int mana_ib_create_queue(struct
mana_ib_dev*mdev, u64 addr, u32 size,drivers/infiniband/hw/mana/main.c +2
-0struct mana_ib_queue *queue) {@@ -279,6 +300,8 @@ void mana_ib_destroy_queue(struct mana_ib_dev*mdev, struct mana_ib_queue *queue */ mana_ib_gd_destroy_dma_region (mdev, queue->gdma_region);ib_umem_release (queue->umem); +if (queue->kmem) +mana_gd_destroy_queue (mdev_to_gc (mdev), queue->kmem); }static int
drivers/infiniband/hw/mana/mana_ib.h +3
-0@@ -52,6 +52,7 @@ struct mana_ib_adapter_caps {struct mana_ib_queue {struct ib_umem *umem; +struct gdma_queue *kmem;u64 gdma_region;u64 id; };@@ -388,6 +389,8 @@ int mana_ib_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, int mana_ib_gd_destroy_dma_region(structmana_ib_dev *dev,mana_handle_t gdma_region); +int mana_ib_create_kernel_queue (struct mana_ib_dev *mdev,u32 size,enum gdma_queue_type type, +struct mana_ib_queue *queue); int mana_ib_create_queue(struct mana_ib_dev *mdev, u64 addr, u32 size,struct
mana_ib_queue*queue);
void mana_ib_destroy_queue(structmana_ib_dev*mdev, structmana_ib_queue*queue); diff --gita/drivers/net/ethernet/microsoft/mana/gdma_main.cb/drivers/net/ethernet/microsoft/mana/gdma_main.cindex e97af7a..3cb0543 100644drivers/net/ethernet/microsoft/mana/gdma_main.c +1
-1@@ -867,6 +867,7 @@ free_q:kfree (queue);return err; } +EXPORT_SYMBOL_NS (mana_gd_create_mana_wq_cq,NET_MANA );void mana_gd_destroy_queue (struct gdma_context *gc,struct gdma_queue *queue) { --2.43.0
PATCH 4/13 RDMA/mana_ib: create kernel-level CQs
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Implement creation of CQs for the kernel.
--- drivers/infiniband/hw/mana/cq.c | 80 +++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 28 deletions(-)
drivers/infiniband/hw/mana/cq.c +52 -28
@@ -15,42 +15,57 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,struct ib_device *ibdev = ibcq->device;struct mana_ib_create_cq ucmd = {};struct mana_ib_dev *mdev; +struct gdma_context *gc;bool is_rnic_cq;u32 doorbell; +u32 buf_size;int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); + gc =mdev_to_gc (mdev); cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; cq->cq_handle =INVALID_MANA_HANDLE ; -if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) -return -EINVAL ; +if (udata) { +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; - err =ib_copy_from_udata (&ucmd, udata,min (sizeof (ucmd), udata->inlen)); -if (err) { -ibdev_dbg (ibdev, -"Failed to copy from udata for create cq, %d\n" , err); -return err; - } + err =ib_copy_from_udata (&ucmd, udata,min (sizeof (ucmd), udata->inlen)); +if (err) { +ibdev_dbg (ibdev,"Failed to copy from udata for create cq, %d\n" , err); +return err; + } - is_rnic_cq = !!(ucmd.flags &MANA_IB_CREATE_RNIC_CQ ); + is_rnic_cq = !!(ucmd.flags &MANA_IB_CREATE_RNIC_CQ ); -if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) { -ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); -return -EINVAL ; - } +if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) { +ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); +return -EINVAL ; + } - cq->cqe = attr->cqe; - err =mana_ib_create_queue (mdev, ucmd.buf_addr, cq->cqe *COMP_ENTRY_SIZE , &cq->queue); -if (err) { -ibdev_dbg (ibdev,"Failed to create queue for create cq, %d\n" , err); -return err; - } + cq->cqe = attr->cqe; + err =mana_ib_create_queue (mdev, ucmd.buf_addr, cq->cqe *COMP_ENTRY_SIZE , + &cq->queue); +if (err) { +ibdev_dbg (ibdev,"Failed to create queue for create cq, %d\n" , err); +return err; + } - mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext, - ibucontext); - doorbell = mana_ucontext->doorbell; + mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext, + ibucontext); + doorbell = mana_ucontext->doorbell; + }else { + is_rnic_cq = true; + buf_size =MANA_PAGE_ALIGN (roundup_pow_of_two (attr->cqe *COMP_ENTRY_SIZE )); + cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err =mana_ib_create_kernel_queue (mdev, buf_size,GDMA_CQ , &cq->queue); +if (err) { +ibdev_dbg (ibdev,"Failed to create kernel queue for create cq, %d\n" , err); +return err; + } + doorbell = gc->mana_ib.doorbell; + }if (is_rnic_cq) { err =mana_ib_gd_create_cq (mdev, cq, doorbell);
@@ -66,11 +81,13 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, } } - resp.cqid = cq->queue.id; - err =ib_copy_to_udata (udata, &resp,min (sizeof (resp), udata->outlen)); -if (err) { -ibdev_dbg (&mdev->ib_dev,"Failed to copy to udata, %d\n" , err); - goto err_remove_cq_cb; +if (udata) { + resp.cqid = cq->queue.id; + err =ib_copy_to_udata (udata, &resp,min (sizeof (resp), udata->outlen)); +if (err) { +ibdev_dbg (&mdev->ib_dev,"Failed to copy to udata, %d\n" , err); + goto err_remove_cq_cb; + } }return 0 ;
@@ -122,7 +139,10 @@ int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)return -EINVAL ;/* Create CQ table entry */ WARN_ON (gc->cq_table[cq->queue.id]); - gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); +if (cq->queue.kmem) + gdma_cq = cq->queue.kmem; +else + gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL );if (!gdma_cq)return -ENOMEM ;
@@ -141,6 +161,10 @@ void mana_ib_remove_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)if (cq->queue.id >= gc->max_num_cqs || cq->queue.id ==INVALID_QUEUE_ID )return ; +if (cq->queue.kmem) +/* Then it will be cleaned and removed by the mana */ +return ; +kfree (gc->cq_table[cq->queue.id]); gc->cq_table[cq->queue.id] =NULL ; }
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 04/13] RDMA/mana_ib: create kernel-level CQs
Quoted 146 lines
Subject: [PATCH rdma-next 04/13] RDMA/mana_ib: create kernel-level CQs
From: Konstantin Taranov <[email protected]>
Implement creation of CQs for the kernel.
Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>--- drivers/infiniband/hw/mana/cq.c | 80 +++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 28 deletions(-)drivers/infiniband/hw/mana/cq.c +18
-19@@ -15,42 +15,57 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const structib_cq_init_attr *attr, struct ib_device *ibdev = ibcq->device;struct mana_ib_create_cq ucmd = {};struct mana_ib_dev *mdev; +struct gdma_context *gc;bool is_rnic_cq;u32 doorbell; +u32 buf_size;int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); + gc =mdev_to_gc (mdev); cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; cq->cq_handle =INVALID_MANA_HANDLE ; -if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) -return -EINVAL ; +if (udata) { +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; - err =ib_copy_from_udata (&ucmd, udata,min (sizeof (ucmd), udata- >inlen)); -if (err) { -ibdev_dbg (ibdev, -"Failed to copy from udata for create cq, %d\n" , err); -return err; - } + err =ib_copy_from_udata (&ucmd, udata,min (sizeof (ucmd), udata->inlen)); +if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata for create cq, %d\n", err); + return err; + } - is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ); + is_rnic_cq = !!(ucmd.flags &MANA_IB_CREATE_RNIC_CQ ); -if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) { -ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); -return -EINVAL ; - } +if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) { +ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); +return -EINVAL ; + } - cq->cqe = attr->cqe; - err =mana_ib_create_queue (mdev, ucmd.buf_addr, cq->cqe * COMP_ENTRY_SIZE, &cq->queue); -if (err) { -ibdev_dbg (ibdev,"Failed to create queue for create cq, %d\n" , err); -return err; - } + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe *
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c +3
-0+ &cq->queue); +if (err) { + ibdev_dbg(ibdev, "Failed to create queue for createcq, %d\n", err);
drivers/infiniband/hw/mana/cq.c +2
-1+return err; + } - mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c +1
-2- ibucontext); - doorbell = mana_ucontext->doorbell; + mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c +5
-0+ ibucontext); + doorbell = mana_ucontext->doorbell; + }else { + is_rnic_cq = true; + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr->cqe*
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size, GDMA_CQ,
&cq->queue);drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue forcreate cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c +5
-0+return err; + } + doorbell = gc->mana_ib.doorbell; + }if (is_rnic_cq) { err = mana_ib_gd_create_cq(mdev, cq, doorbell); @@ -66,11 +81,13 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,drivers/infiniband/hw/mana/cq.c +3
-5} } - resp.cqid = cq->queue.id; - err =ib_copy_to_udata (udata, &resp,min (sizeof (resp), udata->outlen)); -if (err) { -ibdev_dbg (&mdev->ib_dev,"Failed to copy to udata, %d\n" , err); - goto err_remove_cq_cb; +if (udata) { + resp.cqid = cq->queue.id; + err = ib_copy_to_udata(udata, &resp, min(sizeof(resp), udata-Quoted 1 line
outlen));
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(&mdev->ib_dev, "Failed to copy toudata, %d\n", err);
drivers/infiniband/hw/mana/cq.c +6
-1+ goto err_remove_cq_cb; + } }return 0 ;@@ -122,7 +139,10 @@ int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)return -EINVAL ;/* Create CQ table entry */ WARN_ON (gc->cq_table[cq->queue.id]); - gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); +if (cq->queue.kmem) + gdma_cq = cq->queue.kmem; +else + gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL );if (!gdma_cq)return -ENOMEM ;
drivers/infiniband/hw/mana/cq.c void mana_ib_remove_cq_cb(struct mana_ib_dev · line 169
Quoted 9 lines
drivers/infiniband/hw/mana/cq.c +4
-0@@ -141,6 +161,10 @@ void mana_ib_remove_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)if (cq->queue.id >= gc->max_num_cqs || cq->queue.id ==INVALID_QUEUE_ID )return ; +if (cq->queue.kmem) +/* Then it will be cleaned and removed by the mana */ +return ; +
Do you need to call "gc->cq_table[cq->queue.id] = NULL" before return?
Quoted 5 lines
drivers/infiniband/hw/mana/cq.c +0
-0kfree (gc->cq_table[cq->queue.id]);gc->cq_table[cq->queue.id] = NULL;
}
--
2.43.0
Konstantin Taranov
maintainerRE: [PATCH rdma-next 04/13] RDMA/mana_ib: create kernel-level CQs
Quoted 162 lines
Subject: RE: [PATCH rdma-next 04/13] RDMA/mana_ib: create kernel-level CQs
Quoted 101 lines
Subject: [PATCH rdma-next 04/13] RDMA/mana_ib: create kernel-level CQs
From: Konstantin Taranov <[email protected]>
Implement creation of CQs for the kernel.
Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>--- drivers/infiniband/hw/mana/cq.c | 80 +++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 28 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindex f04a679..d26d82d 100644drivers/infiniband/hw/mana/cq.c +18
-19@@ -15,42 +15,57 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct ib_cq_init_attr *attr, struct ib_device *ibdev = ibcq->device;struct mana_ib_create_cq ucmd = {};struct mana_ib_dev *mdev; +struct gdma_context *gc;bool is_rnic_cq;u32 doorbell; +u32 buf_size;int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); + gc =mdev_to_gc (mdev); cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; cq->cq_handle =INVALID_MANA_HANDLE ; -if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) -return -EINVAL ; +if (udata) { +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; - err =ib_copy_from_udata (&ucmd, udata,min (sizeof (ucmd), udata- >inlen)); -if (err) { -ibdev_dbg (ibdev, -"Failed to copy from udata for create cq, %d\n" , err); -return err; - } + err =ib_copy_from_udata (&ucmd, udata,min (sizeof (ucmd), udata->inlen)); +if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata for create cq, %d\n", err); + return err; + } - is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ); + is_rnic_cq = !!(ucmd.flags &MANA_IB_CREATE_RNIC_CQ ); -if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) { -ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); -return -EINVAL ; - } +if (!is_rnic_cq && attr->cqe > mdev- adapter_caps.max_qp_wr) { +ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr- cqe); +return -EINVAL ; + } - cq->cqe = attr->cqe; - err =mana_ib_create_queue (mdev, ucmd.buf_addr, cq->cqe * COMP_ENTRY_SIZE, &cq->queue); -if (err) { -ibdev_dbg (ibdev,"Failed to create queue for create cq, %d\n" , err); -return err; - } + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe *
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c +3
-0+ &cq->queue); +if (err) { + ibdev_dbg(ibdev, "Failed to create queue for createcq, %d\n", err);
drivers/infiniband/hw/mana/cq.c +2
-1+return err; + } - mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c +1
-2- ibucontext); - doorbell = mana_ucontext->doorbell; + mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c +5
-0+ ibucontext); + doorbell = mana_ucontext->doorbell; + }else { + is_rnic_cq = true; + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-cqe
*COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,Quoted 19 lines
&cq->queue);drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue forcreate cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c +5
-0+return err; + } + doorbell = gc->mana_ib.doorbell; + }if (is_rnic_cq) { err = mana_ib_gd_create_cq(mdev, cq, doorbell); @@ -66,11 +81,13 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,drivers/infiniband/hw/mana/cq.c +0
-2} } - resp.cqid = cq->queue.id; - err = ib_copy_to_udata(udata, &resp, min(sizeof(resp), udata-outlen));
drivers/infiniband/hw/mana/cq.c
Quoted 2 lines
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(&mdev->ib_dev, "Failed to copy to udata, %d\n",err);
drivers/infiniband/hw/mana/cq.c int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +3
-1- goto err_remove_cq_cb; +if (udata) { + resp.cqid = cq->queue.id; + err = ib_copy_to_udata(udata, &resp, min(sizeof(resp),udata-
Quoted 28 lines
Quoted 1 line
outlen));
drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(&mdev->ib_dev, "Failed to copy toudata, %d\n", err);
drivers/infiniband/hw/mana/cq.c +6
-1+ goto err_remove_cq_cb; + } }return 0 ;@@ -122,7 +139,10 @@ int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)return -EINVAL ;/* Create CQ table entry */ WARN_ON (gc->cq_table[cq->queue.id]); - gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); +if (cq->queue.kmem) + gdma_cq = cq->queue.kmem; +else + gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL );if (!gdma_cq)return -ENOMEM ;@@ -141,6 +161,10 @@ void mana_ib_remove_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)if (cq->queue.id >= gc->max_num_cqs || cq->queue.id ==INVALID_QUEUE_ID )return ;
Quoted 6 lines
drivers/infiniband/hw/mana/cq.c void mana_ib_remove_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq) · line 167
Quoted 4 lines
drivers/infiniband/hw/mana/cq.c +4
-0+if (cq->queue.kmem) +/* Then it will be cleaned and removed by the mana */ +return ; +Do you need to call "gc->cq_table[cq->queue.id] = NULL" before return?
No. Here I assume ownership by the mana.ko. So, it will be nulled by mana_gd_destroy_cq() -Konstantin
Quoted 7 lines
Quoted 7 lines
drivers/infiniband/hw/mana/cq.c +0
-0kfree (gc->cq_table[cq->queue.id]);gc->cq_table[cq->queue.id] = NULL;
}
--
2.43.0
RE: [PATCH rdma-next 04/13] RDMA/mana_ib: create kernel-level CQs
In reply to Konstantin TaranovQuoted 8 lines
Subject: [PATCH rdma-next 04/13] RDMA/mana_ib: create kernel-level CQs
From: Konstantin Taranov <[email protected]>
Implement creation of CQs for the kernel.
Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 155 lines
--- drivers/infiniband/hw/mana/cq.c | 80 +++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 28 deletions(-)(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/cq.cindex f04a679..d26d82d 100644drivers/infiniband/hw/mana/cq.c +18
-19@@ -15,42 +15,57 @@ int mana_ib_create_cq(struct ib_cq *ibcq, conststruct ib_cq_init_attr *attr, struct ib_device *ibdev = ibcq->device;struct mana_ib_create_cq ucmd = {};struct mana_ib_dev *mdev; +struct gdma_context *gc;bool is_rnic_cq;u32 doorbell; +u32 buf_size;int err; mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); + gc =mdev_to_gc (mdev); cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors; cq->cq_handle =INVALID_MANA_HANDLE ; -if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) -return -EINVAL ; +if (udata) { +if (udata->inlen < offsetof(struct mana_ib_create_cq , flags)) +return -EINVAL ; - err =ib_copy_from_udata (&ucmd, udata,min (sizeof (ucmd), udata- >inlen)); -if (err) { -ibdev_dbg (ibdev, -"Failed to copy from udata for create cq, %d\n" , err); -return err; - } + err =ib_copy_from_udata (&ucmd, udata,min (sizeof (ucmd), udata->inlen)); +if (err) { + ibdev_dbg(ibdev, "Failed to copy from udata for create cq, %d\n", err); + return err; + } - is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ); + is_rnic_cq = !!(ucmd.flags &MANA_IB_CREATE_RNIC_CQ ); -if (!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) { -ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr->cqe); -return -EINVAL ; - } + if (!is_rnic_cq && attr->cqe > mdev- >adapter_caps.max_qp_wr) { +ibdev_dbg (ibdev,"CQE %d exceeding limit\n" , attr- >cqe); +return -EINVAL ; + } - cq->cqe = attr->cqe; - err =mana_ib_create_queue (mdev, ucmd.buf_addr, cq->cqe * COMP_ENTRY_SIZE, &cq->queue); -if (err) { -ibdev_dbg (ibdev,"Failed to create queue for create cq, %d\n" , err); -return err; - } + cq->cqe = attr->cqe; + err = mana_ib_create_queue(mdev, ucmd.buf_addr, cq->cqe *
COMP_ENTRY_SIZE,drivers/infiniband/hw/mana/cq.c +3
-0+ &cq->queue); +if (err) { + ibdev_dbg(ibdev, "Failed to create queue for create cq,%d\n", err);
drivers/infiniband/hw/mana/cq.c +2
-1+return err; + } - mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c +1
-2- ibucontext); - doorbell = mana_ucontext->doorbell; + mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext,drivers/infiniband/hw/mana/cq.c +5
-0+ ibucontext); + doorbell = mana_ucontext->doorbell; + }else { + is_rnic_cq = true; + buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-Quoted 1 line
cqe *
COMP_ENTRY_SIZE));drivers/infiniband/hw/mana/cq.c +2
-0+ cq->cqe = buf_size /COMP_ENTRY_SIZE ; + err = mana_ib_create_kernel_queue(mdev, buf_size,
GDMA_CQ,&cq->queue);drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(ibdev, "Failed to create kernel queue forcreate cq, %d\n", err);
drivers/infiniband/hw/mana/cq.c +5
-0+return err; + } + doorbell = gc->mana_ib.doorbell; + }if (is_rnic_cq) { err = mana_ib_gd_create_cq(mdev, cq, doorbell); @@ -66,11 +81,13 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
ib_cq_init_attr*attr,drivers/infiniband/hw/mana/cq.c +0
-2} } - resp.cqid = cq->queue.id; - err = ib_copy_to_udata(udata, &resp, min(sizeof(resp), udata-Quoted 1 line
outlen));
drivers/infiniband/hw/mana/cq.c +0
-2-if (err) { - ibdev_dbg(&mdev->ib_dev, "Failed to copy to udata, %d\n",err);
drivers/infiniband/hw/mana/cq.c +3
-1- goto err_remove_cq_cb; +if (udata) { + resp.cqid = cq->queue.id; + err = ib_copy_to_udata(udata, &resp, min(sizeof(resp),
udata->outlen));drivers/infiniband/hw/mana/cq.c +2
-0+if (err) { + ibdev_dbg(&mdev->ib_dev, "Failed to copy to udata,%d\n", err);
drivers/infiniband/hw/mana/cq.c +10
-1+ goto err_remove_cq_cb; + } }return 0 ;@@ -122,7 +139,10 @@ int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)return -EINVAL ;/* Create CQ table entry */ WARN_ON (gc->cq_table[cq->queue.id]); - gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL ); +if (cq->queue.kmem) + gdma_cq = cq->queue.kmem; +else + gdma_cq =kzalloc (sizeof (*gdma_cq),GFP_KERNEL );if (!gdma_cq)return -ENOMEM ;@@ -141,6 +161,10 @@ void mana_ib_remove_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)if (cq->queue.id >= gc->max_num_cqs || cq->queue.id ==INVALID_QUEUE_ID )return ; +if (cq->queue.kmem) +/* Then it will be cleaned and removed by the mana */ +return ; +kfree (gc->cq_table[cq->queue.id]);gc->cq_table[cq->queue.id] = NULL;
}
--
2.43.0
PATCH 5/13 RDMA/mana_ib: Create and destroy UD/GSI QP
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Implement HW requests to create and destroy UD/GSI QPs. An UD/GSI QP has send and receive queues.
--- drivers/infiniband/hw/mana/main.c | 58 ++++++++++++++++++++++++++++ drivers/infiniband/hw/mana/mana_ib.h | 49 +++++++++++++++++++++++ 2 files changed, 107 insertions(+)
drivers/infiniband/hw/mana/main.c +58 -0
@@ -1013,3 +1013,61 @@ int mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp) }return 0 ; } + +int mana_ib_gd_create_ud_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp, +struct ib_qp_init_attr *attr,u32 doorbell,u32 type) +{ + struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct mana_ib_cq, ibcq); + struct mana_ib_cq *recv_cq = container_of(qp->ibqp.recv_cq, struct mana_ib_cq, ibcq); + struct mana_ib_pd *pd = container_of(qp->ibqp.pd, struct mana_ib_pd, ibpd); +struct gdma_context *gc =mdev_to_gc (mdev); +struct mana_rnic_create_udqp_resp resp = {}; +struct mana_rnic_create_udqp_req req = {}; +int err, i; + +mana_gd_init_req_hdr (&req.hdr,MANA_IB_CREATE_UD_QP ,sizeof (req),sizeof (resp)); + req.hdr.dev_id = gc->mana_ib.dev_id; + req.adapter = mdev->adapter_handle; + req.pd_handle = pd->pd_handle; + req.send_cq_handle = send_cq->cq_handle; + req.recv_cq_handle = recv_cq->cq_handle; +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; i++) + req.dma_region[i] = qp->ud_qp.queues[i].gdma_region; + req.doorbell_page = doorbell; + req.max_send_wr = attr->cap.max_send_wr; + req.max_recv_wr = attr->cap.max_recv_wr; + req.max_send_sge = attr->cap.max_send_sge; + req.max_recv_sge = attr->cap.max_recv_sge; + req.qp_type = type; + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to create ud qp err %d" , err); +return err; + } + qp->qp_handle = resp.qp_handle; +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; i++) { + qp->ud_qp.queues[i].id = resp.queue_ids[i]; +/* The GDMA regions are now owned by the RNIC QP handle */ + qp->ud_qp.queues[i].gdma_region =GDMA_INVALID_DMA_REGION ; + } +return 0 ; +} + +int mana_ib_gd_destroy_ud_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp) +{ +struct mana_rnic_destroy_udqp_resp resp = {0 }; +struct mana_rnic_destroy_udqp_req req = {0 }; +struct gdma_context *gc =mdev_to_gc (mdev); +int err; + +mana_gd_init_req_hdr (&req.hdr,MANA_IB_DESTROY_UD_QP ,sizeof (req),sizeof (resp)); + req.hdr.dev_id = gc->mana_ib.dev_id; + req.adapter = mdev->adapter_handle; + req.qp_handle = qp->qp_handle; + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to destroy ud qp err %d" , err); +return err; + } +return 0 ; +}
drivers/infiniband/hw/mana/mana_ib.h +49 -0
77 lines not on this page · raw message
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 05/13] RDMA/mana_ib: Create and destroy UD/GSI QP
Quoted 10 lines
Subject: [PATCH rdma-next 05/13] RDMA/mana_ib: Create and destroy UD/GSI QP
From: Konstantin Taranov <[email protected]>
Implement HW requests to create and destroy UD/GSI QPs. An UD/GSI QP has send and receive queues.
Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 171 lines
--- drivers/infiniband/hw/mana/main.c | 58 ++++++++++++++++++++++++++++ drivers/infiniband/hw/mana/mana_ib.h | 49 +++++++++++++++++++++++ 2 files changed, 107 insertions(+)drivers/infiniband/hw/mana/main.c +2
-0@@ -1013,3 +1013,61 @@ int mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp) }return 0 ; } + +int mana_ib_gd_create_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp*qp,
drivers/infiniband/hw/mana/main.c +2
-0+ struct ib_qp_init_attr *attr, u32 doorbell, u32 type) { + struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct
mana_ib_cq, ibcq);drivers/infiniband/hw/mana/main.c +1
-0+ struct mana_ib_cq *recv_cq = container_of(qp->ibqp.recv_cq, struct
mana_ib_cq, ibcq);drivers/infiniband/hw/mana/main.c +1
-0+ struct mana_ib_pd *pd = container_of(qp->ibqp.pd, struct mana_ib_pd,ibpd);
drivers/infiniband/hw/mana/main.c +6
-0+struct gdma_context *gc =mdev_to_gc (mdev); +struct mana_rnic_create_udqp_resp resp = {}; +struct mana_rnic_create_udqp_req req = {}; +int err, i; + + mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_UD_QP, sizeof(req),sizeof(resp));
drivers/infiniband/hw/mana/main.c +23
-0+ req.hdr.dev_id = gc->mana_ib.dev_id; + req.adapter = mdev->adapter_handle; + req.pd_handle = pd->pd_handle; + req.send_cq_handle = send_cq->cq_handle; + req.recv_cq_handle = recv_cq->cq_handle; +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; i++) + req.dma_region[i] = qp->ud_qp.queues[i].gdma_region; + req.doorbell_page = doorbell; + req.max_send_wr = attr->cap.max_send_wr; + req.max_recv_wr = attr->cap.max_recv_wr; + req.max_send_sge = attr->cap.max_send_sge; + req.max_recv_sge = attr->cap.max_recv_sge; + req.qp_type = type; + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to create ud qp err %d" , err); +return err; + } + qp->qp_handle = resp.qp_handle; +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; i++) { + qp->ud_qp.queues[i].id = resp.queue_ids[i]; +/* The GDMA regions are now owned by the RNIC QP handle */ + qp->ud_qp.queues[i].gdma_region =
GDMA_INVALID_DMA_REGION;drivers/infiniband/hw/mana/main.c +12
-0+ } +return 0 ; +} + +int mana_ib_gd_destroy_ud_qp (struct mana_ib_dev *mdev,struct +mana_ib_qp *qp) { +struct mana_rnic_destroy_udqp_resp resp = {0 }; +struct mana_rnic_destroy_udqp_req req = {0 }; +struct gdma_context *gc =mdev_to_gc (mdev); +int err; + + mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_UD_QP,sizeof(req), sizeof(resp));
drivers/infiniband/hw/mana/main.c +10
-0+ req.hdr.dev_id = gc->mana_ib.dev_id; + req.adapter = mdev->adapter_handle; + req.qp_handle = qp->qp_handle; + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to destroy ud qp err %d" , err); +return err; + } +return 0 ; +}drivers/infiniband/hw/mana/mana_ib.h +12
-0@@ -115,6 +115,17 @@ struct mana_ib_rc_qp {struct mana_ib_queue queues[MANA_RC_QUEUE_TYPE_MAX ]; }; +enum mana_ud_queue_type { +MANA_UD_SEND_QUEUE =0 , +MANA_UD_RECV_QUEUE , +MANA_UD_QUEUE_TYPE_MAX , +}; + +struct mana_ib_ud_qp { +struct mana_ib_queue queues[MANA_UD_QUEUE_TYPE_MAX ]; +u32 sq_psn; +}; +struct mana_ib_qp {struct ib_qp ibqp;@@ -122,6 +133,7 @@ struct mana_ib_qp {union {struct mana_ib_queue raw_sq;struct mana_ib_rc_qp rc_qp; +struct mana_ib_ud_qp ud_qp; }; /* The port on the IB device, starting with 1 */ @@ -146,6 +158,8 @@enum
mana_ib_command_code{drivers/infiniband/hw/mana/mana_ib.h +33
-0MANA_IB_DESTROY_ADAPTER =0x30003 ,MANA_IB_CONFIG_IP_ADDR =0x30004 ,MANA_IB_CONFIG_MAC_ADDR =0x30005 , +MANA_IB_CREATE_UD_QP =0x30006 , +MANA_IB_DESTROY_UD_QP =0x30007 ,MANA_IB_CREATE_CQ =0x30008 ,MANA_IB_DESTROY_CQ =0x30009 , MANA_IB_CREATE_RC_QP = 0x3000a,@@ -297,6 +311,37 @@ struct mana_rnic_destroy_rc_qp_resp {struct gdma_resp_hdr hdr; };/* HW Data */ +struct mana_rnic_create_udqp_req { +struct gdma_req_hdr hdr; +mana_handle_t adapter; +mana_handle_t pd_handle; +mana_handle_t send_cq_handle; +mana_handle_t recv_cq_handle; +u64 dma_region[MANA_UD_QUEUE_TYPE_MAX ]; +u32 qp_type; +u32 doorbell_page; +u32 max_send_wr; +u32 max_recv_wr; +u32 max_send_sge; +u32 max_recv_sge; +};/* HW Data */ + +struct mana_rnic_create_udqp_resp { +struct gdma_resp_hdr hdr; +mana_handle_t qp_handle; +u32 queue_ids[MANA_UD_QUEUE_TYPE_MAX ]; +};/* HW Data*/ + +struct mana_rnic_destroy_udqp_req { +struct gdma_req_hdr hdr; +mana_handle_t adapter; +mana_handle_t qp_handle; +};/* HW Data */ + +struct mana_rnic_destroy_udqp_resp { +struct gdma_resp_hdr hdr; +};/* HW Data */ +struct mana_ib_ah_attr {u8 src_addr[16 ];u8 dest_addr[16 ];@@ -483,4 +528,8 @@ int mana_ib_gd_destroy_cq(struct mana_ib_dev *mdev,struct
mana_ib_cq*cq); int mana_ib_gd_create_rc_qp(structmana_ib_dev*mdev, structmana_ib_qp*qp,
structib_qp_init_attr*attr, u32 doorbell, u64 flags);
intmana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp);drivers/infiniband/hw/mana/mana_ib.h +2
-0+ +int mana_ib_gd_create_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp*qp,
drivers/infiniband/hw/mana/mana_ib.h +3
-1+ struct ib_qp_init_attr *attr, u32 doorbell, u32 type); int +mana_ib_gd_destroy_ud_qp (struct mana_ib_dev *mdev,struct mana_ib_qp +*qp);#endif --2.43.0
PATCH 6/13 RDMA/mana_ib: UD/GSI QP creation for kernel
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Implement UD/GSI QPs for the kernel.
Allow create/modify/destroy for such QPs.
--- drivers/infiniband/hw/mana/qp.c | 115 ++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)
drivers/infiniband/hw/mana/qp.c +115 -0
@@ -398,6 +398,52 @@ err_free_vport:return err; } +static u32 mana_ib_wqe_size (u32 sge,u32 oob_size) +{ +u32 wqe_size = sge *sizeof (struct gdma_sge ) +sizeof (struct gdma_wqe ) + oob_size; + +return ALIGN (wqe_size,GDMA_WQE_BU_SIZE ); +} + +static u32 mana_ib_queue_size (struct ib_qp_init_attr *attr,u32 queue_type) +{ +u32 queue_size; + +switch (attr->qp_type) { +case IB_QPT_UD : +case IB_QPT_GSI : +if (queue_type ==MANA_UD_SEND_QUEUE ) + queue_size = attr->cap.max_send_wr * +mana_ib_wqe_size (attr->cap.max_send_sge,INLINE_OOB_LARGE_SIZE ); +else + queue_size = attr->cap.max_recv_wr * +mana_ib_wqe_size (attr->cap.max_recv_sge,INLINE_OOB_SMALL_SIZE ); +break ; +default : +return 0 ; + } + +return MANA_PAGE_ALIGN (roundup_pow_of_two (queue_size)); +} + +static enum gdma_queue_type mana_ib_queue_type (struct ib_qp_init_attr *attr,u32 queue_type) +{ +enum gdma_queue_type type; + +switch (attr->qp_type) { +case IB_QPT_UD : +case IB_QPT_GSI : +if (queue_type ==MANA_UD_SEND_QUEUE ) + type =GDMA_SQ ; +else + type =GDMA_RQ ; +break ; +default : + type =GDMA_INVALID_QUEUE ; + } +return type; +} +static int mana_table_store_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp) {refcount_set (&qp->refcount,1 );
@@ -490,6 +536,51 @@ destroy_queues:return err; } +static int mana_ib_create_ud_qp (struct ib_qp *ibqp,struct ib_pd *ibpd, +struct ib_qp_init_attr *attr,struct ib_udata *udata) +{ + struct mana_ib_dev *mdev = container_of(ibpd->device, struct mana_ib_dev, ib_dev); + struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp); +struct gdma_context *gc =mdev_to_gc (mdev); +u32 doorbell, queue_size; +int i, err; + +if (udata) { +ibdev_dbg (&mdev->ib_dev,"User-level UD QPs are not supported, %d\n" , err); +return -EINVAL ; + } + +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; ++i) { + queue_size =mana_ib_queue_size (attr, i); + err =mana_ib_create_kernel_queue (mdev, queue_size,mana_ib_queue_type (attr, i), + &qp->ud_qp.queues[i]); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to create queue %d, err %d\n" , + i, err); + goto destroy_queues; + } + } + doorbell = gc->mana_ib.doorbell; + + err =mana_ib_gd_create_ud_qp (mdev, qp, attr, doorbell, attr->qp_type); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to create ud qp %d\n" , err); + goto destroy_queues; + } + qp->ibqp.qp_num = qp->ud_qp.queues[MANA_UD_RECV_QUEUE ].id; + qp->port = attr->port_num; + +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; ++i) + qp->ud_qp.queues[i].kmem->id = qp->ud_qp.queues[i].id; + +return 0 ; + +destroy_queues: +while (i-- >0 ) +mana_ib_destroy_queue (mdev, &qp->ud_qp.queues[i]); +return err; +} +int mana_ib_create_qp (struct ib_qp *ibqp,struct ib_qp_init_attr *attr,struct ib_udata *udata) {
@@ -503,6 +594,9 @@ int mana_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,return mana_ib_create_qp_raw (ibqp, ibqp->pd, attr, udata);case IB_QPT_RC :return mana_ib_create_rc_qp (ibqp, ibqp->pd, attr, udata); +case IB_QPT_UD : +case IB_QPT_GSI : +return mana_ib_create_ud_qp (ibqp, ibqp->pd, attr, udata);default :ibdev_dbg (ibqp->device,"Creating QP type %u not supported\n" , attr->qp_type);
@@ -579,6 +673,8 @@ int mana_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, {switch (ibqp->qp_type) {case IB_QPT_RC : +case IB_QPT_UD : +case IB_QPT_GSI :return mana_ib_gd_modify_qp (ibqp, attr, attr_mask, udata);default :ibdev_dbg (ibqp->device,"Modify QP type %u not supported" , ibqp->qp_type);
@@ -652,6 +748,22 @@ static int mana_ib_destroy_rc_qp(struct mana_ib_qp *qp, struct ib_udata *udata)return 0 ; } +static int mana_ib_destroy_ud_qp (struct mana_ib_qp *qp,struct ib_udata *udata) +{ +struct mana_ib_dev *mdev = + container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev); +int i; + +/* Ignore return code as there is not much we can do about it. +* The error message is printed inside. +*/ +mana_ib_gd_destroy_ud_qp (mdev, qp); +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; ++i) +mana_ib_destroy_queue (mdev, &qp->ud_qp.queues[i]); + +return 0 ; +} +int mana_ib_destroy_qp (struct ib_qp *ibqp,struct ib_udata *udata) { struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp);
@@ -665,6 +777,9 @@ int mana_ib_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)return mana_ib_destroy_qp_raw (qp, udata);case IB_QPT_RC :return mana_ib_destroy_rc_qp (qp, udata); +case IB_QPT_UD : +case IB_QPT_GSI : +return mana_ib_destroy_ud_qp (qp, udata);default :ibdev_dbg (ibqp->device,"Unexpected QP type %u\n" , ibqp->qp_type);
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 06/13] RDMA/mana_ib: UD/GSI QP creation for kernel
Quoted 10 lines
Subject: [PATCH rdma-next 06/13] RDMA/mana_ib: UD/GSI QP creation for kernel
From: Konstantin Taranov <[email protected]>
Implement UD/GSI QPs for the kernel.
Allow create/modify/destroy for such QPs.Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 174 lines
--- drivers/infiniband/hw/mana/qp.c | 115 ++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)drivers/infiniband/hw/mana/qp.c +45
-0@@ -398,6 +398,52 @@ err_free_vport:return err; } +static u32 mana_ib_wqe_size (u32 sge,u32 oob_size) { +u32 wqe_size = sge *sizeof (struct gdma_sge ) +sizeof (struct gdma_wqe ) ++ oob_size; + +return ALIGN (wqe_size,GDMA_WQE_BU_SIZE ); } + +static u32 mana_ib_queue_size (struct ib_qp_init_attr *attr,u32 +queue_type) { +u32 queue_size; + +switch (attr->qp_type) { +case IB_QPT_UD : +case IB_QPT_GSI : +if (queue_type ==MANA_UD_SEND_QUEUE ) + queue_size = attr->cap.max_send_wr * +mana_ib_wqe_size (attr->cap.max_send_sge,INLINE_OOB_LARGE_SIZE ); +else + queue_size = attr->cap.max_recv_wr * +mana_ib_wqe_size (attr->cap.max_recv_sge,INLINE_OOB_SMALL_SIZE ); +break ; +default : +return 0 ; + } + +return MANA_PAGE_ALIGN (roundup_pow_of_two (queue_size)); +} + +static enum gdma_queue_type mana_ib_queue_type (struct ib_qp_init_attr +*attr,u32 queue_type) { +enum gdma_queue_type type; + +switch (attr->qp_type) { +case IB_QPT_UD : +case IB_QPT_GSI : +if (queue_type ==MANA_UD_SEND_QUEUE ) + type =GDMA_SQ ; +else + type =GDMA_RQ ; +break ; +default : + type =GDMA_INVALID_QUEUE ; + } +return type; +} + static int mana_table_store_qp(struct mana_ib_dev *mdev, struct mana_ib_qp*qp) {
drivers/infiniband/hw/mana/qp.c +16
-0refcount_set (&qp->refcount,1 );@@ -490,6 +536,51 @@ destroy_queues:return err; } +static int mana_ib_create_ud_qp (struct ib_qp *ibqp,struct ib_pd *ibpd, +struct ib_qp_init_attr *attr,struct ib_udata *udata) { + struct mana_ib_dev *mdev = container_of(ibpd->device, struct mana_ib_dev, ib_dev); + struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp); +struct gdma_context *gc =mdev_to_gc (mdev); +u32 doorbell, queue_size; +int i, err; + +if (udata) { + ibdev_dbg(&mdev->ib_dev, "User-level UD QPs are not supported, %d\n", err); + return -EINVAL; + } + +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; ++i) { + queue_size =mana_ib_queue_size (attr, i); + err = mana_ib_create_kernel_queue(mdev, queue_size,
mana_ib_queue_type(attr, i),drivers/infiniband/hw/mana/qp.c +3
-0+ &qp->ud_qp.queues[i]); +if (err) { + ibdev_err(&mdev->ib_dev, "Failed to create queue %d,err %d\n",
drivers/infiniband/hw/mana/qp.c +28
-0+ i, err); + goto destroy_queues; + } + } + doorbell = gc->mana_ib.doorbell; + + err =mana_ib_gd_create_ud_qp (mdev, qp, attr, doorbell, attr->qp_type); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to create ud qp %d\n" , err); + goto destroy_queues; + } + qp->ibqp.qp_num = qp->ud_qp.queues[MANA_UD_RECV_QUEUE ].id; + qp->port = attr->port_num; + +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; ++i) + qp->ud_qp.queues[i].kmem->id = qp->ud_qp.queues[i].id; + +return 0 ; + +destroy_queues: +while (i-- >0 ) +mana_ib_destroy_queue (mdev, &qp->ud_qp.queues[i]); +return err; +} +int mana_ib_create_qp (struct ib_qp *ibqp,struct ib_qp_init_attr *attr,struct ib_udata *udata) {@@ -503,6 +594,9 @@ int mana_ib_create_qp(struct ib_qp *ibqp, structib_qp_init_attr *attr, return mana_ib_create_qp_raw(ibqp, ibqp->pd, attr, udata);case IB_QPT_RC :return mana_ib_create_rc_qp (ibqp, ibqp->pd, attr, udata); +case IB_QPT_UD : +case IB_QPT_GSI : +return mana_ib_create_ud_qp (ibqp, ibqp->pd, attr, udata);default : ibdev_dbg(ibqp->device, "Creating QP type %u not supported\n",drivers/infiniband/hw/mana/qp.c +2
-0attr->qp_type);@@ -579,6 +673,8 @@ int mana_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, {switch (ibqp->qp_type) {case IB_QPT_RC : +case IB_QPT_UD : +case IB_QPT_GSI :return mana_ib_gd_modify_qp (ibqp, attr, attr_mask, udata);default : ibdev_dbg(ibqp->device, "Modify QP type %u not supported",
ibqp->qp_type); @@ -652,6 +748,22 @@ static intmana_ib_destroy_rc_qp(struct mana_ib_qp *qp, struct ib_udata *udata)drivers/infiniband/hw/mana/qp.c +19
-0return 0 ; } +static int mana_ib_destroy_ud_qp (struct mana_ib_qp *qp,struct ib_udata +*udata) { +struct mana_ib_dev *mdev = + container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev); +int i; + +/* Ignore return code as there is not much we can do about it. +* The error message is printed inside. +*/ +mana_ib_gd_destroy_ud_qp (mdev, qp); +for (i =0 ; i <MANA_UD_QUEUE_TYPE_MAX ; ++i) +mana_ib_destroy_queue (mdev, &qp->ud_qp.queues[i]); + +return 0 ; +} +int mana_ib_destroy_qp (struct ib_qp *ibqp,struct ib_udata *udata) { struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp);@@ -665,6 +777,9 @@ int mana_ib_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)return mana_ib_destroy_qp_raw (qp, udata);case IB_QPT_RC :return mana_ib_destroy_rc_qp (qp, udata); +case IB_QPT_UD : +case IB_QPT_GSI : +return mana_ib_destroy_ud_qp (qp, udata);default : ibdev_dbg(ibqp->device, "Unexpected QP type %u\n",
ibqp->qp_type);
--
2.43.0
PATCH 7/13 RDMA/mana_ib: create/destroy AH
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Implement create and destroy AH for kernel.
In mana_ib, AV is passed as an sge in WQE.
Allocate DMA memory and write an AV there.
--- drivers/infiniband/hw/mana/Makefile | 2 +- drivers/infiniband/hw/mana/ah.c | 58 ++++++++++++++++++++++++++++ drivers/infiniband/hw/mana/device.c | 13 ++++++- drivers/infiniband/hw/mana/mana_ib.h | 30 ++++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 drivers/infiniband/hw/mana/ah.c
drivers/infiniband/hw/mana/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MANA_INFINIBAND) += mana_ib.o -mana_ib-y := device.o main.o wq.o qp.o cq.o mr.o +mana_ib-y := device.o main.o wq.o qp.o cq.o mr.o ah.o
drivers/infiniband/hw/mana/ah.c new file +58 -0
58 lines not on this page · raw message
drivers/infiniband/hw/mana/device.c +12 -1
@@ -19,6 +19,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .add_gid = mana_ib_gd_add_gid, .alloc_pd = mana_ib_alloc_pd, .alloc_ucontext = mana_ib_alloc_ucontext, + .create_ah = mana_ib_create_ah, .create_cq = mana_ib_create_cq, .create_qp = mana_ib_create_qp, .create_rwq_ind_table = mana_ib_create_rwq_ind_table,
@@ -27,6 +28,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .dealloc_ucontext = mana_ib_dealloc_ucontext, .del_gid = mana_ib_gd_del_gid, .dereg_mr = mana_ib_dereg_mr, + .destroy_ah = mana_ib_destroy_ah, .destroy_cq = mana_ib_destroy_cq, .destroy_qp = mana_ib_destroy_qp, .destroy_rwq_ind_table = mana_ib_destroy_rwq_ind_table,
@@ -44,6 +46,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .query_port = mana_ib_query_port, .reg_user_mr = mana_ib_reg_user_mr, +INIT_RDMA_OBJ_SIZE (ib_ah, mana_ib_ah, ibah),INIT_RDMA_OBJ_SIZE (ib_cq, mana_ib_cq, ibcq),INIT_RDMA_OBJ_SIZE (ib_pd, mana_ib_pd, ibpd), INIT_RDMA_OBJ_SIZE(ib_qp, mana_ib_qp, ibqp),
@@ -135,15 +138,22 @@ static int mana_ib_probe(struct auxiliary_device *adev, goto destroy_rnic; } + dev->av_pool =dma_pool_create ("mana_ib_av" , mdev->gdma_context->dev, +MANA_AV_BUFFER_SIZE ,MANA_AV_BUFFER_SIZE ,0 ); +if (!dev->av_pool) + goto destroy_rnic; + ret =ib_register_device (&dev->ib_dev,"mana_%d" , mdev->gdma_context->dev);if (ret) - goto destroy_rnic; + goto deallocate_pool;dev_set_drvdata (&adev->dev, dev);return 0 ; +deallocate_pool: +dma_pool_destroy (dev->av_pool); destroy_rnic:xa_destroy (&dev->qp_table_wq);mana_ib_gd_destroy_rnic_adapter (dev);
@@ -161,6 +171,7 @@ static void mana_ib_remove(struct auxiliary_device *adev)struct mana_ib_dev *dev =dev_get_drvdata (&adev->dev);ib_unregister_device (&dev->ib_dev); +dma_pool_destroy (dev->av_pool);xa_destroy (&dev->qp_table_wq);mana_ib_gd_destroy_rnic_adapter (dev);mana_ib_destroy_eqs (dev);
drivers/infiniband/hw/mana/mana_ib.h +30 -0
@@ -11,6 +11,7 @@#include <rdma/ib_umem.h> #include <rdma/mana-abi.h> #include <rdma/uverbs_ioctl.h> +#include <linux/dmapool.h> #include <net/mana/mana.h>
@@ -32,6 +33,11 @@*/ #define MANA_CA_ACK_DELAY 16 +/* +* The buffer used for writing AV +*/ +#define MANA_AV_BUFFER_SIZE 64 +struct mana_ib_adapter_caps {u32 max_sq_id;u32 max_rq_id;
@@ -65,6 +71,7 @@ struct mana_ib_dev {struct gdma_queue **eqs;struct xarray qp_table_wq;struct mana_ib_adapter_caps adapter_caps; +struct dma_pool *av_pool; };struct mana_ib_wq {
@@ -88,6 +95,25 @@ struct mana_ib_pd {u32 tx_vp_offset; }; +struct mana_ib_av { +u8 dest_ip[16 ]; +u8 dest_mac[ETH_ALEN ]; +u16 udp_src_port; +u8 src_ip[16 ]; +u32 hop_limit :8 ; +u32 reserved1 :12 ; +u32 dscp :6 ; +u32 reserved2 :5 ; +u32 is_ipv6 :1 ; +u32 reserved3 :32 ; +}; + +struct mana_ib_ah { +struct ib_ah ibah; +struct mana_ib_av *av; +dma_addr_t dma_handle; +}; +struct mana_ib_mr {struct ib_mr ibmr;struct ib_umem *umem;
@@ -532,4 +558,8 @@ int mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp);int mana_ib_gd_create_ud_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp,struct ib_qp_init_attr *attr,u32 doorbell,u32 type);int mana_ib_gd_destroy_ud_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp); + +int mana_ib_create_ah (struct ib_ah *ibah,struct rdma_ah_init_attr *init_attr, +struct ib_udata *udata); +int mana_ib_destroy_ah (struct ib_ah *ah,u32 flags);#endif
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 07/13] RDMA/mana_ib: create/destroy AH
Quoted 11 lines
Subject: [PATCH rdma-next 07/13] RDMA/mana_ib: create/destroy AH
From: Konstantin Taranov <[email protected]>
Implement create and destroy AH for kernel.
In
mana_ib, AV is passed as an sge in WQE.
Allocate DMA memory and write an AV there.Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 222 lines
--- drivers/infiniband/hw/mana/Makefile | 2 +- drivers/infiniband/hw/mana/ah.c | 58 ++++++++++++++++++++++++++++ drivers/infiniband/hw/mana/device.c | 13 ++++++- drivers/infiniband/hw/mana/mana_ib.h | 30 ++++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) create mode 100644
drivers/infiniband/hw/mana/ah.cdrivers/infiniband/hw/mana/Makefile +1
-1@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MANA_INFINIBAND) += mana_ib.o -mana_ib-y := device.o main.o wq.o qp.o cq.o mr.o +mana_ib-y := device.o main.o wq.o qp.o cq.o mr.o ah.odrivers/infiniband/hw/mana/ah.c new file +11
-0@@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (c) 2024, Microsoft Corporation. All rights reserved. +*/ + +#include "mana_ib.h" + +int mana_ib_create_ah (struct ib_ah *ibah,struct rdma_ah_init_attr *attr, +struct ib_udata *udata) +{ + struct mana_ib_dev *mdev = container_of(ibah->device, struct
mana_ib_dev,ib_dev);drivers/infiniband/hw/mana/ah.c new file +13
-0+ struct mana_ib_ah *ah = container_of(ibah, struct mana_ib_ah, ibah); +struct rdma_ah_attr *ah_attr = attr->ah_attr; +const struct ib_global_route *grh; +enum rdma_network_type ntype; + +if (ah_attr->type !=RDMA_AH_ATTR_TYPE_ROCE || + !(rdma_ah_get_ah_flags (ah_attr) &IB_AH_GRH )) +return -EINVAL ; + +if (udata) +return -EINVAL ; + + ah->av = dma_pool_zalloc(mdev->av_pool, GFP_ATOMIC, &ah-Quoted 1 line
dma_handle);drivers/infiniband/hw/mana/ah.c new file +8
-0+if (!ah->av) +return -ENOMEM ; + + grh =rdma_ah_read_grh (ah_attr); + ntype =rdma_gid_attr_network_type (grh->sgid_attr); + +copy_in_reverse (ah->av->dest_mac, ah_attr->roce.dmac,ETH_ALEN ); + ah->av->udp_src_port = rdma_flow_label_to_udp_sport(grh-Quoted 1 line
flow_label);drivers/infiniband/hw/mana/ah.c new file +12
-0+ ah->av->hop_limit = grh->hop_limit; + ah->av->dscp = (grh->traffic_class >>2 ) &0x3f ; + ah->av->is_ipv6 = (ntype ==RDMA_NETWORK_IPV6 ); + +if (ah->av->is_ipv6) { +copy_in_reverse (ah->av->dest_ip, grh->dgid.raw,16 ); +copy_in_reverse (ah->av->src_ip, grh->sgid_attr->gid.raw,16 ); + }else { + ah->av->dest_ip[10 ] =0xFF ; + ah->av->dest_ip[11 ] =0xFF ; +copy_in_reverse (&ah->av->dest_ip[12 ], &grh->dgid.raw[12 ],4 ); + copy_in_reverse(&ah->av->src_ip[12], &grh->sgid_attr-Quoted 1 line
gid.raw[12], 4);
drivers/infiniband/hw/mana/ah.c new file +7
-0+ } + +return 0 ; +} + +int mana_ib_destroy_ah (struct ib_ah *ibah,u32 flags) { + struct mana_ib_dev *mdev = container_of(ibah->device, struct
mana_ib_dev,ib_dev);drivers/infiniband/hw/mana/ah.c new file +6
-0+ struct mana_ib_ah *ah = container_of(ibah, struct mana_ib_ah, ibah); + +dma_pool_free (mdev->av_pool, ah->av, ah->dma_handle); + +return 0 ; +}drivers/infiniband/hw/mana/device.c +5
-0@@ -19,6 +19,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .add_gid = mana_ib_gd_add_gid, .alloc_pd = mana_ib_alloc_pd, .alloc_ucontext = mana_ib_alloc_ucontext, + .create_ah = mana_ib_create_ah, .create_cq = mana_ib_create_cq, .create_qp = mana_ib_create_qp, .create_rwq_ind_table = mana_ib_create_rwq_ind_table, @@ -27,6 +28,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .dealloc_ucontext = mana_ib_dealloc_ucontext, .del_gid = mana_ib_gd_del_gid, .dereg_mr = mana_ib_dereg_mr, + .destroy_ah = mana_ib_destroy_ah, .destroy_cq = mana_ib_destroy_cq, .destroy_qp = mana_ib_destroy_qp, .destroy_rwq_ind_table = mana_ib_destroy_rwq_ind_table, @@ -44,6 +46,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .query_port = mana_ib_query_port, .reg_user_mr = mana_ib_reg_user_mr, +INIT_RDMA_OBJ_SIZE (ib_ah, mana_ib_ah, ibah),INIT_RDMA_OBJ_SIZE (ib_cq, mana_ib_cq, ibcq),INIT_RDMA_OBJ_SIZE (ib_pd, mana_ib_pd, ibpd), INIT_RDMA_OBJ_SIZE(ib_qp, mana_ib_qp, ibqp), @@ -135,15 +138,22@@ static int mana_ib_probe(struct
auxiliary_device*adev,drivers/infiniband/hw/mana/device.c +1
-0goto destroy_rnic; } + dev->av_pool = dma_pool_create("mana_ib_av", mdev->gdma_context-Quoted 1 line
dev,
drivers/infiniband/hw/mana/device.c +1
-0+ MANA_AV_BUFFER_SIZE,
MANA_AV_BUFFER_SIZE, 0);drivers/infiniband/hw/mana/device.c +7
-1+if (!dev->av_pool) + goto destroy_rnic; + ret =ib_register_device (&dev->ib_dev,"mana_%d" , mdev->gdma_context->dev);if (ret) - goto destroy_rnic; + goto deallocate_pool;dev_set_drvdata (&adev->dev, dev);return 0 ; +deallocate_pool: +dma_pool_destroy (dev->av_pool); destroy_rnic:xa_destroy (&dev->qp_table_wq);mana_ib_gd_destroy_rnic_adapter (dev);@@ -161,6 +171,7 @@ static void mana_ib_remove(struct auxiliary_device *adev)struct mana_ib_dev *dev =dev_get_drvdata (&adev->dev);ib_unregister_device (&dev->ib_dev); +dma_pool_destroy (dev->av_pool);xa_destroy (&dev->qp_table_wq);mana_ib_gd_destroy_rnic_adapter (dev);drivers/infiniband/hw/mana/device.c +0
-0mana_ib_destroy_eqs (dev);drivers/infiniband/hw/mana/mana_ib.h +26
-0@@ -11,6 +11,7 @@#include <rdma/ib_umem.h> #include <rdma/mana-abi.h> #include <rdma/uverbs_ioctl.h> +#include <linux/dmapool.h> #include <net/mana/mana.h> @@ -32,6 +33,11 @@*/ #define MANA_CA_ACK_DELAY 16 +/* +* The buffer used for writing AV +*/ +#define MANA_AV_BUFFER_SIZE 64 +struct mana_ib_adapter_caps {u32 max_sq_id;u32 max_rq_id;@@ -65,6 +71,7 @@ struct mana_ib_dev {struct gdma_queue **eqs;struct xarray qp_table_wq;struct mana_ib_adapter_caps adapter_caps; +struct dma_pool *av_pool; };struct mana_ib_wq {@@ -88,6 +95,25 @@ struct mana_ib_pd {u32 tx_vp_offset; }; +struct mana_ib_av { +u8 dest_ip[16 ]; +u8 dest_mac[ETH_ALEN ]; +u16 udp_src_port; +u8 src_ip[16 ]; +u32 hop_limit :8 ; +u32 reserved1 :12 ; +u32 dscp :6 ; +u32 reserved2 :5 ; +u32 is_ipv6 :1 ; +u32 reserved3 :32 ; +}; + +struct mana_ib_ah { +struct ib_ah ibah; +struct mana_ib_av *av; +dma_addr_t dma_handle; +}; +struct mana_ib_mr {struct ib_mr ibmr;struct ib_umem *umem;@@ -532,4 +558,8 @@ int mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp); int mana_ib_gd_create_ud_qp(structmana_ib_dev *mdev,struct mana_ib_qp *qp,struct ib_qp_init_attr *attr,u32 doorbell,u32 type);int
mana_ib_gd_destroy_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp);drivers/infiniband/hw/mana/mana_ib.h +4
-1+ +int mana_ib_create_ah (struct ib_ah *ibah,struct rdma_ah_init_attr *init_attr, +struct ib_udata *udata); +int mana_ib_destroy_ah (struct ib_ah *ah,u32 flags);#endif --2.43.0
PATCH 8/13 net/mana: fix warning in the writer of client oob
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Do not warn on missing pad_data when oob is in sgl.
--- drivers/net/ethernet/microsoft/mana/gdma_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/microsoft/mana/gdma_main.c +1 -1
@@ -1042,7 +1042,7 @@ static u32 mana_gd_write_client_oob(const struct gdma_wqe_request *wqe_req, header->inline_oob_size_div4 = client_oob_size /sizeof (u32);if (oob_in_sgl) { -WARN_ON_ONCE (!pad_data || wqe_req->num_sge <2 ); +WARN_ON_ONCE (wqe_req->num_sge <2 ); header->client_oob_in_sgl =1 ;
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 08/13] net/mana: fix warning in the writer of client oob
Quoted 9 lines
Subject: [PATCH rdma-next 08/13] net/mana: fix warning in the writer of client oob
From: Konstantin Taranov <[email protected]>
Do not warn on missing
pad_datawhen oob is in sgl.Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 21 lines
--- drivers/net/ethernet/microsoft/mana/gdma_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/microsoft/mana/gdma_main.c +1
-2@@ -1042,7 +1042,7 @@ static u32 mana_gd_write_client_oob(const struct gdma_wqe_request *wqe_req, header->inline_oob_size_div4 = client_oob_size /sizeof (u32);if (oob_in_sgl) { -WARN_ON_ONCE (!pad_data || wqe_req->num_sge <2 ); +WARN_ON_ONCE (wqe_req->num_sge <2 ); header->client_oob_in_sgl =1 ; --2.43.0
PATCH 9/13 RDMA/mana_ib: UD/GSI work requests
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Implement post send and post recv for UD/GSI QPs. Add information about posted requests into shadow queues.
--- drivers/infiniband/hw/mana/Makefile | 2 +- drivers/infiniband/hw/mana/device.c | 2 + drivers/infiniband/hw/mana/mana_ib.h | 33 ++++ drivers/infiniband/hw/mana/qp.c | 21 ++- drivers/infiniband/hw/mana/shadow_queue.h | 115 ++++++++++++ drivers/infiniband/hw/mana/wr.c | 168 ++++++++++++++++++ .../net/ethernet/microsoft/mana/gdma_main.c | 2 + 7 files changed, 341 insertions(+), 2 deletions(-) create mode 100644 drivers/infiniband/hw/mana/shadow_queue.h create mode 100644 drivers/infiniband/hw/mana/wr.c
drivers/infiniband/hw/mana/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MANA_INFINIBAND) += mana_ib.o -mana_ib-y := device.o main.o wq.o qp.o cq.o mr.o ah.o +mana_ib-y := device.o main.o wq.o qp.o cq.o mr.o ah.o wr.o
drivers/infiniband/hw/mana/device.c +2 -0
@@ -40,6 +40,8 @@ static const struct ib_device_ops mana_ib_dev_ops = { .mmap = mana_ib_mmap, .modify_qp = mana_ib_modify_qp, .modify_wq = mana_ib_modify_wq, + .post_recv = mana_ib_post_recv, + .post_send = mana_ib_post_send, .query_device = mana_ib_query_device, .query_gid = mana_ib_query_gid, .query_pkey = mana_ib_query_pkey,
drivers/infiniband/hw/mana/mana_ib.h +33 -0
@@ -14,6 +14,7 @@#include <linux/dmapool.h> #include <net/mana/mana.h> +#include "shadow_queue.h" #define PAGE_SZ_BM \ (SZ_4K | SZ_8K | SZ_16K | SZ_32K | SZ_64K | SZ_128K | SZ_256K | \
@@ -165,6 +166,9 @@ struct mana_ib_qp {/* The port on the IB device, starting with 1 */ u32 port; +struct shadow_queue shadow_rq; +struct shadow_queue shadow_sq; +refcount_t refcount;struct completion free; };
@@ -404,6 +408,30 @@ struct mana_rnic_set_qp_state_resp {struct gdma_resp_hdr hdr; };/* HW Data */ +enum WQE_OPCODE_TYPES { +WQE_TYPE_UD_SEND =0 , +WQE_TYPE_UD_RECV =8 , +};/* HW DATA */ + +struct rdma_send_oob { +u32 wqe_type :5 ; +u32 fence :1 ; +u32 signaled :1 ; +u32 solicited :1 ; +u32 psn :24 ; + +u32 ssn_or_rqpn :24 ; +u32 reserved1 :8 ; +union { +struct { +u32 remote_qkey; +u32 immediate; +u32 reserved1; +u32 reserved2; + } ud_send; + }; +};/* HW DATA */ +static inline struct gdma_context *mdev_to_gc (struct mana_ib_dev *mdev) {return mdev->gdma_dev->gdma_context;
@@ -562,4 +590,9 @@ int mana_ib_gd_destroy_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp);int mana_ib_create_ah (struct ib_ah *ibah,struct rdma_ah_init_attr *init_attr,struct ib_udata *udata);int mana_ib_destroy_ah (struct ib_ah *ah,u32 flags); + +int mana_ib_post_recv (struct ib_qp *ibqp,const struct ib_recv_wr *wr, +const struct ib_recv_wr **bad_wr); +int mana_ib_post_send (struct ib_qp *ibqp,const struct ib_send_wr *wr, +const struct ib_send_wr **bad_wr);#endif
drivers/infiniband/hw/mana/qp.c +20 -1
@@ -562,10 +562,23 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp, struct ib_pd *ibpd, } doorbell = gc->mana_ib.doorbell; + err =create_shadow_queue (&qp->shadow_rq, attr->cap.max_recv_wr, +sizeof (struct ud_rq_shadow_wqe )); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to create shadow rq err %d\n" , err); + goto destroy_queues; + } + err =create_shadow_queue (&qp->shadow_sq, attr->cap.max_send_wr, +sizeof (struct ud_sq_shadow_wqe )); +if (err) { +ibdev_err (&mdev->ib_dev,"Failed to create shadow sq err %d\n" , err); + goto destroy_shadow_queues; + } + err =mana_ib_gd_create_ud_qp (mdev, qp, attr, doorbell, attr->qp_type);if (err) {ibdev_err (&mdev->ib_dev,"Failed to create ud qp %d\n" , err); - goto destroy_queues; + goto destroy_shadow_queues; } qp->ibqp.qp_num = qp->ud_qp.queues[MANA_UD_RECV_QUEUE ].id; qp->port = attr->port_num;
@@ -575,6 +588,9 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp, struct ib_pd *ibpd,return 0 ; +destroy_shadow_queues: +destroy_shadow_queue (&qp->shadow_rq); +destroy_shadow_queue (&qp->shadow_sq); destroy_queues:while (i-- >0 )mana_ib_destroy_queue (mdev, &qp->ud_qp.queues[i]);
@@ -754,6 +770,9 @@ static int mana_ib_destroy_ud_qp(struct mana_ib_qp *qp, struct ib_udata *udata) container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev);int i; +destroy_shadow_queue (&qp->shadow_rq); +destroy_shadow_queue (&qp->shadow_sq); +/* Ignore return code as there is not much we can do about it. * The error message is printed inside. */
drivers/infiniband/hw/mana/shadow_queue.h new file +115 -0
115 lines not on this page · raw message
drivers/infiniband/hw/mana/wr.c new file +168 -0
168 lines not on this page · raw message
drivers/net/ethernet/microsoft/mana/gdma_main.c +2 -0
@@ -331,6 +331,7 @@ void mana_gd_wq_ring_doorbell(struct gdma_context *gc, struct gdma_queue *queue)mana_gd_ring_doorbell (gc, queue->gdma_dev->doorbell, queue->type, queue->id, queue->head *GDMA_WQE_BU_SIZE ,0 ); } +EXPORT_SYMBOL_NS (mana_gd_wq_ring_doorbell,NET_MANA );void mana_gd_ring_cq (struct gdma_queue *cq,u8 arm_bit) {
@@ -1149,6 +1150,7 @@ int mana_gd_post_work_request(struct gdma_queue *wq,return 0 ; } +EXPORT_SYMBOL_NS (mana_gd_post_work_request,NET_MANA ); int mana_gd_post_and_ring(struct gdma_queue *queue, const struct gdma_wqe_request *wqe_req,
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 09/13] RDMA/mana_ib: UD/GSI work requests
Quoted 326 lines
-----Original Message-----
From: Konstantin Taranov <[email protected]>
Sent: Monday, January 20, 2025 9:27 AM
To: Konstantin Taranov <[email protected]>; Shiraz Saleem <[email protected]>; [email protected]; Haiyang Zhang <[email protected]>; KY Srinivasan <[email protected]>; [email protected]; [email protected]; [email protected]; Dexuan Cui <[email protected]>; [email protected]; [email protected]; Long Li <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: [PATCH rdma-next 09/13] RDMA/mana_ib: UD/GSI work requestsFrom: Konstantin Taranov <[email protected]>
Implement post send and post recv for UD/GSI QPs. Add information about posted requests into shadow queues.
Co-developed-by Shiraz Saleem <[email protected]>Signed-off-by Shiraz Saleem <[email protected]>Signed-off-by Konstantin Taranov <[email protected]>--- drivers/infiniband/hw/mana/Makefile | 2 +- drivers/infiniband/hw/mana/device.c | 2 + drivers/infiniband/hw/mana/mana_ib.h | 33 ++++ drivers/infiniband/hw/mana/qp.c | 21 ++- drivers/infiniband/hw/mana/shadow_queue.h | 115 ++++++++++++ drivers/infiniband/hw/mana/wr.c | 168 ++++++++++++++++++ .../net/ethernet/microsoft/mana/gdma_main.c | 2 + 7 files changed, 341 insertions(+), 2 deletions(-) create mode 100644 drivers/infiniband/hw/mana/shadow_queue.h create mode 100644 drivers/infiniband/hw/mana/wr.cdrivers/infiniband/hw/mana/Makefile +1
-1@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MANA_INFINIBAND) += mana_ib.o -mana_ib-y := device.o main.o wq.o qp.o cq.o mr.o ah.o +mana_ib-y := device.o main.o wq.o qp.o cq.o mr.o ah.o wr.odrivers/infiniband/hw/mana/device.c +2
-0@@ -40,6 +40,8 @@ static const struct ib_device_ops mana_ib_dev_ops = { .mmap = mana_ib_mmap, .modify_qp = mana_ib_modify_qp, .modify_wq = mana_ib_modify_wq, + .post_recv = mana_ib_post_recv, + .post_send = mana_ib_post_send, .query_device = mana_ib_query_device, .query_gid = mana_ib_query_gid, .query_pkey = mana_ib_query_pkey,drivers/infiniband/hw/mana/mana_ib.h +31
-0@@ -14,6 +14,7 @@#include <linux/dmapool.h> #include <net/mana/mana.h> +#include "shadow_queue.h" #define PAGE_SZ_BM \ (SZ_4K | SZ_8K | SZ_16K | SZ_32K | SZ_64K | SZ_128K | SZ_256K | \@@ -165,6 +166,9 @@ struct mana_ib_qp {/* The port on the IB device, starting with 1 */ u32 port; +struct shadow_queue shadow_rq; +struct shadow_queue shadow_sq; +refcount_t refcount;struct completion free; };@@ -404,6 +408,30 @@ struct mana_rnic_set_qp_state_resp {struct gdma_resp_hdr hdr; };/* HW Data */ +enum WQE_OPCODE_TYPES { +WQE_TYPE_UD_SEND =0 , +WQE_TYPE_UD_RECV =8 , +};/* HW DATA */ + +struct rdma_send_oob { +u32 wqe_type :5 ; +u32 fence :1 ; +u32 signaled :1 ; +u32 solicited :1 ; +u32 psn :24 ; + +u32 ssn_or_rqpn :24 ; +u32 reserved1 :8 ; +union { +struct { +u32 remote_qkey; +u32 immediate; +u32 reserved1; +u32 reserved2; + } ud_send; + }; +};/* HW DATA */ +static inline struct gdma_context *mdev_to_gc (struct mana_ib_dev *mdev) {return mdev->gdma_dev->gdma_context;@@ -562,4 +590,9 @@ int mana_ib_gd_destroy_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp); int mana_ib_create_ah(struct ib_ah *ibah,struct rdma_ah_init_attr *init_attr,struct ib_udata *udata);int mana_ib_destroy_ah (struct ib_ah *ah,u32 flags); + +int mana_ib_post_recv (struct ib_qp *ibqp,const struct ib_recv_wr *wr, +const struct ib_recv_wr **bad_wr);int mana_ib_post_send(struct
drivers/infiniband/hw/mana/mana_ib.h +2
-0+ib_qp *ibqp, const struct ib_send_wr *wr, + const struct ib_send_wr **bad_wr);#endif drivers/infiniband/hw/mana/qp.c +14
-1@@ -562,10 +562,23 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp,struct ib_pd *ibpd, } doorbell = gc->mana_ib.doorbell; + err =create_shadow_queue (&qp->shadow_rq, attr->cap.max_recv_wr, +sizeof (struct ud_rq_shadow_wqe )); +if (err) { + ibdev_err(&mdev->ib_dev, "Failed to create shadow rq err %d\n", err); + goto destroy_queues; + } + err =create_shadow_queue (&qp->shadow_sq, attr->cap.max_send_wr, +sizeof (struct ud_sq_shadow_wqe )); +if (err) { + ibdev_err(&mdev->ib_dev, "Failed to create shadow sq err %d\n", err); + goto destroy_shadow_queues; + } + err =mana_ib_gd_create_ud_qp (mdev, qp, attr, doorbell, attr->qp_type);if (err) {ibdev_err (&mdev->ib_dev,"Failed to create ud qp %d\n" , err); - goto destroy_queues; + goto destroy_shadow_queues;drivers/infiniband/hw/mana/qp.c +3
-0} qp->ibqp.qp_num = qp->ud_qp.queues[MANA_UD_RECV_QUEUE ].id; qp->port = attr->port_num;@@ -575,6 +588,9 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp,struct ib_pd *ibpd, return 0; +destroy_shadow_queues: +destroy_shadow_queue (&qp->shadow_rq); +destroy_shadow_queue (&qp->shadow_sq); destroy_queues:while (i-- >0 )
mana_ib_destroy_queue(mdev, &qp->ud_qp.queues[i]); @@ -
754,6 +770,9 @@ static intmana_ib_destroy_ud_qp(struct mana_ib_qp *qp, struct ib_udata *udata)drivers/infiniband/hw/mana/qp.c +3
-0container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev);int i; +destroy_shadow_queue (&qp->shadow_rq); +destroy_shadow_queue (&qp->shadow_sq); +/* Ignore return code as there is not much we can do about it. * The error message is printed inside. */ drivers/infiniband/hw/mana/shadow_queue.h new file +86
-0@@ -0,0 +1,115 @@ +/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */ +/* +* Copyright (c) 2024, Microsoft Corporation. All rights reserved. +*/ + +#ifndef _MANA_SHADOW_QUEUE_H_ +#define _MANA_SHADOW_QUEUE_H_ + +struct shadow_wqe_header { +u16 opcode; +u16 error_code; +u32 posted_wqe_size; +u64 wr_id; +}; + +struct ud_rq_shadow_wqe { +struct shadow_wqe_header header; +u32 byte_len; +u32 src_qpn; +}; + +struct ud_sq_shadow_wqe { +struct shadow_wqe_header header; +}; + +struct shadow_queue { +/* Unmasked producer index, Incremented on wqe posting */ +u64 prod_idx; +/* Unmasked consumer index, Incremented on cq polling */ +u64 cons_idx; +/* Unmasked index of next-to-complete (from HW) shadow WQE */ +u64 next_to_complete_idx; +/* queue size in wqes */ +u32 length; +/* distance between elements in bytes */ +u32 stride; +/* ring buffer holding wqes */ +void *buffer; +}; + +static inline int create_shadow_queue (struct shadow_queue *queue, +uint32_t length,uint32_t stride) { + queue->buffer =kvmalloc (length * stride,GFP_KERNEL ); +if (!queue->buffer) +return -ENOMEM ; + + queue->length = length; + queue->stride = stride; + +return 0 ; +} + +static inline void destroy_shadow_queue (struct shadow_queue *queue) { +kvfree (queue->buffer); +} + +static inline bool shadow_queue_full (struct shadow_queue *queue) { +return (queue->prod_idx - queue->cons_idx) >= queue->length; } + +static inline bool shadow_queue_empty (struct shadow_queue *queue) { +return queue->prod_idx == queue->cons_idx; } + +static inline void * +shadow_queue_get_element (const struct shadow_queue *queue,u64 +unmasked_index) { +u32 index = unmasked_index % queue->length; + +return ((u8 *)queue->buffer + index * queue->stride); } + +static inline void * +shadow_queue_producer_entry (struct shadow_queue *queue) { +return shadow_queue_get_element (queue, queue->prod_idx); } + +static inline void * +shadow_queue_get_next_to_consume (const struct shadow_queue *queue) { +if (queue->cons_idx == queue->next_to_complete_idx) +return NULL ; + +return shadow_queue_get_element (queue, queue->cons_idx); } + +static inline void * +shadow_queue_get_next_to_complete (struct shadow_queue *queue) { +if (queue->next_to_complete_idx == queue->prod_idx) +return NULL ; + + return shadow_queue_get_element(queue, queue-Quoted 1 line
next_to_complete_idx); }drivers/infiniband/hw/mana/shadow_queue.h new file +17
-0+ +static inline void shadow_queue_advance_producer (struct shadow_queue +*queue) { + queue->prod_idx++; +} + +static inline void shadow_queue_advance_consumer (struct shadow_queue +*queue) { + queue->cons_idx++; +} + +static inline void shadow_queue_advance_next_to_complete (struct +shadow_queue *queue) { + queue->next_to_complete_idx++; +} + +#endif drivers/infiniband/hw/mana/wr.c new file +12
-0@@ -0,0 +1,168 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (c) 2024, Microsoft Corporation. All rights reserved. +*/ + +#include "mana_ib.h" + +#define MAX_WR_SGL_NUM (2) + +static int mana_ib_post_recv_ud (struct mana_ib_qp *qp,const struct +ib_recv_wr *wr) { + struct mana_ib_dev *mdev = container_of(qp->ibqp.device, struct
mana_ib_dev,ib_dev);drivers/infiniband/hw/mana/wr.c new file +1
-0+ struct gdma_queue *queue = qp-Quoted 1 line
ud_qp.queues[MANA_UD_RECV_QUEUE].kmem;
drivers/infiniband/hw/mana/wr.c new file +16
-0+struct gdma_posted_wqe_info wqe_info = {0 }; +struct gdma_sge gdma_sgl[MAX_WR_SGL_NUM ]; +struct gdma_wqe_request wqe_req = {0 }; +struct ud_rq_shadow_wqe *shadow_wqe; +int err, i; + +if (shadow_queue_full (&qp->shadow_rq)) +return -EINVAL ; + +if (wr->num_sge >MAX_WR_SGL_NUM ) +return -EINVAL ; + +for (i =0 ; i < wr->num_sge; ++i) { + gdma_sgl[i].address = wr->sg_list[i].addr; + gdma_sgl[i].mem_key = wr->sg_list[i].lkey; + gdma_sgl[i].size = wr->sg_list[i].length;
drivers/infiniband/hw/mana/wr.c line 39
Quoted 10 lines
drivers/infiniband/hw/mana/wr.c new file +10
-0+ } + wqe_req.num_sge = wr->num_sge; + wqe_req.sgl = gdma_sgl; + + err =mana_gd_post_work_request (queue, &wqe_req, &wqe_info); +if (err) +return err; + + shadow_wqe =shadow_queue_producer_entry (&qp->shadow_rq); +memset (shadow_wqe,0 ,sizeof (*shadow_wqe));
I would avoid using memset since this is on data path.
The patch looks good otherwise.
Long
Re: [PATCH rdma-next 09/13] RDMA/mana_ib: UD/GSI work requests
Quoted 4 lines · Long Li
drivers/infiniband/hw/mana/wr.c line 39
Quoted 2 lines
drivers/infiniband/hw/mana/wr.c new file +2
-0+ shadow_wqe =shadow_queue_producer_entry (&qp->shadow_rq); +memset (shadow_wqe,0 ,sizeof (*shadow_wqe));I would avoid using memset since this is on data path.
The compiler often does an amazing job with constant size small length memsets.
Jason
PATCH 10/13 RDMA/mana_ib: implement req_notify_cq
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Arm a CQ when req_notify_cq is called.
--- drivers/infiniband/hw/mana/cq.c | 12 ++++++++++++ drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/mana_ib.h | 2 ++ drivers/net/ethernet/microsoft/mana/gdma_main.c | 1 + 4 files changed, 16 insertions(+)
drivers/infiniband/hw/mana/cq.c +12 -0
@@ -168,3 +168,15 @@ void mana_ib_remove_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)kfree (gc->cq_table[cq->queue.id]); gc->cq_table[cq->queue.id] =NULL ; } + +int mana_ib_arm_cq (struct ib_cq *ibcq,enum ib_cq_notify_flags flags) +{ + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); +struct gdma_queue *gdma_cq = cq->queue.kmem; + +if (!gdma_cq) +return -EINVAL ; + +mana_gd_ring_cq (gdma_cq,SET_ARM_BIT ); +return 0 ; +}
drivers/infiniband/hw/mana/device.c +1 -0
@@ -47,6 +47,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .query_pkey = mana_ib_query_pkey, .query_port = mana_ib_query_port, .reg_user_mr = mana_ib_reg_user_mr, + .req_notify_cq = mana_ib_arm_cq,INIT_RDMA_OBJ_SIZE (ib_ah, mana_ib_ah, ibah), INIT_RDMA_OBJ_SIZE(ib_cq, mana_ib_cq, ibcq),
drivers/infiniband/hw/mana/mana_ib.h +2 -0
@@ -595,4 +595,6 @@ int mana_ib_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr, const struct ib_recv_wr **bad_wr);int mana_ib_post_send (struct ib_qp *ibqp,const struct ib_send_wr *wr,const struct ib_send_wr **bad_wr); + +int mana_ib_arm_cq (struct ib_cq *ibcq,enum ib_cq_notify_flags flags);#endif
drivers/net/ethernet/microsoft/mana/gdma_main.c +1 -0
@@ -344,6 +344,7 @@ void mana_gd_ring_cq(struct gdma_queue *cq, u8 arm_bit)mana_gd_ring_doorbell (gc, cq->gdma_dev->doorbell, cq->type, cq->id, head, arm_bit); } +EXPORT_SYMBOL_NS (mana_gd_ring_cq,NET_MANA );static void mana_gd_process_eqe (struct gdma_queue *eq) {
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 10/13] RDMA/mana_ib: implement req_notify_cq
Quoted 8 lines
Subject: [PATCH rdma-next 10/13] RDMA/mana_ib: implement
req_notify_cqFrom: Konstantin Taranov <[email protected]>
Arm a CQ when
req_notify_cqis called.Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 68 lines
--- drivers/infiniband/hw/mana/cq.c | 12 ++++++++++++ drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/mana_ib.h | 2 ++ drivers/net/ethernet/microsoft/mana/gdma_main.c | 1 + 4 files changed, 16 insertions(+)drivers/infiniband/hw/mana/cq.c +11
-0@@ -168,3 +168,15 @@ void mana_ib_remove_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)kfree (gc->cq_table[cq->queue.id]); gc->cq_table[cq->queue.id] =NULL ; } + +int mana_ib_arm_cq (struct ib_cq *ibcq,enum ib_cq_notify_flags flags) { + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); +struct gdma_queue *gdma_cq = cq->queue.kmem; + +if (!gdma_cq) +return -EINVAL ; + +mana_gd_ring_cq (gdma_cq,SET_ARM_BIT ); +return 0 ; +}drivers/infiniband/hw/mana/device.c +1
-0@@ -47,6 +47,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .query_pkey = mana_ib_query_pkey, .query_port = mana_ib_query_port, .reg_user_mr = mana_ib_reg_user_mr, + .req_notify_cq = mana_ib_arm_cq, INIT_RDMA_OBJ_SIZE(ib_ah, mana_ib_ah, ibah), INIT_RDMA_OBJ_SIZE(ib_cq, mana_ib_cq, ibcq), diff --git
a/drivers/infiniband/hw/mana/mana_ib.hb/drivers/infiniband/hw/mana/mana_ib.h
index 6265c39..bd34ad6 100644drivers/infiniband/hw/mana/mana_ib.h +2
-0@@ -595,4 +595,6 @@ int mana_ib_post_recv(struct ib_qp *ibqp, const structib_recv_wr *wr, const struct ib_recv_wr **bad_wr); intmana_ib_post_send (struct ib_qp *ibqp,const struct ib_send_wr *wr,const struct ib_send_wr **bad_wr); + +int mana_ib_arm_cq (struct ib_cq *ibcq,enum ib_cq_notify_flags flags);#endif
drivers/net/ethernet/microsoft/mana/gdma_main.c +1
-1@@ -344,6 +344,7 @@ void mana_gd_ring_cq(struct gdma_queue *cq, u8 arm_bit) mana_gd_ring_doorbell(gc, cq->gdma_dev->doorbell, cq->type, cq->id, head, arm_bit); } +EXPORT_SYMBOL_NS (mana_gd_ring_cq,NET_MANA );static void mana_gd_process_eqe (struct gdma_queue *eq) { --2.43.0
PATCH 11/13 RDMA/mana_ib: extend mana QP table
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Enable mana QP table to store UD/GSI QPs.
For send queues, set the most significant bit to one, as send and receive WQs can have the same ID in mana.
--- drivers/infiniband/hw/mana/main.c | 2 +- drivers/infiniband/hw/mana/mana_ib.h | 8 ++- drivers/infiniband/hw/mana/qp.c | 78 ++++++++++++++++++++++++++-- 3 files changed, 83 insertions(+), 5 deletions(-)
drivers/infiniband/hw/mana/main.c +1 -1
@@ -704,7 +704,7 @@ mana_ib_event_handler(void *ctx, struct gdma_queue *q, struct gdma_event *event)switch (event->type) {case GDMA_EQE_RNIC_QP_FATAL : qpn = event->details[0 ]; - qp =mana_get_qp_ref (mdev, qpn); + qp =mana_get_qp_ref (mdev, qpn, false);if (!qp)break ;if (qp->ibqp.event_handler) {
drivers/infiniband/hw/mana/mana_ib.h +7 -1
@@ -23,6 +23,9 @@/* MANA doesn't have any limit for MR size */ #define MANA_IB_MAX_MR_SIZE U64_MAX +/* Send queue ID mask */ +#define MANA_SENDQ_MASK BIT(31) +/* * The hardware limit of number of MRs is greater than maximum number of MRs * that can possibly represent in 24 bits
@@ -438,11 +441,14 @@ static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev *mdev) }static inline struct mana_ib_qp *mana_get_qp_ref (struct mana_ib_dev *mdev, -uint32_t qid) +u32 qid,bool is_sq) {struct mana_ib_qp *qp;unsigned long flag; +if (is_sq) + qid |=MANA_SENDQ_MASK ; +xa_lock_irqsave (&mdev->qp_table_wq, flag); qp =xa_load (&mdev->qp_table_wq, qid);if (qp)
drivers/infiniband/hw/mana/qp.c +75 -3
107 lines not on this page · raw message
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 11/13] RDMA/mana_ib: extend mana QP table
Quoted 10 lines
Subject: [PATCH rdma-next 11/13] RDMA/mana_ib: extend mana QP table
From: Konstantin Taranov <[email protected]>
Enable mana QP table to store UD/GSI QPs.
For send queues, set the most significant bit to one, as send and receive WQs can have the same ID in mana.Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 172 lines
--- drivers/infiniband/hw/mana/main.c | 2 +- drivers/infiniband/hw/mana/mana_ib.h | 8 ++- drivers/infiniband/hw/mana/qp.c | 78 ++++++++++++++++++++++++++-- 3 files changed, 83 insertions(+), 5 deletions(-)drivers/infiniband/hw/mana/main.c +1
-1@@ -704,7 +704,7 @@ mana_ib_event_handler(void *ctx, struct gdma_queue *q, struct gdma_event *event)switch (event->type) {case GDMA_EQE_RNIC_QP_FATAL : qpn = event->details[0 ]; - qp =mana_get_qp_ref (mdev, qpn); + qp =mana_get_qp_ref (mdev, qpn, false);if (!qp)break ;drivers/infiniband/hw/mana/main.c +0
-0if (qp->ibqp.event_handler) {drivers/infiniband/hw/mana/mana_ib.h +3
-0@@ -23,6 +23,9 @@/* MANA doesn't have any limit for MR size */ #define MANA_IB_MAX_MR_SIZE U64_MAX +/* Send queue ID mask */ +#define MANA_SENDQ_MASK BIT(31) +/* * The hardware limit of number of MRs is greater than maximum number of MRs * that can possibly represent in 24 bits @@ -438,11 +441,14 @@ static inline struct
gdma_context*mdev_to_gc(structmana_ib_dev*mdev) }static inline struct
mana_ib_qp*mana_get_qp_ref(structmana_ib_dev*mdev,drivers/infiniband/hw/mana/mana_ib.h +4
-1- uint32_t qid) + u32 qid, bool is_sq) {struct mana_ib_qp *qp;unsigned long flag; +if (is_sq) + qid |=MANA_SENDQ_MASK ; +xa_lock_irqsave (&mdev->qp_table_wq, flag); qp =xa_load (&mdev->qp_table_wq, qid);if (qp)drivers/infiniband/hw/mana/qp.c +0
-0@@ -444,18 +444,82 @@ static enum gdma_queue_typemana_ib_queue_type(struct
ib_qp_init_attr*attr, u32drivers/infiniband/hw/mana/qp.c +13
-0return type; } +static int mana_table_store_rc_qp (struct mana_ib_dev *mdev,struct +mana_ib_qp *qp) { +return xa_insert_irq (&mdev->qp_table_wq, qp->ibqp.qp_num, qp, +GFP_KERNEL ); +} + +static void mana_table_remove_rc_qp (struct mana_ib_dev *mdev,struct +mana_ib_qp *qp) { +xa_erase_irq (&mdev->qp_table_wq, qp->ibqp.qp_num); } + +static int mana_table_store_ud_qp (struct mana_ib_dev *mdev,struct +mana_ib_qp *qp) { + u32 qids = qp->ud_qp.queues[MANA_UD_SEND_QUEUE].id |
MANA_SENDQ_MASK;drivers/infiniband/hw/mana/qp.c +21
-0+u32 qidr = qp->ud_qp.queues[MANA_UD_RECV_QUEUE ].id; +int err; + + err =xa_insert_irq (&mdev->qp_table_wq, qids, qp,GFP_KERNEL ); +if (err) +return err; + + err =xa_insert_irq (&mdev->qp_table_wq, qidr, qp,GFP_KERNEL ); +if (err) + goto remove_sq; + +return 0 ; + +remove_sq: +xa_erase_irq (&mdev->qp_table_wq, qids); +return err; +} + +static void mana_table_remove_ud_qp (struct mana_ib_dev *mdev,struct +mana_ib_qp *qp) { + u32 qids = qp->ud_qp.queues[MANA_UD_SEND_QUEUE].id |
MANA_SENDQ_MASK;drivers/infiniband/hw/mana/qp.c +5
-0+u32 qidr = qp->ud_qp.queues[MANA_UD_RECV_QUEUE ].id; + +xa_erase_irq (&mdev->qp_table_wq, qids); +xa_erase_irq (&mdev->qp_table_wq, qidr); } + static int mana_table_store_qp(struct mana_ib_dev *mdev, struct mana_ib_qp*qp) {
drivers/infiniband/hw/mana/qp.c +9
-2refcount_set (&qp->refcount,1 );init_completion (&qp->free); -return xa_insert_irq (&mdev->qp_table_wq, qp->ibqp.qp_num, qp, -GFP_KERNEL ); + +switch (qp->ibqp.qp_type) { +case IB_QPT_RC : +return mana_table_store_rc_qp (mdev, qp); +case IB_QPT_UD : +case IB_QPT_GSI : +return mana_table_store_ud_qp (mdev, qp); +default : + ibdev_dbg(&mdev->ib_dev, "Unknown QP type for storing inmana table, %d\n",
drivers/infiniband/hw/mana/qp.c +14
-1+ qp->ibqp.qp_type); + } + +return -EINVAL ; }static void mana_table_remove_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp) { -xa_erase_irq (&mdev->qp_table_wq, qp->ibqp.qp_num); +switch (qp->ibqp.qp_type) { +case IB_QPT_RC : +mana_table_remove_rc_qp (mdev, qp); +break ; +case IB_QPT_UD : +case IB_QPT_GSI : +mana_table_remove_ud_qp (mdev, qp); +break ; +default : + ibdev_dbg(&mdev->ib_dev, "Unknown QP type for removingfrom mana table, %d\n",
drivers/infiniband/hw/mana/qp.c +9
-0+ qp->ibqp.qp_type); +return ; + }mana_put_qp_ref (qp);wait_for_completion (&qp->free); }@@ -586,8 +650,14 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp,struct ib_pd *ibpd, for (i = 0; i < MANA_UD_QUEUE_TYPE_MAX; ++i) qp->ud_qp.queues[i].kmem->id = qp->ud_qp.queues[i].id; + err =mana_table_store_qp (mdev, qp); +if (err) + goto destroy_qp; +return 0 ; +destroy_qp: +mana_ib_gd_destroy_ud_qp (mdev, qp); destroy_shadow_queues:destroy_shadow_queue (&qp->shadow_rq);drivers/infiniband/hw/mana/qp.c +2
-1destroy_shadow_queue (&qp->shadow_sq);@@ -770,6 +840,8 @@ static int mana_ib_destroy_ud_qp(struct mana_ib_qp *qp, struct ib_udata *udata) container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev);int i; +mana_table_remove_qp (mdev, qp); +destroy_shadow_queue (&qp->shadow_rq);destroy_shadow_queue (&qp->shadow_sq); --2.43.0
PATCH 12/13 RDMA/mana_ib: polling of CQs for GSI/UD
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Add polling for the kernel CQs.
Process completion events for UD/GSI QPs.
--- drivers/infiniband/hw/mana/cq.c | 135 ++++++++++++++++++ drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/mana_ib.h | 32 +++++ drivers/infiniband/hw/mana/qp.c | 33 +++++ .../net/ethernet/microsoft/mana/gdma_main.c | 1 + 5 files changed, 202 insertions(+)
drivers/infiniband/hw/mana/cq.c +135 -0
@@ -90,6 +90,10 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, } } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); +return 0 ; err_remove_cq_cb:
@@ -180,3 +184,134 @@ int mana_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)mana_gd_ring_cq (gdma_cq,SET_ARM_BIT );return 0 ; } + +static inline void handle_ud_sq_cqe (struct mana_ib_qp *qp,struct gdma_comp *cqe) +{ +struct mana_rdma_cqe *rdma_cqe = (struct mana_rdma_cqe *)cqe->cqe_data; +struct gdma_queue *wq = qp->ud_qp.queues[MANA_UD_SEND_QUEUE ].kmem; +struct ud_sq_shadow_wqe *shadow_wqe; + + shadow_wqe =shadow_queue_get_next_to_complete (&qp->shadow_sq); +if (!shadow_wqe) +return ; + + shadow_wqe->header.error_code = rdma_cqe->ud_send.vendor_error; + + wq->tail += shadow_wqe->header.posted_wqe_size; +shadow_queue_advance_next_to_complete (&qp->shadow_sq); +} + +static inline void handle_ud_rq_cqe (struct mana_ib_qp *qp,struct gdma_comp *cqe) +{ +struct mana_rdma_cqe *rdma_cqe = (struct mana_rdma_cqe *)cqe->cqe_data; +struct gdma_queue *wq = qp->ud_qp.queues[MANA_UD_RECV_QUEUE ].kmem; +struct ud_rq_shadow_wqe *shadow_wqe; + + shadow_wqe =shadow_queue_get_next_to_complete (&qp->shadow_rq); +if (!shadow_wqe) +return ; + + shadow_wqe->byte_len = rdma_cqe->ud_recv.msg_len; + shadow_wqe->src_qpn = rdma_cqe->ud_recv.src_qpn; + shadow_wqe->header.error_code =IB_WC_SUCCESS ; + + wq->tail += shadow_wqe->header.posted_wqe_size; +shadow_queue_advance_next_to_complete (&qp->shadow_rq); +} + +static void mana_handle_cqe (struct mana_ib_dev *mdev,struct gdma_comp *cqe) +{ +struct mana_ib_qp *qp =mana_get_qp_ref (mdev, cqe->wq_num, cqe->is_sq); + +if (!qp) +return ; + +if (qp->ibqp.qp_type ==IB_QPT_GSI || qp->ibqp.qp_type ==IB_QPT_UD ) { +if (cqe->is_sq) +handle_ud_sq_cqe (qp, cqe); +else +handle_ud_rq_cqe (qp, cqe); + } + +mana_put_qp_ref (qp); +} + +static void fill_verbs_from_shadow_wqe (struct mana_ib_qp *qp,struct ib_wc *wc, +const struct shadow_wqe_header *shadow_wqe) +{ +const struct ud_rq_shadow_wqe *ud_wqe = (const struct ud_rq_shadow_wqe *)shadow_wqe; + + wc->wr_id = shadow_wqe->wr_id; + wc->status = shadow_wqe->error_code; + wc->opcode = shadow_wqe->opcode; + wc->vendor_err = shadow_wqe->error_code; + wc->wc_flags =0 ; + wc->qp = &qp->ibqp; + wc->pkey_index =0 ; + +if (shadow_wqe->opcode ==IB_WC_RECV ) { + wc->byte_len = ud_wqe->byte_len; + wc->src_qp = ud_wqe->src_qpn; + wc->wc_flags |=IB_WC_GRH ; + } +} + +static int mana_process_completions (struct mana_ib_cq *cq,int nwc,struct ib_wc *wc) +{ +struct shadow_wqe_header *shadow_wqe; +struct mana_ib_qp *qp; +int wc_index =0 ; + +/* process send shadow queue completions */ +list_for_each_entry (qp, &cq->list_send_qp, cq_send_list) { +while ((shadow_wqe =shadow_queue_get_next_to_consume (&qp->shadow_sq)) + !=NULL ) { +if (wc_index >= nwc) + goto out; + +fill_verbs_from_shadow_wqe (qp, &wc[wc_index], shadow_wqe); +shadow_queue_advance_consumer (&qp->shadow_sq); + wc_index++; + } + } + +/* process recv shadow queue completions */ +list_for_each_entry (qp, &cq->list_recv_qp, cq_recv_list) { +while ((shadow_wqe =shadow_queue_get_next_to_consume (&qp->shadow_rq)) + !=NULL ) { +if (wc_index >= nwc) + goto out; + +fill_verbs_from_shadow_wqe (qp, &wc[wc_index], shadow_wqe); +shadow_queue_advance_consumer (&qp->shadow_rq); + wc_index++; + } + } + +out: +return wc_index; +} + +int mana_ib_poll_cq (struct ib_cq *ibcq,int num_entries,struct ib_wc *wc) +{ + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); + struct mana_ib_dev *mdev = container_of(ibcq->device, struct mana_ib_dev, ib_dev); +struct gdma_queue *queue = cq->queue.kmem; +struct gdma_comp gdma_cqe; +unsigned long flags; +int num_polled =0 ; +int comp_read, i; + +spin_lock_irqsave (&cq->cq_lock, flags); +for (i =0 ; i < num_entries; i++) { + comp_read =mana_gd_poll_cq (queue, &gdma_cqe,1 ); +if (comp_read <1 ) +break ; +mana_handle_cqe (mdev, &gdma_cqe); + } + + num_polled =mana_process_completions (cq, num_entries, wc); +spin_unlock_irqrestore (&cq->cq_lock, flags); + +return num_polled; +}
drivers/infiniband/hw/mana/device.c +1 -0
@@ -40,6 +40,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .mmap = mana_ib_mmap, .modify_qp = mana_ib_modify_qp, .modify_wq = mana_ib_modify_wq, + .poll_cq = mana_ib_poll_cq, .post_recv = mana_ib_post_recv, .post_send = mana_ib_post_send, .query_device = mana_ib_query_device,
drivers/infiniband/hw/mana/mana_ib.h +32 -0
@@ -127,6 +127,10 @@ struct mana_ib_mr {struct mana_ib_cq {struct ib_cq ibcq;struct mana_ib_queue queue; +/* protects CQ polling */ +spinlock_t cq_lock; +struct list_head list_send_qp; +struct list_head list_recv_qp;int cqe;u32 comp_vector;mana_handle_t cq_handle;
@@ -169,6 +173,8 @@ struct mana_ib_qp {/* The port on the IB device, starting with 1 */ u32 port; +struct list_head cq_send_list; +struct list_head cq_recv_list;struct shadow_queue shadow_rq;struct shadow_queue shadow_sq;
@@ -435,6 +441,31 @@ struct rdma_send_oob { }; };/* HW DATA */ +struct mana_rdma_cqe { +union { +struct { +u8 cqe_type; +u8 data[GDMA_COMP_DATA_SIZE -1 ]; + }; +struct { +u32 cqe_type :8 ; +u32 vendor_error :9 ; +u32 reserved1 :15 ; +u32 sge_offset :5 ; +u32 tx_wqe_offset :27 ; + } ud_send; +struct { +u32 cqe_type :8 ; +u32 reserved1 :24 ; +u32 msg_len; +u32 src_qpn :24 ; +u32 reserved2 :8 ; +u32 imm_data; +u32 rx_wqe_offset; + } ud_recv; + }; +};/* HW DATA */ +static inline struct gdma_context *mdev_to_gc (struct mana_ib_dev *mdev) {return mdev->gdma_dev->gdma_context;
@@ -602,5 +633,6 @@ int mana_ib_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr,int mana_ib_post_send (struct ib_qp *ibqp,const struct ib_send_wr *wr,const struct ib_send_wr **bad_wr); +int mana_ib_poll_cq (struct ib_cq *ibcq,int num_entries,struct ib_wc *wc);int mana_ib_arm_cq (struct ib_cq *ibcq,enum ib_cq_notify_flags flags);#endif
drivers/infiniband/hw/mana/qp.c +33 -0
@@ -600,6 +600,36 @@ destroy_queues:return err; } +static void mana_add_qp_to_cqs (struct mana_ib_qp *qp) +{ + struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct mana_ib_cq, ibcq); + struct mana_ib_cq *recv_cq = container_of(qp->ibqp.recv_cq, struct mana_ib_cq, ibcq); +unsigned long flags; + +spin_lock_irqsave (&send_cq->cq_lock, flags); +list_add_tail (&qp->cq_send_list, &send_cq->list_send_qp); +spin_unlock_irqrestore (&send_cq->cq_lock, flags); + +spin_lock_irqsave (&recv_cq->cq_lock, flags); +list_add_tail (&qp->cq_recv_list, &recv_cq->list_recv_qp); +spin_unlock_irqrestore (&recv_cq->cq_lock, flags); +} + +static void mana_remove_qp_from_cqs (struct mana_ib_qp *qp) +{ + struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct mana_ib_cq, ibcq); + struct mana_ib_cq *recv_cq = container_of(qp->ibqp.recv_cq, struct mana_ib_cq, ibcq); +unsigned long flags; + +spin_lock_irqsave (&send_cq->cq_lock, flags); +list_del (&qp->cq_send_list); +spin_unlock_irqrestore (&send_cq->cq_lock, flags); + +spin_lock_irqsave (&recv_cq->cq_lock, flags); +list_del (&qp->cq_recv_list); +spin_unlock_irqrestore (&recv_cq->cq_lock, flags); +} +static int mana_ib_create_ud_qp (struct ib_qp *ibqp,struct ib_pd *ibpd,struct ib_qp_init_attr *attr,struct ib_udata *udata) {
@@ -654,6 +684,8 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp, struct ib_pd *ibpd,if (err) goto destroy_qp; +mana_add_qp_to_cqs (qp); +return 0 ; destroy_qp:
@@ -840,6 +872,7 @@ static int mana_ib_destroy_ud_qp(struct mana_ib_qp *qp, struct ib_udata *udata) container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev);int i; +mana_remove_qp_from_cqs (qp);mana_table_remove_qp (mdev, qp);destroy_shadow_queue (&qp->shadow_rq);
drivers/net/ethernet/microsoft/mana/gdma_main.c +1 -0
@@ -1222,6 +1222,7 @@ int mana_gd_poll_cq(struct gdma_queue *cq, struct gdma_comp *comp, int num_cqe)return cqe_idx; } +EXPORT_SYMBOL_NS (mana_gd_poll_cq,NET_MANA );static irqreturn_t mana_gd_intr (int irq,void *arg) {
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 12/13] RDMA/mana_ib: polling of CQs for GSI/UD
Quoted 9 lines
Subject: [PATCH rdma-next 12/13] RDMA/mana_ib: polling of CQs for GSI/UD
From: Konstantin Taranov <[email protected]>
Add polling for the kernel CQs.
Process completion events for UD/GSI QPs.Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 326 lines
--- drivers/infiniband/hw/mana/cq.c | 135 ++++++++++++++++++ drivers/infiniband/hw/mana/device.c | 1 + drivers/infiniband/hw/mana/mana_ib.h | 32 +++++ drivers/infiniband/hw/mana/qp.c | 33 +++++ .../net/ethernet/microsoft/mana/gdma_main.c | 1 + 5 files changed, 202 insertions(+)drivers/infiniband/hw/mana/cq.c +4
-0@@ -90,6 +90,10 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, } } +spin_lock_init (&cq->cq_lock); +INIT_LIST_HEAD (&cq->list_send_qp); +INIT_LIST_HEAD (&cq->list_recv_qp); +return 0 ;
err_remove_cq_cb:drivers/infiniband/hw/mana/cq.c +4
-0@@ -180,3 +184,134 @@ int mana_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)mana_gd_ring_cq (gdma_cq ,SET_ARM_BIT );return 0 ; } + +static inline void handle_ud_sq_cqe (struct mana_ib_qp *qp,struct +gdma_comp *cqe) { + struct mana_rdma_cqe *rdma_cqe = (struct mana_rdma_cqe *)cqe-Quoted 1 line
cqe_data;drivers/infiniband/hw/mana/cq.c +1
-0+ struct gdma_queue *wq = qp-Quoted 1 line
ud_qp.queues[MANA_UD_SEND_QUEUE].kmem;
drivers/infiniband/hw/mana/cq.c +3
-0+struct ud_sq_shadow_wqe *shadow_wqe; + + shadow_wqe = shadow_queue_get_next_to_complete(&qp-Quoted 1 line
shadow_sq);drivers/infiniband/hw/mana/cq.c +12
-0+if (!shadow_wqe) +return ; + + shadow_wqe->header.error_code = rdma_cqe->ud_send.vendor_error; + + wq->tail += shadow_wqe->header.posted_wqe_size; +shadow_queue_advance_next_to_complete (&qp->shadow_sq); +} + +static inline void handle_ud_rq_cqe (struct mana_ib_qp *qp,struct +gdma_comp *cqe) { + struct mana_rdma_cqe *rdma_cqe = (struct mana_rdma_cqe *)cqe-Quoted 1 line
cqe_data;drivers/infiniband/hw/mana/cq.c +1
-0+ struct gdma_queue *wq = qp-Quoted 1 line
ud_qp.queues[MANA_UD_RECV_QUEUE].kmem;
drivers/infiniband/hw/mana/cq.c +3
-0+struct ud_rq_shadow_wqe *shadow_wqe; + + shadow_wqe = shadow_queue_get_next_to_complete(&qp-Quoted 1 line
shadow_rq);drivers/infiniband/hw/mana/cq.c +20
-0+if (!shadow_wqe) +return ; + + shadow_wqe->byte_len = rdma_cqe->ud_recv.msg_len; + shadow_wqe->src_qpn = rdma_cqe->ud_recv.src_qpn; + shadow_wqe->header.error_code =IB_WC_SUCCESS ; + + wq->tail += shadow_wqe->header.posted_wqe_size; +shadow_queue_advance_next_to_complete (&qp->shadow_rq); +} + +static void mana_handle_cqe (struct mana_ib_dev *mdev,struct gdma_comp +*cqe) { +struct mana_ib_qp *qp =mana_get_qp_ref (mdev, cqe->wq_num, +cqe->is_sq); + +if (!qp) +return ; + +if (qp->ibqp.qp_type ==IB_QPT_GSI || qp->ibqp.qp_type ==IB_QPT_UD ){
drivers/infiniband/hw/mana/cq.c +10
-0+if (cqe->is_sq) +handle_ud_sq_cqe (qp, cqe); +else +handle_ud_rq_cqe (qp, cqe); + } + +mana_put_qp_ref (qp); +} + +static void fill_verbs_from_shadow_wqe(struct mana_ib_qp *qp, struct ib_wc*wc,
drivers/infiniband/hw/mana/cq.c +1
-0+ const struct shadow_wqe_header
*shadow_wqe) {drivers/infiniband/hw/mana/cq.c +1
-0+ const struct ud_rq_shadow_wqe *ud_wqe = (const struct
ud_rq_shadow_wqedrivers/infiniband/hw/mana/cq.c +26
-0+*)shadow_wqe; + + wc->wr_id = shadow_wqe->wr_id; + wc->status = shadow_wqe->error_code; + wc->opcode = shadow_wqe->opcode; + wc->vendor_err = shadow_wqe->error_code; + wc->wc_flags =0 ; + wc->qp = &qp->ibqp; + wc->pkey_index =0 ; + +if (shadow_wqe->opcode ==IB_WC_RECV ) { + wc->byte_len = ud_wqe->byte_len; + wc->src_qp = ud_wqe->src_qpn; + wc->wc_flags |=IB_WC_GRH ; + } +} + +static int mana_process_completions (struct mana_ib_cq *cq,int nwc, +struct ib_wc *wc) { +struct shadow_wqe_header *shadow_wqe; +struct mana_ib_qp *qp; +int wc_index =0 ; + +/* process send shadow queue completions */ +list_for_each_entry (qp, &cq->list_send_qp, cq_send_list) { + while ((shadow_wqe =
shadow_queue_get_next_to_consume(&qp->shadow_sq))drivers/infiniband/hw/mana/cq.c +5
-0+ != NULL) { +if (wc_index >= nwc) + goto out; + + fill_verbs_from_shadow_wqe(qp, &wc[wc_index],
shadow_wqe);drivers/infiniband/hw/mana/cq.c +8
-0+shadow_queue_advance_consumer (&qp->shadow_sq); + wc_index++; + } + } + +/* process recv shadow queue completions */ +list_for_each_entry (qp, &cq->list_recv_qp, cq_recv_list) { + while ((shadow_wqe =
shadow_queue_get_next_to_consume(&qp->shadow_rq))drivers/infiniband/hw/mana/cq.c +5
-0+ != NULL) { +if (wc_index >= nwc) + goto out; + + fill_verbs_from_shadow_wqe(qp, &wc[wc_index],
shadow_wqe);drivers/infiniband/hw/mana/cq.c +13
-0+shadow_queue_advance_consumer (&qp->shadow_rq); + wc_index++; + } + } + +out: +return wc_index; +} + +int mana_ib_poll_cq (struct ib_cq *ibcq,int num_entries,struct ib_wc +*wc) { + struct mana_ib_cq *cq = container_of(ibcq, struct mana_ib_cq, ibcq); + struct mana_ib_dev *mdev = container_of(ibcq->device, struct
mana_ib_dev,ib_dev);drivers/infiniband/hw/mana/cq.c +19
-0+struct gdma_queue *queue = cq->queue.kmem; +struct gdma_comp gdma_cqe; +unsigned long flags; +int num_polled =0 ; +int comp_read, i; + +spin_lock_irqsave (&cq->cq_lock, flags); +for (i =0 ; i < num_entries; i++) { + comp_read =mana_gd_poll_cq (queue, &gdma_cqe,1 ); +if (comp_read <1 ) +break ; +mana_handle_cqe (mdev, &gdma_cqe); + } + + num_polled =mana_process_completions (cq, num_entries, wc); +spin_unlock_irqrestore (&cq->cq_lock, flags); + +return num_polled; +}drivers/infiniband/hw/mana/device.c +1
-0@@ -40,6 +40,7 @@ static const struct ib_device_ops mana_ib_dev_ops = { .mmap = mana_ib_mmap, .modify_qp = mana_ib_modify_qp, .modify_wq = mana_ib_modify_wq, + .poll_cq = mana_ib_poll_cq, .post_recv = mana_ib_post_recv, .post_send = mana_ib_post_send, .query_device = mana_ib_query_device,drivers/infiniband/hw/mana/mana_ib.h +31
-0@@ -127,6 +127,10 @@ struct mana_ib_mr { struct mana_ib_cq {struct ib_cq ibcq;struct mana_ib_queue queue; +/* protects CQ polling */ +spinlock_t cq_lock; +struct list_head list_send_qp; +struct list_head list_recv_qp;int cqe;u32 comp_vector;mana_handle_t cq_handle;@@ -169,6 +173,8 @@ struct mana_ib_qp {/* The port on the IB device, starting with 1 */ u32 port; +struct list_head cq_send_list; +struct list_head cq_recv_list;struct shadow_queue shadow_rq;struct shadow_queue shadow_sq;@@ -435,6 +441,31 @@ struct rdma_send_oob { }; };/* HW DATA */ +struct mana_rdma_cqe { +union { +struct { +u8 cqe_type; +u8 data[GDMA_COMP_DATA_SIZE -1 ]; + }; +struct { +u32 cqe_type :8 ; +u32 vendor_error :9 ; +u32 reserved1 :15 ; +u32 sge_offset :5 ; +u32 tx_wqe_offset :27 ; + } ud_send; +struct { +u32 cqe_type :8 ; +u32 reserved1 :24 ; +u32 msg_len; +u32 src_qpn :24 ; +u32 reserved2 :8 ; +u32 imm_data; +u32 rx_wqe_offset; + } ud_recv; + }; +};/* HW DATA */ +static inline struct gdma_context *mdev_to_gc (struct mana_ib_dev *mdev) {return mdev->gdma_dev->gdma_context;@@ -602,5 +633,6 @@ int mana_ib_post_recv(struct ib_qp *ibqp, const struct
ib_recv_wr*wr, int mana_ib_post_send(structib_qp*ibqp, const structib_send_wr*wr,drivers/infiniband/hw/mana/mana_ib.h +2
-0const struct ib_send_wr **bad_wr); +int mana_ib_poll_cq (struct ib_cq *ibcq,int num_entries,struct ib_wc +*wc);int mana_ib_arm_cq (struct ib_cq *ibcq,enum ib_cq_notify_flags flags);#endif drivers/infiniband/hw/mana/qp.c +16
-0@@ -600,6 +600,36 @@ destroy_queues:return err; } +static void mana_add_qp_to_cqs (struct mana_ib_qp *qp) { + struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct mana_ib_cq, ibcq); + struct mana_ib_cq *recv_cq = container_of(qp->ibqp.recv_cq, struct mana_ib_cq, ibcq); +unsigned long flags; + +spin_lock_irqsave (&send_cq->cq_lock, flags); +list_add_tail (&qp->cq_send_list, &send_cq->list_send_qp); +spin_unlock_irqrestore (&send_cq->cq_lock, flags); + +spin_lock_irqsave (&recv_cq->cq_lock, flags); +list_add_tail (&qp->cq_recv_list, &recv_cq->list_recv_qp); +spin_unlock_irqrestore (&recv_cq->cq_lock, flags); } + +static void mana_remove_qp_from_cqs (struct mana_ib_qp *qp) { + struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct mana_ib_cq, ibcq); + struct mana_ib_cq *recv_cq = container_of(qp->ibqp.recv_cq, struct
mana_ib_cq, ibcq);drivers/infiniband/hw/mana/qp.c +10
-0+unsigned long flags; + +spin_lock_irqsave (&send_cq->cq_lock, flags); +list_del (&qp->cq_send_list); +spin_unlock_irqrestore (&send_cq->cq_lock, flags); + +spin_lock_irqsave (&recv_cq->cq_lock, flags); +list_del (&qp->cq_recv_list); +spin_unlock_irqrestore (&recv_cq->cq_lock, flags); } +static int mana_ib_create_ud_qp (struct ib_qp *ibqp,struct ib_pd *ibpd, struct ib_qp_init_attr *attr, struct ib_udata*udata) { @@ -654,6 +684,8 @@ static int mana_ib_create_ud_qp(struct
ib_qp*ibqp, structib_pd*ibpd,drivers/infiniband/hw/mana/qp.c +3
-0if (err) goto destroy_qp; +mana_add_qp_to_cqs (qp); +return 0 ; destroy_qp:@@ -840,6 +872,7 @@ static int mana_ib_destroy_ud_qp(struct mana_ib_qp *qp, struct ib_udata *udata) container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev);int i; +mana_remove_qp_from_cqs (qp);mana_table_remove_qp (mdev, qp);drivers/infiniband/hw/mana/qp.c +0
-0destroy_shadow_queue (&qp->shadow_rq);drivers/net/ethernet/microsoft/mana/gdma_main.c +1
-1@@ -1222,6 +1222,7 @@ int mana_gd_poll_cq(struct gdma_queue *cq, struct gdma_comp *comp, int num_cqe) return cqe_idx; } +EXPORT_SYMBOL_NS (mana_gd_poll_cq,NET_MANA );static irqreturn_t mana_gd_intr (int irq,void *arg) { --2.43.0
PATCH 13/13 RDMA/mana_ib: indicate CM support
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Set max_mad_size and IB_PORT_CM_SUP capability
to enable connection manager.
--- drivers/infiniband/hw/mana/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mana/main.c +7 -2
@@ -561,8 +561,10 @@ int mana_ib_get_port_immutable(struct ib_device *ibdev, u32 port_num, immutable->pkey_tbl_len = attr.pkey_tbl_len; immutable->gid_tbl_len = attr.gid_tbl_len; immutable->core_cap_flags =RDMA_CORE_PORT_RAW_PACKET ; -if (port_num ==1 ) +if (port_num ==1 ) { immutable->core_cap_flags |=RDMA_CORE_PORT_IBA_ROCE_UDP_ENCAP ; + immutable->max_mad_size =IB_MGMT_MAD_SIZE ; + }return 0 ; }
@@ -621,8 +623,11 @@ int mana_ib_query_port(struct ib_device *ibdev, u32 port, props->active_width =IB_WIDTH_4X ; props->active_speed =IB_SPEED_EDR ; props->pkey_tbl_len =1 ; -if (port ==1 ) +if (port ==1 ) { props->gid_tbl_len =16 ; + props->port_cap_flags =IB_PORT_CM_SUP ; + props->ip_gids = true; + }return 0 ; }
Signature · 1 line
2.43.0
RE: [PATCH rdma-next 13/13] RDMA/mana_ib: indicate CM support
Quoted 9 lines
Subject: [PATCH rdma-next 13/13] RDMA/mana_ib: indicate CM support
From: Konstantin Taranov <[email protected]>
Set
max_mad_sizeandIB_PORT_CM_SUPcapability to enable connection manager.Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Shiraz Saleem <[email protected]>
Quoted 39 lines
--- drivers/infiniband/hw/mana/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)drivers/infiniband/hw/mana/main.c +3
-1@@ -561,8 +561,10 @@ int mana_ib_get_port_immutable(struct ib_device *ibdev, u32 port_num, immutable->pkey_tbl_len = attr.pkey_tbl_len; immutable->gid_tbl_len = attr.gid_tbl_len; immutable->core_cap_flags =RDMA_CORE_PORT_RAW_PACKET ; -if (port_num ==1 ) +if (port_num ==1 ) { immutable->core_cap_flags |=RDMA_CORE_PORT_IBA_ROCE_UDP_ENCAP ; + immutable->max_mad_size =IB_MGMT_MAD_SIZE ; + }drivers/infiniband/hw/mana/main.c +4
-1return 0 ; }@@ -621,8 +623,11 @@ int mana_ib_query_port(struct ib_device *ibdev, u32 port, props->active_width =IB_WIDTH_4X ; props->active_speed =IB_SPEED_EDR ; props->pkey_tbl_len =1 ; -if (port ==1 ) +if (port ==1 ) { props->gid_tbl_len =16 ; + props->port_cap_flags =IB_PORT_CM_SUP ; + props->ip_gids = true; + }return 0 ;}
--
2.43.0
Leon Romanovsky
AppliedQuoted 19 lines · Konstantin Taranov
From: Konstantin Taranov <[email protected]>
This patch series enables GSI QPs and CM on
mana_ib.Konstantin Taranov (13):
RDMA/mana_ib: Allow registration of DMA-mapped memory in PDs RDMA/mana_ib: implementget_dma_mr
RDMA/mana_ib: helpers to allocate kernel queues RDMA/mana_ib: create kernel-level CQs RDMA/mana_ib: Create and destroy UD/GSI QP RDMA/mana_ib: UD/GSI QP creation for kernel RDMA/mana_ib: create/destroy AH
net/mana: fix warning in the writer of client oob RDMA/mana_ib: UD/GSI work requests
RDMA/mana_ib: implementreq_notify_cqRDMA/mana_ib: extend mana QP table
RDMA/mana_ib: polling of CQs for GSI/UD RDMA/mana_ib: indicate CM support
Quoted 1 line
[...]
Applied, thanks!
[01/13] RDMA/mana_ib: Allow registration of DMA-mapped memory in PDs
https://git.kernel.org/rdma/rdma/c/78683c25c80e54 [02/13] RDMA/mana_ib: implement get_dma_mr https://git.kernel.org/rdma/rdma/c/6e1b8bdcd04f4e [03/13] RDMA/mana_ib: helpers to allocate kernel queues https://git.kernel.org/rdma/rdma/c/f662c0f5b3396a [04/13] RDMA/mana_ib: create kernel-level CQs https://git.kernel.org/rdma/rdma/c/822d4c938e0d93 [05/13] RDMA/mana_ib: Create and destroy UD/GSI QP https://git.kernel.org/rdma/rdma/c/392ed69a9ac45c [06/13] RDMA/mana_ib: UD/GSI QP creation for kernel https://git.kernel.org/rdma/rdma/c/bf3f6576bbbd51 [07/13] RDMA/mana_ib: create/destroy AH https://git.kernel.org/rdma/rdma/c/09ec8a57903348 [08/13] net/mana: fix warning in the writer of client oob https://git.kernel.org/rdma/rdma/c/622f1fc2ca7dea [09/13] RDMA/mana_ib: UD/GSI work requests https://git.kernel.org/rdma/rdma/c/8d9a5210545c27 [10/13] RDMA/mana_ib: implement req_notify_cq https://git.kernel.org/rdma/rdma/c/cd595cf391733c [11/13] RDMA/mana_ib: extend mana QP table https://git.kernel.org/rdma/rdma/c/9fe09a01ade76d [12/13] RDMA/mana_ib: polling of CQs for GSI/UD https://git.kernel.org/rdma/rdma/c/4aa5b050800325 [13/13] RDMA/mana_ib: indicate CM support https://git.kernel.org/rdma/rdma/c/842ee6aeddff08
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>