From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 434C226988E; Tue, 8 Apr 2025 12:34:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115675; cv=none; b=uJ0tcGP2wKw539ALWQCjehfcW1Id0DDkxssjt4t+MExsFFQxNYo2WitUDhf+WCioKgvGI3Lbi+Ex8aNVjN9iPGFd/NKVYTq6WJaE9Y4nSF21EQ1NPqOibOGEupgaFkcuHxsAxiT05PVWuseT6EZLkgBoyYv8PbLJU2fLGEuEqDo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115675; c=relaxed/simple; bh=WqWYCvme/Rub5rJrz8rtcMVUNSYUQ8yYwlaMLhx95ts=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qIHa3HoxfljbSPeIj/PnVkaGg0lhJayTpLyxk+iPDKcvgwjOswUmLKsCze9kZg2FuWm4lxQv3JLW+2oN88FZRnWtqjfAoZGWR6KCNKb4Uj3DGxlALl1gPgT3bL8AFjxTWYL8z2goGomvw6hITLNmdbsuxD4Z9+8l8LRPbpIDDnc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=poWbrD0w; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="poWbrD0w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C15C0C4CEEA; Tue, 8 Apr 2025 12:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744115675; bh=WqWYCvme/Rub5rJrz8rtcMVUNSYUQ8yYwlaMLhx95ts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=poWbrD0wlcuktpZpUTOH6HrrKfQv7MT62R06HIT4047IVFI5HPK+iqNwCCA226fnR IaJg1l4Co1YxQO0MO+uCviIiQ2Hly47N8Un9MH4uUl/he0z5jRvr3Ayemzv741nzUr 1gS/2abZl3qL+cz1ecaMhnBRnzQAlTB/Q01pu9eI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hou Tao , Alexei Starovoitov , Sasha Levin Subject: [PATCH 6.1 061/204] bpf: Use preempt_count() directly in bpf_send_signal_common() Date: Tue, 8 Apr 2025 12:49:51 +0200 Message-ID: <20250408104822.145987444@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.266892317@linuxfoundation.org> References: <20250408104820.266892317@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hou Tao [ 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 Link: https://lore.kernel.org/r/20250220042259.1583319-1-houtao@huaweicloud.com Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index af48f66466e81..6b5bb0e380b55 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -857,7 +857,7 @@ static int bpf_send_signal_common(u32 sig, enum pid_type type) if (unlikely(is_global_init(current))) return -EPERM; - if (!preemptible()) { + if (preempt_count() != 0 || irqs_disabled()) { /* Do an early check on signal validity. Otherwise, * the error is lost in deferred irq_work. */ -- 2.39.5