Commit 72f4a11d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 * Fix parsing with no sample_id_all bit set, this regression prevents perf
   from reading old perf.data files generated in systems where
   perf_event_attr.sample_id_all isn't available, from Adrian Hunter.

 * Add signal checking to the inner 'perf trace' event processing loop, allowing
   faster response to control+C.

 * Fix formatting of long symbol names removing the hardcoding of a buffer
   size used to format histogram entries, which was truncating the lines.

 * Separate progress bar update when processing events, reducing potentially big
   overhead in not needed TUI progress bar screen updates, from Jiri Olsa.

 * Fix 'perf trace' build in architectures where MAP_32BIT is not defined, from
   Kyle McMartin.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 816434ec 526fd8d4

tools/perf/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -394,6 +394,8 @@ ifeq ($(ARCH),x86) 
LIB_OBJS += $(OUTPUT)tests/perf-time-to-tsc.o

endif

LIB_OBJS += $(OUTPUT)tests/code-reading.o

LIB_OBJS += $(OUTPUT)tests/sample-parsing.o

LIB_OBJS += $(OUTPUT)tests/parse-no-sample-id-all.o



BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o

BUILTIN_OBJS += $(OUTPUT)builtin-bench.o
@@ -439,7 +441,6 @@ PERFLIBS = $(LIB_FILE) $(LIBLK) $(LIBTRACEEVENT) 
ifneq ($(OUTPUT),)

  CFLAGS += -I$(OUTPUT)

endif

LIB_OBJS += $(OUTPUT)tests/sample-parsing.o



ifdef NO_LIBELF

EXTLIBS := $(filter-out -lelf,$(EXTLIBS))

tools/perf/builtin-trace.c

+5 −0
Original line number Diff line number Diff line
@@ -100,7 +100,9 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, 


	P_MMAP_FLAG(SHARED);

	P_MMAP_FLAG(PRIVATE);

#ifdef MAP_32BIT

	P_MMAP_FLAG(32BIT);

#endif

	P_MMAP_FLAG(ANONYMOUS);

	P_MMAP_FLAG(DENYWRITE);

	P_MMAP_FLAG(EXECUTABLE);
@@ -994,6 +996,9 @@ again: 


			handler = evsel->handler.func;

			handler(trace, evsel, &sample);



			if (done)

				goto out_unmap_evlist;

		}

	}

tools/perf/tests/builtin-test.c

+4 −0
Original line number Diff line number Diff line
@@ -111,6 +111,10 @@ static struct test { 
		.desc = "Test using a dummy software event to keep tracking",

		.func = test__keep_tracking,

	},

	{

		.desc = "Test parsing with no sample_id_all bit set",

		.func = test__parse_no_sample_id_all,

	},

	{

		.func = NULL,

	},

tools/perf/tests/parse-no-sample-id-all.c

0 → 100644
+108 −0
Original line number Diff line number Diff line 
#include <sys/types.h>

#include <stddef.h>



#include "tests.h"



#include "event.h"

#include "evlist.h"

#include "header.h"

#include "util.h"



static int process_event(struct perf_evlist **pevlist, union perf_event *event)

{

	struct perf_sample sample;



	if (event->header.type == PERF_RECORD_HEADER_ATTR) {

		if (perf_event__process_attr(NULL, event, pevlist)) {

			pr_debug("perf_event__process_attr failed\n");

			return -1;

		}

		return 0;

	}



	if (event->header.type >= PERF_RECORD_USER_TYPE_START)

		return -1;



	if (!*pevlist)

		return -1;



	if (perf_evlist__parse_sample(*pevlist, event, &sample)) {

		pr_debug("perf_evlist__parse_sample failed\n");

		return -1;

	}



	return 0;

}



static int process_events(union perf_event **events, size_t count)

{

	struct perf_evlist *evlist = NULL;

	int err = 0;

	size_t i;



	for (i = 0; i < count && !err; i++)

		err = process_event(&evlist, events[i]);



	if (evlist)

		perf_evlist__delete(evlist);



	return err;

}



struct test_attr_event {

	struct attr_event attr;

	u64 id;

};



/**

 * test__parse_no_sample_id_all - test parsing with no sample_id_all bit set.

 *

 * This function tests parsing data produced on kernel's that do not support the

 * sample_id_all bit.  Without the sample_id_all bit, non-sample events (such as

 * mmap events) do not have an id sample appended, and consequently logic

 * designed to determine the id will not work.  That case happens when there is

 * more than one selected event, so this test processes three events: 2

 * attributes representing the selected events and one mmap event.

 *

 * Return: %0 on success, %-1 if the test fails.

 */

int test__parse_no_sample_id_all(void)

{

	int err;



	struct test_attr_event event1 = {

		.attr = {

			.header = {

				.type = PERF_RECORD_HEADER_ATTR,

				.size = sizeof(struct test_attr_event),

			},

		},

		.id = 1,

	};

	struct test_attr_event event2 = {

		.attr = {

			.header = {

				.type = PERF_RECORD_HEADER_ATTR,

				.size = sizeof(struct test_attr_event),

			},

		},

		.id = 2,

	};

	struct mmap_event event3 = {

		.header = {

			.type = PERF_RECORD_MMAP,

			.size = sizeof(struct mmap_event),

		},

	};

	union perf_event *events[] = {

		(union perf_event *)&event1,

		(union perf_event *)&event2,

		(union perf_event *)&event3,

	};



	err = process_events(events, ARRAY_SIZE(events));

	if (err)

		return -1;



	return 0;

}

tools/perf/tests/tests.h

+1 −0
Original line number Diff line number Diff line
@@ -39,5 +39,6 @@ int test__perf_time_to_tsc(void); 
int test__code_reading(void);

int test__sample_parsing(void);

int test__keep_tracking(void);

int test__parse_no_sample_id_all(void);



#endif /* TESTS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE