i40e: move I40E_FLAG_FILTER_SYNC to a state bit

jacob-keller · Jeff Kirsher · commit bfe040c3851a · 2018-03-26T13:09:44.000-07:00
The I40E_FLAG_FILTER_SYNC flag is modified during run time possibly when
the RTNL lock is not held. Thus, it should not be part of pf-&gt;flags, and
instead should be using atomic bit operations in the pf-&gt;state field.

Create a __I40E_MACVLAN_SYNC_PENDING state bit, and use it instead of
the old I40E_FLAG_FILTER_SYNC flag.

This is part of a larger effort to remove the need for cmpxchg64 in
i40e_set_priv_flags().

Signed-off-by: Jacob Keller &lt;jacob.e.keller@intel.com&gt;
Tested-by: Andrew Bowers &lt;andrewx.bowers@intel.com&gt;
Signed-off-by: Jeff Kirsher &lt;jeffrey.t.kirsher@intel.com&gt;
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -162,6 +162,7 @@ enum i40e_state_t {
 	__I40E_RESET_FAILED,
 	__I40E_PORT_SUSPENDED,
 	__I40E_VF_DISABLE,
+	__I40E_MACVLAN_SYNC_PENDING,
 	/* This must be last as it determines the size of the BITMAP */
 	__I40E_STATE_SIZE__,
 };
@@ -516,7 +517,7 @@ struct i40e_pf {
 #define I40E_FLAG_MSIX_ENABLED			BIT_ULL(2)
 #define I40E_FLAG_RSS_ENABLED			BIT_ULL(3)
 #define I40E_FLAG_VMDQ_ENABLED			BIT_ULL(4)
-#define I40E_FLAG_FILTER_SYNC			BIT_ULL(5)
+/* Gap for BIT_ULL(5) */
 #define I40E_FLAG_SRIOV_ENABLED			BIT_ULL(6)
 #define I40E_FLAG_DCB_CAPABLE			BIT_ULL(7)
 #define I40E_FLAG_DCB_ENABLED			BIT_ULL(8)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1382,7 +1382,7 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,
 		hash_add(vsi->mac_filter_hash, &f->hlist, key);
 
 		vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;
-		vsi->back->flags |= I40E_FLAG_FILTER_SYNC;
+		set_bit(__I40E_MACVLAN_SYNC_PENDING, vsi->back->state);
 	}
 
 	/* If we're asked to add a filter that has been marked for removal, it
@@ -1432,7 +1432,7 @@ void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f)
 	}
 
 	vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;
-	vsi->back->flags |= I40E_FLAG_FILTER_SYNC;
+	set_bit(__I40E_MACVLAN_SYNC_PENDING, vsi->state);
 }
 
 /**
@@ -1955,7 +1955,7 @@ static void i40e_set_rx_mode(struct net_device *netdev)
 	/* check for other flag changes */
 	if (vsi->current_netdev_flags != vsi->netdev->flags) {
 		vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;
-		vsi->back->flags |= I40E_FLAG_FILTER_SYNC;
+		set_bit(__I40E_MACVLAN_SYNC_PENDING, vsi->back->state);
 	}
 }
 
