Commit 8ad44243 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf updates from Thomas Gleixner:
 "Another set of perf updates:

   - Fix a Skylake Uncore event format declaration

   - Prevent perf pipe mode from crahsing which was caused by a missing
     buffer allocation

   - Make the perf top popup message which tells the user that it uses
     fallback mode on older kernels a debug message.

   - Make perf context rescheduling work correcctly

   - Robustify the jump error drawing in perf browser mode so it does
     not try to create references to NULL initialized offset entries

   - Make trigger_on() robust so it does not enable the trigger before
     everything is set up correctly to handle it

   - Make perf auxtrace respect the --no-itrace option so it does not
     try to queue AUX data for decoding.

   - Prevent having different number of field separators in CVS output
     lines when a counter is not supported.

   - Make the perf kallsyms man page usage behave like it does for all
     other perf commands.

   - Synchronize the kernel headers"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: Fix ctx_event_type in ctx_resched()
  perf tools: Fix trigger class trigger_on()
  perf auxtrace: Prevent decoding when --no-itrace
  perf stat: Fix CVS output format for non-supported counters
  tools headers: Sync x86's cpufeatures.h
  tools headers: Sync copy of kvm UAPI headers
  perf record: Fix crash in pipe mode
  perf annotate browser: Be more robust when drawing jump arrows
  perf top: Fix annoying fallback message on older kernels
  perf kallsyms: Fix the usage on the man page
  perf/x86/intel/uncore: Fix Skylake UPI event format
parents 02bf0ef0 bd903afe

arch/x86/events/intel/uncore_snbep.c

+1 −1
Original line number Diff line number Diff line
@@ -3606,7 +3606,7 @@ static struct intel_uncore_type skx_uncore_imc = { 
};



static struct attribute *skx_upi_uncore_formats_attr[] = {

	&format_attr_event_ext.attr,

	&format_attr_event.attr,

	&format_attr_umask_ext.attr,

	&format_attr_edge.attr,

	&format_attr_inv.attr,

kernel/events/core.c

+3 −1
Original line number Diff line number Diff line
@@ -2246,7 +2246,7 @@ static void ctx_resched(struct perf_cpu_context *cpuctx, 
			struct perf_event_context *task_ctx,

			enum event_type_t event_type)

{

	enum event_type_t ctx_event_type = event_type & EVENT_ALL;

	enum event_type_t ctx_event_type;

	bool cpu_event = !!(event_type & EVENT_CPU);



	/*
@@ -2256,6 +2256,8 @@ static void ctx_resched(struct perf_cpu_context *cpuctx, 
	if (event_type & EVENT_PINNED)

		event_type |= EVENT_FLEXIBLE;



	ctx_event_type = event_type & EVENT_ALL;



	perf_pmu_disable(cpuctx->ctx.pmu);

	if (task_ctx)

		task_ctx_sched_out(cpuctx, task_ctx, event_type);

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

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ 
#define X86_FEATURE_SEV			( 7*32+20) /* AMD Secure Encrypted Virtualization */



#define X86_FEATURE_USE_IBPB		( 7*32+21) /* "" Indirect Branch Prediction Barrier enabled */

#define X86_FEATURE_USE_IBRS_FW		( 7*32+22) /* "" Use IBRS during runtime firmware calls */



/* Virtualization flags: Linux defined, word 8 */

#define X86_FEATURE_TPR_SHADOW		( 8*32+ 0) /* Intel TPR Shadow */

tools/include/uapi/linux/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_TRACE_PAUSE           __KVM_DEPRECATED_MAIN_0x07

#define KVM_TRACE_DISABLE         __KVM_DEPRECATED_MAIN_0x08

#define KVM_GET_EMULATED_CPUID	  _IOWR(KVMIO, 0x09, struct kvm_cpuid2)

#define KVM_GET_MSR_FEATURE_INDEX_LIST    _IOWR(KVMIO, 0x0a, struct kvm_msr_list)



/*

 * Extension capability list.
@@ -934,6 +935,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_S390_AIS_MIGRATION 150

#define KVM_CAP_PPC_GET_CPU_CHAR 151

#define KVM_CAP_S390_BPB 152

#define KVM_CAP_GET_MSR_FEATURES 153



#ifdef KVM_CAP_IRQ_ROUTING

tools/perf/Documentation/perf-kallsyms.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ perf-kallsyms - Searches running kernel for symbols 
SYNOPSIS

--------

[verse]

'perf kallsyms <options> symbol_name[,symbol_name...]'

'perf kallsyms' [<options>] symbol_name[,symbol_name...]



DESCRIPTION

-----------

CRA Git | Maintained and supported by SUSTech CRA and CCSE