Commit 4e92b18e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-5.4-20190820' of... 

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

callchains:

   Alexey Budankov:

  - Allow collecting LBR together with DWARF callchains, for workloads
    where the userspace stack size collected is not big enough for
    pure DWARF based unwinding.

  - Dump the LBR call stack in 'perf report -D'.

perf top:

  Arnaldo Carvalho de Melo:

  - Show visual cue at start to state that the minimal set of samples
    are being collected prior to sorting/bucketizing/displaying.

CoreSight (ARM hardware tracing):

  Leo Yan:

  - Support sample flags 'insn' and 'insnlen'.

core:

  Adrian Hunter:

  - Add comment for 'idx' member in 'struct perf_sample_id.

tools headers:

  Arnaldo Carvalho de Melo:

  - Synchronize linux/bits.h, which required grabbing a copy of the kernel
    const.h headers and some changes in the ordering of header directories.

  - Sync x86's asm/cpufeatures.h with the with the kernel, no change in
    any of the tools.

libperf:

  Jiri Olsa:

  - Fix arch include paths.

libtraceevent:

  Steven Rostedt (VMware):

  - Fix "robust" test of do_generate_dynamic_list_file.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 51c359c2 b81d39c7

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

+3 −0
Original line number Diff line number Diff line
@@ -281,6 +281,8 @@ 
#define X86_FEATURE_CQM_OCCUP_LLC	(11*32+ 1) /* LLC occupancy monitoring */

#define X86_FEATURE_CQM_MBM_TOTAL	(11*32+ 2) /* LLC Total MBM monitoring */

#define X86_FEATURE_CQM_MBM_LOCAL	(11*32+ 3) /* LLC Local MBM monitoring */

#define X86_FEATURE_FENCE_SWAPGS_USER	(11*32+ 4) /* "" LFENCE in user entry SWAPGS path */

#define X86_FEATURE_FENCE_SWAPGS_KERNEL	(11*32+ 5) /* "" LFENCE in kernel entry SWAPGS path */



/* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */

#define X86_FEATURE_AVX512_BF16		(12*32+ 5) /* AVX512 BFLOAT16 instructions */
@@ -394,5 +396,6 @@ 
#define X86_BUG_L1TF			X86_BUG(18) /* CPU is affected by L1 Terminal Fault */

#define X86_BUG_MDS			X86_BUG(19) /* CPU is affected by Microarchitectural data sampling */

#define X86_BUG_MSBDS_ONLY		X86_BUG(20) /* CPU is only affected by the  MSDBS variant of BUG_MDS */

#define X86_BUG_SWAPGS			X86_BUG(21) /* CPU is affected by speculation through SWAPGS */



#endif /* _ASM_X86_CPUFEATURES_H */

tools/include/linux/bitops.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define _TOOLS_LINUX_BITOPS_H_



#include <asm/types.h>

#include <limits.h>

#ifndef __WORDSIZE

#define __WORDSIZE (__SIZEOF_LONG__ * 8)

#endif

tools/include/linux/bits.h

+10 −7
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __LINUX_BITS_H

#define __LINUX_BITS_H



#include <linux/const.h>

#include <asm/bitsperlong.h>



#define BIT(nr)			(1UL << (nr))

#define BIT_ULL(nr)		(1ULL << (nr))

#define BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_LONG))

#define BIT(nr)			(UL(1) << (nr))

#define BIT_ULL(nr)		(ULL(1) << (nr))

#define BIT_MASK(nr)		(UL(1) << ((nr) % BITS_PER_LONG))

#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)

#define BIT_ULL_MASK(nr)	(1ULL << ((nr) % BITS_PER_LONG_LONG))

#define BIT_ULL_MASK(nr)	(ULL(1) << ((nr) % BITS_PER_LONG_LONG))

#define BIT_ULL_WORD(nr)	((nr) / BITS_PER_LONG_LONG)

#define BITS_PER_BYTE		8
@@ -17,10 +19,11 @@ 
 * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.

 */

#define GENMASK(h, l) \

	(((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h))))

	(((~UL(0)) - (UL(1) << (l)) + 1) & \

	 (~UL(0) >> (BITS_PER_LONG - 1 - (h))))



#define GENMASK_ULL(h, l) \

	(((~0ULL) - (1ULL << (l)) + 1) & \

	 (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h))))

	(((~ULL(0)) - (ULL(1) << (l)) + 1) & \

	 (~ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))



#endif	/* __LINUX_BITS_H */

tools/include/linux/const.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_CONST_H

#define _LINUX_CONST_H



#include <uapi/linux/const.h>



#define UL(x)		(_UL(x))

#define ULL(x)		(_ULL(x))



#endif /* _LINUX_CONST_H */

tools/include/uapi/asm/bitsperlong.h

+9 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#if defined(__i386__) || defined(__x86_64__)

#include "../../arch/x86/include/uapi/asm/bitsperlong.h"

#include "../../../arch/x86/include/uapi/asm/bitsperlong.h"

#elif defined(__aarch64__)

#include "../../arch/arm64/include/uapi/asm/bitsperlong.h"

#include "../../../arch/arm64/include/uapi/asm/bitsperlong.h"

#elif defined(__powerpc__)

#include "../../arch/powerpc/include/uapi/asm/bitsperlong.h"

#include "../../../arch/powerpc/include/uapi/asm/bitsperlong.h"

#elif defined(__s390__)

#include "../../arch/s390/include/uapi/asm/bitsperlong.h"

#include "../../../arch/s390/include/uapi/asm/bitsperlong.h"

#elif defined(__sparc__)

#include "../../arch/sparc/include/uapi/asm/bitsperlong.h"

#include "../../../arch/sparc/include/uapi/asm/bitsperlong.h"

#elif defined(__mips__)

#include "../../arch/mips/include/uapi/asm/bitsperlong.h"

#include "../../../arch/mips/include/uapi/asm/bitsperlong.h"

#elif defined(__ia64__)

#include "../../arch/ia64/include/uapi/asm/bitsperlong.h"

#include "../../../arch/ia64/include/uapi/asm/bitsperlong.h"

#elif defined(__riscv)

#include "../../arch/riscv/include/uapi/asm/bitsperlong.h"

#include "../../../arch/riscv/include/uapi/asm/bitsperlong.h"

#elif defined(__alpha__)

#include "../../arch/alpha/include/uapi/asm/bitsperlong.h"

#include "../../../arch/alpha/include/uapi/asm/bitsperlong.h"

#else

#include <asm-generic/bitsperlong.h>

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE