Karol Wachowski
3e3062be7d
commit 5bbccadaf33eea2b879d8326ad59ae0663be47d1 upstream. With hardware scheduler it is not expected to receive JOB_DONE notifications from NPU FW for the jobs aborted due to command queue destroy JSM command. Remove jobs submitted to unregistered command queue from submitted_jobs_xa to avoid triggering a TDR in such case. Add explicit submitted_jobs_lock that protects access to list of submitted jobs which is now used to find jobs to abort. Move context abort procedure to separate work queue not to slow down handling of IPCs or DCT requests in case where job abort takes longer, especially when destruction of the last job of a specific context results in context release. Signed-off-by: Karol Wachowski <karol.wachowski@intel.com> Signed-off-by: Maciej Falkowski <maciej.falkowski@linux.intel.com> Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250107173238.381120-4-maciej.falkowski@linux.intel.com [ This backport removes all the lines from upstream commit related to the command queue UAPI, as it is not present in the 6.12 kernel and should not be backported. ] Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
84 lines
2.3 KiB
C
84 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2024 Intel Corporation
|
|
*/
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/err.h>
|
|
|
|
#include "ivpu_drv.h"
|
|
#include "ivpu_fw.h"
|
|
#include "ivpu_hw.h"
|
|
#include "ivpu_sysfs.h"
|
|
|
|
/*
|
|
* npu_busy_time_us is the time that the device spent executing jobs.
|
|
* The time is counted when and only when there are jobs submitted to firmware.
|
|
*
|
|
* This time can be used to measure the utilization of NPU, either by calculating
|
|
* npu_busy_time_us difference between two timepoints (i.e. measuring the time
|
|
* that the NPU was active during some workload) or monitoring utilization percentage
|
|
* by reading npu_busy_time_us periodically.
|
|
*
|
|
* When reading the value periodically, it shouldn't be read too often as it may have
|
|
* an impact on job submission performance. Recommended period is 1 second.
|
|
*/
|
|
static ssize_t
|
|
npu_busy_time_us_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
{
|
|
struct drm_device *drm = dev_get_drvdata(dev);
|
|
struct ivpu_device *vdev = to_ivpu_device(drm);
|
|
ktime_t total, now = 0;
|
|
|
|
mutex_lock(&vdev->submitted_jobs_lock);
|
|
|
|
total = vdev->busy_time;
|
|
if (!xa_empty(&vdev->submitted_jobs_xa))
|
|
now = ktime_sub(ktime_get(), vdev->busy_start_ts);
|
|
mutex_unlock(&vdev->submitted_jobs_lock);
|
|
|
|
return sysfs_emit(buf, "%lld\n", ktime_to_us(ktime_add(total, now)));
|
|
}
|
|
|
|
static DEVICE_ATTR_RO(npu_busy_time_us);
|
|
|
|
/**
|
|
* DOC: sched_mode
|
|
*
|
|
* The sched_mode is used to report current NPU scheduling mode.
|
|
*
|
|
* It returns following strings:
|
|
* - "HW" - Hardware Scheduler mode
|
|
* - "OS" - Operating System Scheduler mode
|
|
*
|
|
*/
|
|
static ssize_t
|
|
sched_mode_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
{
|
|
struct drm_device *drm = dev_get_drvdata(dev);
|
|
struct ivpu_device *vdev = to_ivpu_device(drm);
|
|
|
|
return sysfs_emit(buf, "%s\n", vdev->fw->sched_mode ? "HW" : "OS");
|
|
}
|
|
|
|
static DEVICE_ATTR_RO(sched_mode);
|
|
|
|
static struct attribute *ivpu_dev_attrs[] = {
|
|
&dev_attr_npu_busy_time_us.attr,
|
|
&dev_attr_sched_mode.attr,
|
|
NULL,
|
|
};
|
|
|
|
static struct attribute_group ivpu_dev_attr_group = {
|
|
.attrs = ivpu_dev_attrs,
|
|
};
|
|
|
|
void ivpu_sysfs_init(struct ivpu_device *vdev)
|
|
{
|
|
int ret;
|
|
|
|
ret = devm_device_add_group(vdev->drm.dev, &ivpu_dev_attr_group);
|
|
if (ret)
|
|
ivpu_warn(vdev, "Failed to add group to device, ret %d", ret);
|
|
}
|