diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2020-11-17 19:43:49 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-20 10:00:54 -0800 |
| commit | 12f4bd86225e348ef3a3c8d2bb42dc23ee0f0a4c (patch) | |
| tree | 28f300cb67bffa2a9d8dae9d3b391c7e9002aba0 /net | |
| parent | c3bc2adb051b27ad1d7fcef6ff80673915c43b0d (diff) | |
| download | linux-12f4bd86225e348ef3a3c8d2bb42dc23ee0f0a4c.tar.gz linux-12f4bd86225e348ef3a3c8d2bb42dc23ee0f0a4c.tar.bz2 linux-12f4bd86225e348ef3a3c8d2bb42dc23ee0f0a4c.zip | |
net: add annotation for sock_{lock,unlock}_fast
The static checker is fooled by the non-static locking scheme
implemented by the mentioned helpers.
Let's make its life easier adding some unconditional annotation
so that the helpers are now interpreted as a plain spinlock from
sparse.
v1 -> v2:
- add __releases() annotation to unlock_sock_fast()
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/6ed7ae627d8271fb7f20e0a9c6750fbba1ac2635.1605634911.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 727ea1cc633c..9badbe7bb4e4 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3078,7 +3078,7 @@ EXPORT_SYMBOL(release_sock); * * sk_lock.slock unlocked, owned = 1, BH enabled */ -bool lock_sock_fast(struct sock *sk) +bool lock_sock_fast(struct sock *sk) __acquires(&sk->sk_lock.slock) { might_sleep(); spin_lock_bh(&sk->sk_lock.slock); @@ -3096,6 +3096,7 @@ bool lock_sock_fast(struct sock *sk) * The sk_lock has mutex_lock() semantics here: */ mutex_acquire(&sk->sk_lock.dep_map, 0, 0, _RET_IP_); + __acquire(&sk->sk_lock.slock); local_bh_enable(); return true; } |