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

Commit 69766c40 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-20160809' of... 

Merge tag 'perf-urgent-for-mingo-20160809' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

User visible fixes:

- Fix the lookup for a kernel module in 'perf probe', fixing for instance, the
  erroneous return of "[raid10]" when looking for "[raid1]"  (Konstantin Khlebnikov)

- Disable counters in a group before reading them in 'perf stat', to avoid skew (Mark Rutland)

- Fix adding probes to function aliases in systems using kaslr (Masami Hiramatsu)

- Trip libtraceevent trace_seq buffers, removing unnecessary memory usage that could
  bring a system using tracepoint events with 'perf top' to a crawl, as the trace_seq
  buffers start at a whooping 4 KB, which is very rarely used in perf's usecases,
  so realloc it to the really used space as a last measure after using libtraceevent
  functions to format the fields of tracepoint events (Arnaldo Carvalho de Melo)

- Fix 'perf probe' location when using DWARF on ppc64le (Ravi Bangoria)

- Allow specifying signedness casts to a 'perf probe' variable, to shorten
  the number of steps to see signed values that otherwise would always appear
  as hex values (Naohiro Aota)

Documentation fixes:

- Add 'bpf-output' field to 'perf script' usage message (Brendan Gregg)

Infrastructure fixes:

- Sync kernel header files: cpufeatures.h, {disabled,required}-features.h,
  bpf.h and vmx.h, so that we get a clean build, without warnings about files
  being different from the kernel counterparts.

  A verification of the need or desirability of changes in tools/ based on what
  was done in the kernel changesets was made and documented in the respective
  file sync changesets (Arnaldo Carvalho de Melo)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 81abf252 99e608b5

tools/arch/x86/include/asm/cpufeatures.h

+3 −6
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ 
#define X86_FEATURE_RDSEED	( 9*32+18) /* The RDSEED instruction */

#define X86_FEATURE_ADX		( 9*32+19) /* The ADCX and ADOX instructions */

#define X86_FEATURE_SMAP	( 9*32+20) /* Supervisor Mode Access Prevention */

#define X86_FEATURE_PCOMMIT	( 9*32+22) /* PCOMMIT instruction */

#define X86_FEATURE_CLFLUSHOPT	( 9*32+23) /* CLFLUSHOPT instruction */

#define X86_FEATURE_CLWB	( 9*32+24) /* CLWB instruction */

#define X86_FEATURE_AVX512PF	( 9*32+26) /* AVX-512 Prefetch */
@@ -301,10 +300,6 @@ 
#define X86_BUG_FXSAVE_LEAK	X86_BUG(6) /* FXSAVE leaks FOP/FIP/FOP */

#define X86_BUG_CLFLUSH_MONITOR	X86_BUG(7) /* AAI65, CLFLUSH required before MONITOR */

#define X86_BUG_SYSRET_SS_ATTRS	X86_BUG(8) /* SYSRET doesn't fix up SS attrs */

#define X86_BUG_NULL_SEG	X86_BUG(9) /* Nulling a selector preserves the base */

#define X86_BUG_SWAPGS_FENCE	X86_BUG(10) /* SWAPGS without input dep on GS */





#ifdef CONFIG_X86_32

/*

 * 64-bit kernels don't use X86_BUG_ESPFIX.  Make the define conditional
@@ -312,5 +307,7 @@ 
 */

#define X86_BUG_ESPFIX		X86_BUG(9) /* "" IRET to 16-bit SS corrupts ESP/RSP high bits */

#endif



#define X86_BUG_NULL_SEG	X86_BUG(10) /* Nulling a selector preserves the base */

#define X86_BUG_SWAPGS_FENCE	X86_BUG(11) /* SWAPGS without input dep on GS */

#define X86_BUG_MONITOR		X86_BUG(12) /* IPI required to wake up remote CPU */

#endif /* _ASM_X86_CPUFEATURES_H */

tools/arch/x86/include/asm/disabled-features.h

+2 −0
Original line number Diff line number Diff line
@@ -56,5 +56,7 @@ 
#define DISABLED_MASK14	0

#define DISABLED_MASK15	0

#define DISABLED_MASK16	(DISABLE_PKU|DISABLE_OSPKE)

#define DISABLED_MASK17	0

#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)



#endif /* _ASM_X86_DISABLED_FEATURES_H */

tools/arch/x86/include/asm/required-features.h

+2 −0
Original line number Diff line number Diff line
@@ -99,5 +99,7 @@ 
#define REQUIRED_MASK14	0

#define REQUIRED_MASK15	0

#define REQUIRED_MASK16	0

#define REQUIRED_MASK17	0

#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)



#endif /* _ASM_X86_REQUIRED_FEATURES_H */

tools/arch/x86/include/uapi/asm/vmx.h

+1 −3
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ 
#define EXIT_REASON_PML_FULL            62

#define EXIT_REASON_XSAVES              63

#define EXIT_REASON_XRSTORS             64

#define EXIT_REASON_PCOMMIT             65



#define VMX_EXIT_REASONS \

	{ EXIT_REASON_EXCEPTION_NMI,         "EXCEPTION_NMI" }, \
