[PATCH 7/8] drm/xe/oa: Add syncs support to OA config ioctl

[Dixit, Ashutosh]

On Thu, 08 Aug 2024 14:39:12 -0700, Cavitt, Jonathan wrote:
>
> -----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 7/8] drm/xe/oa: Add syncs support to OA config ioctl
> >
> > In addition to stream open, add xe_sync support to the OA config ioctl,
> > where it is even more useful. This allows e.g. Mesa to replay a workload
> > repeatedly on the GPU, each time with a different OA configuration, while
> > precisely controlling (at batch buffer granularity) the workload segment
> > for which a particular OA configuration is active, without introducing
> > stalls in the userspace pipeline.
> >
> > Signed-off-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
> > ---
> >  drivers/gpu/drm/xe/xe_oa.c       | 32 ++++++++++++++++++--------------
> >  drivers/gpu/drm/xe/xe_oa_types.h |  3 +++
> >  2 files changed, 21 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
> > index 5520208a46b2c..c9f77f0342b60 100644
> > --- a/drivers/gpu/drm/xe/xe_oa.c
> > +++ b/drivers/gpu/drm/xe/xe_oa.c
> > @@ -867,6 +867,7 @@ static void xe_oa_stream_destroy(struct xe_oa_stream *stream)
> >		xe_gt_WARN_ON(gt, xe_guc_pc_unset_gucrc_mode(&gt->uc.guc.pc));
> >
> >	xe_oa_free_configs(stream);
> > +	xe_file_put(stream->xef);
> >  }
> >
> >  static int xe_oa_alloc_oa_buffer(struct xe_oa_stream *stream)
> > @@ -1433,36 +1434,37 @@ static int xe_oa_disable_locked(struct xe_oa_stream *stream)
> >
> >  static long xe_oa_config_locked(struct xe_oa_stream *stream, u64 arg)
> >  {
> > -	struct drm_xe_ext_set_property ext;
> > +	struct xe_oa_open_param param = {};
> >	long ret = stream->oa_config->id;
> >	struct xe_oa_config *config;
> >	int err;
> >
> > -	err = __copy_from_user(&ext, u64_to_user_ptr(arg), sizeof(ext));
> > -	if (XE_IOCTL_DBG(stream->oa->xe, err))
> > -		return -EFAULT;
> > -
> > -	if (XE_IOCTL_DBG(stream->oa->xe, ext.pad) ||
> > -	    XE_IOCTL_DBG(stream->oa->xe, ext.base.name != DRM_XE_OA_EXTENSION_SET_PROPERTY) ||
> > -	    XE_IOCTL_DBG(stream->oa->xe, ext.base.next_extension) ||
> > -	    XE_IOCTL_DBG(stream->oa->xe, ext.property != DRM_XE_OA_PROPERTY_OA_METRIC_SET))
> > -		return -EINVAL;
>
> I take it these conditions originally blocked batch buffer granular OA configuration
> changes, which we now support due to xe_oa_parse_syncs down below?

Yeah, previously only metric_set configuration was supported for stream
reconfiguration. Now that we have introduced syncs in this series,
both metric_set and xe_syncs are supported in the reconfig path.

>
> At any rate, this all looks fine to me.
> Reviewed-by: Jonathan Cavitt <jonathan.cavitt at intel.com>

Thanks.
--
Ashutosh

> -Jonathan Cavitt
>
> > +	err = xe_oa_user_extensions(stream->oa, arg, 0, &param);
> > +	if (err)
> > +		return err;
> >
> > -	config = xe_oa_get_oa_config(stream->oa, ext.value);
> > +	config = xe_oa_get_oa_config(stream->oa, param.metric_set);
> >	if (!config)
> >		return -ENODEV;
> >
> >	if (config != stream->oa_config) {
> > +		param.xef = stream->xef;
> > +		err = xe_oa_parse_syncs(stream->oa, &param);
> > +		if (err)
> > +			goto err_config_put;
> > +
> > +		stream->num_syncs = param.num_syncs;
> > +		stream->syncs = param.syncs;
> > +
> >		err = xe_oa_emit_oa_config(stream, config);
> >		if (!err)
> >			config = xchg(&stream->oa_config, config);
> > -		else
> > -			ret = err;
> >	}
> >
> > +err_config_put:
> >	xe_oa_config_put(config);
> >
> > -	return ret;
> > +	return err ?: ret;
> >  }
> >
> >  static long xe_oa_status_locked(struct xe_oa_stream *stream, unsigned long arg)
> > @@ -1705,6 +1707,7 @@ static int xe_oa_stream_init(struct xe_oa_stream *stream,
> >	stream->period_exponent = param->period_exponent;
> >	stream->no_preempt = param->no_preempt;
> >
> > +	stream->xef = xe_file_get(param->xef);
> >	stream->num_syncs = param->num_syncs;
> >	stream->syncs = param->syncs;
> >
> > @@ -1804,6 +1807,7 @@ static int xe_oa_stream_init(struct xe_oa_stream *stream,
> >  err_free_configs:
> >	xe_oa_free_configs(stream);
> >  exit:
> > +	xe_file_put(stream->xef);
> >	return ret;
> >  }
> >
> > diff --git a/drivers/gpu/drm/xe/xe_oa_types.h b/drivers/gpu/drm/xe/xe_oa_types.h
> > index c1ca960af9305..303e2e8f2a918 100644
> > --- a/drivers/gpu/drm/xe/xe_oa_types.h
> > +++ b/drivers/gpu/drm/xe/xe_oa_types.h
> > @@ -239,6 +239,9 @@ struct xe_oa_stream {
> >	/** @no_preempt: Whether preemption and timeslicing is disabled for stream exec_q */
> >	u32 no_preempt;
> >
> > +	/** @xef: xe_file with which the stream was opened */
> > +	struct xe_file *xef;
> > +
> >	/** @num_syncs: size of @syncs array */
> >	u32 num_syncs;
> >
> > --
> > 2.41.0
> >
> >