Commit 0e7a3ed0 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:
 "Various fixlets:

  On the kernel side:

   - fix a race
   - fix a bug in the handling of the perf ring-buffer data page

  On the tooling side:

   - fix the handling of certain corrupted perf.data files
   - fix a bug in 'perf probe'
   - fix a bug in 'perf record + perf sched'
   - fix a bug in 'make install'
   - fix a bug in libaudit feature-detection on certain distros"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf session: Fix infinite loop on invalid perf.data file
  perf tools: Fix installation of libexec components
  perf probe: Fix to find line information for probe list
  perf tools: Fix libaudit test
  perf stat: Set child_pid after perf_evlist__prepare_workload()
  perf tools: Add default handler for mmap2 events
  perf/x86: Clean up cap_user_time* setting
  perf: Fix perf_pmu_migrate_context
parents 8b5ede69 1651d120

arch/x86/kernel/cpu/perf_event.c

+3 −8
Original line number Diff line number Diff line
@@ -1888,10 +1888,7 @@ void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now) 
	userpg->cap_user_rdpmc = x86_pmu.attr_rdpmc;

	userpg->pmc_width = x86_pmu.cntval_bits;



	if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))

		return;



	if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))

	if (!sched_clock_stable)

		return;



	userpg->cap_user_time = 1;
@@ -1899,11 +1896,9 @@ void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now) 
	userpg->time_shift = CYC2NS_SCALE_FACTOR;

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



	if (sched_clock_stable && !check_tsc_disabled()) {

	userpg->cap_user_time_zero = 1;

	userpg->time_zero = this_cpu_read(cyc2ns_offset);

}

}



/*

 * callchain support

include/linux/perf_event.h

+23 −1
Original line number Diff line number Diff line
@@ -294,9 +294,31 @@ struct ring_buffer; 
 */

struct perf_event {

#ifdef CONFIG_PERF_EVENTS

	struct list_head		group_entry;

	/*

	 * entry onto perf_event_context::event_list;

	 *   modifications require ctx->lock

	 *   RCU safe iterations.

	 */

	struct list_head		event_entry;



	/*

	 * XXX: group_entry and sibling_list should be mutually exclusive;

	 * either you're a sibling on a group, or you're the group leader.

	 * Rework the code to always use the same list element.

	 *

	 * Locked for modification by both ctx->mutex and ctx->lock; holding

	 * either sufficies for read.

	 */

	struct list_head		group_entry;

	struct list_head		sibling_list;



	/*

	 * We need storage to track the entries in perf_pmu_migrate_context; we

	 * cannot use the event_entry because of RCU and we want to keep the

	 * group in tact which avoids us using the other two entries.

	 */

	struct list_head		migrate_entry;



	struct hlist_node		hlist_entry;

	int				nr_siblings;

	int				group_flags;

kernel/events/core.c

+3 −3
Original line number Diff line number Diff line
@@ -7234,15 +7234,15 @@ void perf_pmu_migrate_context(struct pmu *pmu, int src_cpu, int dst_cpu) 
		perf_remove_from_context(event);

		unaccount_event_cpu(event, src_cpu);

		put_ctx(src_ctx);

		list_add(&event->event_entry, &events);

		list_add(&event->migrate_entry, &events);

	}

	mutex_unlock(&src_ctx->mutex);



	synchronize_rcu();



	mutex_lock(&dst_ctx->mutex);

	list_for_each_entry_safe(event, tmp, &events, event_entry) {

		list_del(&event->event_entry);

	list_for_each_entry_safe(event, tmp, &events, migrate_entry) {

		list_del(&event->migrate_entry);

		if (event->state >= PERF_EVENT_STATE_OFF)

			event->state = PERF_EVENT_STATE_INACTIVE;

		account_event_cpu(event, dst_cpu);

tools/perf/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ check: $(OUTPUT)common-cmds.h 
install-bin: all

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'

	$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

	$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

ifndef NO_LIBPERL

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'

tools/perf/builtin-stat.c

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ static int __run_perf_stat(int argc, const char **argv) 
			perror("failed to prepare workload");

			return -1;

		}

		child_pid = evsel_list->workload.pid;

	}



	if (group)

CRA Git | Maintained and supported by SUSTech CRA and CCSE