@@ -127,8 +126,7 @@ 
	{ EXIT_REASON_INVVPID,               "INVVPID" }, \

	{ EXIT_REASON_INVPCID,               "INVPCID" }, \

	{ EXIT_REASON_XSAVES,                "XSAVES" }, \

	{ EXIT_REASON_XRSTORS,               "XRSTORS" }, \

	{ EXIT_REASON_PCOMMIT,               "PCOMMIT" }

	{ EXIT_REASON_XRSTORS,               "XRSTORS" }



#define VMX_ABORT_SAVE_GUEST_MSR_FAIL        1

#define VMX_ABORT_LOAD_HOST_MSR_FAIL         4

tools/include/uapi/linux/bpf.h

+85 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ enum bpf_map_type { 
	BPF_MAP_TYPE_PERCPU_HASH,

	BPF_MAP_TYPE_PERCPU_ARRAY,

	BPF_MAP_TYPE_STACK_TRACE,

	BPF_MAP_TYPE_CGROUP_ARRAY,

};



enum bpf_prog_type {
@@ -93,6 +94,7 @@ enum bpf_prog_type { 
	BPF_PROG_TYPE_SCHED_CLS,

	BPF_PROG_TYPE_SCHED_ACT,

	BPF_PROG_TYPE_TRACEPOINT,

	BPF_PROG_TYPE_XDP,

};



#define BPF_PSEUDO_MAP_FD	1
@@ -313,6 +315,66 @@ enum bpf_func_id { 
	 */

	BPF_FUNC_skb_get_tunnel_opt,

	BPF_FUNC_skb_set_tunnel_opt,



	/**

	 * bpf_skb_change_proto(skb, proto, flags)

	 * Change protocol of the skb. Currently supported is

	 * v4 -> v6, v6 -> v4 transitions. The helper will also

	 * resize the skb. eBPF program is expected to fill the

	 * new headers via skb_store_bytes and lX_csum_replace.

	 * @skb: pointer to skb

	 * @proto: new skb->protocol type

	 * @flags: reserved

	 * Return: 0 on success or negative error

	 */

	BPF_FUNC_skb_change_proto,



	/**

	 * bpf_skb_change_type(skb, type)

	 * Change packet type of skb.

	 * @skb: pointer to skb

	 * @type: new skb->pkt_type type

	 * Return: 0 on success or negative error

	 */

	BPF_FUNC_skb_change_type,



	/**

	 * bpf_skb_in_cgroup(skb, map, index) - Check cgroup2 membership of skb

	 * @skb: pointer to skb

	 * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type

	 * @index: index of the cgroup in the bpf_map

	 * Return:

	 *   == 0 skb failed the cgroup2 descendant test

	 *   == 1 skb succeeded the cgroup2 descendant test

	 *    < 0 error

	 */

	BPF_FUNC_skb_in_cgroup,



	/**

	 * bpf_get_hash_recalc(skb)

	 * Retrieve and possibly recalculate skb->hash.

	 * @skb: pointer to skb

	 * Return: hash

	 */

	BPF_FUNC_get_hash_recalc,



	/**

	 * u64 bpf_get_current_task(void)

	 * Returns current task_struct

	 * Return: current

	 */

	BPF_FUNC_get_current_task,



	/**

	 * bpf_probe_write_user(void *dst, void *src, int len)

	 * safely attempt to write to a location

	 * @dst: destination address in userspace

	 * @src: source address on stack

	 * @len: number of bytes to copy

	 * Return: 0 on success or negative error

	 */

	BPF_FUNC_probe_write_user,



	__BPF_FUNC_MAX_ID,

};
@@ -347,9 +409,11 @@ enum bpf_func_id { 
#define BPF_F_ZERO_CSUM_TX		(1ULL << 1)

#define BPF_F_DONT_FRAGMENT		(1ULL << 2)



/* BPF_FUNC_perf_event_output flags. */

/* BPF_FUNC_perf_event_output and BPF_FUNC_perf_event_read flags. */

#define BPF_F_INDEX_MASK		0xffffffffULL

#define BPF_F_CURRENT_CPU		BPF_F_INDEX_MASK

/* BPF_FUNC_perf_event_output for sk_buff input context. */

#define BPF_F_CTXLEN_MASK		(0xfffffULL << 32)



/* user accessible mirror of in-kernel sk_buff.

 * new fields can only be added to the end of this structure
@@ -386,4 +450,24 @@ struct bpf_tunnel_key { 
	__u32 tunnel_label;

};



/* User return codes for XDP prog type.

 * A valid XDP program must return one of these defined values. All other

 * return codes are reserved for future use. Unknown return codes will result

 * in packet drop.

 */

enum xdp_action {

	XDP_ABORTED = 0,

	XDP_DROP,

	XDP_PASS,

	XDP_TX,

};



/* user accessible metadata for XDP packet hook

 * new fields must be added to the end of this structure

 */

struct xdp_md {

	__u32 data;

	__u32 data_end;

};



#endif /* _UAPI__LINUX_BPF_H__ */