Commit 116b081c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf updates from Ingo Molnar:
 "The main changes in this cycle on the kernel side:

   - rework kprobes blacklist handling (Masami Hiramatsu)

   - misc cleanups

  on the tooling side these areas were the main focus:

   - 'perf trace'     enhancements (Arnaldo Carvalho de Melo)

   - 'perf bench'     enhancements (Davidlohr Bueso)

   - 'perf record'    enhancements (Alexey Budankov)

   - 'perf annotate'  enhancements (Jin Yao)

   - 'perf top'       enhancements (Jiri Olsa)

   - Intel hw tracing enhancements (Adrian Hunter)

   - ARM hw tracing   enhancements (Leo Yan, Mathieu Poirier)

   - ... plus lots of other enhancements, cleanups and fixes"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (171 commits)
  tools uapi asm: Update asm-generic/unistd.h copy
  perf symbols: Relax checks on perf-PID.map ownership
  perf trace: Wire up the fadvise 'advice' table generator
  perf beauty: Add generator for fadvise64's 'advice' arg constants
  tools headers uapi: Grab a copy of fadvise.h
  perf beauty mmap: Print mmap's 'offset' arg in hexadecimal
  perf beauty mmap: Print PROT_READ before PROT_EXEC to match strace output
  perf trace beauty: Beautify arch_prctl()'s arguments
  perf trace: When showing string prefixes show prefix + ??? for unknown entries
  perf trace: Move strarrays to beauty.h for further reuse
  perf beauty: Wire up the x86_arch prctl code table generator
  perf beauty: Add a string table generator for x86's 'arch_prctl' codes
  tools include arch: Grab a copy of x86's prctl.h
  perf trace: Show NULL when syscall pointer args are 0
  perf trace: Enclose the errno strings with ()
  perf augmented_raw_syscalls: Copy 'access' arg as well
  perf trace: Add alignment spaces after the closing parens
  perf trace beauty: Print O_RDONLY when (flags & O_ACCMODE) == 0
  perf trace: Allow asking for not suppressing common string prefixes
  perf trace: Add a prefix member to the strarray class
  ...
parents 1eefdec1 883f4def

arch/x86/kernel/kprobes/core.c

+3 −5
Original line number Diff line number Diff line
@@ -1026,12 +1026,10 @@ int kprobe_fault_handler(struct pt_regs *regs, int trapnr) 
}

NOKPROBE_SYMBOL(kprobe_fault_handler);



bool arch_within_kprobe_blacklist(unsigned long addr)

int __init arch_populate_kprobe_blacklist(void)

{

	return  (addr >= (unsigned long)__kprobes_text_start &&

		 addr < (unsigned long)__kprobes_text_end) ||

		(addr >= (unsigned long)__entry_text_start &&

		 addr < (unsigned long)__entry_text_end);

	return kprobe_add_area_blacklist((unsigned long)__entry_text_start,

					 (unsigned long)__entry_text_end);

}



int __init arch_init_kprobes(void)

include/linux/kprobes.h

+3 −0
Original line number Diff line number Diff line
@@ -242,10 +242,13 @@ extern int arch_init_kprobes(void); 
extern void show_registers(struct pt_regs *regs);

extern void kprobes_inc_nmissed_count(struct kprobe *p);

extern bool arch_within_kprobe_blacklist(unsigned long addr);

extern int arch_populate_kprobe_blacklist(void);

extern bool arch_kprobe_on_func_entry(unsigned long offset);

extern bool kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset);



extern bool within_kprobe_blacklist(unsigned long addr);

extern int kprobe_add_ksym_blacklist(unsigned long entry);

extern int kprobe_add_area_blacklist(unsigned long start, unsigned long end);



struct kprobe_insn_cache {

	struct mutex mutex;

include/linux/perf_event.h

+2 −2
Original line number Diff line number Diff line
@@ -262,8 +262,8 @@ struct pmu { 
	 */

	int				capabilities;



	int * __percpu			pmu_disable_count;

	struct perf_cpu_context * __percpu pmu_cpu_context;

	int __percpu			*pmu_disable_count;

	struct perf_cpu_context __percpu *pmu_cpu_context;

	atomic_t			exclusive_cnt; /* < 0: cpu; > 0: tsk */

	int				task_ctx_nr;

	int				hrtimer_interval_ms;

kernel/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -5541,7 +5541,7 @@ out_put: 


static const struct vm_operations_struct perf_mmap_vmops = {

	.open		= perf_mmap_open,

	.close		= perf_mmap_close, /* non mergable */

	.close		= perf_mmap_close, /* non mergeable */

	.fault		= perf_mmap_fault,

	.page_mkwrite	= perf_mmap_fault,

};

kernel/events/hw_breakpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ __weak void arch_unregister_hw_breakpoint(struct perf_event *bp) 
}



/*

 * Contraints to check before allowing this new breakpoint counter:

 * Constraints to check before allowing this new breakpoint counter:

 *

 *  == Non-pinned counter == (Considered as pinned for now)

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE