iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i40e: stop using cmpxchg flow in i40e_set_priv_flags()

Browse Source 
Now that the only places which modify flags are either (a) during
initialization prior to creating a netdevice, or (b) while holding the
rtnl lock, we no longer need the cmpxchg64 call in i40e_set_priv_flags.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jacob Keller
2018-03-16 01:26:36 -07:00
committed by Jeff Kirsher
parent f0ee70a042
commit 886ff146a7
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/ethernet/intel/i40e/i40e_ethtool.c
View File

@ -4436,21 +4436,12 @@ flags_complete:
} }
} }
/* Compare and exchange the new flags into place. If we failed, that /* Now that we've checked to ensure that the new flags are valid, load
* is if cmpxchg returns anything but the old value, this means that * them into place. Since we only modify flags either (a) during
* something else has modified the flags variable since we copied it * initialization or (b) while holding the RTNL lock, we don't need
* originally. We'll just punt with an error and log something in the * anything fancy here.
* message buffer.
*
* This is the point of no return for this function. We need to have
* checked any discrepancies or misconfigurations and returned
* EOPNOTSUPP before updating pf->flags here.
*/ */
if (cmpxchg64(&pf->flags, orig_flags, new_flags) != orig_flags) { pf->flags = new_flags;
dev_warn(&pf->pdev->dev,
"Unable to update pf->flags as it was modified by another thread...\n");
return -EAGAIN;
}
/* Process any additional changes needed as a result of flag changes. /* Process any additional changes needed as a result of flag changes.
* The changed_flags value reflects the list of bits that were * The changed_flags value reflects the list of bits that were