Skip to content

Commit 6d96801

Browse files
0x7f454c46NipaLocal
authored and
NipaLocal
committed
net/tcp: Disable TCP-AO static key after RCU grace period
The lifetime of TCP-AO static_key is the same as the last tcp_ao_info. On the socket destruction tcp_ao_info ceases to be with RCU grace period, while tcp-ao static branch is currently deferred destructed. The static key definition is : DEFINE_STATIC_KEY_DEFERRED_FALSE(tcp_ao_needed, HZ); which means that if RCU grace period is delayed by more than a second and tcp_ao_needed is in the process of disablement, other CPUs may yet see tcp_ao_info which atent dead, but soon-to-be. And that breaks the assumption of static_key_fast_inc_not_disabled(). Happened on netdev test-bot[1], so not a theoretical issue: [] jump_label: Fatal kernel bug, unexpected op at tcp_inbound_hash+0x1a7/0x870 [ffffffffa8c4e9b7] (eb 50 0f 1f 44 != 66 90 0f 1f 00)) size:2 type:1 [] ------------[ cut here ]------------ [] kernel BUG at arch/x86/kernel/jump_label.c:73! [] Oops: invalid opcode: 0000 [#1] PREEMPT SMP KASAN NOPTI [] CPU: 3 PID: 243 Comm: kworker/3:3 Not tainted 6.10.0-virtme #1 [] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 [] Workqueue: events jump_label_update_timeout [] RIP: 0010:__jump_label_patch+0x2f6/0x350 ... [] Call Trace: [] <TASK> [] arch_jump_label_transform_queue+0x6c/0x110 [] __jump_label_update+0xef/0x350 [] __static_key_slow_dec_cpuslocked.part.0+0x3c/0x60 [] jump_label_update_timeout+0x2c/0x40 [] process_one_work+0xe3b/0x1670 [] worker_thread+0x587/0xce0 [] kthread+0x28a/0x350 [] ret_from_fork+0x31/0x70 [] ret_from_fork_asm+0x1a/0x30 [] </TASK> [] Modules linked in: veth [] ---[ end trace 0000000000000000 ]--- [] RIP: 0010:__jump_label_patch+0x2f6/0x350 [1]: https://netdev-3.bots.linux.dev/vmksft-tcp-ao-dbg/results/696681/5-connect-deny-ipv6/stderr Cc: stable@kernel.org Fixes: 67fa83f ("net/tcp: Add static_key for TCP-AO") Signed-off-by: Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by: NipaLocal <nipa@local>
1 parent 962787b commit 6d96801

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

net/ipv4/tcp_ao.c

+9-3
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,14 @@ static void tcp_ao_key_free_rcu(struct rcu_head *head)
267267
kfree_sensitive(key);
268268
}
269269

270+
static void tcp_ao_info_free_rcu(struct rcu_head *head)
271+
{
272+
struct tcp_ao_info *ao = container_of(head, struct tcp_ao_info, rcu);
273+
274+
kfree(ao);
275+
static_branch_slow_dec_deferred(&tcp_ao_needed);
276+
}
277+
270278
void tcp_ao_destroy_sock(struct sock *sk, bool twsk)
271279
{
272280
struct tcp_ao_info *ao;
@@ -290,9 +298,7 @@ void tcp_ao_destroy_sock(struct sock *sk, bool twsk)
290298
atomic_sub(tcp_ao_sizeof_key(key), &sk->sk_omem_alloc);
291299
call_rcu(&key->rcu, tcp_ao_key_free_rcu);
292300
}
293-
294-
kfree_rcu(ao, rcu);
295-
static_branch_slow_dec_deferred(&tcp_ao_needed);
301+
call_rcu(&ao->rcu, tcp_ao_info_free_rcu);
296302
}
297303

298304
void tcp_ao_time_wait(struct tcp_timewait_sock *tcptw, struct tcp_sock *tp)

0 commit comments

Comments
 (0)