kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/kernel/trace/trace_event_perf.c
..
..
@@ -299,7 +299,8 @@
299
299
 #endif /* CONFIG_KPROBE_EVENTS */
300
300
 
301
301
 #ifdef CONFIG_UPROBE_EVENTS
302
-int perf_uprobe_init(struct perf_event *p_event, bool is_retprobe)
302
+int perf_uprobe_init(struct perf_event *p_event,
303
+		     unsigned long ref_ctr_offset, bool is_retprobe)
303
304
 {
304
305
 	int ret;
305
306
 	char *path = NULL;
..
..
@@ -319,8 +320,8 @@
319
320
 		goto out;
320
321
 	}
321
322
 
322
-	tp_event = create_local_trace_uprobe(
323
-		path, p_event->attr.probe_offset, is_retprobe);
323
+	tp_event = create_local_trace_uprobe(path, p_event->attr.probe_offset,
324
+					     ref_ctr_offset, is_retprobe);
324
325
 	if (IS_ERR(tp_event)) {
325
326
 		ret = PTR_ERR(tp_event);
326
327
 		goto out;
..
..
@@ -424,8 +425,7 @@
424
425
 	unsigned long flags;
425
426
 
426
427
 	local_save_flags(flags);
427
-	tracing_generic_entry_update(entry, flags, pc);
428
-	entry->type = type;
428
+	tracing_generic_entry_update(entry, type, flags, pc);
429
429
 }
430
430
 NOKPROBE_SYMBOL(perf_trace_buf_update);
431
431