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

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

Merge tag 'perf-core-for-mingo-4.12-20170331' of... 

Merge tag 'perf-core-for-mingo-4.12-20170331' 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:

New features:

- Beautify the statx syscall arguments in 'perf trace' (Arnaldo Carvalho de Melo)

    e.g.:

  System wide strace like session:

  # trace -e statx
   16612.967 ( 0.028 ms): statx/4562 statx(dfd: CWD, filename: /tmp/statx, flags: SYMLINK_NOFOLLOW, mask: TYPE|MODE|NLINK|UID|GID|ATIME|MTIME|CTIME|INO|SIZE|BLOCKS|BTIME, buffer: 0x7ffef195d660) = 0
   36050.891 ( 0.007 ms): statx/4576 statx(dfd: CWD, filename: /etc/passwd, flags: SYMLINK_NOFOLLOW|STATX_DONT_SYNC, mask: BTIME, buffer: 0x7ffda9bf50f0) = 0
  ^C#

User visible changes:

- Handle unpaired raw_syscalls:sys_exit events in 'perf trace', i.e. we
  shouldn't try to calculate duration or print the timestamp for a missing
  matching raw_syscalls:sys_enter (Arnaldo Carvalho de Melo)

- Do not print "cycles: 0" in perf report LBR lines in platforms not
  supporting 'cycles', such as Intel's Broadwell (Jin Yao)

- Handle missing $HOME env var (Jiri Olsa)

- Map 8-bit registers (al, bl, etc), not supported in uprobes_events, to
  the next best thing (ax, bx, etc) supported (Ravi Bangoria)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 25df39f2 fd5cead2

tools/include/linux/types.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#define __SANE_USERSPACE_TYPES__	/* For PPC64, to get LL64 types */

#include <asm/types.h>

#include <asm/posix_types.h>



struct page;

struct kmem_cache;

tools/include/uapi/linux/fcntl.h

0 → 100644
+72 −0
Original line number Diff line number Diff line 
#ifndef _UAPI_LINUX_FCNTL_H

#define _UAPI_LINUX_FCNTL_H



#include <asm/fcntl.h>



#define F_SETLEASE	(F_LINUX_SPECIFIC_BASE + 0)

#define F_GETLEASE	(F_LINUX_SPECIFIC_BASE + 1)



/*

 * Cancel a blocking posix lock; internal use only until we expose an

 * asynchronous lock api to userspace:

 */

#define F_CANCELLK	(F_LINUX_SPECIFIC_BASE + 5)



/* Create a file descriptor with FD_CLOEXEC set. */

#define F_DUPFD_CLOEXEC	(F_LINUX_SPECIFIC_BASE + 6)



/*

 * Request nofications on a directory.

 * See below for events that may be notified.

 */

#define F_NOTIFY	(F_LINUX_SPECIFIC_BASE+2)



/*

 * Set and get of pipe page size array

 */

#define F_SETPIPE_SZ	(F_LINUX_SPECIFIC_BASE + 7)

#define F_GETPIPE_SZ	(F_LINUX_SPECIFIC_BASE + 8)



/*

 * Set/Get seals

 */

#define F_ADD_SEALS	(F_LINUX_SPECIFIC_BASE + 9)

#define F_GET_SEALS	(F_LINUX_SPECIFIC_BASE + 10)



/*

 * Types of seals

 */

#define F_SEAL_SEAL	0x0001	/* prevent further seals from being set */

#define F_SEAL_SHRINK	0x0002	/* prevent file from shrinking */

#define F_SEAL_GROW	0x0004	/* prevent file from growing */

#define F_SEAL_WRITE	0x0008	/* prevent writes */

/* (1U << 31) is reserved for signed error codes */



/*

 * Types of directory notifications that may be requested.

 */

#define DN_ACCESS	0x00000001	/* File accessed */

#define DN_MODIFY	0x00000002	/* File modified */

#define DN_CREATE	0x00000004	/* File created */

#define DN_DELETE	0x00000008	/* File removed */

#define DN_RENAME	0x00000010	/* File renamed */

#define DN_ATTRIB	0x00000020	/* File changed attibutes */

#define DN_MULTISHOT	0x80000000	/* Don't remove notifier */



#define AT_FDCWD		-100    /* Special value used to indicate

                                           openat should use the current

                                           working directory. */

#define AT_SYMLINK_NOFOLLOW	0x100   /* Do not follow symbolic links.  */

#define AT_REMOVEDIR		0x200   /* Remove directory instead of

                                           unlinking file.  */

#define AT_SYMLINK_FOLLOW	0x400   /* Follow symbolic links.  */

#define AT_NO_AUTOMOUNT		0x800	/* Suppress terminal automount traversal */

#define AT_EMPTY_PATH		0x1000	/* Allow empty relative pathname */



#define AT_STATX_SYNC_TYPE	0x6000	/* Type of synchronisation required from statx() */

#define AT_STATX_SYNC_AS_STAT	0x0000	/* - Do whatever stat() does */

#define AT_STATX_FORCE_SYNC	0x2000	/* - Force the attributes to be sync'd with the server */

#define AT_STATX_DONT_SYNC	0x4000	/* - Don't sync attributes with the server */





#endif /* _UAPI_LINUX_FCNTL_H */

tools/include/uapi/linux/stat.h

0 → 100644
+176 −0
Original line number Diff line number Diff line 
#ifndef _UAPI_LINUX_STAT_H

#define _UAPI_LINUX_STAT_H



#include <linux/types.h>



#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)



#define S_IFMT  00170000

#define S_IFSOCK 0140000

#define S_IFLNK	 0120000

#define S_IFREG  0100000

#define S_IFBLK  0060000

#define S_IFDIR  0040000

#define S_IFCHR  0020000

#define S_IFIFO  0010000

#define S_ISUID  0004000

#define S_ISGID  0002000

#define S_ISVTX  0001000



#define S_ISLNK(m)	(((m) & S_IFMT) == S_IFLNK)

#define S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)

#define S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)

#define S_ISCHR(m)	(((m) & S_IFMT) == S_IFCHR)

#define S_ISBLK(m)	(((m) & S_IFMT) == S_IFBLK)

#define S_ISFIFO(m)	(((m) & S_IFMT) == S_IFIFO)

#define S_ISSOCK(m)	(((m) & S_IFMT) == S_IFSOCK)



#define S_IRWXU 00700

#define S_IRUSR 00400

#define S_IWUSR 00200

#define S_IXUSR 00100



#define S_IRWXG 00070

#define S_IRGRP 00040

#define S_IWGRP 00020

#define S_IXGRP 00010



#define S_IRWXO 00007

#define S_IROTH 00004

#define S_IWOTH 00002

#define S_IXOTH 00001



#endif



/*

 * Timestamp structure for the timestamps in struct statx.

 *

 * tv_sec holds the number of seconds before (negative) or after (positive)

 * 00:00:00 1st January 1970 UTC.

 *

 * tv_nsec holds a number of nanoseconds before (0..-999,999,999 if tv_sec is

 * negative) or after (0..999,999,999 if tv_sec is positive) the tv_sec time.

 *

 * Note that if both tv_sec and tv_nsec are non-zero, then the two values must

 * either be both positive or both negative.

 *

 * __reserved is held in case we need a yet finer resolution.

 */

struct statx_timestamp {

	__s64	tv_sec;

	__s32	tv_nsec;

	__s32	__reserved;

};



/*

 * Structures for the extended file attribute retrieval system call

 * (statx()).

 *

 * The caller passes a mask of what they're specifically interested in as a

 * parameter to statx().  What statx() actually got will be indicated in

 * st_mask upon return.

 *

 * For each bit in the mask argument:

 *

 * - if the datum is not supported:

 *

 *   - the bit will be cleared, and

 *

 *   - the datum will be set to an appropriate fabricated value if one is

 *     available (eg. CIFS can take a default uid and gid), otherwise

 *

 *   - the field will be cleared;

 *

 * - otherwise, if explicitly requested:

 *

 *   - the datum will be synchronised to the server if AT_STATX_FORCE_SYNC is

 *     set or if the datum is considered out of date, and

 *

 *   - the field will be filled in and the bit will be set;

 *

 * - otherwise, if not requested, but available in approximate form without any

 *   effort, it will be filled in anyway, and the bit will be set upon return

 *   (it might not be up to date, however, and no attempt will be made to

 *   synchronise the internal state first);

 *

 * - otherwise the field and the bit will be cleared before returning.

 *

 * Items in STATX_BASIC_STATS may be marked unavailable on return, but they

 * will have values installed for compatibility purposes so that stat() and

 * co. can be emulated in userspace.

 */

struct statx {

	/* 0x00 */

	__u32	stx_mask;	/* What results were written [uncond] */

	__u32	stx_blksize;	/* Preferred general I/O size [uncond] */

	__u64	stx_attributes;	/* Flags conveying information about the file [uncond] */

	/* 0x10 */

	__u32	stx_nlink;	/* Number of hard links */

	__u32	stx_uid;	/* User ID of owner */

	__u32	stx_gid;	/* Group ID of owner */

	__u16	stx_mode;	/* File mode */

	__u16	__spare0[1];

	/* 0x20 */

	__u64	stx_ino;	/* Inode number */

	__u64	stx_size;	/* File size */

	__u64	stx_blocks;	/* Number of 512-byte blocks allocated */

	__u64	__spare1[1];

	/* 0x40 */

	struct statx_timestamp	stx_atime;	/* Last access time */

	struct statx_timestamp	stx_btime;	/* File creation time */

	struct statx_timestamp	stx_ctime;	/* Last attribute change time */

	struct statx_timestamp	stx_mtime;	/* Last data modification time */

	/* 0x80 */

	__u32	stx_rdev_major;	/* Device ID of special file [if bdev/cdev] */

	__u32	stx_rdev_minor;

	__u32	stx_dev_major;	/* ID of device containing file [uncond] */

	__u32	stx_dev_minor;

	/* 0x90 */

	__u64	__spare2[14];	/* Spare space for future expansion */

	/* 0x100 */

};



/*

 * Flags to be stx_mask

 *

 * Query request/result mask for statx() and struct statx::stx_mask.

 *

 * These bits should be set in the mask argument of statx() to request

 * particular items when calling statx().

 */

#define STATX_TYPE		0x00000001U	/* Want/got stx_mode & S_IFMT */

#define STATX_MODE		0x00000002U	/* Want/got stx_mode & ~S_IFMT */

#define STATX_NLINK		0x00000004U	/* Want/got stx_nlink */

#define STATX_UID		0x00000008U	/* Want/got stx_uid */

#define STATX_GID		0x00000010U	/* Want/got stx_gid */

#define STATX_ATIME		0x00000020U	/* Want/got stx_atime */

#define STATX_MTIME		0x00000040U	/* Want/got stx_mtime */

#define STATX_CTIME		0x00000080U	/* Want/got stx_ctime */

#define STATX_INO		0x00000100U	/* Want/got stx_ino */

#define STATX_SIZE		0x00000200U	/* Want/got stx_size */

#define STATX_BLOCKS		0x00000400U	/* Want/got stx_blocks */

#define STATX_BASIC_STATS	0x000007ffU	/* The stuff in the normal stat struct */

#define STATX_BTIME		0x00000800U	/* Want/got stx_btime */

#define STATX_ALL		0x00000fffU	/* All currently supported flags */



/*

 * Attributes to be found in stx_attributes

 *

 * These give information about the features or the state of a file that might

 * be of use to ordinary userspace programs such as GUIs or ls rather than

 * specialised tools.

 *

 * Note that the flags marked [I] correspond to generic FS_IOC_FLAGS

 * semantically.  Where possible, the numerical value is picked to correspond

 * also.

 */

#define STATX_ATTR_COMPRESSED		0x00000004 /* [I] File is compressed by the fs */

#define STATX_ATTR_IMMUTABLE		0x00000010 /* [I] File is marked immutable */

#define STATX_ATTR_APPEND		0x00000020 /* [I] File is append-only */

#define STATX_ATTR_NODUMP		0x00000040 /* [I] File is not to be dumped */

#define STATX_ATTR_ENCRYPTED		0x00000800 /* [I] File requires key to decrypt in fs */



#define STATX_ATTR_AUTOMOUNT		0x00001000 /* Dir: Automount trigger */





#endif /* _UAPI_LINUX_STAT_H */

tools/perf/Build

+1 −0
Original line number Diff line number Diff line
@@ -50,5 +50,6 @@ libperf-y += util/ 
libperf-y += arch/

libperf-y += ui/

libperf-y += scripts/

libperf-y += trace/beauty/



gtk-y += ui/gtk/

tools/perf/MANIFEST

+2 −0
Original line number Diff line number Diff line
@@ -73,9 +73,11 @@ tools/include/uapi/asm-generic/mman-common.h 
tools/include/uapi/asm-generic/mman.h

tools/include/uapi/linux/bpf.h

tools/include/uapi/linux/bpf_common.h

tools/include/uapi/linux/fcntl.h

tools/include/uapi/linux/hw_breakpoint.h

tools/include/uapi/linux/mman.h

tools/include/uapi/linux/perf_event.h

tools/include/uapi/linux/stat.h

tools/include/linux/poison.h

tools/include/linux/rbtree.h

tools/include/linux/rbtree_augmented.h