]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ionic: drain the work queue
authorShannon Nelson <snelson@pensando.io>
Thu, 1 Oct 2020 16:22:40 +0000 (09:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Oct 2020 23:30:01 +0000 (16:30 -0700)
Check through our work list for additional items.  This normally
will only have one item, but occasionally may have another
job waiting.  There really is no need reschedule ourself here.

Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/pensando/ionic/ionic_lif.c

index 969979b31e93ff975c45f949ed2d36a4649f75cf..53ac0e4402e733d8d21a6138e4656d713d2d16d1 100644 (file)
@@ -62,15 +62,18 @@ static void ionic_lif_deferred_work(struct work_struct *work)
        struct ionic_deferred *def = &lif->deferred;
        struct ionic_deferred_work *w = NULL;
 
-       spin_lock_bh(&def->lock);
-       if (!list_empty(&def->list)) {
-               w = list_first_entry(&def->list,
-                                    struct ionic_deferred_work, list);
-               list_del(&w->list);
-       }
-       spin_unlock_bh(&def->lock);
+       do {
+               spin_lock_bh(&def->lock);
+               if (!list_empty(&def->list)) {
+                       w = list_first_entry(&def->list,
+                                            struct ionic_deferred_work, list);
+                       list_del(&w->list);
+               }
+               spin_unlock_bh(&def->lock);
+
+               if (!w)
+                       break;
 
-       if (w) {
                switch (w->type) {
                case IONIC_DW_TYPE_RX_MODE:
                        ionic_lif_rx_mode(lif, w->rx_mode);
@@ -94,8 +97,8 @@ static void ionic_lif_deferred_work(struct work_struct *work)
                        break;
                }
                kfree(w);
-               schedule_work(&def->work);
-       }
+               w = NULL;
+       } while (true);
 }
 
 void ionic_lif_deferred_enqueue(struct ionic_deferred *def,