From patchwork Mon Aug 15 14:41:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Bragg X-Patchwork-Id: 9281169 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 643B4607FD for ; Mon, 15 Aug 2016 14:41:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55CCD28D06 for ; Mon, 15 Aug 2016 14:41:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4AD3028D0D; Mon, 15 Aug 2016 14:41:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C898528D06 for ; Mon, 15 Aug 2016 14:41:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EFCE96E56A; Mon, 15 Aug 2016 14:41:53 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 93D7F6E560; Mon, 15 Aug 2016 14:41:48 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id o80so11503873wme.0; Mon, 15 Aug 2016 07:41:48 -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=18+PLVJAEkj90dKwJmrf+eAJZ9EGkr88Sa2VX0Yi/3s=; b=Vc/wsdFmKL2Id8ISn/88+pm2n6/r7mUgBEYjbXBwpDR7Z1LUyORM6+mnq3eyl/emRJ Cqb6Ea1KKfuVTtNnSBLJaVBFCky692puSsOchwVeRVzMRer5yg3bQhV3e2oh7WQIAxfn 4JOpPS+faqxdZGE+dxfA7hZPrq1XspVoaOEmc7IlI911VE/o3Xq9q/BHaNs+hzyWQiz2 XIuFLC3/RjkjXJWPt7GTJPziA0DG0PLmJRAuGmi//BJjxO6fvqpUy/D4cJnw+gJjjwwZ aYyA/3R+7AbcDyItHVDpnRhMNrNZmJX/4CwrYJcFARLG+9XDh7zchgXJfJxJD9M/cZID heqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=18+PLVJAEkj90dKwJmrf+eAJZ9EGkr88Sa2VX0Yi/3s=; b=fW2c/pbFCx32Fg8jiJGkNq6mP3xYMShxP5SsgzxLZbHQO0qWb9PpsyS8iumtFDm81y TQqrbZfIQS9hSj00xYUQuUfaXfqt7wUWmXUIlYXm8o3JmqH/qMjI0HZ2J5B0DmyaNIfa soAUgazNzP8ih5klC3q8vONEq7VOqoZc1/KThTDgrD2npo5noCAOsjM0p7DODp+PCsua JvlfFlYMu5x+FrT71CtHAJ/v5/mhlgqgTaufD73vgptE9z8OMCCVgvHFijRXBmA/ODGQ v7QTGH6SZRC/NSQPKlO/RI2AlvDW6L8SVkYrYqRs41OhqyzPujU8hBA9QuV5xgXGouoV LKvA== X-Gm-Message-State: AEkoouukwlD6shdYITucDg0SDgZ1lLiT/0QcXmICOMiNxMShmhx0q75qezlu5csuujloNg== X-Received: by 10.28.9.194 with SMTP id 185mr14339710wmj.37.1471272107184; Mon, 15 Aug 2016 07:41:47 -0700 (PDT) Received: from sixbynine.org ([192.198.151.62]) by smtp.gmail.com with ESMTPSA id e65sm16876447wmg.3.2016.08.15.07.41.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Aug 2016 07:41:46 -0700 (PDT) From: Robert Bragg To: intel-gfx@lists.freedesktop.org Date: Mon, 15 Aug 2016 15:41:25 +0100 Message-Id: <20160815144128.7847-9-robert@sixbynine.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160815144128.7847-1-robert@sixbynine.org> References: <20160815144128.7847-1-robert@sixbynine.org> Cc: David Airlie , dri-devel@lists.freedesktop.org, Sourab Gupta , Daniel Vetter Subject: [Intel-gfx] [PATCH v3 08/11] 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-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_drv.h | 1 + drivers/gpu/drm/i915/i915_perf.c | 46 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d5c7b70..a49801f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2115,6 +2115,7 @@ struct drm_i915_private { bool initialized; struct kobject *metrics_kobj; + struct ctl_table_header *sysctl_header; struct mutex lock; struct list_head streams; diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index a943664..c9e7104 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -62,6 +62,8 @@ #define POLL_FREQUENCY 200 #define POLL_PERIOD (NSEC_PER_SEC / POLL_FREQUENCY) +static u32 i915_perf_stream_paranoid = true; + /* The maximum exponent the hardware accepts is 63 (essentially it selects one * of the 64bit timestamp bits to trigger reports from) but there's currently * no known use case for sampling as infrequently as once per 47 thousand years. @@ -1121,7 +1123,13 @@ int i915_perf_open_ioctl_locked(struct drm_device *dev, } } - if (!specific_ctx && !capable(CAP_SYS_ADMIN)) { + /* Similar to perf's kernel.perf_paranoid_cpu sysctl option + * we check a dev.i915.perf_stream_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_stream_paranoid && !capable(CAP_SYS_ADMIN)) { DRM_ERROR("Insufficient privileges to open system-wide i915 perf stream\n"); ret = -EACCES; goto err_ctx; @@ -1325,6 +1333,38 @@ int i915_perf_open_ioctl(struct drm_device *dev, void *data, return ret; } + +static struct ctl_table oa_table[] = { + { + .procname = "perf_stream_paranoid", + .data = &i915_perf_stream_paranoid, + .maxlen = sizeof(i915_perf_stream_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_i915_private *dev_priv) { if (!IS_HASWELL(dev_priv)) @@ -1369,6 +1409,8 @@ void i915_perf_init(struct drm_i915_private *dev_priv) return; } + dev_priv->perf.sysctl_header = register_sysctl_table(dev_root); + dev_priv->perf.initialized = true; return; @@ -1379,6 +1421,8 @@ void i915_perf_fini(struct drm_i915_private *dev_priv) if (!dev_priv->perf.initialized) return; + unregister_sysctl_table(dev_priv->perf.sysctl_header); + i915_perf_deinit_sysfs_hsw(dev_priv); kobject_put(dev_priv->perf.metrics_kobj);