Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5a5ba72 authored by Don Zickus's avatar Don Zickus Committed by Jiri Olsa
Browse files

Revert "perf: Disable PERF_RECORD_MMAP2 support" 



This reverts commit 3090ffb5.

Re-enable the mmap2 interface as we will have a user soon.

Since things have changed since perf disabled mmap2, small tweaks
to the revert had to be done:

o commit 9d4ecc88 forced (n!=8) to become (n<7)
o a new libunwind test needed updating to use mmap2 interface

Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
Link: http://lkml.kernel.org/r/1401461382-209586-1-git-send-email-dzickus@redhat.com


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent 7ef80703

kernel/events/core.c

+0 −4
Original line number Diff line number Diff line
@@ -6929,10 +6929,6 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, 
	if (ret)

		return -EFAULT;



	/* disabled for now */

	if (attr->mmap2)

		return -EINVAL;



	if (attr->__reserved_1)

		return -EINVAL;

tools/perf/tests/dwarf-unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ static int mmap_handler(struct perf_tool *tool __maybe_unused, 
			struct perf_sample *sample __maybe_unused,

			struct machine *machine)

{

	return machine__process_mmap_event(machine, event, NULL);

	return machine__process_mmap2_event(machine, event, NULL);

}



static int init_live_machine(struct machine *machine)

tools/perf/util/event.c

+20 −14
Original line number Diff line number Diff line
@@ -179,13 +179,14 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool, 
		return -1;

	}



	event->header.type = PERF_RECORD_MMAP;

	event->header.type = PERF_RECORD_MMAP2;



	while (1) {

		char bf[BUFSIZ];

		char prot[5];

		char execname[PATH_MAX];

		char anonstr[] = "//anon";

		unsigned int ino;

		size_t size;

		ssize_t n;
@@ -196,15 +197,20 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool, 
		strcpy(execname, "");



		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */

		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %*x:%*x %*u %s\n",

		       &event->mmap.start, &event->mmap.len, prot,

		       &event->mmap.pgoff,

		       execname);

		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",

		       &event->mmap2.start, &event->mmap2.len, prot,

		       &event->mmap2.pgoff, &event->mmap2.maj,

		       &event->mmap2.min,

		       &ino, execname);



		/*

 		 * Anon maps don't have the execname.

 		 */

		if (n < 4)

		if (n < 7)

			continue;



		event->mmap2.ino = (u64)ino;



		/*

		 * Just like the kernel, see __perf_event_mmap in kernel/perf_event.c

		 */
@@ -239,15 +245,15 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool, 
			strcpy(execname, anonstr);



		size = strlen(execname) + 1;

		memcpy(event->mmap.filename, execname, size);

		memcpy(event->mmap2.filename, execname, size);

		size = PERF_ALIGN(size, sizeof(u64));

		event->mmap.len -= event->mmap.start;

		event->mmap.header.size = (sizeof(event->mmap) -

					(sizeof(event->mmap.filename) - size));

		memset(event->mmap.filename + size, 0, machine->id_hdr_size);

		event->mmap.header.size += machine->id_hdr_size;

		event->mmap.pid = tgid;

		event->mmap.tid = pid;

		event->mmap2.len -= event->mmap.start;

		event->mmap2.header.size = (sizeof(event->mmap2) -

					(sizeof(event->mmap2.filename) - size));

		memset(event->mmap2.filename + size, 0, machine->id_hdr_size);

		event->mmap2.header.size += machine->id_hdr_size;

		event->mmap2.pid = tgid;

		event->mmap2.tid = pid;



		if (process(tool, event, &synth_sample, machine) != 0) {

			rc = -1;

tools/perf/util/evsel.c

+1 −0
Original line number Diff line number Diff line
@@ -659,6 +659,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts) 
		perf_evsel__set_sample_bit(evsel, WEIGHT);



	attr->mmap  = track;

	attr->mmap2 = track && !perf_missing_features.mmap2;

	attr->comm  = track;



	if (opts->sample_transaction)