Commit c0be92b5 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 fixes from Ingo Molnar:
 "Mostly tooling fixes, but also breakpoint and x86 PMU driver fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
  perf tools: Fix maps__find_symbol_by_name()
  tools headers uapi: Update tools's copy of linux/if_link.h
  tools headers uapi: Update tools's copy of linux/vhost.h
  tools headers uapi: Update tools's copies of kvm headers
  tools headers uapi: Update tools's copy of drm/drm.h
  tools headers uapi: Update tools's copy of asm-generic/unistd.h
  tools headers uapi: Update tools's copy of linux/perf_event.h
  perf/core: Force USER_DS when recording user stack data
  perf/UAPI: Clearly mark __PERF_SAMPLE_CALLCHAIN_EARLY as internal use
  perf/x86/intel: Add support/quirk for the MISPREDICT bit on Knights Landing CPUs
  perf annotate: Fix parsing aarch64 branch instructions after objdump update
  perf probe powerpc: Ignore SyS symbols irrespective of endianness
  perf event-parse: Use fixed size string for comms
  perf util: Fix bad memory access in trace info.
  perf tools: Streamline bpf examples and headers installation
  perf evsel: Fix potential null pointer dereference in perf_evsel__new_idx()
  perf arm64: Fix include path for asm-generic/unistd.h
  perf/hw_breakpoint: Simplify breakpoint enable in perf_event_modify_breakpoint
  perf/hw_breakpoint: Enable breakpoint in modify_user_hw_breakpoint
  perf/hw_breakpoint: Remove superfluous bp->attr.disabled = 0
  ...
parents ca062f8d cb48b6a2

arch/x86/events/intel/lbr.c

+4 −0
Original line number Diff line number Diff line
@@ -1272,4 +1272,8 @@ void intel_pmu_lbr_init_knl(void) 


	x86_pmu.lbr_sel_mask = LBR_SEL_MASK;

	x86_pmu.lbr_sel_map  = snb_lbr_sel_map;



	/* Knights Landing does have MISPREDICT bit */

	if (x86_pmu.intel_cap.lbr_format == LBR_FORMAT_LIP)

		x86_pmu.intel_cap.lbr_format = LBR_FORMAT_EIP_FLAGS;

}

include/uapi/linux/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ enum perf_event_sample_format { 


	PERF_SAMPLE_MAX = 1U << 20,		/* non-ABI */



	__PERF_SAMPLE_CALLCHAIN_EARLY		= 1ULL << 63,

	__PERF_SAMPLE_CALLCHAIN_EARLY		= 1ULL << 63, /* non-ABI; internal use */

};



/*

kernel/events/core.c

+7 −8
Original line number Diff line number Diff line
@@ -2867,18 +2867,13 @@ static int perf_event_modify_breakpoint(struct perf_event *bp, 
	_perf_event_disable(bp);



	err = modify_user_hw_breakpoint_check(bp, attr, true);

	if (err) {



	if (!bp->attr.disabled)

		_perf_event_enable(bp);



	return err;

}



	if (!attr->disabled)

		_perf_event_enable(bp);

	return 0;

}



static int perf_event_modify_attr(struct perf_event *event,

				  struct perf_event_attr *attr)

{
@@ -5948,6 +5943,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size, 
		unsigned long sp;

		unsigned int rem;

		u64 dyn_size;

		mm_segment_t fs;



		/*

		 * We dump:
@@ -5965,7 +5961,10 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size, 


		/* Data. */

		sp = perf_user_stack_pointer(regs);

		fs = get_fs();

		set_fs(USER_DS);

		rem = __output_copy_user(handle, (void *) sp, dump_size);

		set_fs(fs);

		dyn_size = dump_size - rem;



		perf_output_skip(handle, rem);

kernel/events/hw_breakpoint.c

+6 −7
Original line number Diff line number Diff line
@@ -509,6 +509,8 @@ modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *a 
 */

int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr)

{

	int err;



	/*

	 * modify_user_hw_breakpoint can be invoked with IRQs disabled and hence it

	 * will not be possible to raise IPIs that invoke __perf_event_disable.
@@ -520,15 +522,12 @@ int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *att 
	else

		perf_event_disable(bp);



	if (!attr->disabled) {

		int err = modify_user_hw_breakpoint_check(bp, attr, false);

	err = modify_user_hw_breakpoint_check(bp, attr, false);



		if (err)

			return err;

	if (!bp->attr.disabled)

		perf_event_enable(bp);

		bp->attr.disabled = 0;

	}

	return 0;



	return err;

}

EXPORT_SYMBOL_GPL(modify_user_hw_breakpoint);

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

+13 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define __KVM_HAVE_GUEST_DEBUG

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_READONLY_MEM

#define __KVM_HAVE_VCPU_EVENTS



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@ -125,6 +126,18 @@ struct kvm_sync_regs { 
struct kvm_arch_memory_slot {

};



/* for KVM_GET/SET_VCPU_EVENTS */

struct kvm_vcpu_events {

	struct {

		__u8 serror_pending;

		__u8 serror_has_esr;

		/* Align it to 8 bytes */

		__u8 pad[6];

		__u64 serror_esr;

	} exception;

	__u32 reserved[12];

};



/* If you need to interpret the index values, here is the key: */

#define KVM_REG_ARM_COPROC_MASK		0x000000000FFF0000

#define KVM_REG_ARM_COPROC_SHIFT	16

CRA Git | Maintained and supported by SUSTech CRA and CCSE