i40evf: Reorder configure_clsflower to avoid deadlock on error

While doing some code review I noticed that we can get into a state where
we exit with the "IN_CRITICAL_TASK" bit set while notifying the PF of
flower filters. This patch is meant to address that plus tweak the ordering
of the while loop waiting on it slightly so that we don't wait an extra
period after we have failed for the last time.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 486cf491b000f7a5d5f91f77c1553836bd780739..7e7cd80abaf44b17a8a44fd0d88988a20bf6e798 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2791,14 +2791,7 @@ static int i40evf_configure_clsflower(struct i40evf_adapter *adapter,
 {
        int tc = tc_classid_to_hwtc(adapter->netdev, cls_flower->classid);
        struct i40evf_cloud_filter *filter = NULL;
-       int err = 0, count = 50;
-
-       while (test_and_set_bit(__I40EVF_IN_CRITICAL_TASK,
-                               &adapter->crit_section)) {
-               udelay(1);
-               if (--count == 0)
-                       return -EINVAL;
-       }
+       int err = -EINVAL, count = 50;
 
        if (tc < 0) {
                dev_err(&adapter->pdev->dev, "Invalid traffic class\n");
@@ -2806,10 +2799,16 @@ static int i40evf_configure_clsflower(struct i40evf_adapter *adapter,
        }
 
        filter = kzalloc(sizeof(*filter), GFP_KERNEL);
-       if (!filter) {
-               err = -ENOMEM;
-               goto clearout;
+       if (!filter)
+               return -ENOMEM;
+
+       while (test_and_set_bit(__I40EVF_IN_CRITICAL_TASK,
+                               &adapter->crit_section)) {
+               if (--count == 0)
+                       goto err;
+               udelay(1);
        }
+
        filter->cookie = cls_flower->cookie;
 
        /* set the mask to all zeroes to begin with */
@@ -2834,7 +2833,7 @@ static int i40evf_configure_clsflower(struct i40evf_adapter *adapter,
 err:
        if (err)
                kfree(filter);
-clearout:
+
        clear_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section);
        return err;
 }