Use a priority stored in the context as the initial value when submitting a request. This allows us to change the default priority on a per-context basis, allowing different contexts to be favoured with GPU time at the expense of lower importance work. The user can adjust the context's priority via I915_CONTEXT_PARAM_PRIORITY, with more positive values being higher priority (they will be serviced earlier, after their dependencies have been resolved). Any prerequisite work for an execbuf will have its priority raised to match the new request as required. Normal users can specify any value in the range of -1023 to 0 [default], i.e. they can reduce the priority of their workloads (and temporarily boost it back to normal if so desired). Privileged users can specify any value in the range of -1023 to 1023, [default is 0], i.e. they can raise their priority above all overs and so potentially starve the system. Note that the existing schedulers are not fair, nor load balancing, the execution is strictly by priority on a first-come, first-served basis, and the driver may choose to boost some requests above the range available to users. This priority was originally based around nice(2), but evolved to allow clients to adjust their priority within a small range, and allow for a privileged high priority range. For example, this can be used to implement EGL_IMG_context_priority https://www.khronos.org/registry/egl/extensions/IMG/EGL_IMG_context_priority.txt EGL_CONTEXT_PRIORITY_LEVEL_IMG determines the priority level of the context to be created. This attribute is a hint, as an implementation may not support multiple contexts at some priority levels and system policy may limit access to high priority contexts to appropriate system privilege level. The default value for EGL_CONTEXT_PRIORITY_LEVEL_IMG is EGL_CONTEXT_PRIORITY_MEDIUM_IMG." so we can map PRIORITY_HIGH -> 1023 [privileged, will failback to 0] PRIORITY_MED -> 0 [default] PRIORITY_LOW -> -1023 They also map onto the priorities used by VkQueue (and a VkQueue is essentially a timeline, our i915_gem_context under full-ppgtt). v2: s/CAP_SYS_ADMIN/CAP_SYS_NICE/ v3: Report min/max user priorities as defines in the uapi, and rebase internal priorities on the exposed values.
Unified · Split
| @@ -370,6 +370,7 @@ static int i915_getparam(struct drm_device *dev, void *data, · 369 unmodified lines | ||
| 370 | 370 | value = 0; |
| 371 | 371 | if (dev_priv->engine[RCS] && dev_priv->engine[RCS]->schedule) { |
| 372 | 372 | value |= I915_SCHEDULER_CAP_ENABLED; |
| 373 | + value |= I915_SCHEDULER_CAP_PRIORITY; | |
| 373 | 374 | |
| 374 | 375 | if (INTEL_INFO(dev_priv)->has_logical_ring_preemption && |
| 375 | 376 | i915_modparams.enable_execlists && |
| @@ -1070,6 +1070,9 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, · 1069 unmodified lines | ||
| 1070 | 1070 | case I915_CONTEXT_PARAM_BANNABLE: |
| 1071 | 1071 | args->value = i915_gem_context_is_bannable(ctx); |
| 1072 | 1072 | break; |
| 1073 | + case I915_CONTEXT_PARAM_PRIORITY: | |
| 1074 | + args->value = ctx->priority; | |
| 1075 | + break; | |
| 1073 | 1076 | default: |
| 1074 | 1077 | ret = -EINVAL; |
| 1075 | 1078 | break; |
| @@ -1125,6 +1128,26 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, · 49 unmodified lines | ||
| 1125 | 1128 | else |
| 1126 | 1129 | i915_gem_context_clear_bannable(ctx); |
| 1127 | 1130 | break; |
| 1131 | + | |
| 1132 | + case I915_CONTEXT_PARAM_PRIORITY: | |
| 1133 | + { | |
| 1134 | + int priority = args->value; | |
| 1135 | + | |
| 1136 | + if (args->size) | |
| 1137 | + ret = -EINVAL; | |
| 1138 | + else if (!to_i915(dev)->engine[RCS]->schedule) | |
| 1139 | + ret = -ENODEV; | |
| 1140 | + else if (priority > I915_CONTEXT_MAX_USER_PRIORITY || | |
| 1141 | + priority < I915_CONTEXT_MIN_USER_PRIORITY) | |
| 1142 | + ret = -EINVAL; | |
| 1143 | + else if (priority > I915_CONTEXT_DEFAULT_PRIORITY && | |
| 1144 | + !capable(CAP_SYS_NICE)) | |
| 1145 | + ret = -EPERM; | |
| 1146 | + else | |
| 1147 | + ctx->priority = priority; | |
| 1148 | + } | |
| 1149 | + break; | |
| 1150 | + | |
| 1128 | 1151 | default: |
| 1129 | 1152 | ret = -EINVAL; |
| 1130 | 1153 | break; |
| @@ -30,6 +30,8 @@ · 29 unmodified lines | ||
| 30 | 30 | #include "i915_gem.h" |
| 31 | 31 | #include "i915_sw_fence.h" |
| 32 | 32 | |
| 33 | +#include <uapi/drm/i915_drm.h> | |
| 34 | + | |
| 33 | 35 | struct drm_file; |
| 34 | 36 | struct drm_i915_gem_object; |
| 35 | 37 | struct drm_i915_gem_request; |
| @@ -69,10 +71,14 @@ struct i915_priotree { · 33 unmodified lines | ||
| 69 | 71 | struct list_head waiters_list; /* those after us, they depend upon us */ |
| 70 | 72 | struct list_head link; |
| 71 | 73 | int priority; |
| 72 | −#define I915_PRIORITY_MAX 1024 | |
| 73 | −#define I915_PRIORITY_NORMAL 0 | |
| 74 | −#define I915_PRIORITY_MIN (-I915_PRIORITY_MAX) | |
| 75 | −#define I915_PRIORITY_INVALID INT_MIN | |
| 74 | +}; | |
| 75 | + | |
| 76 | +enum { | |
| 77 | + I915_PRIORITY_MIN = I915_CONTEXT_MIN_USER_PRIORITY - 1, | |
| 78 | + I915_PRIORITY_NORMAL = I915_CONTEXT_DEFAULT_PRIORITY, | |
| 79 | + I915_PRIORITY_MAX = I915_CONTEXT_MAX_USER_PRIORITY + 1, | |
| 80 | + | |
| 81 | + I915_PRIORITY_INVALID = INT_MIN | |
| 76 | 82 | }; |
| 77 | 83 | |
| 78 | 84 | struct i915_gem_capture_list { |
| @@ -402,6 +402,9 @@ typedef struct drm_i915_irq_wait { · 401 unmodified lines | ||
| 402 | 402 | * priorities and the driver will attempt to execute batches in priority order. |
| 403 | 403 | * The param returns a capability bitmask, nonzero implies that the scheduler |
| 404 | 404 | * is enabled, with different features present according to the mask. |
| 405 | + * | |
| 406 | + * The initial priority for each batch is supplied by the context and is | |
| 407 | + * controlled via I915_CONTEXT_PARAM_PRIORITY. | |
| 405 | 408 | */ |
| 406 | 409 | #define I915_PARAM_HAS_SCHEDULER 41 |
| 407 | 410 | #define I915_SCHEDULER_CAP_ENABLED (1ul << 0) |
| @@ -1367,6 +1370,10 @@ struct drm_i915_gem_context_param { · 959 unmodified lines | ||
| 1367 | 1370 | #define I915_CONTEXT_PARAM_GTT_SIZE 0x3 |
| 1368 | 1371 | #define I915_CONTEXT_PARAM_NO_ERROR_CAPTURE 0x4 |
| 1369 | 1372 | #define I915_CONTEXT_PARAM_BANNABLE 0x5 |
| 1373 | +#define I915_CONTEXT_PARAM_PRIORITY 0x6 | |
| 1374 | +#define I915_CONTEXT_MAX_USER_PRIORITY 1023 /* inclusive */ | |
| 1375 | +#define I915_CONTEXT_DEFAULT_PRIORITY 0 | |
| 1376 | +#define I915_CONTEXT_MIN_USER_PRIORITY -1023 /* inclusive */ | |
| 1370 | 1377 | __u64 value; |
| 1371 | 1378 | }; |
| 1372 | 1379 | |