Unverified Commit 6ec15398 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9666 ftrace: Fix rcu warn in ftrace_location() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Yejian <zhengyejian1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FE565TYK5K7MZ5Z3XDQDAY2BFBMRFJ67/ 
 
https://gitee.com/openeuler/kernel/issues/IAA3U5 
 
Link:https://gitee.com/openeuler/kernel/pulls/9666

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 1202ff30 5e66a5bd

kernel/trace/ftrace.c

+8 −2
Original line number Diff line number Diff line
@@ -1581,6 +1581,11 @@ unsigned long ftrace_location_range(unsigned long start, unsigned long end) 
	key.ip = start;

	key.flags = end;	/* overload flags, as it is unsigned long */



	/*

	 * It is in atomic context when called from ftrace_int3_handler(),

	 * in this case rcu lock is not needed.

	 */

	if (!in_atomic())

		rcu_read_lock();

	for (pg = ftrace_pages_start; pg; pg = pg->next) {

		if (pg->index == 0 ||
@@ -1595,6 +1600,7 @@ unsigned long ftrace_location_range(unsigned long start, unsigned long end) 
			break;

		}

	}

	if (!in_atomic())

		rcu_read_unlock();



	return ip;