Commit f2edaaaa authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher

i40e/i40evf: Fix handling of boolean logic in polling routines

In the polling routines for i40e and i40evf we were using bitwise operators
to avoid the side effects of the logical operators, specifically the fact
that if the first case is true with "||" we skip the second case, or if it
is false with "&&" we skip the second case.  This fixes an earlier patch
that converted the bitwise operators over to the logical operators and
instead replaces the entire thing with just an if statement since it should
be more readable what we are trying to do this way.

Fixes: 1a36d7fa ("i40e/i40evf: use logical operators, not bitwise")
Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 311f23e9
...@@ -1975,9 +1975,11 @@ int i40e_napi_poll(struct napi_struct *napi, int budget) ...@@ -1975,9 +1975,11 @@ int i40e_napi_poll(struct napi_struct *napi, int budget)
* budget and be more aggressive about cleaning up the Tx descriptors. * budget and be more aggressive about cleaning up the Tx descriptors.
*/ */
i40e_for_each_ring(ring, q_vector->tx) { i40e_for_each_ring(ring, q_vector->tx) {
clean_complete = clean_complete && if (!i40e_clean_tx_irq(ring, vsi->work_limit)) {
i40e_clean_tx_irq(ring, vsi->work_limit); clean_complete = false;
arm_wb = arm_wb || ring->arm_wb; continue;
}
arm_wb |= ring->arm_wb;
ring->arm_wb = false; ring->arm_wb = false;
} }
...@@ -1999,8 +2001,9 @@ int i40e_napi_poll(struct napi_struct *napi, int budget) ...@@ -1999,8 +2001,9 @@ int i40e_napi_poll(struct napi_struct *napi, int budget)
cleaned = i40e_clean_rx_irq_1buf(ring, budget_per_ring); cleaned = i40e_clean_rx_irq_1buf(ring, budget_per_ring);
work_done += cleaned; work_done += cleaned;
/* if we didn't clean as many as budgeted, we must be done */ /* if we clean as many as budgeted, we must not be done */
clean_complete = clean_complete && (budget_per_ring > cleaned); if (cleaned >= budget_per_ring)
clean_complete = false;
} }
/* If work not completed, return budget and polling will return */ /* If work not completed, return budget and polling will return */
......
...@@ -1411,9 +1411,11 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) ...@@ -1411,9 +1411,11 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget)
* budget and be more aggressive about cleaning up the Tx descriptors. * budget and be more aggressive about cleaning up the Tx descriptors.
*/ */
i40e_for_each_ring(ring, q_vector->tx) { i40e_for_each_ring(ring, q_vector->tx) {
clean_complete = clean_complete && if (!i40e_clean_tx_irq(ring, vsi->work_limit)) {
i40e_clean_tx_irq(ring, vsi->work_limit); clean_complete = false;
arm_wb = arm_wb || ring->arm_wb; continue;
}
arm_wb |= ring->arm_wb;
ring->arm_wb = false; ring->arm_wb = false;
} }
...@@ -1435,8 +1437,9 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) ...@@ -1435,8 +1437,9 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget)
cleaned = i40e_clean_rx_irq_1buf(ring, budget_per_ring); cleaned = i40e_clean_rx_irq_1buf(ring, budget_per_ring);
work_done += cleaned; work_done += cleaned;
/* if we didn't clean as many as budgeted, we must be done */ /* if we clean as many as budgeted, we must not be done */
clean_complete = clean_complete && (budget_per_ring > cleaned); if (cleaned >= budget_per_ring)
clean_complete = false;
} }
/* If work not completed, return budget and polling will return */ /* If work not completed, return budget and polling will return */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment