Commit bdc5663f 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:
 "Assorted standalone fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Add model number for Avoton Silvermont
  perf: Fix capabilities bitfield compatibility in 'struct perf_event_mmap_page'
  perf/x86/intel/uncore: Don't use smp_processor_id() in validate_group()
  perf: Update ABI comment
  tools lib lk: Uninclude linux/magic.h in debugfs.c
  perf tools: Fix old GCC build error in trace-event-parse.c:parse_proc_kallsyms()
  perf probe: Fix finder to find lines of given function
  perf session: Check for SIGINT in more loops
  perf tools: Fix compile with libelf without get_phdrnum
  perf tools: Fix buildid cache handling of kallsyms with kcore
  perf annotate: Fix objdump line parsing offset validation
  perf tools: Fill in new definitions for madvise()/mmap() flags
  perf tools: Sharpen the libaudit dependencies test
parents 743a7ecb cf3b425d

arch/x86/kernel/cpu/perf_event.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1883,9 +1883,9 @@ static struct pmu pmu = { 




void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)

void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)

{

{

	userpg->cap_usr_time = 0;

	userpg->cap_user_time = 0;

	userpg->cap_usr_time_zero = 0;

	userpg->cap_user_time_zero = 0;

	userpg->cap_usr_rdpmc = x86_pmu.attr_rdpmc;

	userpg->cap_user_rdpmc = x86_pmu.attr_rdpmc;

	userpg->pmc_width = x86_pmu.cntval_bits;

	userpg->pmc_width = x86_pmu.cntval_bits;





	if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))

	if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
@@ -1894,13 +1894,13 @@ void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now) 
	if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))

	if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))

		return;

		return;





	userpg->cap_usr_time = 1;

	userpg->cap_user_time = 1;

	userpg->time_mult = this_cpu_read(cyc2ns);

	userpg->time_mult = this_cpu_read(cyc2ns);

	userpg->time_shift = CYC2NS_SCALE_FACTOR;

	userpg->time_shift = CYC2NS_SCALE_FACTOR;

	userpg->time_offset = this_cpu_read(cyc2ns_offset) - now;

	userpg->time_offset = this_cpu_read(cyc2ns_offset) - now;





	if (sched_clock_stable && !check_tsc_disabled()) {

	if (sched_clock_stable && !check_tsc_disabled()) {

		userpg->cap_usr_time_zero = 1;

		userpg->cap_user_time_zero = 1;

		userpg->time_zero = this_cpu_read(cyc2ns_offset);

		userpg->time_zero = this_cpu_read(cyc2ns_offset);

	}

	}

}

}

arch/x86/kernel/cpu/perf_event_intel.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2325,6 +2325,7 @@ __init int intel_pmu_init(void) 
		break;

		break;





	case 55: /* Atom 22nm "Silvermont" */

	case 55: /* Atom 22nm "Silvermont" */

	case 77: /* Avoton "Silvermont" */

		memcpy(hw_cache_event_ids, slm_hw_cache_event_ids,

		memcpy(hw_cache_event_ids, slm_hw_cache_event_ids,

			sizeof(hw_cache_event_ids));

			sizeof(hw_cache_event_ids));

		memcpy(hw_cache_extra_regs, slm_hw_cache_extra_regs,

		memcpy(hw_cache_extra_regs, slm_hw_cache_extra_regs,

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -2706,14 +2706,14 @@ static void uncore_pmu_init_hrtimer(struct intel_uncore_box *box) 
	box->hrtimer.function = uncore_pmu_hrtimer;

	box->hrtimer.function = uncore_pmu_hrtimer;

}

}





struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int cpu)

static struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int node)

