From patchwork Tue Sep 29 14:39:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Bragg X-Patchwork-Id: 7286651 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B3F3E9F32B for ; Tue, 29 Sep 2015 14:41:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D1DE520600 for ; Tue, 29 Sep 2015 14:41:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BE3E3204FF for ; Tue, 29 Sep 2015 14:41:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EF9066EAF9; Tue, 29 Sep 2015 07:41:06 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pa0-f66.google.com (mail-pa0-f66.google.com [209.85.220.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7488B6EB01; Tue, 29 Sep 2015 07:41:05 -0700 (PDT) Received: by padew5 with SMTP id ew5so989297pad.0; Tue, 29 Sep 2015 07:41:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=j+v//m7vWQE1tV0Sr8UnbqInOSlhHvswwdPK5j216Sg=; b=XLu08XoNA8WkJ/CRrTXSJocuEnwP1VBTKC+OwWKVRCJa4pM5F07fFwZVanY6UuV8Q5 j4K8fXI6tmUMQsAiEUDoquyb+qKrqe//HzKIW/K9zSPG2FOAvy5dZHmA5TyI7FwXTq2E W03AWmjC8tNWBGn/Z8tsxF74Qzo2XclRYHBvhMisu9SIqt4Bj49oAwBZnN+AMaI1gHpi rq7WTG3fri6QNNiWRAXL/ejANeM359nwez2eiUKLCKN4VQN2wPnaWJRLL6XO/LFRxOis O4dymH+YJBpM6wp/hZjdsukdYpGwMzd1ZZPui4lt5Tyk2x6QQDxRBndk64pC1GcllMPr Qjrg== X-Received: by 10.68.190.170 with SMTP id gr10mr22434242pbc.91.1443537665177; Tue, 29 Sep 2015 07:41:05 -0700 (PDT) Received: from sixbynine.org (host-2-103-31-44.as13285.net. [2.103.31.44]) by smtp.gmail.com with ESMTPSA id kv9sm26213786pab.39.2015.09.29.07.40.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 07:41:04 -0700 (PDT) From: Robert Bragg To: intel-gfx@lists.freedesktop.org Date: Tue, 29 Sep 2015 15:39:08 +0100 Message-Id: <1443537549-6905-6-git-send-email-robert@sixbynine.org> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1443537549-6905-1-git-send-email-robert@sixbynine.org> References: <1443537549-6905-1-git-send-email-robert@sixbynine.org> Cc: Mark Rutland , Matt Fleming , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Sourab Gupta , linux-api@vger.kernel.org, Zheng Yan , Daniel Vetter , Ingo Molnar , Alexander Shishkin Subject: [Intel-gfx] [RFC 5/6] drm/i915: Add dev.i915.perf_event_paranoid sysctl option X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Consistent with the kernel.perf_event_paranoid sysctl option that can allow non-root users to access system wide cpu metrics, this can optionally allow non-root users to access system wide OA counter metrics from Gen graphics hardware. Signed-off-by: Robert Bragg --- drivers/gpu/drm/i915/i915_perf.c | 46 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index bc1c4d1..ab82857 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -38,6 +38,8 @@ #define POLL_FREQUENCY 200 #define POLL_PERIOD max_t(u64, 10000, NSEC_PER_SEC / POLL_FREQUENCY) +static u32 i915_perf_event_paranoid = true; + #define OA_EXPONENT_MAX 0x3f static struct i915_oa_format hsw_oa_formats[I915_OA_FORMAT_MAX] = { @@ -1016,7 +1018,13 @@ int i915_perf_open_ioctl_locked(struct drm_device *dev, void *data, } } - if (!specific_ctx && !capable(CAP_SYS_ADMIN)) { + /* Similar to perf's kernel.perf_paranoid_cpu sysctl option + * we check a dev.i915.perf_event_paranoid sysctl option + * to determine if it's ok to access system wide OA counters + * without CAP_SYS_ADMIN privileges. + */ + if (!specific_ctx && + i915_perf_event_paranoid && !capable(CAP_SYS_ADMIN)) { DRM_ERROR("Insufficient privileges to open perf event\n"); ret = -EACCES; goto err_ctx; @@ -1096,6 +1104,38 @@ int i915_perf_open_ioctl(struct drm_device *dev, void *data, return ret; } + +static struct ctl_table oa_table[] = { + { + .procname = "perf_event_paranoid", + .data = &i915_perf_event_paranoid, + .maxlen = sizeof(i915_perf_event_paranoid), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + {} +}; + +static struct ctl_table i915_root[] = { + { + .procname = "i915", + .maxlen = 0, + .mode = 0555, + .child = oa_table, + }, + {} +}; + +static struct ctl_table dev_root[] = { + { + .procname = "dev", + .maxlen = 0, + .mode = 0555, + .child = i915_root, + }, + {} +}; + void i915_perf_init(struct drm_device *dev) { struct drm_i915_private *dev_priv = to_i915(dev); @@ -1103,6 +1143,8 @@ void i915_perf_init(struct drm_device *dev) if (!IS_HASWELL(dev)) return; + dev_priv->perf.sysctl_header = register_sysctl_table(dev_root); + hrtimer_init(&dev_priv->perf.oa.poll_check_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); dev_priv->perf.oa.poll_check_timer.function = poll_check_timer_cb; @@ -1132,6 +1174,8 @@ void i915_perf_fini(struct drm_device *dev) if (!dev_priv->perf.initialized) return; + unregister_sysctl_table(dev_priv->perf.sysctl_header); + dev_priv->perf.oa.ops.init_oa_buffer = NULL; dev_priv->perf.initialized = false;