From patchwork Thu Oct 1 15:56:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Gordon X-Patchwork-Id: 7309631 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DE255BEEA4 for ; Thu, 1 Oct 2015 15:56:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2B2920610 for ; Thu, 1 Oct 2015 15:56:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D84B9205D6 for ; Thu, 1 Oct 2015 15:56:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 57E236E2DA; Thu, 1 Oct 2015 08:56:30 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D99A6E2DA for ; Thu, 1 Oct 2015 08:56:29 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 01 Oct 2015 08:56:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,618,1437462000"; d="scan'208";a="655955973" Received: from dsgordon-linux2.isw.intel.com (HELO [10.102.226.88]) ([10.102.226.88]) by orsmga003.jf.intel.com with ESMTP; 01 Oct 2015 08:56:27 -0700 References: <1443712868-36598-2-git-send-email-david.s.gordon@intel.com> To: Intel Graphics Development From: Dave Gordon Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ X-Forwarded-Message-Id: <1443712868-36598-2-git-send-email-david.s.gordon@intel.com> Message-ID: <560D57AA.5010209@intel.com> Date: Thu, 1 Oct 2015 16:56:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <1443712868-36598-2-git-send-email-david.s.gordon@intel.com> Subject: [Intel-gfx] [RFC 1/1 v2] drm/i915: Add scheduling priority to per-context parameters 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Hmmm ... the email seems to have been damaged during composition :( I probably shouldn't try to use vi(1) [where '~' means toggle-letter-case] over an ssh link [where '~' is an escape, of sorts] from another Linux machine inside a PuTTY terminal under Windows [where various keys send escape sequences containing '~'] :( Anyway, this version has the #defines as they actually appeared in the source, i.e. starting with UPPERCASE 'I' and not lowercase 'i'! The next use for the i915 get/set per-context parameters ioctl, ahead of the introduction of the forthcoming GPU scheduler. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_drv.h | 28 ++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_gem_context.c | 17 +++++++++++++++++ include/uapi/drm/i915_drm.h | 1 + 3 files changed, 46 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 279e258..104b711 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -850,6 +850,33 @@ struct i915_ctx_hang_stats { bool banned; }; +/* + * User-settable GFX scheduler priorities are on a scale of 1 (lowest + * priority) to 1023 (highest priority). The special value 0 means + * "let the system decide my priority automatically"; this is the + * default if the user process does not explicitly request a different + * priority. Any process may decrease its scheduling priority, but + * only a sufficiently-privileged process may increase it. However, + * it is always permissible to reset it to "system default", even if + * is currently lower than that. Thus, if the system-assigned default + * were, say, 256, a process could decrease it to 128, and then to 64. + * It could NOT then increase it to 128 again, but COULD request a + * priority of 0 -- which would actually reset it to 256, allowing + * the process to then request 128 again. (This avoids the issue with + * nice(2) priorities, namely that non-super-users can not increase + * scheduling priorities of their own processes, even if they were the + * ones that decreased the priorities in the first place). + */ + +#define I915_SCHED_PRIORITY_DEFAULT 0 +#define I915_SCHED_PRIORITY_MIN 1 +#define I915_SCHED_PRIORITY_MAX 1023 + +struct i915_ctx_sched_info { + /* Scheduling priority */ + unsigned long priority; +}; + /* This must match up with the value previously used for execbuf2.rsvd1. */ #define DEFAULT_CONTEXT_HANDLE 0 @@ -881,6 +908,7 @@ struct intel_context { int flags; struct drm_i915_file_private *file_priv; struct i915_ctx_hang_stats hang_stats; + struct i915_ctx_sched_info sched_info; struct i915_hw_ppgtt *ppgtt; /* Legacy ring buffer submission */ diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 74aa0c9..2728a0d 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -901,6 +901,9 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, case I915_CONTEXT_PARAM_NO_ZEROMAP: args->value = ctx->flags & CONTEXT_NO_ZEROMAP; break; + case I915_CONTEXT_PARAM_PRIORITY: + args->value = ctx->sched_info.priority; + break; default: ret = -EINVAL; break; @@ -938,6 +941,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, else ctx->hang_stats.ban_period_seconds = args->value; break; + case I915_CONTEXT_PARAM_NO_ZEROMAP: if (args->size) { ret = -EINVAL; @@ -946,6 +950,19 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, ctx->flags |= args->value ? CONTEXT_NO_ZEROMAP : 0; } break; + + case I915_CONTEXT_PARAM_PRIORITY: + if (args->size) + ret = -EINVAL; + else if (args->value > I915_SCHED_PRIORITY_MAX) + ret = -EINVAL; + else if (args->value > ctx->sched_info.priority && + !capable(CAP_SYS_ADMIN)) + ret = -EPERM; + else + ctx->sched_info.priority = args->value; + break; + default: ret = -EINVAL; break; diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index fd5aa47..a860263 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -1126,6 +1126,7 @@ struct drm_i915_gem_context_param { __u64 param; #define I915_CONTEXT_PARAM_BAN_PERIOD 0x1 #define I915_CONTEXT_PARAM_NO_ZEROMAP 0x2 +#define I915_CONTEXT_PARAM_PRIORITY 0x3 __u64 value; };