Commit 5925fa68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v5.9-2020-09-16' of... 

Merge tag 'perf-tools-fixes-for-v5.9-2020-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Set PERF_SAMPLE_PERIOD if attr->freq is set.

 - Remove trailing commas from AMD JSON vendor event files.

 - Don't clear event's period if set by a event definition term.

 - Leader sampling shouldn't clear sample period in 'perf test'.

 - Fix the "signal" test inline assembly when built with DEBUG=1.

 - Fix memory leaks detected by ASAN, some in normal paths, some in
   error paths.

 - Fix 2 memory sanitizer warnings in 'perf bench'.

 - Fix the ratio comments of miss-events in 'perf stat'.

 - Prevent override of attr->sample_period for libpfm4 events.

 - Sync kvm.h and in.h headers with the kernel sources.

* tag 'perf-tools-fixes-for-v5.9-2020-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf stat: Fix the ratio comments of miss-events
  perf test: Free formats for perf pmu parse test
  perf metric: Do not free metric when failed to resolve
  perf metric: Free metric when it failed to resolve
  perf metric: Release expr_parse_ctx after testing
  perf test: Fix memory leaks in parse-metric test
  perf parse-event: Fix memory leak in evsel->unit
  perf evlist: Fix cpu/thread map leak
  perf metric: Fix some memory leaks - part 2
  perf metric: Fix some memory leaks
  perf test: Free aliases for PMU event map aliases test
  perf vendor events amd: Remove trailing commas
  perf test: Leader sampling shouldn't clear sample period
  perf record: Don't clear event's period if set by a term
  tools headers UAPI: update linux/in.h copy
  tools headers UAPI: Sync kvm.h headers with the kernel sources
  perf record: Prevent override of attr->sample_period for libpfm4 events
  perf record: Set PERF_RECORD_PERIOD if attr->freq is set.
  perf bench: Fix 2 memory sanitizer warnings
  perf test: Fix the "signal" test inline assembly
parents 05da40eb ce9c13f3

tools/include/uapi/linux/in.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ struct in_addr { 
 * this socket to prevent accepting spoofed ones.

 */

#define IP_PMTUDISC_INTERFACE		4

/* weaker version of IP_PMTUDISC_INTERFACE, which allos packets to get

/* weaker version of IP_PMTUDISC_INTERFACE, which allows packets to get

 * fragmented if they exeed the interface mtu

 */

#define IP_PMTUDISC_OMIT		5

tools/include/uapi/linux/kvm.h

+4 −2
Original line number Diff line number Diff line
@@ -790,9 +790,10 @@ struct kvm_ppc_resize_hpt { 
#define KVM_VM_PPC_HV 1

#define KVM_VM_PPC_PR 2



/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */

#define KVM_VM_MIPS_TE		0

/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */

#define KVM_VM_MIPS_AUTO	0

#define KVM_VM_MIPS_VZ		1

#define KVM_VM_MIPS_TE		2



#define KVM_S390_SIE_PAGE_OFFSET 1
@@ -1035,6 +1036,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_LAST_CPU 184

#define KVM_CAP_SMALLER_MAXPHYADDR 185

#define KVM_CAP_S390_DIAG318 186

#define KVM_CAP_STEAL_TIME 187



#ifdef KVM_CAP_IRQ_ROUTING

tools/perf/bench/sched-messaging.c

+2 −2
Original line number Diff line number Diff line
@@ -66,11 +66,10 @@ static void fdpair(int fds[2]) 
/* Block until we're ready to go */

static void ready(int ready_out, int wakefd)

{

	char dummy;

	struct pollfd pollfd = { .fd = wakefd, .events = POLLIN };



	/* Tell them we're ready. */

	if (write(ready_out, &dummy, 1) != 1)

	if (write(ready_out, "R", 1) != 1)

		err(EXIT_FAILURE, "CLIENT: ready write");



	/* Wait for "GO" signal */
@@ -85,6 +84,7 @@ static void *sender(struct sender_context *ctx) 
	unsigned int i, j;



	ready(ctx->ready_out, ctx->wakefd);

	memset(data, 'S', sizeof(data));



	/* Now pump to every receiver. */

	for (i = 0; i < nr_loops; i++) {

tools/perf/pmu-events/arch/x86/amdzen1/core.json

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
  {

    "EventName": "ex_ret_brn_ind_misp",

    "EventCode": "0xca",

    "BriefDescription": "Retired Indirect Branch Instructions Mispredicted.",

    "BriefDescription": "Retired Indirect Branch Instructions Mispredicted."

  },

  {

    "EventName": "ex_ret_mmx_fp_instr.sse_instr",

tools/perf/pmu-events/arch/x86/amdzen2/core.json

+1 −1
Original line number Diff line number Diff line
@@ -125,6 +125,6 @@ 
  {

    "EventName": "ex_ret_fus_brnch_inst",

    "EventCode": "0x1d0",

    "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8.",

    "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8."

  }

]

CRA Git | Maintained and supported by SUSTech CRA and CCSE