From: Matthew Brost <matthew.brost@intel.com>
To: Dan Carpenter <dan.carpenter@linaro.org>
Cc: kernel-janitors@vger.kernel.org, Daniel Vetter <daniel@ffwll.ch>,
Lucas De Marchi <lucas.demarchi@intel.com>,
linux-kernel@vger.kernel.org, Maxime Ripard <mripard@kernel.org>,
dri-devel@lists.freedesktop.org,
Thomas Zimmermann <tzimmermann@suse.de>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
David Airlie <airlied@gmail.com>,
intel-xe@lists.freedesktop.org
Subject: Re: [PATCH] drm/xe: unlock on error path in xe_vm_add_compute_exec_queue()
Date: Fri, 5 Jan 2024 20:36:48 +0000 [thread overview]
Message-ID: <ZZhoYCzCgq4zBsIO@DUT025-TGLU.fm.intel.com> (raw)
In-Reply-To: <fa88d289-9886-474d-b697-b69881b4ddbe@moroto.mountain>
On Fri, Jan 05, 2024 at 03:20:22PM +0300, Dan Carpenter wrote:
> Drop the "&vm->lock" before returning.
>
> Fixes: 24f947d58fe5 ("drm/xe: Use DRM GPUVM helpers for external- and evicted objects")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
> ---
> drivers/gpu/drm/xe/xe_vm.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index 9180f2d2d71d..4aa7979fe6bf 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -332,13 +332,13 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q)
> down_write(&vm->lock);
> err = drm_gpuvm_exec_lock(&vm_exec);
> if (err)
> - return err;
> + goto out_up_write;
>
> pfence = xe_preempt_fence_create(q, q->compute.context,
> ++q->compute.seqno);
> if (!pfence) {
> err = -ENOMEM;
> - goto out_unlock;
> + goto out_fini;
> }
>
> list_add(&q->compute.link, &vm->preempt.exec_queues);
> @@ -361,8 +361,9 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q)
>
> up_read(&vm->userptr.notifier_lock);
>
> -out_unlock:
> +out_fini:
> drm_exec_fini(exec);
> +out_up_write:
> up_write(&vm->lock);
>
> return err;
> --
> 2.42.0
>
next prev parent reply other threads:[~2024-01-05 20:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-05 12:20 [PATCH] drm/xe: unlock on error path in xe_vm_add_compute_exec_queue() Dan Carpenter
2024-01-05 20:27 ` ✓ CI.Patch_applied: success for " Patchwork
2024-01-05 20:27 ` ✗ CI.checkpatch: warning " Patchwork
2024-01-05 20:28 ` ✓ CI.KUnit: success " Patchwork
2024-01-05 20:35 ` ✓ CI.Build: " Patchwork
2024-01-05 20:36 ` ✓ CI.Hooks: " Patchwork
2024-01-05 20:36 ` Matthew Brost [this message]
2024-01-05 20:37 ` ✓ CI.checksparse: " Patchwork
2024-01-05 21:12 ` ✓ CI.BAT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZZhoYCzCgq4zBsIO@DUT025-TGLU.fm.intel.com \
--to=matthew.brost@intel.com \
--cc=airlied@gmail.com \
--cc=dan.carpenter@linaro.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=mripard@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox