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

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

Merge tag 'perf-core-for-mingo-4.19-20180801' of... 

Merge tag 'perf-core-for-mingo-4.19-20180801' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

perf trace: (Arnaldo Carvalho de Melo)

- Do not require --no-syscalls to suppress strace like output, i.e.

     # perf trace -e sched:*switch

  will show just sched:sched_switch events, not strace-like formatted
  syscall events, use --syscalls to get the previous behaviour.

  If instead:

     # perf trace

  is used, i.e. no events specified, then --syscalls is implied and
  system wide strace like formatting will be applied to all syscalls.

  The behaviour when just a syscall subset is used with '-e' is unchanged:

     # perf trace -e *sleep,sched:*switch

  will work as before: just the 'nanosleep' syscall will be strace-like
  formatted plus the sched:sched_switch tracepoint event, system wide.

- Allow string table generators to use a default header dir, allowing
  use of them without parameters to see the table it generates on
  stdout, e.g.:

    $ tools/perf/trace/beauty/kvm_ioctl.sh
    static const char *kvm_ioctl_cmds[] = {
        [0x00] = "GET_API_VERSION",
        [0x01] = "CREATE_VM",
        [0x02] = "GET_MSR_INDEX_LIST",
        [0x03] = "CHECK_EXTENSION",
<BIG SNIP>
        [0xe0] = "CREATE_DEVICE",
        [0xe1] = "SET_DEVICE_ATTR",
        [0xe2] = "GET_DEVICE_ATTR",
        [0xe3] = "HAS_DEVICE_ATTR",
    };
    $

  See 'ls tools/perf/trace/beauty/*.sh' to see the available string
  table generators.

- Add a generator for IPPROTO_ socket's protocol constants.

perf record: (Kan Liang)

- Fix error out while applying initial delay and using LBR, due to
  the use of a PERF_TYPE_SOFTWARE/PERF_COUNT_SW_DUMMY event to track
  PERF_RECORD_MMAP events while waiting for the initial delay. Such
  events fail when configured asking PERF_SAMPLE_BRANCH_STACK in
  perf_event_attr.sample_type.

perf c2c: (Jiri Olsa)

- Fix report crash for empty browser, when processing a perf.data file
  without events of interest, either because not asked for in
  'perf record' or because the workload didn't triggered such events.

perf list: (Michael Petlan)

- Align metric group description format with PMU event description.

perf tests: (Sandipan Das)

- Fix indexing when invoking subtests, which caused BPF tests to
  get results for the next test in the list, with the last one
  reporting a failure.

eBPF:

- Fix installation directory for header files included from eBPF proggies,
  avoiding clashing with relative paths used to build other software projects
  such as glibc. (Thomas Richter)

- Show better message when failing to load an object. (Arnaldo Carvalho de Melo)

General: (Christophe Leroy)

- Allow overriding MAX_NR_CPUS at compile time, to make the tooling
  usable in systems with less memory, in time this has to be changed
  to properly allocate based on _NPROCESSORS_ONLN.

Architecture specific:

- Update arm64's ThunderX2 implementation defined pmu core events (Ganapatrao Kulkarni)

- Fix complex event name parsing in 'perf test' for PowerPC, where the 'umask' event
  modifier isn't present. (Sandipan Das)

CoreSight ARM hardware tracing: (Leo Yan)

- Fix start tracing packet handling.

- Support dummy address value for CS_ETM_TRACE_ON packet.

- Generate branch sample when receiving a CS_ETM_TRACE_ON packet.

- Generate branch sample for CS_ETM_TRACE_ON packet.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 16e0e6a8 b912885a

tools/include/uapi/linux/in.h

0 → 100644
+301 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */

/*

 * INET		An implementation of the TCP/IP protocol suite for the LINUX

 *		operating system.  INET is implemented using the  BSD Socket

 *		interface as the means of communication with the user level.

 *

 *		Definitions of the Internet Protocol.

 *

 * Version:	@(#)in.h	1.0.1	04/21/93

 *

 * Authors:	Original taken from the GNU Project <netinet/in.h> file.

 *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>

 *

 *		This program is free software; you can redistribute it and/or

 *		modify it under the terms of the GNU General Public License

 *		as published by the Free Software Foundation; either version

 *		2 of the License, or (at your option) any later version.

 */

#ifndef _UAPI_LINUX_IN_H

#define _UAPI_LINUX_IN_H



#include <linux/types.h>

#include <linux/libc-compat.h>

#include <linux/socket.h>



#if __UAPI_DEF_IN_IPPROTO

/* Standard well-defined IP protocols.  */

enum {

  IPPROTO_IP = 0,		/* Dummy protocol for TCP		*/

#define IPPROTO_IP		IPPROTO_IP

  IPPROTO_ICMP = 1,		/* Internet Control Message Protocol	*/

#define IPPROTO_ICMP		IPPROTO_ICMP

  IPPROTO_IGMP = 2,		/* Internet Group Management Protocol	*/

#define IPPROTO_IGMP		IPPROTO_IGMP

  IPPROTO_IPIP = 4,		/* IPIP tunnels (older KA9Q tunnels use 94) */

#define IPPROTO_IPIP		IPPROTO_IPIP

  IPPROTO_TCP = 6,		/* Transmission Control Protocol	*/

#define IPPROTO_TCP		IPPROTO_TCP

  IPPROTO_EGP = 8,		/* Exterior Gateway Protocol		*/

#define IPPROTO_EGP		IPPROTO_EGP

  IPPROTO_PUP = 12,		/* PUP protocol				*/

#define IPPROTO_PUP		IPPROTO_PUP

  IPPROTO_UDP = 17,		/* User Datagram Protocol		*/

#define IPPROTO_UDP		IPPROTO_UDP

  IPPROTO_IDP = 22,		/* XNS IDP protocol			*/

#define IPPROTO_IDP		IPPROTO_IDP

  IPPROTO_TP = 29,		/* SO Transport Protocol Class 4	*/

#define IPPROTO_TP		IPPROTO_TP

  IPPROTO_DCCP = 33,		/* Datagram Congestion Control Protocol */

#define IPPROTO_DCCP		IPPROTO_DCCP

  IPPROTO_IPV6 = 41,		/* IPv6-in-IPv4 tunnelling		*/

#define IPPROTO_IPV6		IPPROTO_IPV6

  IPPROTO_RSVP = 46,		/* RSVP Protocol			*/

#define IPPROTO_RSVP		IPPROTO_RSVP

  IPPROTO_GRE = 47,		/* Cisco GRE tunnels (rfc 1701,1702)	*/

#define IPPROTO_GRE		IPPROTO_GRE

  IPPROTO_ESP = 50,		/* Encapsulation Security Payload protocol */

#define IPPROTO_ESP		IPPROTO_ESP

  IPPROTO_AH = 51,		/* Authentication Header protocol	*/

#define IPPROTO_AH		IPPROTO_AH

  IPPROTO_MTP = 92,		/* Multicast Transport Protocol		*/

#define IPPROTO_MTP		IPPROTO_MTP

  IPPROTO_BEETPH = 94,		/* IP option pseudo header for BEET	*/

#define IPPROTO_BEETPH		IPPROTO_BEETPH

  IPPROTO_ENCAP = 98,		/* Encapsulation Header			*/

#define IPPROTO_ENCAP		IPPROTO_ENCAP

  IPPROTO_PIM = 103,		/* Protocol Independent Multicast	*/

#define IPPROTO_PIM		IPPROTO_PIM

  IPPROTO_COMP = 108,		/* Compression Header Protocol		*/

#define IPPROTO_COMP		IPPROTO_COMP

  IPPROTO_SCTP = 132,		/* Stream Control Transport Protocol	*/

#define IPPROTO_SCTP		IPPROTO_SCTP