@@ -2577,9 +2577,10 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf)
 {
 	int v;
 
-	if (!pf || !(pf->flags & I40E_FLAG_FILTER_SYNC))
+	if (!pf)
+		return;
+	if (!test_and_clear_bit(__I40E_MACVLAN_SYNC_PENDING, pf->state))
 		return;
-	pf->flags &= ~I40E_FLAG_FILTER_SYNC;
 
 	for (v = 0; v < pf->num_alloc_vsi; v++) {
 		if (pf->vsi[v] &&
@@ -2588,7 +2589,8 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf)
 
 			if (ret) {
 				/* come back and try again later */
-				pf->flags |= I40E_FLAG_FILTER_SYNC;
+				set_bit(__I40E_MACVLAN_SYNC_PENDING,
+					pf->state);
 				break;
 			}
 		}
@@ -12240,7 +12242,7 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
 
 	if (f_count) {
 		vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;
-		pf->flags |= I40E_FLAG_FILTER_SYNC;
+		set_bit(__I40E_MACVLAN_SYNC_PENDING, pf->state);
 	}
 
 	/* Update VSI BW information */

Original file line number	Diff line number	Diff line change
`@@ -1382,7 +1382,7 @@ struct i40e_mac_filter i40e_add_filter(struct i40e_vsi vsi,`
`1382`	`1382`	`hash_add(vsi->mac_filter_hash, &f->hlist, key);`
`1383`	`1383`
`1384`	`1384`	`vsi->flags \|= I40E_VSI_FLAG_FILTER_CHANGED;`
`1385`		`- vsi->back->flags \|= I40E_FLAG_FILTER_SYNC;`
	`1385`	`+ set_bit(__I40E_MACVLAN_SYNC_PENDING, vsi->back->state);`
`1386`	`1386`	`}`
`1387`	`1387`
`1388`	`1388`	`/* If we're asked to add a filter that has been marked for removal, it`
`@@ -1432,7 +1432,7 @@ void __i40e_del_filter(struct i40e_vsi vsi, struct i40e_mac_filter f)`
`1432`	`1432`	`}`
`1433`	`1433`
`1434`	`1434`	`vsi->flags \|= I40E_VSI_FLAG_FILTER_CHANGED;`
`1435`		`- vsi->back->flags \|= I40E_FLAG_FILTER_SYNC;`
	`1435`	`+ set_bit(__I40E_MACVLAN_SYNC_PENDING, vsi->state);`
`1436`	`1436`	`}`
`1437`	`1437`
`1438`	`1438`	`/**`
`@@ -1955,7 +1955,7 @@ static void i40e_set_rx_mode(struct net_device *netdev)`
`1955`	`1955`	`/* check for other flag changes */`
`1956`	`1956`	`if (vsi->current_netdev_flags != vsi->netdev->flags) {`
`1957`	`1957`	`vsi->flags \|= I40E_VSI_FLAG_FILTER_CHANGED;`
`1958`		`- vsi->back->flags \|= I40E_FLAG_FILTER_SYNC;`
	`1958`	`+ set_bit(__I40E_MACVLAN_SYNC_PENDING, vsi->back->state);`
`1959`	`1959`	`}`
`1960`	`1960`	`}`
`1961`	`1961`
`@@ -2577,9 +2577,10 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf)`
`2577`	`2577`	`{`
`2578`	`2578`	`int v;`
`2579`	`2579`
`2580`		`- if (!pf \|\| !(pf->flags & I40E_FLAG_FILTER_SYNC))`
	`2580`	`+ if (!pf)`
	`2581`	`+ return;`
	`2582`	`+ if (!test_and_clear_bit(__I40E_MACVLAN_SYNC_PENDING, pf->state))`
`2581`	`2583`	`return;`
`2582`		`- pf->flags &= ~I40E_FLAG_FILTER_SYNC;`
`2583`	`2584`
`2584`	`2585`	`for (v = 0; v < pf->num_alloc_vsi; v++) {`
`2585`	`2586`	`if (pf->vsi[v] &&`
`@@ -2588,7 +2589,8 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf)`
`2588`	`2589`
`2589`	`2590`	`if (ret) {`
`2590`	`2591`	`/* come back and try again later */`
`2591`		`- pf->flags \|= I40E_FLAG_FILTER_SYNC;`
	`2592`	`+ set_bit(__I40E_MACVLAN_SYNC_PENDING,`
	`2593`	`+ pf->state);`
`2592`	`2594`	`break;`
`2593`	`2595`	`}`
`2594`	`2596`	`}`
`@@ -12240,7 +12242,7 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)`
`12240`	`12242`
`12241`	`12243`	`if (f_count) {`
`12242`	`12244`	`vsi->flags \|= I40E_VSI_FLAG_FILTER_CHANGED;`
`12243`		`- pf->flags \|= I40E_FLAG_FILTER_SYNC;`
	`12245`	`+ set_bit(__I40E_MACVLAN_SYNC_PENDING, pf->state);`
`12244`	`12246`	`}`
`12245`	`12247`
`12246`	`12248`	`/* Update VSI BW information */`