From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757440AbcASVf3 (ORCPT <rfc822;w@1wt.eu>);
	Tue, 19 Jan 2016 16:35:29 -0500
Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:50573 "EHLO
	shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1756744AbcASVfV (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 19 Jan 2016 16:35:21 -0500
Date: Tue, 19 Jan 2016 21:35:15 +0000
From: Ben Hutchings <ben@decadent.org.uk>
To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Message-ID: <20160119213515.GG2637@decadent.org.uk>
References: <20160111151958.GQ28542@decadent.org.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="TKYYegg/GYAC5JIZ"
Content-Disposition: inline
In-Reply-To: <20160111151958.GQ28542@decadent.org.uk>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: ben@decadent.org.uk
Subject: [PATCH RESEND] perf: Document the perf sysctls
X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000)
X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


--TKYYegg/GYAC5JIZ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

perf_event_paranoid was only documented in source code and a perf
error message.  Move the documentation from the error message to
Documentation/sysctl/kernel.txt.

perf_cpu_time_max_percent was already documented but missing from the
list at the top, so add it there.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 Documentation/sysctl/kernel.txt | 13 +++++++++++++
 tools/perf/util/evsel.c         |  7 ++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.=
txt
index af70d15..88a2c8e 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -58,6 +58,8 @@ show up in /proc/sys/kernel:
 - panic_on_stackoverflow
 - panic_on_unrecovered_nmi
 - panic_on_warn
+- perf_cpu_time_max_percent
+- perf_event_paranoid
 - pid_max
 - powersave-nap               [ PPC only ]
 - printk
@@ -624,6 +626,17 @@ allowed to execute.
=20
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=20
+perf_event_paranoid:
+
+Controls use of the performance events system by unprivileged
+users (without CAP_SYS_ADMIN).  The default value is 1.
+
+ -1: Allow use of (almost) all events by all users
+>=3D0: Disallow raw tracepoint access by users without CAP_IOC_LOCK
+>=3D1: Disallow CPU event access by users without CAP_SYS_ADMIN
+>=3D2: Disallow kernel profiling by users without CAP_SYS_ADMIN
+
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=20
 pid_max:
=20
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 397fb4e..9b4df11 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2314,11 +2314,8 @@ int perf_evsel__open_strerror(struct perf_evsel *evs=
el, struct target *target,
 	case EACCES:
 		return scnprintf(msg, size,
 		 "You may not have permission to collect %sstats.\n"
-		 "Consider tweaking /proc/sys/kernel/perf_event_paranoid:\n"
-		 " -1 - Not paranoid at all\n"
-		 "  0 - Disallow raw tracepoint access for unpriv\n"
-		 "  1 - Disallow cpu events for unpriv\n"
-		 "  2 - Disallow kernel profiling for unpriv",
+		 "Consider tweaking /proc/sys/kernel/perf_event_paranoid -\n"
+		 "see Documentation/sysctl/kernel.txt",
 				 target->system_wide ? "system-wide " : "");
 	case ENOENT:
 		return scnprintf(msg, size, "The %s event is not supported.",


--TKYYegg/GYAC5JIZ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIVAwUBVp6sE+e/yOyVhhEJAQoGqw/+Mjdxv6bayHpx6p0V68nJvjsDc8qjqYCm
NWRl/3NGQh20e2Sm2hOMQ8d5uFkElCNFSDmOzjdmRtkzROGbHFt+5xtWIy50fXR+
juCVW9+ub+azanK0L2SNZK64yhu7OoXAfoThWHa0kKiaOrKiM02nSJ5XlKDoGzew
NsDygjg+xM6YXT1h6cOGB8FA7IEWwfe+s949MFcieTqMrXAwuEjtXbvc4TjAwkry
af5NrmrNsm2jsDIpNuCRlnfoGJJ7jL0iuwTUDANkcY+YmoT8OUVE04m51YuApQkv
xSmsJtB0y+mU6cwxDXox9XCDWpOrmKKfjLc8E7cKFVQkb8knUMx8XFZ43XhLEXva
OhK3LlhERmpnncxxUITGx1TJd1oDhp6tZxwAy72UBhWwXaIMFve2cbQuGFgcKTpO
yaa0T0iC0M/unFCt+z8RVRKvjJQ7p5AQPYzw5o3ovIcUXTmpUclqpER+s9h/LGBN
9O/RKA1rtRAa5O4859Qt7Ak7r93KxuaSpNk9EJ745mqTX4R/NpXOxU0ylQaZ34UF
U98BjTRRIUl+/LhoB0HQUX4fS0yeY322BfkiFAeLYP0qDo7gRaKwv0BDb4H79j/0
px1ObrhVkRAV2t12GQZEouuKmsBcDBgLkyvsp/mC+k50xWxWL1XkTUuuSVKmcKsh
eV+geaZpSEg=
=SLsL
-----END PGP SIGNATURE-----

--TKYYegg/GYAC5JIZ--