Commit 9a0c32d6 authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

drm/nouveau: don't fini scheduler if not initialized 



nouveau_abi16_ioctl_channel_alloc() and nouveau_cli_init() simply call
their corresponding *_fini() counterpart. This can lead to
nouveau_sched_fini() being called without struct nouveau_sched ever
being initialized in the first place.

Instead of embedding struct nouveau_sched into struct nouveau_cli and
struct nouveau_chan_abi16, allocate struct nouveau_sched separately,
such that we can check for the corresponding pointer to be NULL in the
particular *_fini() functions.

It makes sense to allocate struct nouveau_sched separately anyway, since
in a subsequent commit we can also avoid to allocate a struct
nouveau_sched in nouveau_abi16_ioctl_channel_alloc() at all, if the
VM_BIND uAPI has been disabled due to the legacy uAPI being used.

Fixes: 5f03a507 ("drm/nouveau: implement 1:1 scheduler - entity relationship")
Reported-by: default avatarTimur Tabi <ttabi@nvidia.com>
Tested-by: default avatarTimur Tabi <ttabi@nvidia.com>
Closes: https://lore.kernel.org/nouveau/20240131213917.1545604-1-ttabi@nvidia.com/


Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240202000606.3526-1-dakr@redhat.com
parent 28083ff1

drivers/gpu/drm/nouveau/nouveau_abi16.c

+6 −4
Original line number Diff line number Diff line
@@ -128,12 +128,14 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, 
	struct nouveau_abi16_ntfy *ntfy, *temp;



	/* Cancel all jobs from the entity's queue. */

	drm_sched_entity_fini(&chan->sched.entity);

	if (chan->sched)

		drm_sched_entity_fini(&chan->sched->entity);



	if (chan->chan)

		nouveau_channel_idle(chan->chan);



	nouveau_sched_fini(&chan->sched);

	if (chan->sched)

		nouveau_sched_destroy(&chan->sched);



	/* cleanup notifier state */

	list_for_each_entry_safe(ntfy, temp, &chan->notifiers, head) {
@@ -337,7 +339,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) 
	if (ret)

		goto done;



	ret = nouveau_sched_init(&chan->sched, drm, drm->sched_wq,

	ret = nouveau_sched_create(&chan->sched, drm, drm->sched_wq,

				   chan->chan->dma.ib_max);

	if (ret)

		goto done;

drivers/gpu/drm/nouveau/nouveau_abi16.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ struct nouveau_abi16_chan { 
	struct nouveau_bo *ntfy;

	struct nouveau_vma *ntfy_vma;

	struct nvkm_mm  heap;

	struct nouveau_sched sched;

	struct nouveau_sched *sched;

};



struct nouveau_abi16 {

drivers/gpu/drm/nouveau/nouveau_drm.c

+4 −3
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ nouveau_cli_fini(struct nouveau_cli *cli) 
	WARN_ON(!list_empty(&cli->worker));



	usif_client_fini(cli);

	nouveau_sched_fini(&cli->sched);

	if (cli->sched)

		nouveau_sched_destroy(&cli->sched);

	if (uvmm)

		nouveau_uvmm_fini(uvmm);

	nouveau_vmm_fini(&cli->svm);
@@ -311,7 +312,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname, 
	cli->mem = &mems[ret];



	/* Don't pass in the (shared) sched_wq in order to let

	 * nouveau_sched_init() create a dedicated one for VM_BIND jobs.

	 * nouveau_sched_create() create a dedicated one for VM_BIND jobs.

	 *

	 * This is required to ensure that for VM_BIND jobs free_job() work and

	 * run_job() work can always run concurrently and hence, free_job() work
@@ -320,7 +321,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname, 
	 * locks which indirectly or directly are held for allocations

	 * elsewhere.

	 */

	ret = nouveau_sched_init(&cli->sched, drm, NULL, 1);

	ret = nouveau_sched_create(&cli->sched, drm, NULL, 1);

	if (ret)

		goto done;

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct nouveau_cli { 
		bool disabled;

	} uvmm;



	struct nouveau_sched sched;

	struct nouveau_sched *sched;



	const struct nvif_mclass *mem;

drivers/gpu/drm/nouveau/nouveau_exec.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ nouveau_exec_ioctl_exec(struct drm_device *dev, 
	if (ret)

		goto out;



	args.sched = &chan16->sched;

	args.sched = chan16->sched;

	args.file_priv = file_priv;

	args.chan = chan;