linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Clark Williams <williams@redhat.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>
Subject: [PATCH 01/28] perf tools: Introduce rlimit__bump_memlock() helper
Date: Mon, 15 Jul 2019 18:11:33 -0300	[thread overview]
Message-ID: <20190715211200.10984-2-acme@kernel.org> (raw)
In-Reply-To: <20190715211200.10984-1-acme@kernel.org>

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Just like the BPF guys did when faced with failures with map creation,
etc, i.e. their solution is:

  tools/testing/selftests/bpf/bpf_rlimit.h

For perf use this function in 'perf test' and in 'perf trace'.

Make it bump to 4 times the current value, if it fails twice the current
value and if it still fails, warn that things like BPF map creation may
fail, to help in diagnosing the problem.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-muvqef2i7n6pzqbmu7tn2d2y@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/Build    |  1 +
 tools/perf/util/rlimit.c | 29 +++++++++++++++++++++++++++++
 tools/perf/util/rlimit.h |  6 ++++++
 3 files changed, 36 insertions(+)
 create mode 100644 tools/perf/util/rlimit.c
 create mode 100644 tools/perf/util/rlimit.h

diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index d7e3b008a613..14f812bb07a7 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -20,6 +20,7 @@ perf-y += parse-events.o
 perf-y += perf_regs.o
 perf-y += path.o
 perf-y += print_binary.o
+perf-y += rlimit.o
 perf-y += argv_split.o
 perf-y += rbtree.o
 perf-y += libstring.o
diff --git a/tools/perf/util/rlimit.c b/tools/perf/util/rlimit.c
new file mode 100644
index 000000000000..13521d392a22
--- /dev/null
+++ b/tools/perf/util/rlimit.c
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: LGPL-2.1 */
+
+#include "util/debug.h"
+#include "util/rlimit.h"
+#include <sys/time.h>
+#include <sys/resource.h>
+
+/*
+ * Bump the memlock so that we can get bpf maps of a reasonable size,
+ * like the ones used with 'perf trace' and with 'perf test bpf',
+ * improve this to some specific request if needed.
+ */
+void rlimit__bump_memlock(void)
+{
+	struct rlimit rlim;
+
+	if (getrlimit(RLIMIT_MEMLOCK, &rlim) == 0) {
+		rlim.rlim_cur *= 4;
+		rlim.rlim_max *= 4;
+
+		if (setrlimit(RLIMIT_MEMLOCK, &rlim) < 0) {
+			rlim.rlim_cur /= 2;
+			rlim.rlim_max /= 2;
+
+			if (setrlimit(RLIMIT_MEMLOCK, &rlim) < 0)
+				pr_debug("Couldn't bump rlimit(MEMLOCK), failures may take place when creating BPF maps, etc\n");
+		}
+	}
+}
diff --git a/tools/perf/util/rlimit.h b/tools/perf/util/rlimit.h
new file mode 100644
index 000000000000..9f59d8e710a3
--- /dev/null
+++ b/tools/perf/util/rlimit.h
@@ -0,0 +1,6 @@
+#ifndef __PERF_RLIMIT_H_
+#define __PERF_RLIMIT_H_
+/* SPDX-License-Identifier: LGPL-2.1 */
+
+void rlimit__bump_memlock(void);
+#endif // __PERF_RLIMIT_H_
-- 
2.21.0


  reply	other threads:[~2019-07-15 21:12 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-15 21:11 [GIT PULL] perf/core improvements and fixes Arnaldo Carvalho de Melo
2019-07-15 21:11 ` Arnaldo Carvalho de Melo [this message]
2019-07-15 21:11 ` [PATCH 02/28] perf test: Auto bump rlimit(MEMLOCK) for BPF test sake Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 03/28] perf trace: Auto bump rlimit(MEMLOCK) for eBPF maps sake Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 04/28] perf db-export: Get rid of db_export__deferred() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 05/28] perf db-export: Rename db_export__comm() to db_export__exec_comm() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 06/28] perf db-export: Pass main_thread to db_export__thread() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 07/28] perf db-export: Export main_thread in db_export__sample() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 08/28] perf db-export: Export comm before exporting thread Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 09/28] perf db-export: Move export__comm_thread into db_export__sample() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 10/28] perf db-export: Fix a white space issue in db_export__sample() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 11/28] perf db-export: Export comm details Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 12/28] perf scripts python: export-to-sqlite.py: " Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 13/28] perf scripts python: export-to-postgresql.py: " Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 14/28] perf db-export: Factor out db_export__comm() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 15/28] perf db-export: Also export thread's current comm Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 16/28] perf scripts python: export-to-sqlite.py: Add has_calls column to comms table Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 17/28] perf scripts python: export-to-postgresql.py: " Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 18/28] perf scripts python: exported-sql-viewer.py: Remove redundant semi-colons Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 19/28] perf scripts python: exported-sql-viewer.py: Use new 'has_calls' column Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 20/28] perf script: Add scripting operation process_switch() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 21/28] perf db-export: Factor out db_export__threads() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 22/28] perf db-export: Export switch events Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 23/28] perf scripts python: export-to-sqlite.py: " Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 24/28] perf scripts python: export-to-postgresql.py: " Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 25/28] perf cs-etm: Remove errnoeous ERR_PTR() usage in cs_etm__process_auxtrace_info Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 26/28] perf cs-etm: Return errcode in cs_etm__process_auxtrace_info() Arnaldo Carvalho de Melo
2019-07-15 21:11 ` [PATCH 27/28] perf vendor events s390: Add JSON files for machine type 8561 Arnaldo Carvalho de Melo
2019-07-15 21:12 ` [PATCH 28/28] perf version: Fix segfault due to missing OPT_END() Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190715211200.10984-2-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=ast@kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=williams@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).