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>,
"Ruhl Michael J" <michael.j.ruhl@intel.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 v6 02/21] dma-buf: Add unlocked variant of attachment-mapping functions
Date: Wed, 28 Sep 2022 22:15:41 +0300 [thread overview]
Message-ID: <20220928191600.5874-3-dmitry.osipenko@collabora.com> (raw)
In-Reply-To: <20220928191600.5874-1-dmitry.osipenko@collabora.com>
Add unlocked variant of dma_buf_map/unmap_attachment() that will
be used by drivers that don't take the reservation lock explicitly.
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
drivers/dma-buf/dma-buf.c | 53 +++++++++++++++++++++++++++++++++++++++
include/linux/dma-buf.h | 6 +++++
2 files changed, 59 insertions(+)
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 0427f3b88170..f349613790a6 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -1100,6 +1100,34 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach,
}
EXPORT_SYMBOL_NS_GPL(dma_buf_map_attachment, DMA_BUF);
+/**
+ * dma_buf_map_attachment_unlocked - Returns the scatterlist table of the attachment;
+ * mapped into _device_ address space. Is a wrapper for map_dma_buf() of the
+ * dma_buf_ops.
+ * @attach: [in] attachment whose scatterlist is to be returned
+ * @direction: [in] direction of DMA transfer
+ *
+ * Unlocked variant of dma_buf_map_attachment().
+ */
+struct sg_table *
+dma_buf_map_attachment_unlocked(struct dma_buf_attachment *attach,
+ enum dma_data_direction direction)
+{
+ struct sg_table *sg_table;
+
+ might_sleep();
+
+ if (WARN_ON(!attach || !attach->dmabuf))
+ return ERR_PTR(-EINVAL);
+
+ dma_resv_lock(attach->dmabuf->resv, NULL);
+ sg_table = dma_buf_map_attachment(attach, direction);
+ dma_resv_unlock(attach->dmabuf->resv);
+
+ return sg_table;
+}
+EXPORT_SYMBOL_NS_GPL(dma_buf_map_attachment_unlocked, DMA_BUF);
+
/**
* dma_buf_unmap_attachment - unmaps and decreases usecount of the buffer;might
* deallocate the scatterlist associated. Is a wrapper for unmap_dma_buf() of
@@ -1136,6 +1164,31 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,
}
EXPORT_SYMBOL_NS_GPL(dma_buf_unmap_attachment, DMA_BUF);
+/**
+ * dma_buf_unmap_attachment_unlocked - unmaps and decreases usecount of the buffer;might
+ * deallocate the scatterlist associated. Is a wrapper for unmap_dma_buf() of
+ * dma_buf_ops.
+ * @attach: [in] attachment to unmap buffer from
+ * @sg_table: [in] scatterlist info of the buffer to unmap
+ * @direction: [in] direction of DMA transfer
+ *
+ * Unlocked variant of dma_buf_unmap_attachment().
+ */
+void dma_buf_unmap_attachment_unlocked(struct dma_buf_attachment *attach,
+ struct sg_table *sg_table,
+ enum dma_data_direction direction)
+{
+ might_sleep();
+
+ if (WARN_ON(!attach || !attach->dmabuf || !sg_table))
+ return;
+
+ dma_resv_lock(attach->dmabuf->resv, NULL);
+ dma_buf_unmap_attachment(attach, sg_table, direction);
+ dma_resv_unlock(attach->dmabuf->resv);
+}
+EXPORT_SYMBOL_NS_GPL(dma_buf_unmap_attachment_unlocked, DMA_BUF);
+
/**
* dma_buf_move_notify - notify attachments that DMA-buf is moving
*
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 8daa054dd7fe..f11b5bbc2f37 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -627,6 +627,12 @@ int dma_buf_begin_cpu_access(struct dma_buf *dma_buf,
enum dma_data_direction dir);
int dma_buf_end_cpu_access(struct dma_buf *dma_buf,
enum dma_data_direction dir);
+struct sg_table *
+dma_buf_map_attachment_unlocked(struct dma_buf_attachment *attach,
+ enum dma_data_direction direction);
+void dma_buf_unmap_attachment_unlocked(struct dma_buf_attachment *attach,
+ struct sg_table *sg_table,
+ enum dma_data_direction direction);
int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *,
unsigned long);
--
2.37.3
next prev parent reply other threads:[~2022-09-28 19:17 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 19:15 [PATCH v6 00/21] Move all drivers to a common dma-buf locking convention Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 01/21] dma-buf: Add unlocked variant of vmapping functions Dmitry Osipenko
2022-09-28 19:15 ` Dmitry Osipenko [this message]
2022-09-28 19:15 ` [PATCH v6 03/21] drm/gem: Take reservation lock for vmap/vunmap operations Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 04/21] drm/prime: Prepare to dynamic dma-buf locking specification Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 05/21] drm/armada: " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 06/21] drm/i915: " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 07/21] drm/omapdrm: " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 08/21] drm/tegra: " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 09/21] drm/etnaviv: " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 10/21] RDMA/umem: " Dmitry Osipenko
2022-10-09 0:08 ` Dmitry Osipenko
2022-10-10 18:56 ` Jason Gunthorpe
2022-09-28 19:15 ` [PATCH v6 11/21] misc: fastrpc: " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 12/21] xen/gntdev: " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 13/21] media: videobuf2: " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 14/21] media: tegra-vde: " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 15/21] dma-buf: Move dma_buf_vmap() to dynamic " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 16/21] dma-buf: Move dma_buf_attach() " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 17/21] dma-buf: Move dma_buf_map_attachment() " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 18/21] dma-buf: Move dma_buf_mmap() " Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 19/21] dma-buf: Document dynamic locking convention Dmitry Osipenko
2022-09-28 19:15 ` [PATCH v6 20/21] media: videobuf2: Stop using internal dma-buf lock Dmitry Osipenko
2022-09-28 19:16 ` [PATCH v6 21/21] dma-buf: Remove obsoleted internal lock Dmitry Osipenko
2022-10-11 17:31 ` [PATCH v6 00/21] Move all drivers to a common dma-buf locking convention 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=20220928191600.5874-3-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=michael.j.ruhl@intel.com \
--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).