diff options
| author | Dmitry Safonov <[email protected]> | 2024-10-30 04:22:33 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-11-03 20:10:11 +0000 |
| commit | 6b2d11e2d8fc130df4708be0b6b53fd3e6b54cf6 (patch) | |
| tree | b6d8000fc99731fe31738ede8c35a03f0e308c4a /net/ipv4/tcp_ipv4.c | |
| parent | Merge branch 'selftest-netconsole-enhance-selftest-to-validate-userdata-trans... (diff) | |
| download | kernel-6b2d11e2d8fc130df4708be0b6b53fd3e6b54cf6.tar.gz kernel-6b2d11e2d8fc130df4708be0b6b53fd3e6b54cf6.zip | |
net/tcp: Add missing lockdep annotations for TCP-AO hlist traversals
Under CONFIG_PROVE_RCU_LIST + CONFIG_RCU_EXPERT
hlist_for_each_entry_rcu() provides very helpful splats, which help
to find possible issues. I missed CONFIG_RCU_EXPERT=y in my testing
config the same as described in
a3e4bf7f9675 ("configs/debug: make sure PROVE_RCU_LIST=y takes effect").
The fix itself is trivial: add the very same lockdep annotations
as were used to dereference ao_info from the socket.
Reported-by: Jakub Kicinski <[email protected]>
Closes: https://lore.kernel.org/netdev/[email protected]/
Signed-off-by: Dmitry Safonov <[email protected]>
Link: https://patch.msgid.link/20241030-tcp-ao-hlist-lockdep-annotate-v1-1-bf641a64d7c6@gmail.com
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 9d3dd101ea71..a38c8b1f44db 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1053,7 +1053,8 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb) } if (aoh) - key.ao_key = tcp_ao_established_key(ao_info, aoh->rnext_keyid, -1); + key.ao_key = tcp_ao_established_key(sk, ao_info, + aoh->rnext_keyid, -1); } } if (key.ao_key) { |