From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Lance Roy <ldr709@gmail.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 01/12] igbvf: Replace spin_is_locked() with lockdep
Date: Wed, 7 Nov 2018 14:48:19 -0800 [thread overview]
Message-ID: <20181107224830.9737-2-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20181107224830.9737-1-jeffrey.t.kirsher@intel.com>
From: Lance Roy <ldr709@gmail.com>
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>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igbvf/mbx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c
index 163e5838f7c2..a3cd7ac48d4b 100644
--- a/drivers/net/ethernet/intel/igbvf/mbx.c
+++ b/drivers/net/ethernet/intel/igbvf/mbx.c
@@ -241,7 +241,7 @@ static s32 e1000_write_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size)
s32 err;
u16 i;
- WARN_ON_ONCE(!spin_is_locked(&hw->mbx_lock));
+ lockdep_assert_held(&hw->mbx_lock);
/* lock the mailbox to prevent pf/vf race condition */
err = e1000_obtain_mbx_lock_vf(hw);
@@ -279,7 +279,7 @@ static s32 e1000_read_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size)
s32 err;
u16 i;
- WARN_ON_ONCE(!spin_is_locked(&hw->mbx_lock));
+ lockdep_assert_held(&hw->mbx_lock);
/* lock the mailbox to prevent pf/vf race condition */
err = e1000_obtain_mbx_lock_vf(hw);
--
2.19.1
next prev parent reply other threads:[~2018-11-08 8:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-07 22:48 [net-next 00/12][pull request] Intel Wired LAN Driver Updates 2018-11-07 Jeff Kirsher
2018-11-07 22:48 ` Jeff Kirsher [this message]
2018-11-07 22:48 ` [net-next 02/12] ixgbe: don't clear_bit on xdp_ring->state if xdp_ring is null Jeff Kirsher
2018-11-07 22:48 ` [net-next 03/12] ixgbe: allow IPsec Tx offload in VEPA mode Jeff Kirsher
2018-11-07 22:48 ` [net-next 04/12] ixgbevf: add support for software timestamps Jeff Kirsher
2018-11-07 22:48 ` [net-next 05/12] intel-ethernet: software timestamp skbs as late as possible Jeff Kirsher
2018-11-07 22:48 ` [net-next 06/12] i40e/ixgbe/igb: fail on new WoL flag setting WAKE_MAGICSECURE Jeff Kirsher
2018-11-08 6:05 ` Kevin Easton
2018-11-08 6:42 ` Michal Kubecek
2018-11-08 21:53 ` Jeff Kirsher
2018-11-07 22:48 ` [net-next 07/12] igc: Remove set but not used variables 'ctrl_ext, link_mode' Jeff Kirsher
2018-11-07 22:48 ` [net-next 08/12] igc: Remove set but not used variable 'pci_using_dac' Jeff Kirsher
2018-11-07 22:48 ` [net-next 09/12] igc: fix error return handling from call to netif_set_real_num_tx_queues Jeff Kirsher
2018-11-07 22:48 ` [net-next 10/12] igc: Tidy up some white space Jeff Kirsher
2018-11-07 22:48 ` [net-next 11/12] e1000e: allow non-monotonic SYSTIM readings Jeff Kirsher
2018-11-07 22:48 ` [net-next 12/12] igc: Clean up code Jeff Kirsher
2018-11-08 11:00 ` Joe Perches
2018-11-08 12:09 ` Neftin, Sasha
2018-11-08 7:07 ` [net-next 00/12][pull request] Intel Wired LAN Driver Updates 2018-11-07 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181107224830.9737-2-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=ldr709@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).