{

{

	struct intel_uncore_box *box;

	struct intel_uncore_box *box;

	int i, size;

	int i, size;





	size = sizeof(*box) + type->num_shared_regs * sizeof(struct intel_uncore_extra_reg);

	size = sizeof(*box) + type->num_shared_regs * sizeof(struct intel_uncore_extra_reg);





	box = kzalloc_node(size, GFP_KERNEL, cpu_to_node(cpu));

	box = kzalloc_node(size, GFP_KERNEL, node);

	if (!box)

	if (!box)

		return NULL;

		return NULL;
@@ -3031,7 +3031,7 @@ static int uncore_validate_group(struct intel_uncore_pmu *pmu, 
	struct intel_uncore_box *fake_box;

	struct intel_uncore_box *fake_box;

	int ret = -EINVAL, n;

	int ret = -EINVAL, n;





	fake_box = uncore_alloc_box(pmu->type, smp_processor_id());

	fake_box = uncore_alloc_box(pmu->type, NUMA_NO_NODE);

	if (!fake_box)

	if (!fake_box)

		return -ENOMEM;

		return -ENOMEM;
@@ -3294,7 +3294,7 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id 
	}

	}





	type = pci_uncores[UNCORE_PCI_DEV_TYPE(id->driver_data)];

	type = pci_uncores[UNCORE_PCI_DEV_TYPE(id->driver_data)];

	box = uncore_alloc_box(type, 0);

	box = uncore_alloc_box(type, NUMA_NO_NODE);

	if (!box)

	if (!box)

		return -ENOMEM;

		return -ENOMEM;
@@ -3499,7 +3499,7 @@ static int uncore_cpu_prepare(int cpu, int phys_id) 
			if (pmu->func_id < 0)

			if (pmu->func_id < 0)

				pmu->func_id = j;

				pmu->func_id = j;





			box = uncore_alloc_box(type, cpu);

			box = uncore_alloc_box(type, cpu_to_node(cpu));

			if (!box)

			if (!box)

				return -ENOMEM;

				return -ENOMEM;

include/uapi/linux/perf_event.h

+10 −5
Original line number Original line Diff line number Diff line
@@ -380,10 +380,13 @@ struct perf_event_mmap_page { 
	union {

	union {

		__u64	capabilities;

		__u64	capabilities;

		struct {

		struct {

			__u64	cap_usr_time		: 1,

			__u64	cap_bit0		: 1, /* Always 0, deprecated, see commit 860f085b74e9 */

				cap_usr_rdpmc		: 1,

				cap_bit0_is_deprecated	: 1, /* Always 1, signals that bit 0 is zero */

				cap_usr_time_zero	: 1,



				cap_____res		: 61;

				cap_user_rdpmc		: 1, /* The RDPMC instruction can be used to read counts */

				cap_user_time		: 1, /* The time_* fields are used */

				cap_user_time_zero	: 1, /* The time_zero field is used */

				cap_____res		: 59;

		};

		};

	};

	};
@@ -442,12 +445,13 @@ struct perf_event_mmap_page { 
	 *               ((rem * time_mult) >> time_shift);

	 *               ((rem * time_mult) >> time_shift);

	 */

	 */

	__u64	time_zero;

	__u64	time_zero;

	__u32	size;			/* Header size up to __reserved[] fields. */





		/*

		/*

		 * Hole for extension of the self monitor capabilities

		 * Hole for extension of the self monitor capabilities

		 */

		 */





	__u64	__reserved[119];	/* align to 1k */

	__u8	__reserved[118*8+4];	/* align to 1k. */





	/*

	/*

	 * Control data for the mmap() data buffer.

	 * Control data for the mmap() data buffer.
@@ -528,6 +532,7 @@ enum perf_event_type { 
	 *	u64				len;

	 *	u64				len;

	 *	u64				pgoff;

	 *	u64				pgoff;

	 *	char				filename[];

	 *	char				filename[];

	 * 	struct sample_id		sample_id;

	 * };

	 * };

	 */

	 */

	PERF_RECORD_MMAP			= 1,

	PERF_RECORD_MMAP			= 1,

kernel/events/core.c

+21 −0
Original line number Original line Diff line number Diff line
@@ -3660,6 +3660,26 @@ static void calc_timer_values(struct perf_event *event, 
	*running = ctx_time - event->tstamp_running;

	*running = ctx_time - event->tstamp_running;

}

}





static void perf_event_init_userpage(struct perf_event *event)

{

	struct perf_event_mmap_page *userpg;

	struct ring_buffer *rb;



	rcu_read_lock();

	rb = rcu_dereference(event->rb);

	if (!rb)

		goto unlock;



	userpg = rb->user_page;



	/* Allow new userspace to detect that bit 0 is deprecated */

	userpg->cap_bit0_is_deprecated = 1;

	userpg->size = offsetof(struct perf_event_mmap_page, __reserved);



unlock:

	rcu_read_unlock();

}



void __weak arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)

void __weak arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)

{

{

}

}
@@ -4044,6 +4064,7 @@ again: 
	ring_buffer_attach(event, rb);

	ring_buffer_attach(event, rb);

	rcu_assign_pointer(event->rb, rb);

	rcu_assign_pointer(event->rb, rb);





	perf_event_init_userpage(event);

	perf_event_update_userpage(event);

	perf_event_update_userpage(event);





unlock:

unlock:

CRA Git | Maintained and supported by SUSTech CRA and CCSE