Re: [PATCH tip/core/rcu 2/7] sfc: Replace spin_is_locked() with lockdep
From: Paul E. McKenney
Date: Mon Nov 12 2018 - 12:07:58 EST
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@xxxxxxxxx>
> >
> > 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@xxxxxxxxx>
> > Cc: Solarflare linux maintainers <linux-net-drivers@xxxxxxxxxxxxxx>
> > Cc: Edward Cree <ecree@xxxxxxxxxxxxxx>
> > Cc: Bert Kenward <bkenward@xxxxxxxxxxxxxx>
> > Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
> > Cc: <netdev@xxxxxxxxxxxxxxx>
> > Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxx>
> > ---
> Acked-by: Edward Cree <ecree@xxxxxxxxxxxxxx>
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];
>
>