  IPPROTO_UDPLITE = 136,	/* UDP-Lite (RFC 3828)			*/

#define IPPROTO_UDPLITE		IPPROTO_UDPLITE

  IPPROTO_MPLS = 137,		/* MPLS in IP (RFC 4023)		*/

#define IPPROTO_MPLS		IPPROTO_MPLS

  IPPROTO_RAW = 255,		/* Raw IP packets			*/

#define IPPROTO_RAW		IPPROTO_RAW

  IPPROTO_MAX

};

#endif



#if __UAPI_DEF_IN_ADDR

/* Internet address. */

struct in_addr {

	__be32	s_addr;

};

#endif



#define IP_TOS		1

#define IP_TTL		2

#define IP_HDRINCL	3

#define IP_OPTIONS	4

#define IP_ROUTER_ALERT	5

#define IP_RECVOPTS	6

#define IP_RETOPTS	7

#define IP_PKTINFO	8

#define IP_PKTOPTIONS	9

#define IP_MTU_DISCOVER	10

#define IP_RECVERR	11

#define IP_RECVTTL	12

#define	IP_RECVTOS	13

#define IP_MTU		14

#define IP_FREEBIND	15

#define IP_IPSEC_POLICY	16

#define IP_XFRM_POLICY	17

#define IP_PASSSEC	18

#define IP_TRANSPARENT	19



/* BSD compatibility */

#define IP_RECVRETOPTS	IP_RETOPTS



/* TProxy original addresses */

#define IP_ORIGDSTADDR       20

#define IP_RECVORIGDSTADDR   IP_ORIGDSTADDR



#define IP_MINTTL       21

#define IP_NODEFRAG     22

#define IP_CHECKSUM	23

#define IP_BIND_ADDRESS_NO_PORT	24

#define IP_RECVFRAGSIZE	25



/* IP_MTU_DISCOVER values */

#define IP_PMTUDISC_DONT		0	/* Never send DF frames */

#define IP_PMTUDISC_WANT		1	/* Use per route hints	*/

#define IP_PMTUDISC_DO			2	/* Always DF		*/

#define IP_PMTUDISC_PROBE		3       /* Ignore dst pmtu      */

/* Always use interface mtu (ignores dst pmtu) but don't set DF flag.

 * Also incoming ICMP frag_needed notifications will be ignored on

 * this socket to prevent accepting spoofed ones.

 */

#define IP_PMTUDISC_INTERFACE		4

/* weaker version of IP_PMTUDISC_INTERFACE, which allos packets to get

 * fragmented if they exeed the interface mtu

 */

#define IP_PMTUDISC_OMIT		5



#define IP_MULTICAST_IF			32

#define IP_MULTICAST_TTL 		33

#define IP_MULTICAST_LOOP 		34

#define IP_ADD_MEMBERSHIP		35

#define IP_DROP_MEMBERSHIP		36

#define IP_UNBLOCK_SOURCE		37

#define IP_BLOCK_SOURCE			38

#define IP_ADD_SOURCE_MEMBERSHIP	39

#define IP_DROP_SOURCE_MEMBERSHIP	40

#define IP_MSFILTER			41

#define MCAST_JOIN_GROUP		42

#define MCAST_BLOCK_SOURCE		43

#define MCAST_UNBLOCK_SOURCE		44

#define MCAST_LEAVE_GROUP		45

#define MCAST_JOIN_SOURCE_GROUP		46

#define MCAST_LEAVE_SOURCE_GROUP	47

#define MCAST_MSFILTER			48

#define IP_MULTICAST_ALL		49

#define IP_UNICAST_IF			50



#define MCAST_EXCLUDE	0

#define MCAST_INCLUDE	1



/* These need to appear somewhere around here */

#define IP_DEFAULT_MULTICAST_TTL        1

#define IP_DEFAULT_MULTICAST_LOOP       1



/* Request struct for multicast socket ops */



