From: Danilo Krummrich <dakr@redhat.com>
To: airlied@gmail.com, daniel@ffwll.ch, bskeggs@redhat.com,
kherbst@redhat.com, lyude@redhat.com, sfr@canb.auug.org.au
Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
linux-kernel@vger.kernel.org, Danilo Krummrich <dakr@redhat.com>,
kernel test robot <lkp@intel.com>
Subject: [PATCH drm-misc-next 4/5] drm/nouveau: uvmm: remove incorrect calls to mas_unlock()
Date: Mon, 7 Aug 2023 18:32:25 +0200 [thread overview]
Message-ID: <20230807163238.2091-5-dakr@redhat.com> (raw)
In-Reply-To: <20230807163238.2091-1-dakr@redhat.com>
Remove incorrect calls to mas_unlock() in the unwind path of
__nouveau_uvma_region_insert(). The region maple tree uses an external
lock instead, namely the global uvmm lock.
Fixes: b88baab82871 ("drm/nouveau: implement new VM_BIND uAPI")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
---
drivers/gpu/drm/nouveau/nouveau_uvmm.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c b/drivers/gpu/drm/nouveau/nouveau_uvmm.c
index 2acbac73e57a..91b964ef98b1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c
@@ -279,15 +279,11 @@ __nouveau_uvma_region_insert(struct nouveau_uvmm *uvmm,
u64 last = addr + range - 1;
MA_STATE(mas, &uvmm->region_mt, addr, addr);
- if (unlikely(mas_walk(&mas))) {
- mas_unlock(&mas);
+ if (unlikely(mas_walk(&mas)))
return -EEXIST;
- }
- if (unlikely(mas.last < last)) {
- mas_unlock(&mas);
+ if (unlikely(mas.last < last))
return -EEXIST;
- }
mas.index = addr;
mas.last = last;
--
2.41.0
next prev parent reply other threads:[~2023-08-07 16:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 16:32 [PATCH drm-misc-next 0/5] Nouveau VM_BIND uAPI Fixes Danilo Krummrich
2023-08-07 16:32 ` [PATCH drm-misc-next 1/5] nouveau/dmem: fix copy-paste error in nouveau_dmem_migrate_chunk() Danilo Krummrich
2023-08-07 16:32 ` [PATCH drm-misc-next 2/5] drm/nouveau: nvkm: vmm: silence warning from cast Danilo Krummrich
2023-08-07 16:32 ` [PATCH drm-misc-next 3/5] drm/nouveau: remove incorrect __user annotations Danilo Krummrich
2023-08-07 16:32 ` Danilo Krummrich [this message]
2023-08-07 16:32 ` [PATCH drm-misc-next 5/5] drm/nouveau: uvmm: remove dedicated VM pointer from VMAs Danilo Krummrich
2023-08-08 2:37 ` [PATCH drm-misc-next 0/5] Nouveau VM_BIND uAPI Fixes Dave Airlie
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=20230807163238.2091-5-dakr@redhat.com \
--to=dakr@redhat.com \
--cc=airlied@gmail.com \
--cc=bskeggs@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=kherbst@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=lyude@redhat.com \
--cc=nouveau@lists.freedesktop.org \
--cc=sfr@canb.auug.org.au \
/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