Commit 3f26b0c8 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:
 "Misc fixes on the kernel and tooling side - nothing in particular
  stands out"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
  perf/core: Fix the perf_cpu_time_max_percent check
  perf/core: Fix perf_event_enable_on_exec() timekeeping (again)
  perf/core: Remove confusing comment and move put_ctx()
  perf record: Honor --quiet option properly
  perf annotate: Add -q/--quiet option
  perf diff: Add -q/--quiet option
  perf report: Add -q/--quiet option
  perf utils: Check verbose flag properly
  perf utils: Add perf_quiet_option()
  perf record: Add -a as default target
  perf stat: Add -a as default target
  perf tools: Fail on using multiple bits long terms without value
  perf tools: Move new_term arguments into struct parse_events_term template
  perf build: Add special fixdep cleaning rule
  perf tools: Replace _SC_NPROCESSORS_CONF with max_present_cpu in cpu_topology_map
  perf header: Make build_cpu_topology skip offline/absent CPUs
  perf cpumap: Add cpu__max_present_cpu()
  perf session: Fix DEBUG=1 build with clang
  tools lib traceevent: It's preempt not prempt
  perf python: Filter out -specs=/a/b/c from the python binding cc options
  ...
parents 74efe07b 1572e45a

kernel/events/core.c

+4 −8
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write, 
				void __user *buffer, size_t *lenp,

				loff_t *ppos)

{

	int ret = proc_dointvec(table, write, buffer, lenp, ppos);

	int ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);



	if (ret || !write)

		return ret;
@@ -3522,6 +3522,8 @@ static void perf_event_enable_on_exec(int ctxn) 
	if (enabled) {

		clone_ctx = unclone_ctx(ctx);

		ctx_resched(cpuctx, ctx, event_type);

	} else {

		ctx_sched_in(ctx, cpuctx, EVENT_TIME, current);

	}

	perf_ctx_unlock(cpuctx, ctx);
@@ -9955,6 +9957,7 @@ SYSCALL_DEFINE5(perf_event_open, 
		 * of swizzling perf_event::ctx.

		 */

		perf_remove_from_context(group_leader, 0);

		put_ctx(gctx);



		list_for_each_entry(sibling, &group_leader->sibling_list,

				    group_entry) {
@@ -9993,13 +9996,6 @@ SYSCALL_DEFINE5(perf_event_open, 
		perf_event__state_init(group_leader);

		perf_install_in_context(ctx, group_leader, group_leader->cpu);

		get_ctx(ctx);



		/*

		 * Now that all events are installed in @ctx, nothing

		 * references @gctx anymore, so drop the last reference we have

		 * on it.

		 */

		put_ctx(gctx);

	}



	/*

tools/build/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ all: $(OUTPUT)fixdep 


clean:

	$(call QUIET_CLEAN, fixdep)

	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)rm -f fixdep

	$(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)rm -f $(OUTPUT)fixdep



$(OUTPUT)fixdep-in.o: FORCE

	$(Q)$(MAKE) $(build)=fixdep

tools/build/Makefile.include

+3 −0
Original line number Diff line number Diff line
@@ -3,4 +3,7 @@ build := -f $(srctree)/tools/build/Makefile.build dir=. obj 
fixdep:

	$(Q)$(MAKE) -C $(srctree)/tools/build CFLAGS= LDFLAGS= $(OUTPUT)fixdep



fixdep-clean:

	$(Q)$(MAKE) -C $(srctree)/tools/build clean



.PHONY: fixdep

tools/lib/traceevent/event-parse.c

+2 −2
Original line number Diff line number Diff line
@@ -5225,13 +5225,13 @@ int pevent_data_pid(struct pevent *pevent, struct pevent_record *rec) 
}



/**

 * pevent_data_prempt_count - parse the preempt count from the record

 * pevent_data_preempt_count - parse the preempt count from the record

 * @pevent: a handle to the pevent

 * @rec: the record to parse

 *

 * This returns the preempt count from a record.

 */

int pevent_data_prempt_count(struct pevent *pevent, struct pevent_record *rec)

int pevent_data_preempt_count(struct pevent *pevent, struct pevent_record *rec)

{

	return parse_common_pc(pevent, rec->data);

}

tools/lib/traceevent/event-parse.h

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ void pevent_data_lat_fmt(struct pevent *pevent, 
int pevent_data_type(struct pevent *pevent, struct pevent_record *rec);

struct event_format *pevent_data_event_from_type(struct pevent *pevent, int type);

int pevent_data_pid(struct pevent *pevent, struct pevent_record *rec);

int pevent_data_prempt_count(struct pevent *pevent, struct pevent_record *rec);

int pevent_data_preempt_count(struct pevent *pevent, struct pevent_record *rec);

int pevent_data_flags(struct pevent *pevent, struct pevent_record *rec);

const char *pevent_data_comm_from_pid(struct pevent *pevent, int pid);

struct cmdline;

CRA Git | Maintained and supported by SUSTech CRA and CCSE