#if __UAPI_DEF_IP_MREQ

struct ip_mreq  {

	struct in_addr imr_multiaddr;	/* IP multicast address of group */

	struct in_addr imr_interface;	/* local IP address of interface */

};



struct ip_mreqn {

	struct in_addr	imr_multiaddr;		/* IP multicast address of group */

	struct in_addr	imr_address;		/* local IP address of interface */

	int		imr_ifindex;		/* Interface index */

};



struct ip_mreq_source {

	__be32		imr_multiaddr;

	__be32		imr_interface;

	__be32		imr_sourceaddr;

};



struct ip_msfilter {

	__be32		imsf_multiaddr;

	__be32		imsf_interface;

	__u32		imsf_fmode;

	__u32		imsf_numsrc;

	__be32		imsf_slist[1];

};



#define IP_MSFILTER_SIZE(numsrc) \

	(sizeof(struct ip_msfilter) - sizeof(__u32) \

	+ (numsrc) * sizeof(__u32))



struct group_req {

	__u32				 gr_interface;	/* interface index */

	struct __kernel_sockaddr_storage gr_group;	/* group address */

};



struct group_source_req {

	__u32				 gsr_interface;	/* interface index */

	struct __kernel_sockaddr_storage gsr_group;	/* group address */

	struct __kernel_sockaddr_storage gsr_source;	/* source address */

};



struct group_filter {

	__u32				 gf_interface;	/* interface index */

	struct __kernel_sockaddr_storage gf_group;	/* multicast address */

	__u32				 gf_fmode;	/* filter mode */

	__u32				 gf_numsrc;	/* number of sources */

	struct __kernel_sockaddr_storage gf_slist[1];	/* interface index */

};



#define GROUP_FILTER_SIZE(numsrc) \

	(sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \

	+ (numsrc) * sizeof(struct __kernel_sockaddr_storage))

#endif



#if __UAPI_DEF_IN_PKTINFO

struct in_pktinfo {

	int		ipi_ifindex;

	struct in_addr	ipi_spec_dst;

	struct in_addr	ipi_addr;

};

#endif



/* Structure describing an Internet (IP) socket address. */

#if  __UAPI_DEF_SOCKADDR_IN

#define __SOCK_SIZE__	16		/* sizeof(struct sockaddr)	*/

struct sockaddr_in {

  __kernel_sa_family_t	sin_family;	/* Address family		*/

  __be16		sin_port;	/* Port number			*/

  struct in_addr	sin_addr;	/* Internet address		*/



  /* Pad to size of `struct sockaddr'. */

  unsigned char		__pad[__SOCK_SIZE__ - sizeof(short int) -

			sizeof(unsigned short int) - sizeof(struct in_addr)];

};

#define sin_zero	__pad		/* for BSD UNIX comp. -FvK	*/

#endif



#if __UAPI_DEF_IN_CLASS

/*

 * Definitions of the bits in an Internet address integer.

 * On subnets, host and network parts are found according

 * to the subnet mask, not these masks.

 */

#define	IN_CLASSA(a)		((((long int) (a)) & 0x80000000) == 0)

#define	IN_CLASSA_NET		0xff000000

#define	IN_CLASSA_NSHIFT	24

#define	IN_CLASSA_HOST		(0xffffffff & ~IN_CLASSA_NET)

#define	IN_CLASSA_MAX		128



#define	IN_CLASSB(a)		((((long int) (a)) & 0xc0000000) == 0x80000000)

#define	IN_CLASSB_NET		0xffff0000

#define	IN_CLASSB_NSHIFT	16

#define	IN_CLASSB_HOST		(0xffffffff & ~IN_CLASSB_NET)

#define	IN_CLASSB_MAX		65536



#define	IN_CLASSC(a)		((((long int) (a)) & 0xe0000000) == 0xc0000000)

#define	IN_CLASSC_NET		0xffffff00

#define	IN_CLASSC_NSHIFT	8

