Commit 20e8e72d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.19-20181017' of... 

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

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Stop falling back to kallsyms for vDSO symbols lookup, this wasn't
  being really used and is not valid in arches such as Sparc, where
  user and kernel space don't share the address space, relying only on
  cpumode to figure out what DSOs to lookup (Arnaldo Carvalho de Melo)

- Align CPU map synthesized events properly, fixing SIGBUS in
  CPUs like Sparc (David Miller)

- Fix use of alternatives to find JDIR (Jarod Wilson)

- Store IDs for events with their own CPUs when synthesizing user
  level event details (scale, unit, etc) events, fixing a crash
  when recording a PMU event with a cpumask defined (Jiri Olsa)

- Fix wrong filter_band* values for uncore Intel vendor events (Jiri Olsa)

- Fix detection of tracefs path in systems without tracefs, where
  that path should be the debugfs mountpoint plus "/tracing/" (Jiri Olsa)

- Pass build flags to traceevent build, allowing using alternative
  flags in distro packages, RPM, for instance (Jiri Olsa)

- Fix 'perf report' crash on invalid inline debug information (Milian Wolff)

- Synch KVM UAPI copies (Arnaldo Carvalho de Melo)

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

tools/arch/x86/include/uapi/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ struct kvm_sync_regs { 


#define KVM_X86_QUIRK_LINT0_REENABLED	(1 << 0)

#define KVM_X86_QUIRK_CD_NW_CLEARED	(1 << 1)

#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE	(1 << 2)



#define KVM_STATE_NESTED_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_RUN_PENDING	0x00000002

tools/include/uapi/linux/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -952,6 +952,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_S390_HPAGE_1M 156

#define KVM_CAP_NESTED_STATE 157

#define KVM_CAP_ARM_INJECT_SERROR_ESR 158

#define KVM_CAP_MSR_PLATFORM_INFO 159



#ifdef KVM_CAP_IRQ_ROUTING

tools/lib/api/fs/tracing_path.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static const char *tracing_path_tracefs_mount(void) 


	__tracing_path_set("", mnt);



	return mnt;

	return tracing_path;

}



static const char *tracing_path_debugfs_mount(void)
@@ -49,7 +49,7 @@ static const char *tracing_path_debugfs_mount(void) 


	__tracing_path_set("tracing/", mnt);



	return mnt;

	return tracing_path;

}



const char *tracing_path_mount(void)

tools/perf/Makefile.config

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ ifndef NO_JVMTI 
    JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | awk '{print $$3}')

  else

    ifneq (,$(wildcard /usr/sbin/alternatives))

      JDIR=$(shell alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g')

      JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g')

    endif

  endif

  ifndef JDIR

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ $(LIBPERF_IN): prepare FORCE 
$(LIB_FILE): $(LIBPERF_IN)

	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) $(LIB_OBJS)



LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ)

LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ) 'EXTRA_CFLAGS=$(EXTRA_CFLAGS)' 'LDFLAGS=$(LDFLAGS)'



$(LIBTRACEEVENT): FORCE

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) $(OUTPUT)libtraceevent.a

CRA Git | Maintained and supported by SUSTech CRA and CCSE