From patchwork Wed Sep 14 14:19:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Bragg X-Patchwork-Id: 9331645 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 0A0ED60231 for ; Wed, 14 Sep 2016 14:21:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED77E288B3 for ; Wed, 14 Sep 2016 14:21:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E21BB29E80; Wed, 14 Sep 2016 14:21:00 +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=ham 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 83856288B3 for ; Wed, 14 Sep 2016 14:21:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EDCA46E749; Wed, 14 Sep 2016 14:20:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3C39E6E750; Wed, 14 Sep 2016 14:20:32 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id g141so2812087wmd.1; Wed, 14 Sep 2016 07:20:32 -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=zV/ep+DVr+cdFJ/BDqXQyCZCRIX3aNYcIUza9MklztQ=; b=TI+6hoPZ9jC9nsyPST+Z9sLkDTSC+BsDC5+lLbvYLUiSWytbvr4S8goZTzj9wyXUfd Yle7F7+XcY8aOdM5k9n5Vhq71S7UslMfxpkrrM7dMk+9+gvy0KUGVABeHDzkLTFEMrSS sbdqhtu3LBFZ7hKhxr9iZUFt5MY0xkyWwnIQ5QdFPah/BnH7erCq11iUpfpooV4HbBsj 4EWRlJMWK4Kp7oWMKTvYppk1zG4qmBpRyNKqUHuAN1liKM5n2Kg/nd/UXE0FM5pU7OxP +yq3j43Aqeqyh/YnjbvBEe3tfpceX01E+xWMHw2bV3QxtvX+vMg4IlkrqzOJxgsPGZhJ FuAg== 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=zV/ep+DVr+cdFJ/BDqXQyCZCRIX3aNYcIUza9MklztQ=; b=T7lNgIpCi4+Wff2dmSZessF1ljM6RF44HyGpL1AWrbHV6RBbuM6TIkGmJT1bcefsJH Q8YHmaikbUSd7IULWNNQMPImSwuK0hDdplja3dwWbJh3xvioyvJLhVYvhpygZbV8rAzO DOKchdRT83+eaqw0A4BQ4ifWX5kO/Yx69CobuT7JeXDUCWzA565dYc0mwySNxGrPzkAd hShS2bTWysVDDUgVsmYt6362VYbo8SN/Vy3GBD9FxCaoTPDKmZSSY6l+pztLTbQWq4KD UAqJrIKEB2CJAohOvgg5zB3hksacSlnF5nqWJLVMs78heHy4sDlkjy7pmKTYoqI7Tf5M DiVw== X-Gm-Message-State: AE9vXwNPN8h+i01ezmVdG7e8tpsjqCUijMHHpbBntOteYdug3vr7ZdVnpbpu+QDskvhCxA== X-Received: by 10.28.52.135 with SMTP id b129mr3603206wma.107.1473862829554; Wed, 14 Sep 2016 07:20:29 -0700 (PDT) Received: from sixbynine.org (host-78-151-16-234.as13285.net. [78.151.16.234]) by smtp.gmail.com with ESMTPSA id k2sm10996581wmg.23.2016.09.14.07.20.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2016 07:20:29 -0700 (PDT) From: Robert Bragg To: intel-gfx@lists.freedesktop.org Subject: [PATCH v5 09/11] drm/i915: add oa_event_min_timer_exponent sysctl Date: Wed, 14 Sep 2016 15:19:47 +0100 Message-Id: <20160914141949.27402-10-robert@sixbynine.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160914141949.27402-1-robert@sixbynine.org> References: <20160914141949.27402-1-robert@sixbynine.org> Cc: dri-devel@lists.freedesktop.org, Sourab Gupta , Daniel Vetter , Robert Bragg X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The minimal sampling period is now configurable via a dev.i915.oa_min_timer_exponent sysctl parameter. Following the precedent set by perf, the default is the minimum that won't (on its own) exceed the default kernel.perf_event_max_sample_rate default of 100000 samples/s. Signed-off-by: Robert Bragg Reviewed-by: Matthew Auld --- drivers/gpu/drm/i915/i915_perf.c | 42 ++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index 38b13fa..a7a248b 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -74,6 +74,23 @@ static u32 i915_perf_stream_paranoid = true; */ #define OA_EXPONENT_MAX 31 +/* for sysctl proc_dointvec_minmax of i915_oa_min_timer_exponent */ +static int zero; +static int oa_exponent_max = OA_EXPONENT_MAX; + +/* Theoretically we can program the OA unit to sample every 160ns but don't + * allow that by default unless root... + * + * The period is derived from the exponent as: + * + * period = 80ns * 2^(exponent + 1) + * + * Referring to perf's kernel.perf_event_max_sample_rate for a precedent + * (100000 by default); with an OA exponent of 6 we get a period of 10.240 + * microseconds - just under 100000Hz + */ +static u32 i915_oa_min_timer_exponent = 6; + /* XXX: beware if future OA HW adds new report formats that the current * code assumes all reports have a power-of-two size and ~(size - 1) can * be used as a mask to align the OA tail pointer. @@ -1315,21 +1332,13 @@ static int read_properties_unlocked(struct drm_i915_private *dev_priv, return -EINVAL; } - /* NB: The exponent represents a period as follows: - * - * 80ns * 2^(period_exponent + 1) - * - * Theoretically we can program the OA unit to sample + /* Theoretically we can program the OA unit to sample * every 160ns but don't allow that by default unless * root. - * - * Referring to perf's - * kernel.perf_event_max_sample_rate for a precedent - * (100000 by default); with an OA exponent of 6 we get - * a period of 10.240 microseconds -just under 100000Hz */ - if (value < 6 && !capable(CAP_SYS_ADMIN)) { - DRM_ERROR("Sampling period too high without root privileges\n"); + if (value < i915_oa_min_timer_exponent && + !capable(CAP_SYS_ADMIN)) { + DRM_ERROR("OA timer exponent too low without root privileges\n"); return -EACCES; } @@ -1433,6 +1442,15 @@ static struct ctl_table oa_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, + { + .procname = "oa_min_timer_exponent", + .data = &i915_oa_min_timer_exponent, + .maxlen = sizeof(i915_oa_min_timer_exponent), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, + .extra2 = &oa_exponent_max, + }, {} };