#define	IN_CLASSC_HOST		(0xffffffff & ~IN_CLASSC_NET)



#define	IN_CLASSD(a)		((((long int) (a)) & 0xf0000000) == 0xe0000000)

#define	IN_MULTICAST(a)		IN_CLASSD(a)

#define IN_MULTICAST_NET	0xF0000000



#define	IN_EXPERIMENTAL(a)	((((long int) (a)) & 0xf0000000) == 0xf0000000)

#define	IN_BADCLASS(a)		IN_EXPERIMENTAL((a))



/* Address to accept any incoming messages. */

#define	INADDR_ANY		((unsigned long int) 0x00000000)



/* Address to send to all hosts. */

#define	INADDR_BROADCAST	((unsigned long int) 0xffffffff)



/* Address indicating an error return. */

#define	INADDR_NONE		((unsigned long int) 0xffffffff)



/* Network number for local host loopback. */

#define	IN_LOOPBACKNET		127



/* Address to loopback in software to local host.  */

#define	INADDR_LOOPBACK		0x7f000001	/* 127.0.0.1   */

#define	IN_LOOPBACK(a)		((((long int) (a)) & 0xff000000) == 0x7f000000)



/* Defines for Multicast INADDR */

#define INADDR_UNSPEC_GROUP   	0xe0000000U	/* 224.0.0.0   */

#define INADDR_ALLHOSTS_GROUP 	0xe0000001U	/* 224.0.0.1   */

#define INADDR_ALLRTRS_GROUP    0xe0000002U	/* 224.0.0.2 */

#define INADDR_MAX_LOCAL_GROUP  0xe00000ffU	/* 224.0.0.255 */

#endif



/* <asm/byteorder.h> contains the htonl type stuff.. */

#include <asm/byteorder.h> 





#endif /* _UAPI_LINUX_IN_H */

tools/perf/Makefile.config

+2 −2
Original line number Diff line number Diff line
@@ -907,8 +907,8 @@ bindir = $(abspath $(prefix)/$(bindir_relative)) 
mandir = share/man

infodir = share/info

perfexecdir = libexec/perf-core

perf_include_dir = lib/include/perf

perf_examples_dir = lib/examples/perf

perf_include_dir = lib/perf/include

perf_examples_dir = lib/perf/examples

sharedir = $(prefix)/share

template_dir = share/perf-core/templates

STRACE_GROUPS_DIR = share/perf-core/strace/groups

tools/perf/Makefile.perf

+10 −0
Original line number Diff line number Diff line
@@ -384,6 +384,8 @@ export INSTALL SHELL_PATH 


SHELL = $(SHELL_PATH)



linux_uapi_dir := $(srctree)/tools/include/uapi/linux



beauty_outdir := $(OUTPUT)trace/beauty/generated

beauty_ioctl_outdir := $(beauty_outdir)/ioctl

drm_ioctl_array := $(beauty_ioctl_outdir)/drm_ioctl_array.c
@@ -431,6 +433,12 @@ kvm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/kvm_ioctl.sh 
$(kvm_ioctl_array): $(kvm_hdr_dir)/kvm.h $(kvm_ioctl_tbl)

	$(Q)$(SHELL) '$(kvm_ioctl_tbl)' $(kvm_hdr_dir) > $@



socket_ipproto_array := $(beauty_outdir)/socket_ipproto_array.c

socket_ipproto_tbl := $(srctree)/tools/perf/trace/beauty/socket_ipproto.sh



$(socket_ipproto_array): $(linux_uapi_dir)/in.h $(socket_ipproto_tbl)

	$(Q)$(SHELL) '$(socket_ipproto_tbl)' $(linux_uapi_dir) > $@



vhost_virtio_ioctl_array := $(beauty_ioctl_outdir)/vhost_virtio_ioctl_array.c

vhost_virtio_hdr_dir := $(srctree)/tools/include/uapi/linux

