Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47b5ece9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fixes from Steven Rostedt:

 - Add workqueue forward declaration (for new work, but a nice clean up)

 - seftest fixes for the new histogram code

 - Print output fix for hwlat tracer

 - Fix missing system call events - due to change in x86 syscall naming

 - Fix kprobe address being used by perf being hashed

* tag 'trace-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix missing tab for hwlat_detector print format
  selftests: ftrace: Add a testcase for multiple actions on trigger
  selftests: ftrace: Fix trigger extended error testcase
  kprobes: Fix random address output of blacklist file
  tracing: Fix kernel crash while using empty filter with perf
  tracing/x86: Update syscall trace events to handle new prefixed syscall func names
  tracing: Add missing forward declaration
parents fe03a759 9a0fd675

arch/x86/include/asm/ftrace.h

+17 −2
Original line number Diff line number Diff line
@@ -46,7 +46,21 @@ int ftrace_int3_handler(struct pt_regs *regs); 
#endif /* CONFIG_FUNCTION_TRACER */





#if !defined(__ASSEMBLY__) && !defined(COMPILE_OFFSETS)

#ifndef __ASSEMBLY__



#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME

static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)

{

	/*

	 * Compare the symbol name with the system call name. Skip the

	 * "__x64_sys", "__ia32_sys" or simple "sys" prefix.

	 */

	return !strcmp(sym + 3, name + 3) ||

		(!strncmp(sym, "__x64_", 6) && !strcmp(sym + 9, name + 3)) ||

		(!strncmp(sym, "__ia32_", 7) && !strcmp(sym + 10, name + 3));

}



#ifndef COMPILE_OFFSETS



#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_IA32_EMULATION)

#include <asm/compat.h>
@@ -67,6 +81,7 @@ static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs) 
	return false;

}

#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_IA32_EMULATION */

#endif /* !__ASSEMBLY__  && !COMPILE_OFFSETS */

#endif /* !COMPILE_OFFSETS */

#endif /* !__ASSEMBLY__ */



#endif /* _ASM_X86_FTRACE_H */

include/trace/events/workqueue.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ DECLARE_EVENT_CLASS(workqueue_work, 
	TP_printk("work struct %p", __entry->work)

);



struct pool_workqueue;



/**

 * workqueue_queue_work - called when a work gets queued

 * @req_cpu:	the requested cpu

kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -2428,7 +2428,7 @@ static int kprobe_blacklist_seq_show(struct seq_file *m, void *v) 
	struct kprobe_blacklist_entry *ent =

		list_entry(v, struct kprobe_blacklist_entry, list);



	seq_printf(m, "0x%p-0x%p\t%ps\n", (void *)ent->start_addr,

	seq_printf(m, "0x%px-0x%px\t%ps\n", (void *)ent->start_addr,

		   (void *)ent->end_addr, (void *)ent->start_addr);

	return 0;

}

kernel/trace/trace_entries.h

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ FTRACE_ENTRY(hwlat, hwlat_entry, 
		__field(	unsigned int,		seqnum		)

	),



	F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llunmi-ts:%llu\tnmi-count:%u\n",

	F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llu\tnmi-ts:%llu\tnmi-count:%u\n",

		 __entry->seqnum,

		 __entry->tv_sec,

		 __entry->tv_nsec,

kernel/trace/trace_events_filter.c

+7 −7
Original line number Diff line number Diff line
@@ -1499,14 +1499,14 @@ static int process_preds(struct trace_event_call *call, 
		return ret;

	}



	if (!nr_preds) {

		prog = NULL;

	} else {

	if (!nr_preds)

		return -EINVAL;



	prog = predicate_parse(filter_string, nr_parens, nr_preds,

			       parse_pred, call, pe);

	if (IS_ERR(prog))

		return PTR_ERR(prog);

	}



	rcu_assign_pointer(filter->prog, prog);

	return 0;

}