| Message ID | 20181111200443.10772-2-paulmck@linux.ibm.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | None | expand |
On 11/11/18 20:04, Paul E. McKenney wrote: > From: Lance Roy <ldr709@gmail.com> > > lockdep_assert_held() is better suited to checking locking requirements, > since it only checks if the current thread holds the lock regardless of > whether someone else does. This is also a step towards possibly removing > spin_is_locked(). > > Signed-off-by: Lance Roy <ldr709@gmail.com> > Cc: Solarflare linux maintainers <linux-net-drivers@solarflare.com> > Cc: Edward Cree <ecree@solarflare.com> > Cc: Bert Kenward <bkenward@solarflare.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: <netdev@vger.kernel.org> > Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com> > --- Acked-by: Edward Cree <ecree@solarflare.com> > drivers/net/ethernet/sfc/efx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c > index 98fe7e762e17..3643015a55cf 100644 > --- a/drivers/net/ethernet/sfc/efx.c > +++ b/drivers/net/ethernet/sfc/efx.c > @@ -3167,7 +3167,7 @@ struct hlist_head *efx_rps_hash_bucket(struct efx_nic *efx, > { > u32 hash = efx_filter_spec_hash(spec); > > - WARN_ON(!spin_is_locked(&efx->rps_hash_lock)); > + lockdep_assert_held(&efx->rps_hash_lock); > if (!efx->rps_hash_table) > return NULL; > return &efx->rps_hash_table[hash % EFX_ARFS_HASH_TABLE_SIZE];
On Mon, Nov 12, 2018 at 01:02:32PM +0000, Edward Cree wrote: > On 11/11/18 20:04, Paul E. McKenney wrote: > > From: Lance Roy <ldr709@gmail.com> > > > > lockdep_assert_held() is better suited to checking locking requirements, > > since it only checks if the current thread holds the lock regardless of > > whether someone else does. This is also a step towards possibly removing > > spin_is_locked(). > > > > Signed-off-by: Lance Roy <ldr709@gmail.com> > > Cc: Solarflare linux maintainers <linux-net-drivers@solarflare.com> > > Cc: Edward Cree <ecree@solarflare.com> > > Cc: Bert Kenward <bkenward@solarflare.com> > > Cc: "David S. Miller" <davem@davemloft.net> > > Cc: <netdev@vger.kernel.org> > > Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com> > > --- > Acked-by: Edward Cree <ecree@solarflare.com> Applied, thank you! Thanx, Paul > > drivers/net/ethernet/sfc/efx.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c > > index 98fe7e762e17..3643015a55cf 100644 > > --- a/drivers/net/ethernet/sfc/efx.c > > +++ b/drivers/net/ethernet/sfc/efx.c > > @@ -3167,7 +3167,7 @@ struct hlist_head *efx_rps_hash_bucket(struct efx_nic *efx, > > { > > u32 hash = efx_filter_spec_hash(spec); > > > > - WARN_ON(!spin_is_locked(&efx->rps_hash_lock)); > > + lockdep_assert_held(&efx->rps_hash_lock); > > if (!efx->rps_hash_table) > > return NULL; > > return &efx->rps_hash_table[hash % EFX_ARFS_HASH_TABLE_SIZE]; > >
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 98fe7e762e17..3643015a55cf 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -3167,7 +3167,7 @@ struct hlist_head *efx_rps_hash_bucket(struct efx_nic *efx, { u32 hash = efx_filter_spec_hash(spec); - WARN_ON(!spin_is_locked(&efx->rps_hash_lock)); + lockdep_assert_held(&efx->rps_hash_lock); if (!efx->rps_hash_table) return NULL; return &efx->rps_hash_table[hash % EFX_ARFS_HASH_TABLE_SIZE];