vhost_virtio_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/vhost_virtio_ioctl.sh
@@ -566,6 +574,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders $(drm_ioc 
	$(sndrv_ctl_ioctl_array) \

	$(kcmp_type_array) \

	$(kvm_ioctl_array) \

	$(socket_ipproto_array) \

	$(vhost_virtio_ioctl_array) \

	$(madvise_behavior_array) \

	$(perf_ioctl_array) \
@@ -860,6 +869,7 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea 
		$(OUTPUT)$(sndrv_pcm_ioctl_array) \

		$(OUTPUT)$(kvm_ioctl_array) \

		$(OUTPUT)$(kcmp_type_array) \

		$(OUTPUT)$(socket_ipproto_array) \

		$(OUTPUT)$(vhost_virtio_ioctl_array) \

		$(OUTPUT)$(perf_ioctl_array) \

		$(OUTPUT)$(prctl_option_array) \

tools/perf/builtin-c2c.c

+3 −0
Original line number Diff line number Diff line
@@ -2349,6 +2349,9 @@ static int perf_c2c__browse_cacheline(struct hist_entry *he) 
	" s             Toggle full length of symbol and source line columns \n"

	" q             Return back to cacheline list \n";



	if (!he)

		return 0;



	/* Display compact version first. */

	c2c.symbol_full = false;

tools/perf/builtin-trace.c

+8 −11
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ size_t strarray__scnprintf(struct strarray *sa, char *bf, size_t size, const cha 
{

	int idx = val - sa->offset;



	if (idx < 0 || idx >= sa->nr_entries)

	if (idx < 0 || idx >= sa->nr_entries || sa->entries[idx] == NULL)

		return scnprintf(bf, size, intfmt, val);



	return scnprintf(bf, size, "%s", sa->entries[idx]);
@@ -761,10 +761,12 @@ static struct syscall_fmt { 
	  .arg = { [0] = STRARRAY(resource, rlimit_resources), }, },

	{ .name	    = "socket",

	  .arg = { [0] = STRARRAY(family, socket_families),

		   [1] = { .scnprintf = SCA_SK_TYPE, /* type */ }, }, },

		   [1] = { .scnprintf = SCA_SK_TYPE, /* type */ },

		   [2] = { .scnprintf = SCA_SK_PROTO, /* protocol */ }, }, },

	{ .name	    = "socketpair",

	  .arg = { [0] = STRARRAY(family, socket_families),

		   [1] = { .scnprintf = SCA_SK_TYPE, /* type */ }, }, },

		   [1] = { .scnprintf = SCA_SK_TYPE, /* type */ },

		   [2] = { .scnprintf = SCA_SK_PROTO, /* protocol */ }, }, },

	{ .name	    = "stat", .alias = "newstat", },

	{ .name	    = "statx",

	  .arg = { [0] = { .scnprintf = SCA_FDAT,	 /* fdat */ },
@@ -2990,6 +2992,7 @@ static int trace__parse_events_option(const struct option *opt, const char *str, 


		if (trace__validate_ev_qualifier(trace))

			goto out;

		trace->trace_syscalls = true;

	}



	err = 0;
@@ -3045,7 +3048,7 @@ int cmd_trace(int argc, const char **argv) 
		},

		.output = stderr,

		.show_comm = true,

		.trace_syscalls = true,

		.trace_syscalls = false,

		.kernel_syscallchains = false,

		.max_stack = UINT_MAX,

	};
@@ -3191,13 +3194,7 @@ int cmd_trace(int argc, const char **argv) 


	if (!trace.trace_syscalls && !trace.trace_pgfaults &&

	    trace.evlist->nr_entries == 0 /* Was --events used? */) {

		pr_err("Please specify something to trace.\n");

		return -1;

	}



	if (!trace.trace_syscalls && trace.ev_qualifier) {

		pr_err("The -e option can't be used with --no-syscalls.\n");

		goto out;

		trace.trace_syscalls = true;

	}



	if (output_name != NULL) {