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

Commit 3d521f91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-core-for-linus' of... 

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

Pull perf updates from Ingo Molnar:
 "The tooling changes maintained by Jiri Olsa until Arnaldo is on
  vacation:

  User visible changes:
   - Add -F option for specifying output fields (Namhyung Kim)
   - Propagate exit status of a command line workload for record command
     (Namhyung Kim)
   - Use tid for finding thread (Namhyung Kim)
   - Clarify the output of perf sched map plus small sched command
     fixes (Dongsheng Yang)
   - Wire up perf_regs and unwind support for ARM64 (Jean Pihet)
   - Factor hists statistics counts processing which in turn also fixes
     several bugs in TUI report command (Namhyung Kim)
   - Add --percentage option to control absolute/relative percentage
     output (Namhyung Kim)
   - Add --list-cmds to 'kmem', 'mem', 'lock' and 'sched', for use by
     completion scripts (Ramkumar Ramachandra)

  Development/infrastructure changes and fixes:
   - Android related fixes for pager and map dso resolving (Michael
     Lentine)
   - Add libdw DWARF post unwind support for ARM (Jean Pihet)
   - Consolidate types.h for ARM and ARM64 (Jean Pihet)
   - Fix possible null pointer dereference in session.c (Masanari Iida)
   - Cleanup, remove unused variables in map_switch_event() (Dongsheng
     Yang)
   - Remove nr_state_machine_bugs in perf latency (Dongsheng Yang)
   - Remove usage of trace_sched_wakeup(.success) (Peter Zijlstra)
   - Cleanups for perf.h header (Jiri Olsa)
   - Consolidate types.h and export.h within tools (Borislav Petkov)
   - Move u64_swap union to its single user's header, evsel.h (Borislav
     Petkov)
   - Fix for s390 to properly parse tracepoints plus test code
     (Alexander Yarygin)
   - Handle EINTR error for readn/writen (Namhyung Kim)
   - Add a test case for hists filtering (Namhyung Kim)
   - Share map_groups among threads of the same group (Arnaldo Carvalho
     de Melo, Jiri Olsa)
   - Making some code (cpu node map and report parse callchain callback)
     global to be usable by upcomming changes (Don Zickus)
   - Fix pmu object compilation error (Jiri Olsa)

  Kernel side changes:
   - intrusive uprobes fixes from Oleg Nesterov.  Since the interface is
     admin-only, and the bug only affects user-space ("any probed
     jmp/call can kill the application"), we queued these fixes via the
     development tree, as a special exception.
   - more fuzzer motivated race fixes and related refactoring and
     robustization.
   - allow PMU drivers to be built as modules.  (No actual module yet,
     because the x86 Intel uncore module wasn't ready in time for this)"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (114 commits)
  perf tools: Add automatic remapping of Android libraries
  perf tools: Add cat as fallback pager
  perf tests: Add a testcase for histogram output sorting
  perf tests: Factor out print_hists_*()
  perf tools: Introduce reset_output_field()
  perf tools: Get rid of obsolete hist_entry__sort_list
  perf hists: Reset width of output fields with header length
  perf tools: Skip elided sort entries
  perf top: Add --fields option to specify output fields
  perf report/tui: Fix a bug when --fields/sort is given
  perf tools: Add ->sort() member to struct sort_entry
  perf report: Add -F option to specify output fields
  perf tools: Call perf_hpp__init() before setting up GUI browsers
  perf tools: Consolidate management of default sort orders
  perf tools: Allow hpp fields to be sort keys
  perf ui: Get rid of callback from __hpp__fmt()
  perf tools: Consolidate output field handling to hpp format routines
  perf tools: Use hpp formats to sort final output
  perf tools: Support event grouping in hpp ->sort()
  perf tools: Use hpp formats to sort hist entries
  ...
parents 776edb59 e450f90e

arch/x86/include/asm/uprobes.h

+14 −2
Original line number Diff line number Diff line
@@ -33,15 +33,27 @@ typedef u8 uprobe_opcode_t; 
#define UPROBE_SWBP_INSN		0xcc

#define UPROBE_SWBP_INSN_SIZE		   1



struct uprobe_xol_ops;



struct arch_uprobe {

	u16				fixups;

	union {

		u8			insn[MAX_UINSN_BYTES];

		u8			ixol[MAX_UINSN_BYTES];

	};



	u16				fixups;

	const struct uprobe_xol_ops	*ops;



	union {

#ifdef CONFIG_X86_64

		unsigned long			rip_rela_target_address;

#endif

		struct {

			s32	offs;

			u8	ilen;

			u8	opc1;

		}				branch;

	};

};



struct arch_uprobe_task {

arch/x86/kernel/cpu/perf_event.c

+1 −0
Original line number Diff line number Diff line
@@ -721,6 +721,7 @@ int perf_assign_events(struct perf_event **events, int n, 


	return sched.state.unassigned;

}

EXPORT_SYMBOL_GPL(perf_assign_events);



int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)

{

arch/x86/kernel/cpu/perf_event_intel_ds.c

+19 −3
Original line number Diff line number Diff line
@@ -108,15 +108,31 @@ static u64 precise_store_data(u64 status) 
	return val;

}



static u64 precise_store_data_hsw(u64 status)

static u64 precise_store_data_hsw(struct perf_event *event, u64 status)

{

	union perf_mem_data_src dse;

	u64 cfg = event->hw.config & INTEL_ARCH_EVENT_MASK;



	dse.val = 0;

	dse.mem_op = PERF_MEM_OP_STORE;

	dse.mem_lvl = PERF_MEM_LVL_NA;



	/*

	 * L1 info only valid for following events:

	 *

	 * MEM_UOPS_RETIRED.STLB_MISS_STORES

	 * MEM_UOPS_RETIRED.LOCK_STORES

	 * MEM_UOPS_RETIRED.SPLIT_STORES

	 * MEM_UOPS_RETIRED.ALL_STORES

	 */

	if (cfg != 0x12d0 && cfg != 0x22d0 && cfg != 0x42d0 && cfg != 0x82d0)

		return dse.mem_lvl;



	if (status & 1)

		dse.mem_lvl = PERF_MEM_LVL_L1;

		dse.mem_lvl = PERF_MEM_LVL_L1 | PERF_MEM_LVL_HIT;

	else

		dse.mem_lvl = PERF_MEM_LVL_L1 | PERF_MEM_LVL_MISS;



	/* Nothing else supported. Sorry. */

	return dse.val;

}
@@ -887,7 +903,7 @@ static void __intel_pmu_pebs_event(struct perf_event *event, 
				data.data_src.val = load_latency_data(pebs->dse);

			else if (event->hw.flags & PERF_X86_EVENT_PEBS_ST_HSW)

				data.data_src.val =

					precise_store_data_hsw(pebs->dse);

					precise_store_data_hsw(event, pebs->dse);

			else

				data.data_src.val = precise_store_data(pebs->dse);

		}

arch/x86/kernel/uprobes.c

+349 −202

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/perf_event.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ struct perf_event; 
struct pmu {

	struct list_head		entry;



	struct module			*module;

	struct device			*dev;

	const struct attribute_group	**attr_groups;

	const char			*name;