History

net: mana: Clear RDMA teardown and suspend state in mana_rdma_probe()

mana_rdma_remove() sets gd->rdma_teardown to stop mana_rdma_service_handle() from acting on servicing events, but nothing ever clears it. A hardware service reset (GDMA_EQE_HWC_RESET_REQUEST) goes through mana_gd_suspend() -> mana_rdma_remove() and mana_gd_resume() -> mana_rdma_probe(), so from the first reset onwards every GDMA_EQE_HWC_SOC_SERVICE event returns early and RDMA suspend/resume servicing is silently dropped for the life of the device. gd->is_suspended has the same problem: it is set when servicing removes the adev and is cleared only by a matching resume. A reset while RDMA is suspended re-adds the adev but leaves is_suspended set, so a later resume event calls add_adev() on top of a live gd->adev and leaks it. This is currently masked by the rdma_teardown bug. Clear both in mana_rdma_probe(). On the reset path mana_rdma_remove() has closed the gate and drained the service workqueue, so clear is_suspended first and re-open the gate with smp_store_release(), paired with smp_load_acquire() in the handler, so the handler cannot observe an open gate with a stale is_suspended. On the initial probe path the gate was never closed and both flags are already clear. This does not order gd->adev, which add_adev() publishes afterwards. A servicing event arriving in that window is still dropped, as it is in mainline today on the initial probe path; closing it needs probe and the handler to be serialized and is left to a separate change.

Long Li committed 2 months ago

Commit f6d61fe1 parent 1b8e5601 file · +17 −1Browse files

Unified · Split

drivers/net/ethernet/microsoft/mana/mana_en.c+17−1
@@ -3987,7 +3987,8 @@ static void mana_rdma_service_handle(struct work_struct *work) · 3986 unmodified lines
39873987 struct device *dev = gd->gdma_context->dev;
39883988 int ret;
39893989
3990− if (READ_ONCE(gd->rdma_teardown))
3990+ /* Pairs with the smp_store_release() in mana_rdma_probe(). */
3991+ if (smp_load_acquire(&gd->rdma_teardown))
39913992 goto out;
39923993
39933994 switch (serv_work->event) {
@@ -4283,6 +4284,21 @@ int mana_rdma_probe(struct gdma_dev *gd) · 289 unmodified lines
42834284 if (err)
42844285 return err;
42854286
4287+ /* Clear the state left by a previous mana_rdma_remove() so servicing
4288+ * events are handled again after a reset cycle.
4289+ */
4290+ gd->is_suspended = false;
4291+
4292+ /* Publish is_suspended before re-opening the gate, so the handler
4293+ * cannot observe an open gate with a stale is_suspended. Pairs
4294+ * with the smp_load_acquire() in mana_rdma_service_handle(). This
4295+ * matters on the reset path, where mana_rdma_remove() closed the
4296+ * gate and drained the workqueue; on the initial probe path the
4297+ * gate was never closed and both flags are already clear. It does
4298+ * not order gd->adev, which add_adev() publishes below.
4299+ */
4300+ smp_store_release(&gd->rdma_teardown, false);
4301+
42864302 err = add_adev(gd, "rdma");
42874303 if (err)
42884304 mana_gd_deregister_device(gd);