Unverified Commit 51146cab authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15348 Mainline Patch 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiaomeng Zhang <zhangxiaomeng13@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/2W4KAD5VZSNFXXDNRXDCILVNVKYPMGJD/ 
Hou Tao (1):
  bpf: Use preempt_count() directly in bpf_send_signal_common()

Puranjay Mohan (1):
  bpf: Send signals asynchronously if !preemptible

 
https://gitee.com/src-openeuler/kernel/issues/IBQWD8
https://gitee.com/src-openeuler/kernel/issues/IBOK8S 
 
Link:https://gitee.com/openeuler/kernel/pulls/15348

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 498e3591 7e792d39

kernel/trace/bpf_trace.c

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ static int bpf_send_signal_common(u32 sig, enum pid_type type) 
	if (unlikely(is_global_init(current)))

		return -EPERM;



	if (irqs_disabled()) {

	if (preempt_count() != 0 || irqs_disabled()) {

		/* Do an early check on signal validity. Otherwise,

		 * the error is lost in deferred irq_work.

		 */