Unverified Commit 33a5644b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12088 tracing: Have tracing_max_latency inc the trace array ref count 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Zhongjin <chenzhongjin@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IUJTJID3F5UACKTZYHX6ST3XGXZD2JIR/ 
 
https://gitee.com/src-openeuler/kernel/issues/IATD5H 
 
Link:https://gitee.com/openeuler/kernel/pulls/12088

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 3c54de9b a9cdc0ea

kernel/trace/trace.c

+10 −5
Original line number Diff line number Diff line
@@ -1718,7 +1718,7 @@ static void trace_create_maxlat_file(struct trace_array *tr, 
	init_irq_work(&tr->fsnotify_irqwork, latency_fsnotify_workfn_irq);

	tr->d_max_latency = trace_create_file("tracing_max_latency",

					      TRACE_MODE_WRITE,

					      d_tracer, &tr->max_latency,

					      d_tracer, tr,

					      &tracing_max_lat_fops);

}
@@ -1752,7 +1752,7 @@ void latency_fsnotify(struct trace_array *tr) 


#define trace_create_maxlat_file(tr, d_tracer)				\

	trace_create_file("tracing_max_latency", TRACE_MODE_WRITE, \

				d_tracer, &tr->max_latency, &tracing_max_lat_fops)

			  d_tracer, tr, &tracing_max_lat_fops)



#else

#define trace_create_maxlat_file(tr, d_tracer)	 do { } while (0)
@@ -6227,14 +6227,18 @@ static ssize_t 
tracing_max_lat_read(struct file *filp, char __user *ubuf,

		     size_t cnt, loff_t *ppos)

{

	return tracing_nsecs_read(filp->private_data, ubuf, cnt, ppos);

	struct trace_array *tr = filp->private_data;



	return tracing_nsecs_read(&tr->max_latency, ubuf, cnt, ppos);

}



static ssize_t

tracing_max_lat_write(struct file *filp, const char __user *ubuf,

		      size_t cnt, loff_t *ppos)

{

	return tracing_nsecs_write(filp->private_data, ubuf, cnt, ppos);

	struct trace_array *tr = filp->private_data;



	return tracing_nsecs_write(&tr->max_latency, ubuf, cnt, ppos);

}



#endif
@@ -7264,10 +7268,11 @@ static const struct file_operations tracing_thresh_fops = { 


#if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)

static const struct file_operations tracing_max_lat_fops = {

	.open		= tracing_open_generic,

	.open		= tracing_open_generic_tr,

	.read		= tracing_max_lat_read,

	.write		= tracing_max_lat_write,

	.llseek		= generic_file_llseek,

	.release	= tracing_release_generic_tr,

};

#endif