accel/ivpu: Add support for getting and setting command queue priority
Subsystems (4)
Andrzej Kacprowski
maintainerPATCH 1/1 accel/ivpu: Add support for getting and setting command queue priority
Add a new DRM_IVPU_PARAM_CMDQ_PRIORITY parameter to query and update the scheduling priority of an existing command queue, identified by its ID via drm_ivpu_param.index.
The priority can be changed on a queue that already has pending jobs; if the queue's doorbell is registered, the new priority is propagated to the firmware immediately, otherwise it is applied when the queue is next registered. The firmware picks up the change at the first opportunity.
The feature requires HW scheduling mode and is advertised through the new DRM_IVPU_CAP_CMDQ_SET_PRIORITY capability. Legacy command queues are not supported.
--- drivers/accel/ivpu/ivpu_drv.c | 13 ++++++ drivers/accel/ivpu/ivpu_job.c | 85 +++++++++++++++++++++++++++++++++++ drivers/accel/ivpu/ivpu_job.h | 5 ++- include/uapi/drm/ivpu_accel.h | 17 ++++++- 4 files changed, 118 insertions(+), 2 deletions(-)
drivers/accel/ivpu/ivpu_drv.c +13 -0
@@ -205,6 +205,7 @@ bool ivpu_is_capable(struct ivpu_device *vdev, u32 capability)case DRM_IVPU_CAP_BO_CREATE_FROM_USERPTR :return true;case DRM_IVPU_CAP_MANAGE_CMDQ : +case DRM_IVPU_CAP_CMDQ_SET_PRIORITY :return vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_HW ;default :return false;
@@ -273,6 +274,9 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_fcase DRM_IVPU_PARAM_PREEMPT_BUFFER_SIZE : args->value =ivpu_fw_preempt_buf_size (vdev);break ; +case DRM_IVPU_PARAM_CMDQ_PRIORITY : + ret =ivpu_cmdq_get_priority (file_priv, args->index, &args->value); +break ;default : ret = -EINVAL ;break ;
@@ -284,14 +288,23 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_fstatic int ivpu_set_param_ioctl (struct drm_device *dev,void *data,struct drm_file *file) { +struct ivpu_file_priv *file_priv = file->driver_priv;struct drm_ivpu_param *args = data;int ret =0 ; +int idx; + +if (!drm_dev_enter (dev, &idx)) +return -ENODEV ;switch (args->param) { +case DRM_IVPU_PARAM_CMDQ_PRIORITY : + ret =ivpu_cmdq_set_priority (file_priv, args->index, args->value); +break ;default : ret = -EINVAL ; } +drm_dev_exit (idx);return ret; }
drivers/accel/ivpu/ivpu_job.c +85 -0
97 lines not on this page · raw message
drivers/accel/ivpu/ivpu_job.h +4 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (C) 2020-2025 Intel Corporation +* Copyright (C) 2020-2026 Intel Corporation */ #ifndef __IVPU_JOB_H__
@@ -81,6 +81,9 @@ int ivpu_cmdq_create_ioctl(struct drm_device *dev, void *data, struct drm_file *int ivpu_cmdq_destroy_ioctl (struct drm_device *dev,void *data,struct drm_file *file);int ivpu_cmdq_submit_ioctl (struct drm_device *dev,void *data,struct drm_file *file); +int ivpu_cmdq_get_priority (struct ivpu_file_priv *file_priv,u32 cmdq_id,u64 *priority); +int ivpu_cmdq_set_priority (struct ivpu_file_priv *file_priv,u32 cmdq_id,u64 priority); +void ivpu_context_abort_locked (struct ivpu_file_priv *file_priv);void ivpu_cmdq_release_all_locked (struct ivpu_file_priv *file_priv);
include/uapi/drm/ivpu_accel.h +16 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* -* Copyright (C) 2020-2025 Intel Corporation +* Copyright (C) 2020-2026 Intel Corporation */ #ifndef __UAPI_IVPU_DRM_H__
@@ -96,6 +96,7 @@ extern "C" {#define DRM_IVPU_PARAM_SKU 12#define DRM_IVPU_PARAM_CAPABILITIES 13#define DRM_IVPU_PARAM_PREEMPT_BUFFER_SIZE 14 +#define DRM_IVPU_PARAM_CMDQ_PRIORITY 15#define DRM_IVPU_PLATFORM_TYPE_SILICON 0
@@ -140,6 +141,15 @@ extern "C" {*/ #define DRM_IVPU_CAP_BO_CREATE_FROM_USERPTR 4 +/** +* DRM_IVPU_CAP_CMDQ_SET_PRIORITY +* +* Driver supports DRM_IVPU_PARAM_CMDQ_PRIORITY parameter to get/set command +* queue priority. +* This allows changing command queue priority after creation. +*/ +#define DRM_IVPU_CAP_CMDQ_SET_PRIORITY 5 +/** * struct drm_ivpu_param - Get/Set VPU parameters */
@@ -192,6 +202,11 @@ struct drm_ivpu_param {* * %DRM_IVPU_PARAM_PREEMPT_BUFFER_SIZE: * Size of the preemption buffer (read-only) +* +* %DRM_IVPU_PARAM_CMDQ_PRIORITY: +* Get/Set command queue priority (see DRM_IVPU_JOB_PRIORITY_*). +* DRM_IVPU_JOB_PRIORITY_DEFAULT is treated as DRM_IVPU_JOB_PRIORITY_NORMAL. +* Command queue ID is given via drm_ivpu_param.index. */ __u32 param;
Signature · 1 line
2.43.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Missing CAP_SYS_NICE or DRM_MASTER check for elevated job priorities (REALTIME / FOCUS), allowing unprivileged users to monopolize the NPU. --
commit 57cf0d7005a7761ad6193ea568802164b7fac6db
Author: Andrzej Kacprowski <[email protected]>
accel/ivpu: Add support for getting and setting command queue priority
This commit adds a new DRM_IVPU_PARAM_CMDQ_PRIORITY parameter to query and update the scheduling priority of an existing command queue. The priority can be changed on a queue that already has pending jobs, propagating the change to firmware in hardware scheduling mode.
Quoted 4 lines
drivers/accel/ivpu/ivpu_job.c +0
-0
[ ... ]
Quoted 8 lines
drivers/accel/ivpu/ivpu_job.c +4
-0@@ -1127,6 +1132,86 @@ int ivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_filereturn ret; } +static int ivpu_cmdq_priority_args_check (struct ivpu_device *vdev,u32 cmdq_id,u64 priority) +{ +if (!ivpu_is_capable (vdev,DRM_IVPU_CAP_CMDQ_SET_PRIORITY )) { +ivpu_dbg (vdev,IOCTL ,"Command queue priority not supported\n" );
drivers/accel/ivpu/ivpu_job.c int ivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_file · line 1148
Quoted 10 lines
drivers/accel/ivpu/ivpu_job.c +10
-0+return -ENODEV ; + } + +if (cmdq_id <IVPU_CMDQ_MIN_ID || cmdq_id >IVPU_CMDQ_MAX_ID ) { +ivpu_dbg (vdev,IOCTL ,"Invalid command queue ID %u\n" , cmdq_id); +return -EINVAL ; + } + +if (priority >DRM_IVPU_JOB_PRIORITY_REALTIME ) +return -EINVAL ;
[Severity: High]
This is a pre-existing issue, but is there a missing capability check for elevated priorities here?
An unprivileged user who opens the NPU device can call the IVPU_SET_PARAM ioctl with DRM_IVPU_PARAM_CMDQ_PRIORITY and set the priority to DRM_IVPU_JOB_PRIORITY_REALTIME. Without a CAP_SYS_NICE or DRM_MASTER check, could a malicious or buggy application elevate its command queue priority to monopolize the hardware and starve other processes?
I notice this same behavior appears to be pre-existing in ivpu_cmdq_create_ioctl() as well, where queues can be created with realtime priority by any user. Should these priority levels be restricted?
Quoted 6 lines
drivers/accel/ivpu/ivpu_job.c +6
-0+ +return 0 ; +} + +int ivpu_cmdq_get_priority (struct ivpu_file_priv *file_priv,u32 cmdq_id,u64 *priority) +{
[ ... ]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Andrzej Kacprowski
maintainerQuoted 52 lines · On 31-Aug-26 2:33 PM, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] MissingCAP_SYS_NICEorDRM_MASTERcheck for elevated job priorities (REALTIME / FOCUS), allowing unprivileged users to monopolize the NPU. --commit
57cf0d7005a7761ad6193ea568802164b7fac6db
Author: Andrzej Kacprowski <[email protected]>accel/ivpu: Add support for getting and setting command queue priority
This commit adds a new
DRM_IVPU_PARAM_CMDQ_PRIORITYparameter to query and update the scheduling priority of an existing command queue. The priority can be changed on a queue that already has pending jobs, propagating the change to firmware in hardware scheduling mode.Quoted 4 lines
drivers/accel/ivpu/ivpu_job.c +0
-0[ ... ]
Quoted 8 lines
drivers/accel/ivpu/ivpu_job.c +4
-0@@ -1127,6 +1132,86 @@ int ivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_filereturn ret; } +static int ivpu_cmdq_priority_args_check (struct ivpu_device *vdev,u32 cmdq_id,u64 priority) +{ +if (!ivpu_is_capable (vdev,DRM_IVPU_CAP_CMDQ_SET_PRIORITY )) { +ivpu_dbg (vdev,IOCTL ,"Command queue priority not supported\n" );drivers/accel/ivpu/ivpu_job.c int ivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_file · line 1148
Quoted 10 lines
drivers/accel/ivpu/ivpu_job.c +10
-0+return -ENODEV ; + } + +if (cmdq_id <IVPU_CMDQ_MIN_ID || cmdq_id >IVPU_CMDQ_MAX_ID ) { +ivpu_dbg (vdev,IOCTL ,"Invalid command queue ID %u\n" , cmdq_id); +return -EINVAL ; + } + +if (priority >DRM_IVPU_JOB_PRIORITY_REALTIME ) +return -EINVAL ;[Severity: High]
This is a pre-existing issue, but is there a missing capability check for elevated priorities here?An unprivileged user who opens the NPU device can call the
IVPU_SET_PARAMioctl withDRM_IVPU_PARAM_CMDQ_PRIORITYand set the priority toDRM_IVPU_JOB_PRIORITY_REALTIME. Without aCAP_SYS_NICEorDRM_MASTERcheck, could a malicious or buggy application elevate its command queue priority to monopolize the hardware and starve other processes?
Quoted 4 lines
I notice this same behavior appears to be pre-existing in
ivpu_cmdq_create_ioctl()as well, where queues can be created with realtime priority by any user. Should these priority levels be restricted?
The Intel NPU is not a display/graphics device and has no notion of DRM_MASTER which is typically the display server process.
Using CAP_SYS_NICE has a bit more merit however:
- strict CAP_SYS_NICE check in KMD will break existing use cases
- no other accel drivers use CAP_SYS_NICE
Current strategy is to allow OS level AI runtime to control NPU workload priority - dynamic priority change was added to support that use case.
I will take it into consideration for future driver updates, but it cannot be immediately solved in this patch.
- Andrzej
Quoted 9 lines
Quoted 6 lines
drivers/accel/ivpu/ivpu_job.c +6
-0+ +return 0 ; +} + +int ivpu_cmdq_get_priority (struct ivpu_file_priv *file_priv,u32 cmdq_id,u64 *priority) +{[ ... ]
Quoted 231 lines · Andrzej Kacprowski
Add a new
DRM_IVPU_PARAM_CMDQ_PRIORITYparameter to query and update the scheduling priority of an existing command queue, identified by its ID via drm_ivpu_param.index.The priority can be changed on a queue that already has pending jobs; if the queue's doorbell is registered, the new priority is propagated to the firmware immediately, otherwise it is applied when the queue is next registered. The firmware picks up the change at the first opportunity.
The feature requires HW scheduling mode and is advertised through the new
DRM_IVPU_CAP_CMDQ_SET_PRIORITYcapability. Legacy command queues are not supported.Signed-off-by Andrzej Kacprowski <[email protected]>--- drivers/accel/ivpu/ivpu_drv.c | 13 ++++++ drivers/accel/ivpu/ivpu_job.c | 85 +++++++++++++++++++++++++++++++++++ drivers/accel/ivpu/ivpu_job.h | 5 ++- include/uapi/drm/ivpu_accel.h | 17 ++++++- 4 files changed, 118 insertions(+), 2 deletions(-)drivers/accel/ivpu/ivpu_drv.c +13
-0@@ -205,6 +205,7 @@ bool ivpu_is_capable(struct ivpu_device *vdev, u32 capability)case DRM_IVPU_CAP_BO_CREATE_FROM_USERPTR :return true;case DRM_IVPU_CAP_MANAGE_CMDQ : +case DRM_IVPU_CAP_CMDQ_SET_PRIORITY :return vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_HW ;default :return false;@@ -273,6 +274,9 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_fcase DRM_IVPU_PARAM_PREEMPT_BUFFER_SIZE : args->value =ivpu_fw_preempt_buf_size (vdev);break ; +case DRM_IVPU_PARAM_CMDQ_PRIORITY : + ret =ivpu_cmdq_get_priority (file_priv, args->index, &args->value); +break ;default : ret = -EINVAL ;break ;@@ -284,14 +288,23 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_fstatic int ivpu_set_param_ioctl (struct drm_device *dev,void *data,struct drm_file *file) { +struct ivpu_file_priv *file_priv = file->driver_priv;struct drm_ivpu_param *args = data;int ret =0 ; +int idx; + +if (!drm_dev_enter (dev, &idx)) +return -ENODEV ;switch (args->param) { +case DRM_IVPU_PARAM_CMDQ_PRIORITY : + ret =ivpu_cmdq_set_priority (file_priv, args->index, args->value); +break ;default : ret = -EINVAL ; } +drm_dev_exit (idx);return ret; }drivers/accel/ivpu/ivpu_job.c +85
-0@@ -323,6 +323,11 @@ static inline u8 ivpu_job_to_jsm_priority(u8 priority)return priority -1 ; } +static inline u8 ivpu_jsm_to_job_priority (u8 priority) +{ +return priority +1 ; +} +static void ivpu_cmdq_destroy (struct ivpu_file_priv *file_priv,struct ivpu_cmdq *cmdq) {lockdep_assert_held (&file_priv->lock);@@ -1127,6 +1132,86 @@ int ivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_filereturn ret; } +static int ivpu_cmdq_priority_args_check (struct ivpu_device *vdev,u32 cmdq_id,u64 priority) +{ +if (!ivpu_is_capable (vdev,DRM_IVPU_CAP_CMDQ_SET_PRIORITY )) { +ivpu_dbg (vdev,IOCTL ,"Command queue priority not supported\n" ); +return -ENODEV ; + } + +if (cmdq_id <IVPU_CMDQ_MIN_ID || cmdq_id >IVPU_CMDQ_MAX_ID ) { +ivpu_dbg (vdev,IOCTL ,"Invalid command queue ID %u\n" , cmdq_id); +return -EINVAL ; + } + +if (priority >DRM_IVPU_JOB_PRIORITY_REALTIME ) +return -EINVAL ; + +return 0 ; +} + +int ivpu_cmdq_get_priority (struct ivpu_file_priv *file_priv,u32 cmdq_id,u64 *priority) +{ +struct ivpu_device *vdev = file_priv->vdev; +struct ivpu_cmdq *cmdq; +int ret; + + ret =ivpu_cmdq_priority_args_check (vdev, cmdq_id,DRM_IVPU_JOB_PRIORITY_NORMAL ); +if (ret) +return ret; + +guard (mutex)(&file_priv->lock); + + cmdq =ivpu_cmdq_acquire (file_priv, cmdq_id); +if (!cmdq || cmdq->is_legacy) +return -EINVAL ; + + *priority =ivpu_jsm_to_job_priority (cmdq->priority); +return 0 ; +} + +int ivpu_cmdq_set_priority (struct ivpu_file_priv *file_priv,u32 cmdq_id,u64 priority) +{ +struct ivpu_device *vdev = file_priv->vdev; +struct ivpu_cmdq *cmdq; +u8 jsm_priority; +int ret =0 ; + + ret =ivpu_cmdq_priority_args_check (vdev, cmdq_id, priority); +if (ret) +return ret; + + ret =ivpu_rpm_get (vdev); +if (ret <0 ) +return ret; + +mutex_lock (&file_priv->lock); + + cmdq =ivpu_cmdq_acquire (file_priv, cmdq_id); +if (!cmdq || cmdq->is_legacy) { + ret = -EINVAL ; + goto out; + } + + jsm_priority =ivpu_job_to_jsm_priority (priority); +if (cmdq->priority == jsm_priority) + goto out; + +if (cmdq->db_id) { + ret =ivpu_jsm_hws_set_context_sched_properties (vdev, file_priv->ctx.id, cmdq_id, + jsm_priority); +if (ret) + goto out; + } + + cmdq->priority = jsm_priority; + +out: +mutex_unlock (&file_priv->lock); +ivpu_rpm_put (vdev); +return ret; +} +static void ivpu_job_done_callback (struct ivpu_device *vdev,struct ivpu_ipc_hdr *ipc_hdr,struct vpu_jsm_msg *jsm_msg)drivers/accel/ivpu/ivpu_job.h +4
-1@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (C) 2020-2025 Intel Corporation +* Copyright (C) 2020-2026 Intel Corporation */ #ifndef __IVPU_JOB_H__@@ -81,6 +81,9 @@ int ivpu_cmdq_create_ioctl(struct drm_device *dev, void *data, struct drm_file *int ivpu_cmdq_destroy_ioctl (struct drm_device *dev,void *data,struct drm_file *file);int ivpu_cmdq_submit_ioctl (struct drm_device *dev,void *data,struct drm_file *file); +int ivpu_cmdq_get_priority (struct ivpu_file_priv *file_priv,u32 cmdq_id,u64 *priority); +int ivpu_cmdq_set_priority (struct ivpu_file_priv *file_priv,u32 cmdq_id,u64 priority); +void ivpu_context_abort_locked (struct ivpu_file_priv *file_priv);void ivpu_cmdq_release_all_locked (struct ivpu_file_priv *file_priv);include/uapi/drm/ivpu_accel.h +11
-1@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* -* Copyright (C) 2020-2025 Intel Corporation +* Copyright (C) 2020-2026 Intel Corporation */ #ifndef __UAPI_IVPU_DRM_H__@@ -96,6 +96,7 @@ extern "C" {#define DRM_IVPU_PARAM_SKU 12#define DRM_IVPU_PARAM_CAPABILITIES 13#define DRM_IVPU_PARAM_PREEMPT_BUFFER_SIZE 14 +#define DRM_IVPU_PARAM_CMDQ_PRIORITY 15#define DRM_IVPU_PLATFORM_TYPE_SILICON 0@@ -140,6 +141,15 @@ extern "C" {*/ #define DRM_IVPU_CAP_BO_CREATE_FROM_USERPTR 4 +/** +* DRM_IVPU_CAP_CMDQ_SET_PRIORITY +* +* Driver supports DRM_IVPU_PARAM_CMDQ_PRIORITY parameter to get/set command +* queue priority. +* This allows changing command queue priority after creation. +*/ +#define DRM_IVPU_CAP_CMDQ_SET_PRIORITY 5 +/** * struct drm_ivpu_param - Get/Set VPU parameters */ @@ -192,6 +202,11 @@ struct drm_ivpu_param {*
include/uapi/drm/ivpu_accel.h struct drm_ivpu_param { · line 212
Quoted 10 lines
include/uapi/drm/ivpu_accel.h +5
-0* %DRM_IVPU_PARAM_PREEMPT_BUFFER_SIZE: * Size of the preemption buffer (read-only) +* +* %DRM_IVPU_PARAM_CMDQ_PRIORITY: +* Get/Set command queue priority (see DRM_IVPU_JOB_PRIORITY_*). +* DRM_IVPU_JOB_PRIORITY_DEFAULT is treated as DRM_IVPU_JOB_PRIORITY_NORMAL. +* Command queue ID is given via drm_ivpu_param.index. */ __u32 param;
Quoted 239 lines · Karol
Quoted 238 lines · Andrzej Kacprowski
Add a new
DRM_IVPU_PARAM_CMDQ_PRIORITYparameter to query and update the scheduling priority of an existing command queue, identified by its ID via drm_ivpu_param.index.The priority can be changed on a queue that already has pending jobs; if the queue's doorbell is registered, the new priority is propagated to the firmware immediately, otherwise it is applied when the queue is next registered. The firmware picks up the change at the first opportunity.
The feature requires HW scheduling mode and is advertised through the new
DRM_IVPU_CAP_CMDQ_SET_PRIORITYcapability. Legacy command queues are not supported.Signed-off-by Andrzej Kacprowski <[email protected]>---
drivers/accel/ivpu/ivpu_drv.c | 13 ++++++ drivers/accel/ivpu/ivpu_job.c | 85 +++++++++++++++++++++++++++++++++++ drivers/accel/ivpu/ivpu_job.h | 5 ++- include/uapi/drm/ivpu_accel.h | 17 ++++++- 4 files changed, 118 insertions(+), 2 deletions(-)drivers/accel/ivpu/ivpu_drv.c +0
-0@@ -205,6 +205,7 @@ bool ivpu_is_capable(struct ivpu_device *vdev, u32 capability)case
DRM_IVPU_CAP_BO_CREATE_FROM_USERPTR:
return true;
caseDRM_IVPU_CAP_MANAGE_CMDQ:
+ caseDRM_IVPU_CAP_CMDQ_SET_PRIORITY:
returnvdev->fw->sched_mode==VPU_SCHEDULING_MODE_HW; default:
return false;drivers/accel/ivpu/ivpu_drv.c +0
-0@@ -273,6 +274,9 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_fcase
DRM_IVPU_PARAM_PREEMPT_BUFFER_SIZE:
args->value=ivpu_fw_preempt_buf_size(vdev); break;
+ caseDRM_IVPU_PARAM_CMDQ_PRIORITY:
+ ret = ivpu_cmdq_get_priority(file_priv,args->index, &args-Quoted 1 line
value);
+ break;
default:
ret =-EINVAL;
break;drivers/accel/ivpu/ivpu_drv.c +0
-0@@ -284,14 +288,23 @@ static int ivpu_get_param_ioctl(struct
drm_device*dev, void *data, structdrm_f
static intivpu_set_param_ioctl(struct drm_device *dev, void *data, struct drm_file *file){
+ structivpu_file_priv*file_priv=file->driver_priv;
structdrm_ivpu_param*args = data;
int ret = 0;
+ int idx;
+
+ if (!drm_dev_enter(dev, &idx))
+ return-ENODEV;
switch (args->param) {
+ caseDRM_IVPU_PARAM_CMDQ_PRIORITY:
+ ret = ivpu_cmdq_set_priority(file_priv,args->index, args-Quoted 1 line
value);
+ break;
default:
ret =-EINVAL;
}
+drm_dev_exit(idx);
return ret;
}drivers/accel/ivpu/ivpu_job.c +44
-0@@ -323,6 +323,11 @@ static inline u8 ivpu_job_to_jsm_priority(u8 priority) return priority - 1; } +static inline u8 ivpu_jsm_to_job_priority (u8 priority) +{ + return priority + 1; +} + static void ivpu_cmdq_destroy(struct ivpu_file_priv *file_priv, struct ivpu_cmdq *cmdq) { lockdep_assert_held(&file_priv->lock);@@ -1127,6 +1132,86 @@ int ivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_file return ret; } +static int ivpu_cmdq_priority_args_check (struct ivpu_device *vdev,u32 cmdq_id,u64 priority) +{ + if (!ivpu_is_capable(vdev, DRM_IVPU_CAP_CMDQ_SET_PRIORITY)) { + ivpu_dbg(vdev, IOCTL, "Command queue priority not supported\n"); + return -ENODEV; + } + + if (cmdq_id < IVPU_CMDQ_MIN_ID || cmdq_id > IVPU_CMDQ_MAX_ID) { + ivpu_dbg(vdev, IOCTL, "Invalid command queue ID %u\n", cmdq_id); + return -EINVAL; + } + + if (priority > DRM_IVPU_JOB_PRIORITY_REALTIME) + return -EINVAL; + + return 0; +} + +int ivpu_cmdq_get_priority (struct ivpu_file_priv *file_priv,u32 cmdq_id,u64 *priority) +{ + struct ivpu_device *vdev = file_priv->vdev; + struct ivpu_cmdq *cmdq; + int ret; + + ret = ivpu_cmdq_priority_args_check(vdev, cmdq_id,DRM_IVPU_JOB_PRIORITY_NORMAL ); + if (ret) + return ret; + + guard(mutex)(&file_priv->lock); + + cmdq = ivpu_cmdq_acquire(file_priv, cmdq_id); + if (!cmdq || cmdq->is_legacy) + return -EINVAL; + + *priority = ivpu_jsm_to_job_priority(cmdq->priority); + return 0; +} + +int ivpu_cmdq_set_priority(struct ivpu_file_priv *file_priv, u32
cmdq_id, u64 priority)drivers/accel/ivpu/ivpu_job.c +28
-0+{ + struct ivpu_device *vdev = file_priv->vdev; + struct ivpu_cmdq *cmdq; + u8 jsm_priority; + int ret = 0; + + ret = ivpu_cmdq_priority_args_check(vdev, cmdq_id, priority); + if (ret) + return ret; + + ret = ivpu_rpm_get(vdev); + if (ret < 0) + return ret; + + mutex_lock(&file_priv->lock); + + cmdq = ivpu_cmdq_acquire(file_priv, cmdq_id); + if (!cmdq || cmdq->is_legacy) { + ret = -EINVAL; + goto out; + } + + jsm_priority = ivpu_job_to_jsm_priority(priority); + if (cmdq->priority == jsm_priority) + goto out; + + if (cmdq->db_id) { + ret = ivpu_jsm_hws_set_context_sched_properties(vdev,
file_priv->ctx.id,cmdq_id,
+jsm_priority);
+ if (ret)
+ goto out;
+ }drivers/accel/ivpu/ivpu_job.c +9
-0+ + cmdq->priority = jsm_priority; + +out: + mutex_unlock(&file_priv->lock); + ivpu_rpm_put(vdev); + return ret; +} +static void
ivpu_job_done_callback(struct ivpu_device *vdev, struct ivpu_ipc_hdr *ipc_hdr, struct vpu_jsm_msg *jsm_msg)drivers/accel/ivpu/ivpu_job.h +1
-1@@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (C) 2020-2025 Intel Corporation + * Copyright (C) 2020-2026 Intel Corporation */ #ifndef __IVPU_JOB_H__@@ -81,6 +81,9 @@ int ivpu_cmdq_create_ioctl(struct drm_device *dev,void *data, struct
drm_file*
intivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_file *file); intivpu_cmdq_submit_ioctl(struct drm_device *dev, void *data, struct drm_file *file); +int ivpu_cmdq_get_priority(structivpu_file_priv*file_priv, u32cmdq_id, u64 *priority);
+int ivpu_cmdq_set_priority(structivpu_file_priv*file_priv, u32cmdq_id, u64 priority);
+
voidivpu_context_abort_locked(struct ivpu_file_priv *file_priv);
voidivpu_cmdq_release_all_locked(struct ivpu_file_priv *file_priv);include/uapi/drm/ivpu_accel.h +6
-1@@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* - * Copyright (C) 2020-2025 Intel Corporation + * Copyright (C) 2020-2026 Intel Corporation */ #ifndef __UAPI_IVPU_DRM_H__@@ -96,6 +96,7 @@ extern "C" { #define DRM_IVPU_PARAM_SKU 12 #define DRM_IVPU_PARAM_CAPABILITIES 13 #define DRM_IVPU_PARAM_PREEMPT_BUFFER_SIZE 14 +#define DRM_IVPU_PARAM_CMDQ_PRIORITY 15 #define DRM_IVPU_PLATFORM_TYPE_SILICON 0@@ -140,6 +141,15 @@ extern "C" {*/ #define DRM_IVPU_CAP_BO_CREATE_FROM_USERPTR 4 +/** +* DRM_IVPU_CAP_CMDQ_SET_PRIORITY +* +* Driver supports DRM_IVPU_PARAM_CMDQ_PRIORITY parameter to get/set command
+ * queue priority.
+ * This allows changing command queue priority after creation.
+ */include/uapi/drm/ivpu_accel.h +2
-0+#define DRM_IVPU_CAP_CMDQ_SET_PRIORITY 5 +/**
* structdrm_ivpu_param- Get/Set VPU parameters */include/uapi/drm/ivpu_accel.h +2
-0@@ -192,6 +202,11 @@ struct drm_ivpu_param { * * %DRM_IVPU_PARAM_PREEMPT_BUFFER_SIZE: * Size of the preemption buffer (read-only) + * + * %DRM_IVPU_PARAM_CMDQ_PRIORITY:
Quoted 8 lines
Quoted 6 lines
include/uapi/drm/ivpu_accel.h +2
-0+ * Get/Set command queue priority (see DRM_IVPU_JOB_PRIORITY_*). + * DRM_IVPU_JOB_PRIORITY_DEFAULT is treated as
DRM_IVPU_JOB_PRIORITY_NORMAL.
+ * Command queue ID is given via drm_ivpu_param.index. */
__u32param;Reviewed-by Karol Wachowski <[email protected]>
Applied to drm-misc-next.