From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
To: "David Airlie" <airlied@linux.ie>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Gurchetan Singh" <gurchetansingh@chromium.org>,
"Chia-I Wu" <olvaffe@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Daniel Almeida" <daniel.almeida@collabora.com>,
"Gert Wollny" <gert.wollny@collabora.com>,
"Gustavo Padovan" <gustavo.padovan@collabora.com>,
"Daniel Stone" <daniel@fooishbar.org>,
"Tomeu Vizoso" <tomeu.vizoso@collabora.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Rob Clark" <robdclark@gmail.com>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Christian König" <christian.koenig@amd.com>,
"Pan, Xinhui" <Xinhui.Pan@amd.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Tomasz Figa" <tfiga@chromium.org>,
"Marek Szyprowski" <m.szyprowski@samsung.com>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Tvrtko Ursulin" <tvrtko.ursulin@linux.intel.com>,
"Thomas Hellström" <thomas_os@shipmail.org>,
"Qiang Yu" <yuq825@gmail.com>,
"Srinivas Kandagatla" <srinivas.kandagatla@linaro.org>,
"Amol Maheshwari" <amahesh@qti.qualcomm.com>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Leon Romanovsky" <leon@kernel.org>,
"Juergen Gross" <jgross@suse.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Oleksandr Tyshchenko" <oleksandr_tyshchenko@epam.com>,
"Tomi Valkeinen" <tomba@kernel.org>,
"Russell King" <linux@armlinux.org.uk>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Christian Gmeiner" <christian.gmeiner@gmail.com>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Dmitry Osipenko <digetx@gmail.com>,
linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org,
amd-gfx@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
kernel@collabora.com, virtualization@lists.linux-foundation.org,
linux-rdma@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: [PATCH v4 15/21] dma-buf: Move dma_buf_vmap() to dynamic locking specification
Date: Wed, 31 Aug 2022 18:37:51 +0300 [thread overview]
Message-ID: <20220831153757.97381-16-dmitry.osipenko@collabora.com> (raw)
In-Reply-To: <20220831153757.97381-1-dmitry.osipenko@collabora.com>
Move dma_buf_vmap/vunmap_unlocked() functions to the dynamic locking
specification by asserting that the reservation lock is held.
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
drivers/dma-buf/dma-buf.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 51fb69048853..ceea4839c641 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -1449,6 +1449,8 @@ int dma_buf_vmap(struct dma_buf *dmabuf, struct iosys_map *map)
if (WARN_ON(!dmabuf))
return -EINVAL;
+ dma_resv_assert_held(dmabuf->resv);
+
if (!dmabuf->ops->vmap)
return -EINVAL;
@@ -1509,6 +1511,8 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, struct iosys_map *map)
if (WARN_ON(!dmabuf))
return;
+ dma_resv_assert_held(dmabuf->resv);
+
BUG_ON(iosys_map_is_null(&dmabuf->vmap_ptr));
BUG_ON(dmabuf->vmapping_counter == 0);
BUG_ON(!iosys_map_is_equal(&dmabuf->vmap_ptr, map));
--
2.37.2
next prev parent reply other threads:[~2022-08-31 15:41 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 15:37 [PATCH v4 00/21] Move all drivers to a common dma-buf locking convention Dmitry Osipenko
2022-08-31 15:37 ` [PATCH v4 01/21] dma-buf: Add unlocked variant of vmapping functions Dmitry Osipenko
2022-08-31 15:37 ` [PATCH v4 02/21] dma-buf: Add unlocked variant of attachment-mapping functions Dmitry Osipenko
2022-08-31 15:37 ` [PATCH v4 03/21] drm/gem: Take reservation lock for vmap/vunmap operations Dmitry Osipenko
2022-08-31 15:37 ` [PATCH v4 04/21] drm/prime: Prepare to dynamic dma-buf locking specification Dmitry Osipenko
2022-09-01 6:42 ` Christian König
2022-08-31 15:37 ` [PATCH v4 05/21] drm/armada: " Dmitry Osipenko
2022-09-01 6:43 ` Christian König
2022-08-31 15:37 ` [PATCH v4 06/21] drm/i915: " Dmitry Osipenko
2022-09-01 6:45 ` Christian König
2022-09-01 10:44 ` Dmitry Osipenko
2022-09-01 14:02 ` Ruhl, Michael J
2022-09-02 10:31 ` Dmitry Osipenko
2022-09-02 10:38 ` Dmitry Osipenko
2022-09-02 16:26 ` Ruhl, Michael J
2022-09-09 17:36 ` Dmitry Osipenko
2022-08-31 15:37 ` [PATCH v4 07/21] drm/omapdrm: " Dmitry Osipenko
2022-09-01 6:45 ` [Linaro-mm-sig] " Christian König
2022-08-31 15:37 ` [PATCH v4 08/21] drm/tegra: " Dmitry Osipenko
2022-09-01 6:49 ` Christian König
2022-08-31 15:37 ` [PATCH v4 09/21] drm/etnaviv: " Dmitry Osipenko
2022-09-01 6:50 ` Christian König
2022-09-01 10:41 ` Dmitry Osipenko
2022-08-31 15:37 ` [PATCH v4 10/21] RDMA/umem: " Dmitry Osipenko
2022-09-01 6:54 ` Christian König
2022-08-31 15:37 ` [PATCH v4 11/21] misc: fastrpc: " Dmitry Osipenko
2022-09-01 6:55 ` Christian König
2022-09-02 9:31 ` Srinivas Kandagatla
2022-09-02 9:31 ` Srinivas Kandagatla
2022-08-31 15:37 ` [PATCH v4 12/21] xen/gntdev: " Dmitry Osipenko
2022-08-31 15:43 ` Juergen Gross
2022-09-01 7:04 ` Christian König
2022-08-31 15:37 ` [PATCH v4 13/21] media: videobuf2: " Dmitry Osipenko
2022-09-01 7:04 ` Christian König
2022-08-31 15:37 ` [PATCH v4 14/21] media: tegra-vde: " Dmitry Osipenko
2022-09-01 7:05 ` Christian König
2022-08-31 15:37 ` Dmitry Osipenko [this message]
2022-08-31 15:37 ` [PATCH v4 16/21] dma-buf: Move dma_buf_attach() to dynamic " Dmitry Osipenko
2022-09-01 7:07 ` Christian König
2022-08-31 15:37 ` [PATCH v4 17/21] dma-buf: Move dma_buf_map_attachment() " Dmitry Osipenko
2022-09-01 7:08 ` Christian König
2022-08-31 15:37 ` [PATCH v4 18/21] dma-buf: Move dma_buf_mmap() " Dmitry Osipenko
2022-08-31 15:37 ` [PATCH v4 19/21] dma-buf: Document dynamic locking convention Dmitry Osipenko
2022-09-01 7:16 ` Christian König
2022-08-31 15:37 ` [PATCH v4 20/21] media: videobuf2: Stop using internal dma-buf lock Dmitry Osipenko
2022-09-01 7:46 ` Christian König
2022-08-31 15:37 ` [PATCH v4 21/21] dma-buf: Remove obsoleted internal lock Dmitry Osipenko
2022-09-01 7:46 ` Christian König
2022-09-01 7:49 ` [PATCH v4 00/21] Move all drivers to a common dma-buf locking convention Christian König
2022-09-01 10:47 ` Dmitry Osipenko
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=20220831153757.97381-16-dmitry.osipenko@collabora.com \
--to=dmitry.osipenko@collabora.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amahesh@qti.qualcomm.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.gmeiner@gmail.com \
--cc=christian.koenig@amd.com \
--cc=daniel.almeida@collabora.com \
--cc=daniel@ffwll.ch \
--cc=daniel@fooishbar.org \
--cc=digetx@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gert.wollny@collabora.com \
--cc=gurchetansingh@chromium.org \
--cc=gustavo.padovan@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=jgross@suse.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=kernel@collabora.com \
--cc=kraxel@redhat.com \
--cc=l.stach@pengutronix.de \
--cc=leon@kernel.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=m.szyprowski@samsung.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=oleksandr_tyshchenko@epam.com \
--cc=olvaffe@gmail.com \
--cc=robdclark@gmail.com \
--cc=rodrigo.vivi@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=sstabellini@kernel.org \
--cc=sumit.semwal@linaro.org \
--cc=tfiga@chromium.org \
--cc=thierry.reding@gmail.com \
--cc=thomas_os@shipmail.org \
--cc=tomba@kernel.org \
--cc=tomeu.vizoso@collabora.com \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=tzimmermann@suse.de \
--cc=virtualization@lists.linux-foundation.org \
--cc=yuq825@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).