Commit 576b50ea authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-5.0-20190108' of... 

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

 into perf/urgent

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

perf top:

  Arnaldo Carvalho de Melo:

  - Lift restriction on using callchains without "sym" in --sort

perf trace:

  Arnaldo Carvalho de Melo:

  - Fix ')' placement in "interrupted" syscall lines.

  - Fix alignment for [continued] lines.

perf tests:

  Florian Fainelli:

  - Add a test for the ARM 32-bit [vectors] page.

tools lib traceevent:

  Tzvetomir Stoyanov:

  - Introduce new libtracevent API: tep_override_comm().
  - Initialize host_bigendian at tep_handle allocation.
  - More namespacing changes.
  - Remove superfluous APIs.

tools headers uapi:

  Arnaldo Carvalho de Melo:

  . Update linux/{fs,vhost}.h, grab a copy o linux/mount.h, where the
    MS_ mount flags were moved.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 64598e8b ee412f14

tools/include/uapi/linux/fs.h

+8 −52
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ 
#include <linux/ioctl.h>

#include <linux/types.h>



/* Use of MS_* flags within the kernel is restricted to core mount(2) code. */

#if !defined(__KERNEL__)

#include <linux/mount.h>

#endif



/*

 * It's silly to have NR_OPEN bigger than NR_FILE, but you can change

 * the file limit at runtime and only root can increase the per-process
@@ -101,57 +106,6 @@ struct inodes_stat_t { 


#define NR_FILE  8192	/* this can well be larger on a larger system */





/*

 * These are the fs-independent mount-flags: up to 32 flags are supported

 */

#define MS_RDONLY	 1	/* Mount read-only */

#define MS_NOSUID	 2	/* Ignore suid and sgid bits */

#define MS_NODEV	 4	/* Disallow access to device special files */

#define MS_NOEXEC	 8	/* Disallow program execution */

#define MS_SYNCHRONOUS	16	/* Writes are synced at once */

#define MS_REMOUNT	32	/* Alter flags of a mounted FS */

#define MS_MANDLOCK	64	/* Allow mandatory locks on an FS */

#define MS_DIRSYNC	128	/* Directory modifications are synchronous */

#define MS_NOATIME	1024	/* Do not update access times. */

#define MS_NODIRATIME	2048	/* Do not update directory access times */

#define MS_BIND		4096

#define MS_MOVE		8192

#define MS_REC		16384

#define MS_VERBOSE	32768	/* War is peace. Verbosity is silence.

				   MS_VERBOSE is deprecated. */

#define MS_SILENT	32768

#define MS_POSIXACL	(1<<16)	/* VFS does not apply the umask */

#define MS_UNBINDABLE	(1<<17)	/* change to unbindable */

#define MS_PRIVATE	(1<<18)	/* change to private */

#define MS_SLAVE	(1<<19)	/* change to slave */

#define MS_SHARED	(1<<20)	/* change to shared */

#define MS_RELATIME	(1<<21)	/* Update atime relative to mtime/ctime. */

#define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */

#define MS_I_VERSION	(1<<23) /* Update inode I_version field */

#define MS_STRICTATIME	(1<<24) /* Always perform atime updates */

#define MS_LAZYTIME	(1<<25) /* Update the on-disk [acm]times lazily */



/* These sb flags are internal to the kernel */

#define MS_SUBMOUNT     (1<<26)

#define MS_NOREMOTELOCK	(1<<27)

#define MS_NOSEC	(1<<28)

#define MS_BORN		(1<<29)

#define MS_ACTIVE	(1<<30)

#define MS_NOUSER	(1<<31)



/*

 * Superblock flags that can be altered by MS_REMOUNT

 */

#define MS_RMT_MASK	(MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION|\

			 MS_LAZYTIME)



/*

 * Old magic mount flag and mask

 */

#define MS_MGC_VAL 0xC0ED0000

#define MS_MGC_MSK 0xffff0000



/*

 * Structure for FS_IOC_FSGETXATTR[A] and FS_IOC_FSSETXATTR.

 */
