[PATCH 3/8] drm/xe/oa/uapi: Define and parse OA sync properties
Cavitt, Jonathan
jonathan.cavitt at intel.com
Thu Aug 8 21:05:30 UTC 2024
-----Original Message-----
From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf Of Ashutosh Dixit
Sent: Thursday, August 8, 2024 10:42 AM
To: intel-xe at lists.freedesktop.org
Cc: Nerlige Ramappa, Umesh <umesh.nerlige.ramappa at intel.com>; Souza, Jose <jose.souza at intel.com>; Landwerlin, Lionel G <lionel.g.landwerlin at intel.com>
Subject: [PATCH 3/8] drm/xe/oa/uapi: Define and parse OA sync properties
>
> Now that we have laid the groundwork, introduce OA sync properties in the
> uapi. Also parse the input xe_sync array as is done elsewhere in the
> driver.
>
> Signed-off-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
LGTM.
Reviewed-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
-Jonathan Cavitt
> ---
> drivers/gpu/drm/xe/xe_oa.c | 83 +++++++++++++++++++++++++++++++-
> drivers/gpu/drm/xe/xe_oa_types.h | 6 +++
> include/uapi/drm/xe_drm.h | 14 ++++++
> 3 files changed, 102 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
> index f97d64ffb460f..ba8f2e9d95b7f 100644
> --- a/drivers/gpu/drm/xe/xe_oa.c
> +++ b/drivers/gpu/drm/xe/xe_oa.c
> @@ -36,6 +36,7 @@
> #include "xe_pm.h"
> #include "xe_sched_job.h"
> #include "xe_sriov.h"
> +#include "xe_sync.h"
>
> #define DEFAULT_POLL_FREQUENCY_HZ 200
> #define DEFAULT_POLL_PERIOD_NS (NSEC_PER_SEC / DEFAULT_POLL_FREQUENCY_HZ)
> @@ -70,6 +71,7 @@ struct flex {
> };
>
> struct xe_oa_open_param {
> + struct xe_file *xef;
> u32 oa_unit_id;
> bool sample;
> u32 metric_set;
> @@ -81,6 +83,9 @@ struct xe_oa_open_param {
> struct xe_exec_queue *exec_q;
> struct xe_hw_engine *hwe;
> bool no_preempt;
> + struct drm_xe_sync __user *syncs_user;
> + int num_syncs;
> + struct xe_sync_entry *syncs;
> };
>
> struct xe_oa_config_bo {
> @@ -1417,6 +1422,9 @@ static int xe_oa_stream_init(struct xe_oa_stream *stream,
> stream->period_exponent = param->period_exponent;
> stream->no_preempt = param->no_preempt;
>
> + stream->num_syncs = param->num_syncs;
> + stream->syncs = param->syncs;
> +
> /*
> * For Xe2+, when overrun mode is enabled, there are no partial reports at the end
> * of buffer, making the OA buffer effectively a non-power-of-2 size circular
> @@ -1767,6 +1775,20 @@ static int xe_oa_set_no_preempt(struct xe_oa *oa, u64 value,
> return 0;
> }
>
> +static int xe_oa_set_num_syncs(struct xe_oa *oa, u64 value,
> + struct xe_oa_open_param *param)
> +{
> + param->num_syncs = value;
> + return 0;
> +}
> +
> +static int xe_oa_set_syncs_user(struct xe_oa *oa, u64 value,
> + struct xe_oa_open_param *param)
> +{
> + param->syncs_user = u64_to_user_ptr(value);
> + return 0;
> +}
> +
> typedef int (*xe_oa_set_property_fn)(struct xe_oa *oa, u64 value,
> struct xe_oa_open_param *param);
> static const xe_oa_set_property_fn xe_oa_set_property_funcs[] = {
> @@ -1779,6 +1801,8 @@ static const xe_oa_set_property_fn xe_oa_set_property_funcs[] = {
> [DRM_XE_OA_PROPERTY_EXEC_QUEUE_ID] = xe_oa_set_prop_exec_queue_id,
> [DRM_XE_OA_PROPERTY_OA_ENGINE_INSTANCE] = xe_oa_set_prop_engine_instance,
> [DRM_XE_OA_PROPERTY_NO_PREEMPT] = xe_oa_set_no_preempt,
> + [DRM_XE_OA_PROPERTY_NUM_SYNCS] = xe_oa_set_num_syncs,
> + [DRM_XE_OA_PROPERTY_SYNCS] = xe_oa_set_syncs_user,
> };
>
> static int xe_oa_user_ext_set_property(struct xe_oa *oa, u64 extension,
> @@ -1838,6 +1862,49 @@ static int xe_oa_user_extensions(struct xe_oa *oa, u64 extension, int ext_number
> return 0;
> }
>
> +static int xe_oa_parse_syncs(struct xe_oa *oa, struct xe_oa_open_param *param)
> +{
> + int ret, num_syncs, num_ufence = 0;
> +
> + if (param->num_syncs && !param->syncs_user) {
> + drm_dbg(&oa->xe->drm, "num_syncs specified without sync array\n");
> + ret = -EINVAL;
> + goto exit;
> + }
> +
> + if (param->num_syncs) {
> + param->syncs = kcalloc(param->num_syncs, sizeof(*param->syncs), GFP_KERNEL);
> + if (!param->syncs) {
> + ret = -ENOMEM;
> + goto exit;
> + }
> + }
> +
> + for (num_syncs = 0; num_syncs < param->num_syncs; num_syncs++) {
> + ret = xe_sync_entry_parse(oa->xe, param->xef, ¶m->syncs[num_syncs],
> + ¶m->syncs_user[num_syncs], SYNC_PARSE_FLAG_EXEC);
> + if (ret)
> + goto err_syncs;
> +
> + if (xe_sync_is_ufence(¶m->syncs[num_syncs]))
> + num_ufence++;
> + }
> +
> + if (XE_IOCTL_DBG(oa->xe, num_ufence > 1)) {
> + ret = -EINVAL;
> + goto err_syncs;
> + }
> +
> + return 0;
> +
> +err_syncs:
> + while (num_syncs--)
> + xe_sync_entry_cleanup(¶m->syncs[num_syncs]);
> + kfree(param->syncs);
> +exit:
> + return ret;
> +}
> +
> /**
> * xe_oa_stream_open_ioctl - Opens an OA stream
> * @dev: @drm_device
> @@ -1863,6 +1930,7 @@ int xe_oa_stream_open_ioctl(struct drm_device *dev, u64 data, struct drm_file *f
> return -ENODEV;
> }
>
> + param.xef = xef;
> ret = xe_oa_user_extensions(oa, data, 0, ¶m);
> if (ret)
> return ret;
> @@ -1931,11 +1999,24 @@ int xe_oa_stream_open_ioctl(struct drm_device *dev, u64 data, struct drm_file *f
> drm_dbg(&oa->xe->drm, "Using periodic sampling freq %lld Hz\n", oa_freq_hz);
> }
>
> + ret = xe_oa_parse_syncs(oa, ¶m);
> + if (ret)
> + goto err_exec_q;
> +
> mutex_lock(¶m.hwe->gt->oa.gt_lock);
> ret = xe_oa_stream_open_ioctl_locked(oa, ¶m);
> mutex_unlock(¶m.hwe->gt->oa.gt_lock);
> + if (ret < 0)
> + goto err_sync_cleanup;
> +
> + return ret;
> +
> +err_sync_cleanup:
> + while (param.num_syncs--)
> + xe_sync_entry_cleanup(¶m.syncs[param.num_syncs]);
> + kfree(param.syncs);
> err_exec_q:
> - if (ret < 0 && param.exec_q)
> + if (param.exec_q)
> xe_exec_queue_put(param.exec_q);
> return ret;
> }
> diff --git a/drivers/gpu/drm/xe/xe_oa_types.h b/drivers/gpu/drm/xe/xe_oa_types.h
> index 540c3ec53a6d7..c1ca960af9305 100644
> --- a/drivers/gpu/drm/xe/xe_oa_types.h
> +++ b/drivers/gpu/drm/xe/xe_oa_types.h
> @@ -238,5 +238,11 @@ struct xe_oa_stream {
>
> /** @no_preempt: Whether preemption and timeslicing is disabled for stream exec_q */
> u32 no_preempt;
> +
> + /** @num_syncs: size of @syncs array */
> + u32 num_syncs;
> +
> + /** @syncs: syncs to wait on and to signal */
> + struct xe_sync_entry *syncs;
> };
> #endif
> diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
> index b6fbe4988f2e9..0a3daaea4eb27 100644
> --- a/include/uapi/drm/xe_drm.h
> +++ b/include/uapi/drm/xe_drm.h
> @@ -1632,6 +1632,20 @@ enum drm_xe_oa_property_id {
> * to be disabled for the stream exec queue.
> */
> DRM_XE_OA_PROPERTY_NO_PREEMPT,
> +
> + /**
> + * @DRM_XE_OA_PROPERTY_NUM_SYNCS: Number of syncs in the sync array
> + * specified in @DRM_XE_OA_PROPERTY_SYNCS
> + */
> + DRM_XE_OA_PROPERTY_NUM_SYNCS,
> +
> + /**
> + * @DRM_XE_OA_PROPERTY_SYNCS: Pointer to struct @drm_xe_sync array
> + * with array size specified via @DRM_XE_OA_PROPERTY_NUM_SYNCS. OA
> + * configuration will wait till input fences signal. Output fences
> + * will signal after the new OA configuration takes effect.
> + */
> + DRM_XE_OA_PROPERTY_SYNCS,
> };
>
> /**
> --
> 2.41.0
>
>
More information about the Intel-xe
mailing list