Unverified Commit 4b99a7ce authored Sep 04, 2023 by openeuler-ci-bot Committed by Gitee Sep 04, 2023

!1906 tracing: Fix memleak due to race between current_tracer and trace

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

 

Reviewed-by: Xu Kuohai <xukuohai@huawei.com>
Reviewed-by: Liu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents 05340364 52ecd8d3

kernel/trace/trace.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -3246,8 +3246,15 @@ static void s_start(struct seq_file m, loff_t *pos)
		* will point to the same string as current_trace->name.
		*/
		mutex_lock(&trace_types_lock);
		if (unlikely(tr->current_trace && iter->trace->name != tr->current_trace->name))
		if (unlikely(tr->current_trace && iter->trace->name != tr->current_trace->name)) {
		/* Close iter->trace before switching to the new current tracer */
		if (iter->trace->close)
		iter->trace->close(iter);
		iter->trace = tr->current_trace;
		/* Reopen the new current tracer */
		if (iter->trace->open)
		iter->trace->open(iter);
		}
		mutex_unlock(&trace_types_lock);

		#ifdef CONFIG_TRACER_MAX_TRACE

kernel/trace/trace_irqsoff.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,8 @@ static void irqsoff_trace_open(struct trace_iterator *iter)
		{
		if (is_graph(iter->tr))
		graph_trace_open(iter);

		else
		iter->private = NULL;
		}

		static void irqsoff_trace_close(struct trace_iterator *iter)

kernel/trace/trace_sched_wakeup.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -287,6 +287,8 @@ static void wakeup_trace_open(struct trace_iterator *iter)
		{
		if (is_graph(iter->tr))
		graph_trace_open(iter);
		else
		iter->private = NULL;
		}

		static void wakeup_trace_close(struct trace_iterator *iter)