Commit 65a50c95 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 updates from Ingo Molnar.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
  perf ui browser: Stop using 'self'
  perf annotate browser: Read perf config file for settings
  perf config: Allow '_' in config file variable names
  perf annotate browser: Make feature toggles global
  perf annotate browser: The idx_asm field should be used in asm only view
  perf tools: Convert critical messages to ui__error()
  perf ui: Make --stdio default when TUI is not supported
  tools lib traceevent: Silence compiler warning on 32bit build
  perf record: Fix branch_stack type in perf_record_opts
  perf tools: Reconstruct event with modifiers from perf_event_attr
  perf top: Fix counter name fixup when fallbacking to cpu-clock
  perf tools: fix thread_map__new_by_pid_str() memory leak in error path
  perf tools: Do not use _FORTIFY_SOURCE when DEBUG=1 is specified
  tools lib traceevent: Fix signature of create_arg_item()
  tools lib traceevent: Use proper function parameter type
  tools lib traceevent: Fix freeing arg on process_dynamic_array()
  tools lib traceevent: Fix a possibly wrong memory dereference
  tools lib traceevent: Fix a possible memory leak
  tools lib traceevent: Allow expressions in __print_symbolic() fields
  perf evlist: Explicititely initialize input_name
  ...
parents 42fe55ce 59cd358a

kernel/trace/ring_buffer.c

+5 −0
Original line number Diff line number Diff line
@@ -1486,6 +1486,11 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size, 
	if (!buffer)

		return size;



	/* Make sure the requested buffer exists */

	if (cpu_id != RING_BUFFER_ALL_CPUS &&

	    !cpumask_test_cpu(cpu_id, buffer->cpumask))

		return size;



	size = DIV_ROUND_UP(size, BUF_PAGE_SIZE);

	size *= BUF_PAGE_SIZE;

tools/lib/traceevent/event-parse.c

+18 −4
Original line number Diff line number Diff line
@@ -1434,8 +1434,11 @@ static int event_read_fields(struct event_format *event, struct format_field **f 
fail:

	free_token(token);

fail_expect:

	if (field)

	if (field) {

		free(field->type);

		free(field->name);

		free(field);

	}

	return -1;

}
@@ -1712,6 +1715,8 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok) 


		if (set_op_prio(arg) == -1) {

			event->flags |= EVENT_FL_FAILED;

			/* arg->op.op (= token) will be freed at out_free */

			arg->op.op = NULL;

			goto out_free;

		}
@@ -2124,6 +2129,13 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char ** 


		free_token(token);

		type = process_arg(event, arg, &token);



		if (type == EVENT_OP)

			type = process_op(event, arg, &token);



		if (type == EVENT_ERROR)

			goto out_free;



		if (test_type_token(type, token, EVENT_DELIM, ","))

			goto out_free;
@@ -2288,17 +2300,18 @@ process_dynamic_array(struct event_format *event, struct print_arg *arg, char ** 
	arg = alloc_arg();

	type = process_arg(event, arg, &token);

	if (type == EVENT_ERROR)

		goto out_free;

		goto out_free_arg;



	if (!test_type_token(type, token, EVENT_OP, "]"))

		goto out_free;

		goto out_free_arg;



	free_token(token);

	type = read_token_item(tok);

	return type;



 out_free_arg:

	free_arg(arg);

 out_free:

	free(arg);

	free_token(token);

	*tok = NULL;

	return EVENT_ERROR;
@@ -3362,6 +3375,7 @@ process_defined_func(struct trace_seq *s, void *data, int size, 
			break;

		}

		farg = farg->next;

		param = param->next;

	}



	ret = (*func_handle->func)(s, args);

tools/lib/traceevent/parse-filter.c

+3 −4
Original line number Diff line number Diff line
@@ -325,9 +325,8 @@ static void free_events(struct event_list *events) 
}



static struct filter_arg *

create_arg_item(struct event_format *event,

		const char *token, enum filter_arg_type type,

		char **error_str)

create_arg_item(struct event_format *event, const char *token,

		enum event_type type, char **error_str)

{

	struct format_field *field;

	struct filter_arg *arg;
@@ -1585,7 +1584,7 @@ get_value(struct event_format *event, 
		const char *name;



		name = get_comm(event, record);

		return (unsigned long long)name;

		return (unsigned long)name;

	}



	pevent_read_number_field(field, record->data, &val);

tools/perf/Documentation/perfconfig.example

+8 −0
Original line number Diff line number Diff line
@@ -19,3 +19,11 @@ 


	# Default, disable using /dev/null

	dir = /root/.debug



[annotate]



	# Defaults

	hide_src_code = false

	use_offset = true

	jump_arrows = true

	show_nr_jumps = false

tools/perf/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ ifeq ("$(origin DEBUG)", "command line") 
  PERF_DEBUG = $(DEBUG)

endif

ifndef PERF_DEBUG

  CFLAGS_OPTIMIZE = -O6

  CFLAGS_OPTIMIZE = -O6 -D_FORTIFY_SOURCE=2

endif



ifdef PARSER_DEBUG
@@ -89,7 +89,7 @@ ifdef PARSER_DEBUG 
	PARSER_DEBUG_CFLAGS := -DPARSER_DEBUG

endif



CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) $(PARSER_DEBUG_CFLAGS)

CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) $(PARSER_DEBUG_CFLAGS)

EXTLIBS = -lpthread -lrt -lelf -lm

ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

ALL_LDFLAGS = $(LDFLAGS)

CRA Git | Maintained and supported by SUSTech CRA and CCSE