From: Ajay Sharma <sharmaajay@xxxxxxxxxxxxx>
Send the QP fatal error event to only the
context that created the qp.
Signed-off-by: Ajay Sharma <sharmaajay@xxxxxxxxxxxxx>
---
drivers/infiniband/hw/mana/device.c | 9 +++++++++
drivers/infiniband/hw/mana/main.c | 9 ++++++---
drivers/infiniband/hw/mana/mana_ib.h | 18 +++++++++---------
drivers/infiniband/hw/mana/qp.c | 2 ++
4 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/drivers/infiniband/hw/mana/device.c b/drivers/infiniband/hw/mana/device.c
index e15da43c73a0..563b5a1e79d2 100644
--- a/drivers/infiniband/hw/mana/device.c
+++ b/drivers/infiniband/hw/mana/device.c
@@ -101,6 +101,14 @@ static int mana_ib_probe(struct auxiliary_device *adev,
if (ret)
ibdev_dbg(&mib_dev->ib_dev, "Failed to get caps, use defaults");
+ mib_dev->rq_to_qp_lookup_table = kzalloc(sizeof(struct mana_ib_qp*) *
+ mib_dev->adapter_caps.max_qp_count,
+ GFP_KERNEL);
+ if (!mib_dev->rq_to_qp_lookup_table) {
+ ibdev_err(&mib_dev->ib_dev, "Failed to allocate rq lookup table");
+ goto free_error_eq;
+ }
+
ret = ib_register_device(&mib_dev->ib_dev, "mana_%d",
mdev->gdma_context->dev);
if (ret)
@@ -112,6 +120,7 @@ static int mana_ib_probe(struct auxiliary_device *adev,
destroy_adapter:
mana_ib_destroy_adapter(mib_dev);
+ kfree(mib_dev->rq_to_qp_lookup_table);
free_error_eq:
mana_gd_destroy_queue(mib_dev->gc, mib_dev->fatal_err_eq);
deregister_device:
diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
index 82923475267d..517a2a4f0d76 100644
--- a/drivers/infiniband/hw/mana/main.c
+++ b/drivers/infiniband/hw/mana/main.c
@@ -556,13 +556,16 @@ static void mana_ib_critical_event_handler(void *ctx, struct gdma_queue *queue,
{
struct mana_ib_dev *mib_dev = (struct mana_ib_dev *)ctx;
struct ib_event mib_event;
+ struct mana_ib_qp *qp;
+ u64 rq_id;
switch (event->type) {
case GDMA_EQE_SOC_EVENT_NOTIFICATION:
+ rq_id = event->details[0] & 0xFFFFFF;
+ qp = mib_dev->rq_to_qp_lookup_table[rq_id];
mib_event.event = IB_EVENT_QP_FATAL;
mib_event.device = &mib_dev->ib_dev;
- mib_event.element.qp =
- (struct ib_qp*)(event->details[0] & 0xFFFFFF);
- ib_dispatch_event(&mib_event);
+ if (qp && qp->ibqp.event_handler)
+ qp->ibqp.event_handler(&mib_event, qp->ibqp.qp_context);
ibdev_dbg(&mib_dev->ib_dev, "Received critical notification");
break;
default:
diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h
index 6b9406738cb2..d796b0ed0288 100644
--- a/drivers/infiniband/hw/mana/mana_ib.h
+++ b/drivers/infiniband/hw/mana/mana_ib.h
@@ -48,15 +48,6 @@ struct mana_ib_adapter_caps {
u32 max_inline_data_size;
};
-struct mana_ib_dev {
- struct ib_device ib_dev;
- struct gdma_dev *gdma_dev;
- struct gdma_context *gc;
- struct gdma_queue *fatal_err_eq;
- mana_handle_t adapter_handle;
- struct mana_ib_adapter_caps adapter_caps;
-};
-
struct mana_ib_wq {
struct ib_wq ibwq;
struct ib_umem *umem;
@@ -113,6 +104,15 @@ struct mana_ib_ucontext {
u32 doorbell;
};
+struct mana_ib_dev {
+ struct ib_device ib_dev;
+ struct gdma_dev *gdma_dev;
+ struct gdma_context *gc;
+ struct gdma_queue *fatal_err_eq;
+ mana_handle_t adapter_handle;
+ struct mana_ib_adapter_caps adapter_caps;
+ struct mana_ib_qp **rq_to_qp_lookup_table;
+};
struct mana_ib_rwq_ind_table {
struct ib_rwq_ind_table ib_ind_table;
};
diff --git a/drivers/infiniband/hw/mana/qp.c b/drivers/infiniband/hw/mana/qp.c
index ef3275ac92a0..bad72c0e8265 100644
--- a/drivers/infiniband/hw/mana/qp.c
+++ b/drivers/infiniband/hw/mana/qp.c
@@ -210,6 +210,8 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd,
wq->id = wq_spec.queue_index;
cq->id = cq_spec.queue_index;
+ mib_dev->rq_to_qp_lookup_table[wq->id] = qp;
+
ibdev_dbg(&mib_dev->ib_dev,
"ret %d rx_object 0x%llx wq id %llu cq id %llu\n",
ret, wq->rx_object, wq->id, cq->id);
--
2.25.1
