Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/ipv4: Use nested-BH locking for ipv4_tcp_sk.

ipv4_tcp_sk is a per-CPU variable and relies on disabled BH for its
locking. Without per-CPU locking in local_bh_disable() on PREEMPT_RT
this data structure requires explicit locking.

Make a struct with a sock member (original ipv4_tcp_sk) and a
local_lock_t and use local_lock_nested_bh() for locking. This change
adds only lockdep coverage and does not alter the functional behaviour
for !PREEMPT_RT.

Cc: David Ahern <dsahern@kernel.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://patch.msgid.link/20240620132727.660738-7-bigeasy@linutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Sebastian Andrzej Siewior and committed by
Jakub Kicinski
ebad6d03 585aa621

+16 -4
+5
include/net/sock.h
··· 544 544 netns_tracker ns_tracker; 545 545 }; 546 546 547 + struct sock_bh_locked { 548 + struct sock *sock; 549 + local_lock_t bh_lock; 550 + }; 551 + 547 552 enum sk_pacing { 548 553 SK_PACING_NONE = 0, 549 554 SK_PACING_NEEDED = 1,
+11 -4
net/ipv4/tcp_ipv4.c
··· 93 93 struct inet_hashinfo tcp_hashinfo; 94 94 EXPORT_SYMBOL(tcp_hashinfo); 95 95 96 - static DEFINE_PER_CPU(struct sock *, ipv4_tcp_sk); 96 + static DEFINE_PER_CPU(struct sock_bh_locked, ipv4_tcp_sk) = { 97 + .bh_lock = INIT_LOCAL_LOCK(bh_lock), 98 + }; 97 99 98 100 static u32 tcp_v4_init_seq(const struct sk_buff *skb) 99 101 { ··· 884 882 arg.tos = ip_hdr(skb)->tos; 885 883 arg.uid = sock_net_uid(net, sk && sk_fullsock(sk) ? sk : NULL); 886 884 local_bh_disable(); 887 - ctl_sk = this_cpu_read(ipv4_tcp_sk); 885 + local_lock_nested_bh(&ipv4_tcp_sk.bh_lock); 886 + ctl_sk = this_cpu_read(ipv4_tcp_sk.sock); 887 + 888 888 sock_net_set(ctl_sk, net); 889 889 if (sk) { 890 890 ctl_sk->sk_mark = (sk->sk_state == TCP_TIME_WAIT) ? ··· 911 907 sock_net_set(ctl_sk, &init_net); 912 908 __TCP_INC_STATS(net, TCP_MIB_OUTSEGS); 913 909 __TCP_INC_STATS(net, TCP_MIB_OUTRSTS); 910 + local_unlock_nested_bh(&ipv4_tcp_sk.bh_lock); 914 911 local_bh_enable(); 915 912 916 913 #ifdef CONFIG_TCP_MD5SIG ··· 1007 1002 arg.tos = tos; 1008 1003 arg.uid = sock_net_uid(net, sk_fullsock(sk) ? sk : NULL); 1009 1004 local_bh_disable(); 1010 - ctl_sk = this_cpu_read(ipv4_tcp_sk); 1005 + local_lock_nested_bh(&ipv4_tcp_sk.bh_lock); 1006 + ctl_sk = this_cpu_read(ipv4_tcp_sk.sock); 1011 1007 sock_net_set(ctl_sk, net); 1012 1008 ctl_sk->sk_mark = (sk->sk_state == TCP_TIME_WAIT) ? 1013 1009 inet_twsk(sk)->tw_mark : READ_ONCE(sk->sk_mark); ··· 1023 1017 1024 1018 sock_net_set(ctl_sk, &init_net); 1025 1019 __TCP_INC_STATS(net, TCP_MIB_OUTSEGS); 1020 + local_unlock_nested_bh(&ipv4_tcp_sk.bh_lock); 1026 1021 local_bh_enable(); 1027 1022 } 1028 1023 ··· 3622 3615 3623 3616 sk->sk_clockid = CLOCK_MONOTONIC; 3624 3617 3625 - per_cpu(ipv4_tcp_sk, cpu) = sk; 3618 + per_cpu(ipv4_tcp_sk.sock, cpu) = sk; 3626 3619 } 3627 3620 if (register_pernet_subsys(&tcp_sk_ops)) 3628 3621 panic("Failed to create the TCP control socket.\n");