RDMA/mana_ib: process QP error events in mana_ib
Subsystems (5)
PATCH v2 1/1 RDMA/mana_ib: process QP error events in mana_ib
From: Konstantin Taranov <[email protected]>
Process QP fatal events from the error event queue.
For that, find the QP, using QPN from the event, and then call its event_handler. To find the QPs, store created RC QPs in an xarray.
---
v2 is the same code, but some code is moved into helper functions
v1->v2
* Introduced helpers to add and remove QPs to/from the table
* Introduced helpers to get and put QP references
drivers/infiniband/hw/mana/device.c | 3 ++ drivers/infiniband/hw/mana/main.c | 31 +++++++++++++++++-- drivers/infiniband/hw/mana/mana_ib.h | 23 ++++++++++++++ drivers/infiniband/hw/mana/qp.c | 20 ++++++++++++ .../net/ethernet/microsoft/mana/gdma_main.c | 1 + include/net/mana/gdma.h | 1 + 6 files changed, 77 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mana/device.c +3 -0
@@ -126,6 +126,7 @@ static int mana_ib_probe(struct auxiliary_device *adev,if (ret) goto destroy_eqs; +xa_init_flags (&dev->qp_table_wq,XA_FLAGS_LOCK_IRQ ); ret =mana_ib_gd_config_mac (dev,ADDR_OP_ADD , mac_addr);if (ret) { ibdev_err(&dev->ib_dev, "Failed to add Mac address, ret %d",
@@ -143,6 +144,7 @@ static int mana_ib_probe(struct auxiliary_device *adev,return 0 ; destroy_rnic: +xa_destroy (&dev->qp_table_wq);mana_ib_gd_destroy_rnic_adapter (dev); destroy_eqs:mana_ib_destroy_eqs (dev);
@@ -158,6 +160,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); +xa_destroy (&dev->qp_table_wq);mana_ib_gd_destroy_rnic_adapter (dev);mana_ib_destroy_eqs (dev);mana_gd_deregister_device (dev->gdma_dev);
drivers/infiniband/hw/mana/main.c +29 -2
@@ -667,6 +667,33 @@ int mana_ib_gd_query_adapter_caps(struct mana_ib_dev *dev)return 0 ; } +static void +mana_ib_event_handler (void *ctx,struct gdma_queue *q,struct gdma_event *event) +{ +struct mana_ib_dev *mdev = (struct mana_ib_dev *)ctx; +struct mana_ib_qp *qp; +struct ib_event ev; +u32 qpn; + +switch (event->type) { +case GDMA_EQE_RNIC_QP_FATAL : + qpn = event->details[0 ]; + qp =mana_get_qp_ref (mdev, qpn); +if (!qp) +break ; +if (qp->ibqp.event_handler) { + ev.device = qp->ibqp.device; + ev.element.qp = &qp->ibqp; + ev.event =IB_EVENT_QP_FATAL ; + qp->ibqp.event_handler (&ev, qp->ibqp.qp_context); + } +mana_put_qp_ref (qp); +break ; +default : +break ; + } +} +int mana_ib_create_eqs (struct mana_ib_dev *mdev) {struct gdma_context *gc =mdev_to_gc (mdev);
@@ -676,7 +703,7 @@ int mana_ib_create_eqs(struct mana_ib_dev *mdev) spec.type =GDMA_EQ ; spec.monitor_avl_buf = false; spec.queue_size =EQ_SIZE ; - spec.eq.callback =NULL ; + spec.eq.callback = mana_ib_event_handler; spec.eq.context = mdev; spec.eq.log2_throttle_limit =LOG2_EQ_THROTTLE ; spec.eq.msix_index =0 ;
@@ -691,7 +718,7 @@ int mana_ib_create_eqs(struct mana_ib_dev *mdev) err = -ENOMEM ; goto destroy_fatal_eq; } - + spec.eq.callback =NULL ;for (i =0 ; i < mdev->ib_dev.num_comp_vectors; i++) { spec.eq.msix_index = (i +1 ) % gc->num_msix_usable; err =mana_gd_create_mana_eq (mdev->gdma_dev, &spec, &mdev->eqs[i]);
drivers/infiniband/hw/mana/mana_ib.h +23 -0
@@ -62,6 +62,7 @@ struct mana_ib_dev {mana_handle_t adapter_handle;struct gdma_queue *fatal_err_eq;struct gdma_queue **eqs; +struct xarray qp_table_wq;struct mana_ib_adapter_caps adapter_caps; };
@@ -124,6 +125,9 @@ struct mana_ib_qp {/* The port on the IB device, starting with 1 */ u32 port; + +refcount_t refcount; +struct completion free; };struct mana_ib_ucontext {
@@ -333,6 +337,25 @@ static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev *mdev)return mdev->gdma_dev->gdma_context; } +static inline struct mana_ib_qp *mana_get_qp_ref (struct mana_ib_dev *mdev,uint32_t qid) +{ +struct mana_ib_qp *qp; +unsigned long flag; + +xa_lock_irqsave (&mdev->qp_table_wq, flag); + qp =xa_load (&mdev->qp_table_wq, qid); +if (qp) +refcount_inc (&qp->refcount); +xa_unlock_irqrestore (&mdev->qp_table_wq, flag); +return qp; +} + +static inline void mana_put_qp_ref (struct mana_ib_qp *qp) +{ +if (refcount_dec_and_test (&qp->refcount)) +complete (&qp->free); +} +static inline struct net_device *mana_ib_get_netdev (struct ib_device *ibdev,u32 port) { struct mana_ib_dev *mdev = container_of(ibdev, struct mana_ib_dev, ib_dev);
drivers/infiniband/hw/mana/qp.c +20 -0
@@ -398,6 +398,20 @@ err_free_vport:return err; } +static int mana_table_store_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp) +{ +refcount_set (&qp->refcount,1 ); +init_completion (&qp->free); +return xa_insert_irq (&mdev->qp_table_wq, qp->ibqp.qp_num, qp,GFP_KERNEL ); +} + +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); +mana_put_qp_ref (qp); +wait_for_completion (&qp->free); +} +static int mana_ib_create_rc_qp (struct ib_qp *ibqp,struct ib_pd *ibpd,struct ib_qp_init_attr *attr,struct ib_udata *udata) {
@@ -460,6 +474,10 @@ static int mana_ib_create_rc_qp(struct ib_qp *ibqp, struct ib_pd *ibpd, } } + err =mana_table_store_qp (mdev, qp); +if (err) + goto destroy_qp; +return 0 ; destroy_qp:
@@ -620,6 +638,8 @@ static int mana_ib_destroy_rc_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); +/* Ignore return code as there is not much we can do about it. * The error message is printed inside. */
drivers/net/ethernet/microsoft/mana/gdma_main.c +1 -0
@@ -380,6 +380,7 @@ static void mana_gd_process_eqe(struct gdma_queue *eq)case GDMA_EQE_HWC_INIT_EQ_ID_DB :case GDMA_EQE_HWC_INIT_DATA :case GDMA_EQE_HWC_INIT_DONE : +case GDMA_EQE_RNIC_QP_FATAL :if (!eq->eq.callback)break ;
include/net/mana/gdma.h +1 -0
@@ -60,6 +60,7 @@ enum gdma_eqe_type {GDMA_EQE_HWC_INIT_DONE =131 ,GDMA_EQE_HWC_SOC_RECONFIG =132 ,GDMA_EQE_HWC_SOC_RECONFIG_DATA =133 , + GDMA_EQE_RNIC_QP_FATAL = 176, }; enum {
Signature · 1 line
2.43.0
Quoted 16 lines · Konstantin Taranov
From: Konstantin Taranov <[email protected]>
Process QP fatal events from the error event queue.
For that, find the QP, using QPN from the event, and then call itsevent_handler. To find the QPs, store created RC QPs in an xarray.Signed-off-by Konstantin Taranov <[email protected]>Reviewed-by Wei Hu <[email protected]>---
v2 is the same code, but some code is moved into helper functions
v1->v2
* Introduced helpers to add and remove QPs to/from the table
* Introduced helpers to get and put QP references
Quoted 7 lines
drivers/infiniband/hw/mana/device.c | 3 ++ drivers/infiniband/hw/mana/main.c | 31 +++++++++++++++++-- drivers/infiniband/hw/mana/mana_ib.h | 23 ++++++++++++++ drivers/infiniband/hw/mana/qp.c | 20 ++++++++++++ .../net/ethernet/microsoft/mana/gdma_main.c | 1 + include/net/mana/gdma.h | 1 + 6 files changed, 77 insertions(+), 2 deletions(-)
Please run checkpatch.pl on your patches before sending them. I fixed it and applied.
➜ kernel git:(wip/leon-for-next) mkt ci878a8e752041 (HEAD -> build) RDMA/mana_ib: process QP error events in mana_ib
WARNING: line length of 88 exceeds 80 columns
#133: FILE: drivers/infiniband/hw/mana/mana_ib.h:340:
+static inline struct mana_ib_qp *mana_get_qp_ref(struct mana_ib_dev *mdev, uint32_t qid)
WARNING: line length of 82 exceeds 80 columns
#167: FILE: drivers/infiniband/hw/mana/qp.c:405:
+ return xa_insert_irq(&mdev->qp_table_wq, qp->ibqp.qp_num, qp, GFP_KERNEL);
WARNING: line length of 81 exceeds 80 columns
#170: FILE: drivers/infiniband/hw/mana/qp.c:408:
+static void mana_table_remove_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp)
Thanks
Konstantin Taranov
maintainerQuoted 2 lines
Please run checkpatch.pl on your patches before sending them. I fixed it and applied.
Thanks, Leon! I completely forgot to re-check. It will not happen again.
Quoted 20 lines
➜ kernel git:(wip/leon-for-next) mkt ci
878a8e752041(HEAD -> build) RDMA/mana_ib: process QP error events inmana_ib
WARNING: line length of 88 exceeds 80 columns
#133: FILE:drivers/infiniband/hw/mana/mana_ib.h:340:(quoted diff) +2
-0+static inline struct mana_ib_qp *mana_get_qp_ref(struct mana_ib_dev +*mdev, uint32_t qid)WARNING: line length of 82 exceeds 80 columns
#167: FILE:drivers/infiniband/hw/mana/qp.c:405:
+ return xa_insert_irq(&mdev->qp_table_wq,qp->ibqp.qp_num, qp,
+GFP_KERNEL);WARNING: line length of 81 exceeds 80 columns
#170: FILE:drivers/infiniband/hw/mana/qp.c:408:(quoted diff) +2
-0+static void mana_table_remove_qp(struct mana_ib_dev *mdev, struct +mana_ib_qp *qp)Thanks
Leon Romanovsky
AppliedQuoted 5 lines · Konstantin Taranov
Process QP fatal events from the error event queue.
For that, find the QP, using QPN from the event, and then call itsevent_handler. To find the QPs, store created RC QPs in an xarray.
Applied, thanks!
[1/1] RDMA/mana_ib: process QP error events in mana_ib
https://git.kernel.org/rdma/rdma/c/52f803542f970f
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>