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

Commit 79598041 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.18-20180625' of... 

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

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

perf bench: (Jiri Olsa):

- Fix NUMA report output code handling of less than 1s runtimes.

perf script: (Ravi Bangoria)

- Add missing output fields in a 'perf script -h' hint.

- Fix crash because of missing evsel->priv.

- Fix crash caused by accessing feat_ops[HEADER_LAST_FEATURE], which
  is just a end of features header marker.

perf stat: (Thomas Richter)

- Remove duplicate event counting

perf test:

- Wire parsing error handling in 'parse events' test (Jiri Olsa)

- Fix 'session topology' test on s/390 (Thomas Richter)

eBPF: (Yonghong Song)

- Fix a clang 7.0 compilation error when building perf linking
  with libclang

intel-pt: (Adrian Hunter)

- Fix packet decoding of CYC packets.

Copies of kernel files: (Arnaldo Carvalho de Melo)

- Synchronize drm/drm.h UAPI

- Update x86's syscall_64.tbl, adding support for 'io_pgetevents' and 'rseq'
  in 'perf trace'.

- Update powerpc uapi/asm/unistd.h, adding support for the 'rseq' syscall.

- Update if_link.h and bpf.h, no effect on tool features.

PowerPC: (Sandipan Das)

- Fix crash if callchain is empty.

s/390: (Thomas Richter)

- Support random socked_id assignment in the perf header.

- Support s390 random socket_id assignment in perf.data file.

- Make PMU alias definitions taken from sysfs and JSON files comparable
  by normalizing them wrt spaces and newlines.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6f0d349d 92ead7ee

tools/arch/powerpc/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -398,5 +398,6 @@ 
#define __NR_pkey_alloc		384

#define __NR_pkey_free		385

#define __NR_pkey_mprotect	386

#define __NR_rseq		387



#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */

tools/include/uapi/drm/drm.h

+7 −0
Original line number Diff line number Diff line
@@ -680,6 +680,13 @@ struct drm_get_cap { 
 */

#define DRM_CLIENT_CAP_ATOMIC	3



/**

 * DRM_CLIENT_CAP_ASPECT_RATIO

 *

 * If set to 1, the DRM core will provide aspect ratio information in modes.

 */

#define DRM_CLIENT_CAP_ASPECT_RATIO    4



/** DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */

struct drm_set_client_cap {

	__u64 capability;

tools/include/uapi/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -2630,7 +2630,7 @@ struct bpf_fib_lookup { 
	union {

		/* inputs to lookup */

		__u8	tos;		/* AF_INET  */

		__be32	flowlabel;	/* AF_INET6 */

		__be32	flowinfo;	/* AF_INET6, flow_label + priority */



		/* output: metric of fib result (IPv4/IPv6 only) */

		__u32	rt_metric;

tools/include/uapi/linux/if_link.h

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ enum { 
	IFLA_BRPORT_BCAST_FLOOD,

	IFLA_BRPORT_GROUP_FWD_MASK,

	IFLA_BRPORT_NEIGH_SUPPRESS,

	IFLA_BRPORT_ISOLATED,

	__IFLA_BRPORT_MAX

};

#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -516,6 +517,7 @@ enum { 
	IFLA_VXLAN_COLLECT_METADATA,

	IFLA_VXLAN_LABEL,

	IFLA_VXLAN_GPE,

	IFLA_VXLAN_TTL_INHERIT,

	__IFLA_VXLAN_MAX

};

#define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)

tools/perf/arch/powerpc/util/skip-callchain-idx.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ int arch_skip_callchain_idx(struct thread *thread, struct ip_callchain *chain) 
	u64 ip;

	u64 skip_slot = -1;



	if (chain->nr < 3)

	if (!chain || chain->nr < 3)

		return skip_slot;



	ip = chain->ips[2];