]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf: Use preempt_count() directly in bpf_send_signal_common()
authorHou Tao <houtao1@huawei.com>
Thu, 20 Feb 2025 04:22:59 +0000 (12:22 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:32:00 +0000 (14:32 +0200)
commiteba7778cf9b977329bec485337aa56599f911ebf
treefb65abda609c4a215ccd3e2f56d786dadb804351
parent948b7898a81a22b97cdb361af2bfc71a5d9a3a7b
bpf: Use preempt_count() directly in bpf_send_signal_common()

[ Upstream commit b4a8b5bba712a711d8ca1f7d04646db63f9c88f5 ]

bpf_send_signal_common() uses preemptible() to check whether or not the
current context is preemptible. If it is preemptible, it will use
irq_work to send the signal asynchronously instead of trying to hold a
spin-lock, because spin-lock is sleepable under PREEMPT_RT.

However, preemptible() depends on CONFIG_PREEMPT_COUNT. When
CONFIG_PREEMPT_COUNT is turned off (e.g., CONFIG_PREEMPT_VOLUNTARY=y),
!preemptible() will be evaluated as 1 and bpf_send_signal_common() will
use irq_work unconditionally.

Fix it by unfolding "!preemptible()" and using "preempt_count() != 0 ||
irqs_disabled()" instead.

Fixes: 87c544108b61 ("bpf: Send signals asynchronously if !preemptible")
Signed-off-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20250220042259.1583319-1-houtao@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/trace/bpf_trace.c