IB/hfi1: Check xchg returned value for queuing link down entry

Check xchg returned value for queuing link down entry
to guarantee proper atomic value reads.

Fixes: 626c077c025f ("IB/hfi1: Prevent link down request double queuing")
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index cbda3738698219b37125eabe0981e345ea461a93..bfb50a4e7e5f2d4b41483c07a3a18a289d4bee5a 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -7810,16 +7810,22 @@ static void handle_8051_interrupt(struct hfi1_devdata *dd, u32 unused, u64 reg)
        if (queue_link_down) {
                /*
                 * if the link is already going down or disabled, do not
-                * queue another
+                * queue another. If there's a link down entry already
+                * queued, don't queue another one.
                 */
                if ((ppd->host_link_state &
                    (HLS_GOING_OFFLINE | HLS_LINK_COOLDOWN)) ||
-                   ppd->link_enabled == 0 || ppd->is_link_down_queued) {
-                       dd_dev_info(dd, "%s: not queuing link down\n",
-                                   __func__);
+                   ppd->link_enabled == 0) {
+                       dd_dev_info(dd, "%s: not queuing link down. host_link_state %x, link_enabled %x\n",
+                                   __func__, ppd->host_link_state,
+                                   ppd->link_enabled);
                } else {
-                       xchg(&ppd->is_link_down_queued, 1);
-                       queue_work(ppd->link_wq, &ppd->link_down_work);
+                       if (xchg(&ppd->is_link_down_queued, 1) == 1)
+                               dd_dev_info(dd,
+                                           "%s: link down request already queued\n",
+                                           __func__);
+                       else
+                               queue_work(ppd->link_wq, &ppd->link_down_work);
                }
        }
 }