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

Commit 629ae2ee authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.16-20180306' of... 

Merge tag 'perf-urgent-for-mingo-4.16-20180306' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Be more robust when drawing arrows in the annotation TUI, avoiding a
  segfault when jump instructions have as a target addresses in functions
  other that the one currently being annotated. The full fix will come in
  the following days, when jumping to other functions will work as call
  instructions (Arnaldo Carvalho de Melo)

- Prevent auxtrace_queues__process_index() from queuing AUX area data for
  decoding when the --no-itrace option has been used (Adrian Hunter)

- Sync copy of kvm UAPI headers and x86's cpufeatures.h (Arnaldo Carvalho de Melo)

- Fix 'perf stat' CSV output format for non-supported counters (Ilya Pronin)

- Fix crash in 'perf record|perf report' pipe mode (Jiri Olsa)

- Fix annoying 'perf top' overwrite fallback message on older kernels (Kan Liang)

- Fix the usage on the 'perf kallsyms' man page (Sangwon Hong)

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

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

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

#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_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 */

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

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

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

tools/include/uapi/linux/kvm.h

+2 −0
Original line number Original line 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_PAUSE           __KVM_DEPRECATED_MAIN_0x07

#define KVM_TRACE_DISABLE         __KVM_DEPRECATED_MAIN_0x08

#define KVM_TRACE_DISABLE         __KVM_DEPRECATED_MAIN_0x08

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

#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.

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

#define KVM_CAP_S390_AIS_MIGRATION 150

#define KVM_CAP_PPC_GET_CPU_CHAR 151

#define KVM_CAP_PPC_GET_CPU_CHAR 151

#define KVM_CAP_S390_BPB 152

#define KVM_CAP_S390_BPB 152

#define KVM_CAP_GET_MSR_FEATURES 153





#ifdef KVM_CAP_IRQ_ROUTING

#ifdef KVM_CAP_IRQ_ROUTING

tools/perf/Documentation/perf-kallsyms.txt

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

SYNOPSIS

--------

--------

[verse]

[verse]

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

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





DESCRIPTION

DESCRIPTION

-----------

-----------

tools/perf/builtin-record.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -881,6 +881,15 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) 
		}

		}

	}

	}





	/*

	 * If we have just single event and are sending data

	 * through pipe, we need to force the ids allocation,

	 * because we synthesize event name through the pipe

	 * and need the id for that.

	 */

	if (data->is_pipe && rec->evlist->nr_entries == 1)

		rec->opts.sample_id = true;



	if (record__open(rec) != 0) {

	if (record__open(rec) != 0) {

		err = -1;

		err = -1;

		goto out_child;

		goto out_child;

tools/perf/builtin-stat.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -917,7 +917,7 @@ static void print_metric_csv(void *ctx, 
	char buf[64], *vals, *ends;

	char buf[64], *vals, *ends;





	if (unit == NULL || fmt == NULL) {

	if (unit == NULL || fmt == NULL) {

		fprintf(out, "%s%s%s%s", csv_sep, csv_sep, csv_sep, csv_sep);

		fprintf(out, "%s%s", csv_sep, csv_sep);

		return;

		return;

	}

	}

	snprintf(buf, sizeof(buf), fmt, val);

	snprintf(buf, sizeof(buf), fmt, val);