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

Commit e5d4a290 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evlist: Clarify sterror_mmap variable names 

Prep patch for doing further checks like when the number of pages that
is being attempted is actually below /proc/sys/kernel/perf_event_mlock_kb but
the operation fails because the user doesn't have CAP_IPC_LOCK.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-wetzlux7mzvofu5cuji5i71i@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0a2138b2

tools/perf/util/evlist.c

+3 −3
Original line number Diff line number Diff line
@@ -1487,16 +1487,16 @@ int perf_evlist__strerror_open(struct perf_evlist *evlist __maybe_unused, 
int perf_evlist__strerror_mmap(struct perf_evlist *evlist, int err, char *buf, size_t size)

{

	char sbuf[STRERR_BUFSIZE], *emsg = strerror_r(err, sbuf, sizeof(sbuf));

	int value;

	int pages_attempted = evlist->mmap_len / 1024, pages_max_per_user;



	switch (err) {

	case EPERM:

		sysctl__read_int("kernel/perf_event_mlock_kb", &value);

		sysctl__read_int("kernel/perf_event_mlock_kb", &pages_max_per_user);

		scnprintf(buf, size, "Error:\t%s.\n"

				     "Hint:\tCheck /proc/sys/kernel/perf_event_mlock_kb (%d kB) setting.\n"

				     "Hint:\tTried using %zd kB.\n"

				     "Hint:\tTry using a smaller -m/--mmap-pages value.",

				     emsg, value, evlist->mmap_len / 1024);

				     emsg, pages_max_per_user, pages_attempted);

		break;

	default:

		scnprintf(buf, size, "%s", emsg);