@@ -269,7 +223,8 @@ struct fsxattr { 
#define FS_POLICY_FLAGS_PAD_16		0x02

#define FS_POLICY_FLAGS_PAD_32		0x03

#define FS_POLICY_FLAGS_PAD_MASK	0x03

#define FS_POLICY_FLAGS_VALID		0x03

#define FS_POLICY_FLAG_DIRECT_KEY	0x04	/* use master key directly */

#define FS_POLICY_FLAGS_VALID		0x07



/* Encryption algorithms */

#define FS_ENCRYPTION_MODE_INVALID		0
@@ -281,6 +236,7 @@ struct fsxattr { 
#define FS_ENCRYPTION_MODE_AES_128_CTS		6

#define FS_ENCRYPTION_MODE_SPECK128_256_XTS	7 /* Removed, do not use. */

#define FS_ENCRYPTION_MODE_SPECK128_256_CTS	8 /* Removed, do not use. */

#define FS_ENCRYPTION_MODE_ADIANTUM		9



struct fscrypt_policy {

	__u8 version;

tools/include/uapi/linux/mount.h

0 → 100644
+58 −0
Original line number Diff line number Diff line 
#ifndef _UAPI_LINUX_MOUNT_H

#define _UAPI_LINUX_MOUNT_H



/*

 * These are the fs-independent mount-flags: up to 32 flags are supported

 *

 * Usage of these is restricted within the kernel to core mount(2) code and

 * callers of sys_mount() only.  Filesystems should be using the SB_*

 * equivalent instead.

 */

#define MS_RDONLY	 1	/* Mount read-only */

#define MS_NOSUID	 2	/* Ignore suid and sgid bits */

#define MS_NODEV	 4	/* Disallow access to device special files */

#define MS_NOEXEC	 8	/* Disallow program execution */

#define MS_SYNCHRONOUS	16	/* Writes are synced at once */

#define MS_REMOUNT	32	/* Alter flags of a mounted FS */

#define MS_MANDLOCK	64	/* Allow mandatory locks on an FS */

#define MS_DIRSYNC	128	/* Directory modifications are synchronous */

#define MS_NOATIME	1024	/* Do not update access times. */

#define MS_NODIRATIME	2048	/* Do not update directory access times */

#define MS_BIND		4096

#define MS_MOVE		8192

#define MS_REC		16384

#define MS_VERBOSE	32768	/* War is peace. Verbosity is silence.

				   MS_VERBOSE is deprecated. */

#define MS_SILENT	32768

#define MS_POSIXACL	(1<<16)	/* VFS does not apply the umask */

#define MS_UNBINDABLE	(1<<17)	/* change to unbindable */

#define MS_PRIVATE	(1<<18)	/* change to private */

#define MS_SLAVE	(1<<19)	/* change to slave */

#define MS_SHARED	(1<<20)	/* change to shared */

#define MS_RELATIME	(1<<21)	/* Update atime relative to mtime/ctime. */

#define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */

#define MS_I_VERSION	(1<<23) /* Update inode I_version field */

#define MS_STRICTATIME	(1<<24) /* Always perform atime updates */

#define MS_LAZYTIME	(1<<25) /* Update the on-disk [acm]times lazily */



/* These sb flags are internal to the kernel */

#define MS_SUBMOUNT     (1<<26)

#define MS_NOREMOTELOCK	(1<<27)

#define MS_NOSEC	(1<<28)

#define MS_BORN		(1<<29)

#define MS_ACTIVE	(1<<30)

#define MS_NOUSER	(1<<31)



/*

 * Superblock flags that can be altered by MS_REMOUNT

 */

#define MS_RMT_MASK	(MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION|\

			 MS_LAZYTIME)



/*

 * Old magic mount flag and mask

 */

#define MS_MGC_VAL 0xC0ED0000

#define MS_MGC_MSK 0xffff0000



#endif /* _UAPI_LINUX_MOUNT_H */

tools/include/uapi/linux/vhost.h

+2 −111
Original line number Diff line number Diff line
@@ -11,94 +11,9 @@ 
 * device configuration.

 */



#include <linux/vhost_types.h>

#include <linux/types.h>

#include <linux/compiler.h>

#include <linux/ioctl.h>

#include <linux/virtio_config.h>

#include <linux/virtio_ring.h>



struct vhost_vring_state {

	unsigned int index;

	unsigned int num;

};



struct vhost_vring_file {

	unsigned int index;

	int fd; /* Pass -1 to unbind from file. */



};



struct vhost_vring_addr {

	unsigned int index;

	/* Option flags. */

	unsigned int flags;

	/* Flag values: */

	/* Whether log address is valid. If set enables logging. */

#define VHOST_VRING_F_LOG 0



	/* Start of array of descriptors (virtually contiguous) */

	__u64 desc_user_addr;

	/* Used structure address. Must be 32 bit aligned */

	__u64 used_user_addr;

	/* Available structure address. Must be 16 bit aligned */

	__u64 avail_user_addr;

	/* Logging support. */

	/* Log writes to used structure, at offset calculated from specified

	 * address. Address must be 32 bit aligned. */

	__u64 log_guest_addr;

};



/* no alignment requirement */

struct vhost_iotlb_msg {

	__u64 iova;

	__u64 size;

	__u64 uaddr;

#define VHOST_ACCESS_RO      0x1

#define VHOST_ACCESS_WO      0x2

#define VHOST_ACCESS_RW      0x3

	__u8 perm;

#define VHOST_IOTLB_MISS           1

#define VHOST_IOTLB_UPDATE         2

#define VHOST_IOTLB_INVALIDATE     3

#define VHOST_IOTLB_ACCESS_FAIL    4

	__u8 type;

};



#define VHOST_IOTLB_MSG 0x1

#define VHOST_IOTLB_MSG_V2 0x2



struct vhost_msg {

	int type;

	union {

		struct vhost_iotlb_msg iotlb;

		__u8 padding[64];

	};

};



struct vhost_msg_v2 {

	__u32 type;

	__u32 reserved;

	union {

		struct vhost_iotlb_msg iotlb;

		__u8 padding[64];

	};

};



struct vhost_memory_region {

	__u64 guest_phys_addr;

	__u64 memory_size; /* bytes */

	__u64 userspace_addr;

	__u64 flags_padding; /* No flags are currently specified. */

};



/* All region addresses and sizes must be 4K aligned. */

#define VHOST_PAGE_SIZE 0x1000



struct vhost_memory {

	__u32 nregions;

	__u32 padding;

	struct vhost_memory_region regions[0];

};



/* ioctls */
@@ -186,31 +101,7 @@ struct vhost_memory { 
 * device.  This can be used to stop the ring (e.g. for migration). */

#define VHOST_NET_SET_BACKEND _IOW(VHOST_VIRTIO, 0x30, struct vhost_vring_file)



/* Feature bits */

/* Log all write descriptors. Can be changed while device is active. */

#define VHOST_F_LOG_ALL 26

/* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */

#define VHOST_NET_F_VIRTIO_NET_HDR 27



/* VHOST_SCSI specific definitions */



/*

 * Used by QEMU userspace to ensure a consistent vhost-scsi ABI.

 *

 * ABI Rev 0: July 2012 version starting point for v3.6-rc merge candidate +

 *            RFC-v2 vhost-scsi userspace.  Add GET_ABI_VERSION ioctl usage

 * ABI Rev 1: January 2013. Ignore vhost_tpgt filed in struct vhost_scsi_target.

 *            All the targets under vhost_wwpn can be seen and used by guset.

 */



#define VHOST_SCSI_ABI_VERSION	1



struct vhost_scsi_target {

	int abi_version;

	char vhost_wwpn[224]; /* TRANSPORT_IQN_LEN */

	unsigned short vhost_tpgt;

	unsigned short reserved;

};

/* VHOST_SCSI specific defines */



#define VHOST_SCSI_SET_ENDPOINT _IOW(VHOST_VIRTIO, 0x40, struct vhost_scsi_target)

#define VHOST_SCSI_CLEAR_ENDPOINT _IOW(VHOST_VIRTIO, 0x41, struct vhost_scsi_target)

tools/lib/traceevent/event-parse-api.c

+2 −2
Original line number Diff line number Diff line
@@ -194,13 +194,13 @@ void tep_set_page_size(struct tep_handle *pevent, int _page_size) 
}



/**

 * tep_is_file_bigendian - get if the file is in big endian order

 * tep_file_bigendian - get if the file is in big endian order

 * @pevent: a handle to the tep_handle

 *

 * This returns if the file is in big endian order

 * If @pevent is NULL, 0 is returned.

 */

int tep_is_file_bigendian(struct tep_handle *pevent)

int tep_file_bigendian(struct tep_handle *pevent)

{

	if(pevent)

		return pevent->file_bigendian;

tools/lib/traceevent/event-parse-local.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#ifndef _PARSE_EVENTS_INT_H

#define _PARSE_EVENTS_INT_H



struct cmdline;

struct tep_cmdline;

struct cmdline_list;

struct func_map;

struct func_list;
@@ -36,7 +36,7 @@ struct tep_handle { 
	int long_size;

	int page_size;



	struct cmdline *cmdlines;

	struct tep_cmdline *cmdlines;

	struct cmdline_list *cmdlist;

	int cmdline_count;