On 09/30, Iago Toral wrote:
> On Wed, 2021-09-29 at 10:45 +0100, Melissa Wen wrote:
> > Using the generic extension from the previous patch, a specific
> > multisync
> > extension enables more than one in/out binary syncobj per job
> > submission.
> > Arrays of syncobjs are set in struct drm_v3d_multisync, that also
> > cares
> > of determining the stage for sync (wait deps) according to the job
> > queue.
> > 
> > v2:
> > - subclass the generic extension struct (Daniel)
> > - simplify adding dependency conditions to make understandable (Iago)
> > 
> > Signed-off-by: Melissa Wen <mwen@igalia.com>
> > ---
> >  drivers/gpu/drm/v3d/v3d_drv.c |   6 +-
> >  drivers/gpu/drm/v3d/v3d_drv.h |  23 +++--
> >  drivers/gpu/drm/v3d/v3d_gem.c | 176 ++++++++++++++++++++++++++++++
> > ----
> >  include/uapi/drm/v3d_drm.h    |  49 +++++++++-
> >  4 files changed, 224 insertions(+), 30 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/v3d/v3d_drv.c
> > b/drivers/gpu/drm/v3d/v3d_drv.c
> > index 3d6b9bcce2f7..bd46396a1ae0 100644
> > --- a/drivers/gpu/drm/v3d/v3d_drv.c
> > +++ b/drivers/gpu/drm/v3d/v3d_drv.c
> > @@ -96,6 +96,9 @@ static int v3d_get_param_ioctl(struct drm_device
> > *dev, void *data,
> >  	case DRM_V3D_PARAM_SUPPORTS_PERFMON:
> >  		args->value = (v3d->ver >= 40);
> >  		return 0;
> > +	case DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT:
> > +		args->value = 1;
> > +		return 0;
> >  	default:
> >  		DRM_DEBUG("Unknown parameter %d\n", args->param);
> >  		return -EINVAL;
> > @@ -135,9 +138,8 @@ v3d_postclose(struct drm_device *dev, struct
> > drm_file *file)
> >  	struct v3d_file_priv *v3d_priv = file->driver_priv;
> >  	enum v3d_queue q;
> >  
> > -	for (q = 0; q < V3D_MAX_QUEUES; q++) {
> > +	for (q = 0; q < V3D_MAX_QUEUES; q++)
> >  		drm_sched_entity_destroy(&v3d_priv->sched_entity[q]);
> > -	}
> >  
> >  	v3d_perfmon_close_file(v3d_priv);
> >  	kfree(v3d_priv);
> > diff --git a/drivers/gpu/drm/v3d/v3d_drv.h
> > b/drivers/gpu/drm/v3d/v3d_drv.h
> > index b900a050d5e2..b14ff1e96f49 100644
> > --- a/drivers/gpu/drm/v3d/v3d_drv.h
> > +++ b/drivers/gpu/drm/v3d/v3d_drv.h
> > @@ -19,15 +19,6 @@ struct reset_control;
> >  
> >  #define GMP_GRANULARITY (128 * 1024)
> >  
> > -/* Enum for each of the V3D queues. */
> > -enum v3d_queue {
> > -	V3D_BIN,
> > -	V3D_RENDER,
> > -	V3D_TFU,
> > -	V3D_CSD,
> > -	V3D_CACHE_CLEAN,
> > -};
> > -
> >  #define V3D_MAX_QUEUES (V3D_CACHE_CLEAN + 1)
> >  
> >  struct v3d_queue_state {
> > @@ -294,6 +285,20 @@ struct v3d_csd_job {
> >  	struct drm_v3d_submit_csd args;
> >  };
> >  
> > +struct v3d_submit_outsync {
> > +	struct drm_syncobj *syncobj;
> > +};
> > +
> > +struct v3d_submit_ext {
> > +	u32 wait_stage;
> > +
> > +	u32 in_sync_count;
> > +	u64 in_syncs;
> > +
> > +	u32 out_sync_count;
> > +	struct v3d_submit_outsync *out_syncs;
> > +};
> > +
> >  /**
> >   * __wait_for - magic wait macro
> >   *
> > diff --git a/drivers/gpu/drm/v3d/v3d_gem.c
> > b/drivers/gpu/drm/v3d/v3d_gem.c
> > index b912419027f7..e92998d39eaa 100644
> > --- a/drivers/gpu/drm/v3d/v3d_gem.c
> > +++ b/drivers/gpu/drm/v3d/v3d_gem.c
> > @@ -454,11 +454,12 @@ v3d_job_add_deps(struct drm_file *file_priv,
> > struct v3d_job *job,
> >  static int
> >  v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv,
> >  	     void **container, size_t size, void (*free)(struct kref
> > *ref),
> > -	     u32 in_sync, enum v3d_queue queue)
> > +	     u32 in_sync, struct v3d_submit_ext *se, enum v3d_queue
> > queue)
> >  {
> >  	struct v3d_file_priv *v3d_priv = file_priv->driver_priv;
> >  	struct v3d_job *job;
> > -	int ret;
> > +	bool has_multisync = (se && se->in_sync_count);
> 
> I think this is not correct... we could be using the multisync
> interface and pass 0 in_syncs and/or 0 out_syncs... what should
> determine if we take the multisync path is the presence of the
> extension alone.
hmm.. yeah. so, I should drop this has_multisync and change conditions
to only check if we have a submit_ext (that means we have multisync
support) and move the in_sync_count to check if we should add any wait
semaphores, as below: 

> 
> > +	int ret, i;
> >  
> >  	*container = kcalloc(1, size, GFP_KERNEL);
> >  	if (!*container) {
> > @@ -479,9 +480,28 @@ v3d_job_init(struct v3d_dev *v3d, struct
> > drm_file *file_priv,
> >  	if (ret)
> >  		goto fail;
> >  
> > -	ret = v3d_job_add_deps(file_priv, job, in_sync, 0);
> > -	if (ret)
> > -		goto fail_job;
	if (se) {
		if (se->in_sync_count && se->wait_stage == queue) {
> > +			struct drm_v3d_sem __user *handle =
> > u64_to_user_ptr(se->in_syncs);
> > +
> > +			for (i = 0; i < se->in_sync_count; i++) {
> > +				struct drm_v3d_sem in;
> > +
> > +				ret = copy_from_user(&in, handle++,
> > sizeof(in));
> > +				if (ret) {
> > +					DRM_DEBUG("Failed to copy wait
> > dep handle.\n");
> > +					goto fail_job;
> > +				}
> > +				ret = v3d_job_add_deps(file_priv, job,
> > in.handle, 0);
> > +				if (ret)
> > +					goto fail_job;
> > +			}
> > +		}
> > +	} else {
> > +		ret = v3d_job_add_deps(file_priv, job, in_sync, 0);
> > +		if (ret)
> > +			goto fail_job;
> > +	}
> >  
> >  	kref_init(&job->refcount);
> >  
> > @@ -514,6 +534,7 @@ v3d_attach_fences_and_unlock_reservation(struct
> > drm_file *file_priv,
> >  					 struct v3d_job *job,
> >  					 struct ww_acquire_ctx
> > *acquire_ctx,
> >  					 u32 out_sync,
> > +					 struct v3d_submit_ext *se,
> >  					 struct dma_fence *done_fence)
> >  {
> >  	struct drm_syncobj *sync_out;
> > @@ -528,6 +549,18 @@ v3d_attach_fences_and_unlock_reservation(struct
> > drm_file *file_priv,
> >  	drm_gem_unlock_reservations(job->bo, job->bo_count,
> > acquire_ctx);
> >  
> >  	/* Update the return sync object for the job */
> > +	/* If multiples semaphores is supported */
> > +	if (se && se->out_sync_count) {

and drop this out_sync_count condition too ^
> > +		for (i = 0; i < se->out_sync_count; i++) {
> > +			drm_syncobj_replace_fence(se-
> > >out_syncs[i].syncobj,
> > +						  done_fence);
> > +			drm_syncobj_put(se->out_syncs[i].syncobj);
> > +		}
> > +		kvfree(se->out_syncs);
> > +		return;
> > +	}
> > +
> > +	/* Single signal semaphore */
> >  	sync_out = drm_syncobj_find(file_priv, out_sync);
> >  	if (sync_out) {
> >  		drm_syncobj_replace_fence(sync_out, done_fence);
> > @@ -535,13 +568,107 @@
> > v3d_attach_fences_and_unlock_reservation(struct drm_file *file_priv,
> >  	}
> >  }
> >  
> > +static void
> > +v3d_put_multisync_post_deps(struct v3d_submit_ext *se)
> > +{
> > +	unsigned int i;
> > +
> > +	for (i = 0; i < se->out_sync_count; i++)
> > +		drm_syncobj_put(se->out_syncs[i].syncobj);
> > +	kvfree(se->out_syncs);
> > +}
> > +
> >  static int
> > -v3d_get_extensions(struct drm_file *file_priv, u64 ext_handles)
> > +v3d_get_multisync_post_deps(struct drm_file *file_priv,
> > +			    struct v3d_submit_ext *se,
> > +			    u32 count, u64 handles)
> > +{
> > +	struct drm_v3d_sem __user *post_deps;
> > +	int i, ret;
> > +
> > +	se->out_syncs = (struct v3d_submit_outsync *)
> > +			kvmalloc_array(count,
> > +				       sizeof(struct
> > v3d_submit_outsync),
> > +				       GFP_KERNEL);
> > +	if (!se->out_syncs)
> > +		return -ENOMEM;
> > +
> > +	post_deps = u64_to_user_ptr(handles);
> > +
> > +	for (i = 0; i < count; i++) {
> > +		struct drm_v3d_sem out;
> > +
> > +		ret = copy_from_user(&out, post_deps++, sizeof(out));
> > +		if (ret) {
> > +			DRM_DEBUG("Failed to copy post dep handles\n");
> > +			goto fail;
> > +		}
> > +
> > +		se->out_syncs[i].syncobj = drm_syncobj_find(file_priv,
> > +							    out.handle)
> > ;
> > +		if (!se->out_syncs[i].syncobj) {
> > +			ret = -EINVAL;
> > +			goto fail;
> > +		}
> > +	}
> > +	se->out_sync_count = count;
> > +
> > +	return 0;
> > +
> > +fail:
> > +	for (i--; i >= 0; i--)
> > +		drm_syncobj_put(se->out_syncs[i].syncobj);
> > +	kvfree(se->out_syncs);
> > +
> > +	return ret;
> > +}
> > +
> > +/* Get data for multiple binary semaphores synchronization. Parse
> > syncobj
> > + * to be signaled when job completes (out_sync).
> > + */
> > +static int
> > +v3d_get_multisync_submit_deps(struct drm_file *file_priv,
> > +			      struct drm_v3d_extension __user *ext,
> > +			      void *data)
> > +{
> > +	struct drm_v3d_multi_sync multisync;
> > +	struct v3d_submit_ext *se = data;
> > +	int ret;
> > +
> > +	ret = copy_from_user(&multisync, ext, sizeof(multisync));
> > +	if (ret)
> > +		return ret;
> > +
> > +	if (multisync.pad)
> > +		return -EINVAL;
> > +
> > +	ret = v3d_get_multisync_post_deps(file_priv, data,
> > multisync.out_sync_count,
> > +					  multisync.out_syncs);
> > +	if (ret)
> > +		return ret;
> > +
> > +	se->in_sync_count = multisync.in_sync_count;
> > +	se->in_syncs = multisync.in_syncs;
> > +
> > +	se->wait_stage = multisync.wait_stage;
> > +
> > +	return 0;
> > +}
> > +
> > +/* Whenever userspace sets ioctl extensions, parses data according
> > to the
> > + * extension id (name). By now, generic ioctl extensions is only
> > used to
> > + * support multiple binary semaphores (struct drm_v3d_multi_sync).
> > + */
> 
> Let's remove the sentence that starts with "By now, generic..." it is
> not really relevant and it is bound to get obsolete when we add more
> extensions.
ok. I think I should also move this comment to the previous patch
where the function below was created.
> 
> > +static int
> > +v3d_get_extensions(struct drm_file *file_priv,
> > +		   u64 ext_handles,
> > +		   void *data)
> >  {
> >  	struct drm_v3d_extension __user *user_ext;
> > +	int ret;
> >  
> >  	user_ext = u64_to_user_ptr(ext_handles);
> > -	while(user_ext) {
> > +	while (user_ext) {
> >  		struct drm_v3d_extension ext;
> >  
> >  		if (copy_from_user(&ext, user_ext, sizeof(ext))) {
> > @@ -550,7 +677,11 @@ v3d_get_extensions(struct drm_file *file_priv,
> > u64 ext_handles)
> >  		}
> >  
> >  		switch (ext.id) {
> > -		case 0:
> > +		case DRM_V3D_EXT_ID_MULTI_SYNC:
> > +			ret = v3d_get_multisync_submit_deps(file_priv,
> > user_ext, data);
> > +			if (ret)
> > +				return ret;
> > +			break;
> >  		default:
> >  			DRM_DEBUG_DRIVER("Unknown extension id: %d\n",
> > ext.id);
> >  			return -EINVAL;
> > @@ -581,6 +712,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void
> > *data,
> >  	struct v3d_dev *v3d = to_v3d_dev(dev);
> >  	struct v3d_file_priv *v3d_priv = file_priv->driver_priv;
> >  	struct drm_v3d_submit_cl *args = data;
> > +	struct v3d_submit_ext se = {0};
> >  	struct v3d_bin_job *bin = NULL;
> >  	struct v3d_render_job *render;
> >  	struct v3d_job *clean_job = NULL;
> > @@ -601,7 +733,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void
> > *data,
> >  	}
> >  
> >  	if (args->flags & DRM_V3D_SUBMIT_EXTENSION) {
> > -		ret = v3d_get_extensions(file_priv, args->extensions);
> > +		ret = v3d_get_extensions(file_priv, args->extensions,
> > &se);
> >  		if (ret) {
> >  			DRM_DEBUG("Failed to get extensions.\n");
> >  			return ret;
> > @@ -609,7 +741,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void
> > *data,
> >  	}
> >  
> >  	ret = v3d_job_init(v3d, file_priv, (void *)&render,
> > sizeof(*render),
> > -			   v3d_render_job_free, args->in_sync_bcl,
> > V3D_RENDER);
> > +			   v3d_render_job_free, args->in_sync_bcl, &se,
> > V3D_RENDER);
> 
> So here is an example of what I was saying above... if the driver is
> using the multisync interface with 0 in_syncs, v3d_job_init here will
> think we are not using multisync and instead try to use args-
> >in_sync_bcl, which is not what we want. The same issue happens in all
> other submission ioctls.
> 
> >  	if (ret)
> >  		goto fail;
> >  
> > @@ -619,7 +751,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void
> > *data,
> >  
> >  	if (args->bcl_start != args->bcl_end) {
> >  		ret = v3d_job_init(v3d, file_priv, (void *)&bin,
> > sizeof(*bin),
> > -				   v3d_job_free, args->in_sync_bcl,
> > V3D_BIN);
> > +				   v3d_job_free, args->in_sync_bcl,
> > &se, V3D_BIN);
> 
> Same here.
> 
> >  		if (ret)
> >  			goto fail;
> >  
> > @@ -633,7 +765,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void
> > *data,
> >  
> >  	if (args->flags & DRM_V3D_SUBMIT_CL_FLUSH_CACHE) {
> >  		ret = v3d_job_init(v3d, file_priv, (void *)&clean_job,
> > sizeof(*clean_job),
> > -				   v3d_job_free, 0, V3D_CACHE_CLEAN);
> > +				   v3d_job_free, 0, 0,
> > V3D_CACHE_CLEAN);
> >  		if (ret)
> >  			goto fail;
> >  
> > @@ -693,6 +825,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void
> > *data,
> >  						 last_job,
> >  						 &acquire_ctx,
> >  						 args->out_sync,
> > +						 &se,
> >  						 last_job->done_fence);
> >  
> >  	if (bin)
> > @@ -711,6 +844,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void
> > *data,
> >  	v3d_job_cleanup((void *)bin);
> >  	v3d_job_cleanup((void *)render);
> >  	v3d_job_cleanup(clean_job);
> > +	v3d_put_multisync_post_deps(&se);
> >  
> >  	return ret;
> >  }
> > @@ -730,6 +864,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void
> > *data,
> >  {
> >  	struct v3d_dev *v3d = to_v3d_dev(dev);
> >  	struct drm_v3d_submit_tfu *args = data;
> > +	struct v3d_submit_ext se = {0};
> >  	struct v3d_tfu_job *job;
> >  	struct ww_acquire_ctx acquire_ctx;
> >  	int ret = 0;
> > @@ -742,7 +877,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void
> > *data,
> >  	}
> >  
> >  	if (args->flags & DRM_V3D_SUBMIT_EXTENSION) {
> > -		ret = v3d_get_extensions(file_priv, args->extensions);
> > +		ret = v3d_get_extensions(file_priv, args->extensions,
> > &se);
> >  		if (ret) {
> >  			DRM_DEBUG("Failed to get extensions.\n");
> >  			return ret;
> > @@ -750,7 +885,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void
> > *data,
> >  	}
> >  
> >  	ret = v3d_job_init(v3d, file_priv, (void *)&job, sizeof(*job),
> > -			   v3d_job_free, args->in_sync, V3D_TFU);
> > +			   v3d_job_free, args->in_sync, &se, V3D_TFU);
> 
> Same here.
> 
> >  	if (ret)
> >  		goto fail;
> >  
> > @@ -798,6 +933,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void
> > *data,
> >  	v3d_attach_fences_and_unlock_reservation(file_priv,
> >  						 &job->base,
> > &acquire_ctx,
> >  						 args->out_sync,
> > +						 &se,
> >  						 job->base.done_fence);
> >  
> >  	v3d_job_put(&job->base);
> > @@ -806,6 +942,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void
> > *data,
> >  
> >  fail:
> >  	v3d_job_cleanup((void *)job);
> > +	v3d_put_multisync_post_deps(&se);
> >  
> >  	return ret;
> >  }
> > @@ -826,8 +963,9 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void
> > *data,
> >  	struct v3d_dev *v3d = to_v3d_dev(dev);
> >  	struct v3d_file_priv *v3d_priv = file_priv->driver_priv;
> >  	struct drm_v3d_submit_csd *args = data;
> > +	struct v3d_submit_ext se = {0};
> >  	struct v3d_csd_job *job;
> > -	struct v3d_job *clean_job;
> > +	struct v3d_job *clean_job = NULL;
> >  	struct ww_acquire_ctx acquire_ctx;
> >  	int ret;
> >  
> > @@ -847,7 +985,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void
> > *data,
> >  	}
> >  
> >  	if (args->flags & DRM_V3D_SUBMIT_EXTENSION) {
> > -		ret = v3d_get_extensions(file_priv, args->extensions);
> > +		ret = v3d_get_extensions(file_priv, args->extensions,
> > &se);
> >  		if (ret) {
> >  			DRM_DEBUG("Failed to get extensions.\n");
> >  			return ret;
> > @@ -855,12 +993,12 @@ v3d_submit_csd_ioctl(struct drm_device *dev,
> > void *data,
> >  	}
> >  
> >  	ret = v3d_job_init(v3d, file_priv, (void *)&job, sizeof(*job),
> > -			   v3d_job_free, args->in_sync, V3D_CSD);
> > +			   v3d_job_free, args->in_sync, &se, V3D_CSD);
> 
> Same here.
> 
> >  	if (ret)
> >  		goto fail;
> >  
> >  	ret = v3d_job_init(v3d, file_priv, (void *)&clean_job,
> > sizeof(*clean_job),
> > -			   v3d_job_free, 0, V3D_CACHE_CLEAN);
> > +			   v3d_job_free, 0, 0, V3D_CACHE_CLEAN);
> >  	if (ret)
> >  		goto fail;
> >  
> > @@ -899,6 +1037,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev,
> > void *data,
> >  						 clean_job,
> >  						 &acquire_ctx,
> >  						 args->out_sync,
> > +						 &se,
> >  						 clean_job-
> > >done_fence);
> >  
> >  	v3d_job_put(&job->base);
> > @@ -913,6 +1052,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev,
> > void *data,
> >  fail:
> >  	v3d_job_cleanup((void *)job);
> >  	v3d_job_cleanup(clean_job);
> > +	v3d_put_multisync_post_deps(&se);
> >  
> >  	return ret;
> >  }
> > diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h
> > index 55b443ca6c0b..3dfc0af8756a 100644
> > --- a/include/uapi/drm/v3d_drm.h
> > +++ b/include/uapi/drm/v3d_drm.h
> > @@ -73,6 +73,53 @@ struct drm_v3d_extension {
> >  	__u32 flags; /* mbz */
> >  };
> >  
> > +/* struct drm_v3d_sem - wait/signal semaphore
> > + *
> > + * If binary semaphore, it only takes syncobj handle and ignores
> > flags and
> > + * point fields. Point is defined for timeline syncobj feature.
> > + */
> > +struct drm_v3d_sem {
> > +	__u32 handle; /* syncobj */
> > +	/* rsv below, for future uses */
> > +	__u32 flags;
> > +	__u64 point;  /* for timeline sem support */
> > +	__u64 mbz[2]; /* must be zero, rsv */
> > +};
> > +
> > +/* Enum for each of the V3D queues. */
> > +enum v3d_queue {
> > +	V3D_BIN,
> > +	V3D_RENDER,
> > +	V3D_TFU,
> > +	V3D_CSD,
> > +	V3D_CACHE_CLEAN,
> > +};
> > +
> > +/**
> > + * struct drm_v3d_multi_sync - ioctl extension to add support
> > multiples
> > + * syncobjs for commands submission.
> > + *
> > + * When an extension of DRM_V3D_EXT_ID_MULTI_SYNC id is defined, it
> > points to
> > + * this extension to define wait and signal dependencies, instead of
> > single
> > + * in/out sync entries on submitting commands. The field flags is
> > used to
> > + * determine the stage to set wait dependencies.
> > + */
> > +struct drm_v3d_multi_sync {
> > +	struct drm_v3d_extension base;
> > +	/* Array of wait and signal semaphores */
> > +	__u64 in_syncs;
> > +	__u64 out_syncs;
> > +
> > +	/* Number of entries */
> > +	__u32 in_sync_count;
> > +	__u32 out_sync_count;
> > +
> > +	/* set the stage (v3d_queue) to sync */
> > +	__u32 wait_stage;
> > +
> > +	__u32 pad; /* mbz */
> > +};
> > +
> >  /**
> >   * struct drm_v3d_submit_cl - ioctl argument for submitting commands
> > to the 3D
> >   * engine.
> > @@ -228,6 +275,7 @@ enum drm_v3d_param {
> >  	DRM_V3D_PARAM_SUPPORTS_CSD,
> >  	DRM_V3D_PARAM_SUPPORTS_CACHE_FLUSH,
> >  	DRM_V3D_PARAM_SUPPORTS_PERFMON,
> > +	DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT,
> >  };
> >  
> >  struct drm_v3d_get_param {
> > @@ -271,7 +319,6 @@ struct drm_v3d_submit_tfu {
> >  
> >  	/* Pointer to an array of ioctl extensions*/
> >  	__u64 extensions;
> > -
> >  };
> >  
> >  /* Submits a compute shader for dispatch.  This job will block on
> > any
>