| Message ID | 20181003053902.6910-5-ldr709@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | None | expand |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Lance Roy > Sent: Tuesday, October 2, 2018 10:39 PM > To: linux-kernel@vger.kernel.org > Cc: netdev@vger.kernel.org; Lance Roy <ldr709@gmail.com>; intel-wired- > lan@lists.osuosl.org; Paul E. McKenney <paulmck@linux.ibm.com>; David S. > Miller <davem@davemloft.net> > Subject: [Intel-wired-lan] [PATCH 04/16] i40e: Replace spin_is_locked() with > lockdep > > lockdep_assert_held() is better suited to checking locking requirements, > since it won't get confused when someone else holds the lock. This is also a > step towards possibly removing spin_is_locked(). > > Signed-off-by: Lance Roy <ldr709@gmail.com> > Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: intel-wired-lan@lists.osuosl.org > Cc: <netdev@vger.kernel.org> > --- > drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index ac685ad4d877..8ce3471723d3 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -1489,8 +1489,7 @@ int i40e_del_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr) bool found = false; int bkt; - WARN(!spin_is_locked(&vsi->mac_filter_hash_lock), - "Missing mac_filter_hash_lock\n"); + lockdep_assert_held(&vsi->mac_filter_hash_lock); hash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) { if (ether_addr_equal(macaddr, f->macaddr)) { __i40e_del_filter(vsi, f);
lockdep_assert_held() is better suited to checking locking requirements, since it won't get confused when someone else holds the lock. This is also a step towards possibly removing spin_is_locked(). Signed-off-by: Lance Roy <ldr709@gmail.com> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: intel-wired-lan@lists.osuosl.org Cc: <netdev@vger.kernel.org> --- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)