From: Robin Murphy <robin.murphy@arm.com>
To: Marek Szyprowski <m.szyprowski@samsung.com>,
dri-devel@lists.freedesktop.org,
iommu@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org,
linux-kernel@vger.kernel.org
Cc: Pawel Osciak <pawel@osciak.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
David Airlie <airlied@linux.ie>, Tomasz Figa <tfiga@chromium.org>,
Kyungmin Park <kyungmin.park@samsung.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Christoph Hellwig <hch@lst.de>,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org
Subject: Re: [PATCH v9 32/32] videobuf2: use sgtable-based scatterlist wrappers
Date: Tue, 1 Sep 2020 21:19:03 +0100 [thread overview]
Message-ID: <02d07186-d97d-2309-9d9d-2f697112e7e0@arm.com> (raw)
In-Reply-To: <20200826063316.23486-33-m.szyprowski@samsung.com>
On 2020-08-26 07:33, Marek Szyprowski wrote:
> Use recently introduced common wrappers operating directly on the struct
> sg_table objects and scatterlist page iterators to make the code a bit
> more compact, robust, easier to follow and copy/paste safe.
>
> No functional change, because the code already properly did all the
> scaterlist related calls.
^^ typo
Otherwise,
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> .../common/videobuf2/videobuf2-dma-contig.c | 34 ++++++++-----------
> .../media/common/videobuf2/videobuf2-dma-sg.c | 32 +++++++----------
> .../common/videobuf2/videobuf2-vmalloc.c | 12 +++----
> 3 files changed, 31 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> index ec3446cc45b8..1b242d844dde 100644
> --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> @@ -58,10 +58,10 @@ static unsigned long vb2_dc_get_contiguous_size(struct sg_table *sgt)
> unsigned int i;
> unsigned long size = 0;
>
> - for_each_sg(sgt->sgl, s, sgt->nents, i) {
> + for_each_sgtable_dma_sg(sgt, s, i) {
> if (sg_dma_address(s) != expected)
> break;
> - expected = sg_dma_address(s) + sg_dma_len(s);
> + expected += sg_dma_len(s);
> size += sg_dma_len(s);
> }
> return size;
> @@ -103,8 +103,7 @@ static void vb2_dc_prepare(void *buf_priv)
> if (!sgt)
> return;
>
> - dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->orig_nents,
> - buf->dma_dir);
> + dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir);
> }
>
> static void vb2_dc_finish(void *buf_priv)
> @@ -115,7 +114,7 @@ static void vb2_dc_finish(void *buf_priv)
> if (!sgt)
> return;
>
> - dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
> + dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir);
> }
>
> /*********************************************/
> @@ -275,8 +274,8 @@ static void vb2_dc_dmabuf_ops_detach(struct dma_buf *dbuf,
> * memory locations do not require any explicit cache
> * maintenance prior or after being used by the device.
> */
> - dma_unmap_sg_attrs(db_attach->dev, sgt->sgl, sgt->orig_nents,
> - attach->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> + dma_unmap_sgtable(db_attach->dev, sgt, attach->dma_dir,
> + DMA_ATTR_SKIP_CPU_SYNC);
> sg_free_table(sgt);
> kfree(attach);
> db_attach->priv = NULL;
> @@ -301,8 +300,8 @@ static struct sg_table *vb2_dc_dmabuf_ops_map(
>
> /* release any previous cache */
> if (attach->dma_dir != DMA_NONE) {
> - dma_unmap_sg_attrs(db_attach->dev, sgt->sgl, sgt->orig_nents,
> - attach->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> + dma_unmap_sgtable(db_attach->dev, sgt, attach->dma_dir,
> + DMA_ATTR_SKIP_CPU_SYNC);
> attach->dma_dir = DMA_NONE;
> }
>
> @@ -310,9 +309,8 @@ static struct sg_table *vb2_dc_dmabuf_ops_map(
> * mapping to the client with new direction, no cache sync
> * required see comment in vb2_dc_dmabuf_ops_detach()
> */
> - sgt->nents = dma_map_sg_attrs(db_attach->dev, sgt->sgl, sgt->orig_nents,
> - dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> - if (!sgt->nents) {
> + if (dma_map_sgtable(db_attach->dev, sgt, dma_dir,
> + DMA_ATTR_SKIP_CPU_SYNC)) {
> pr_err("failed to map scatterlist\n");
> mutex_unlock(lock);
> return ERR_PTR(-EIO);
> @@ -455,8 +453,8 @@ static void vb2_dc_put_userptr(void *buf_priv)
> * No need to sync to CPU, it's already synced to the CPU
> * since the finish() memop will have been called before this.
> */
> - dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
> - buf->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> + dma_unmap_sgtable(buf->dev, sgt, buf->dma_dir,
> + DMA_ATTR_SKIP_CPU_SYNC);
> pages = frame_vector_pages(buf->vec);
> /* sgt should exist only if vector contains pages... */
> BUG_ON(IS_ERR(pages));
> @@ -553,9 +551,8 @@ static void *vb2_dc_get_userptr(struct device *dev, unsigned long vaddr,
> * No need to sync to the device, this will happen later when the
> * prepare() memop is called.
> */
> - sgt->nents = dma_map_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
> - buf->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> - if (sgt->nents <= 0) {
> + if (dma_map_sgtable(buf->dev, sgt, buf->dma_dir,
> + DMA_ATTR_SKIP_CPU_SYNC)) {
> pr_err("failed to map scatterlist\n");
> ret = -EIO;
> goto fail_sgt_init;
> @@ -577,8 +574,7 @@ static void *vb2_dc_get_userptr(struct device *dev, unsigned long vaddr,
> return buf;
>
> fail_map_sg:
> - dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
> - buf->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> + dma_unmap_sgtable(buf->dev, sgt, buf->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
>
> fail_sgt_init:
> sg_free_table(sgt);
> diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
> index 0a40e00f0d7e..0dd3b19025e0 100644
> --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
> +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
> @@ -148,9 +148,8 @@ static void *vb2_dma_sg_alloc(struct device *dev, unsigned long dma_attrs,
> * No need to sync to the device, this will happen later when the
> * prepare() memop is called.
> */
> - sgt->nents = dma_map_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
> - buf->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> - if (!sgt->nents)
> + if (dma_map_sgtable(buf->dev, sgt, buf->dma_dir,
> + DMA_ATTR_SKIP_CPU_SYNC))
> goto fail_map;
>
> buf->handler.refcount = &buf->refcount;
> @@ -186,8 +185,8 @@ static void vb2_dma_sg_put(void *buf_priv)
> if (refcount_dec_and_test(&buf->refcount)) {
> dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
> buf->num_pages);
> - dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
> - buf->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> + dma_unmap_sgtable(buf->dev, sgt, buf->dma_dir,
> + DMA_ATTR_SKIP_CPU_SYNC);
> if (buf->vaddr)
> vm_unmap_ram(buf->vaddr, buf->num_pages);
> sg_free_table(buf->dma_sgt);
> @@ -204,8 +203,7 @@ static void vb2_dma_sg_prepare(void *buf_priv)
> struct vb2_dma_sg_buf *buf = buf_priv;
> struct sg_table *sgt = buf->dma_sgt;
>
> - dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->orig_nents,
> - buf->dma_dir);
> + dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir);
> }
>
> static void vb2_dma_sg_finish(void *buf_priv)
> @@ -213,7 +211,7 @@ static void vb2_dma_sg_finish(void *buf_priv)
> struct vb2_dma_sg_buf *buf = buf_priv;
> struct sg_table *sgt = buf->dma_sgt;
>
> - dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
> + dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir);
> }
>
> static void *vb2_dma_sg_get_userptr(struct device *dev, unsigned long vaddr,
> @@ -256,9 +254,8 @@ static void *vb2_dma_sg_get_userptr(struct device *dev, unsigned long vaddr,
> * No need to sync to the device, this will happen later when the
> * prepare() memop is called.
> */
> - sgt->nents = dma_map_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
> - buf->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> - if (!sgt->nents)
> + if (dma_map_sgtable(buf->dev, sgt, buf->dma_dir,
> + DMA_ATTR_SKIP_CPU_SYNC))
> goto userptr_fail_map;
>
> return buf;
> @@ -284,8 +281,7 @@ static void vb2_dma_sg_put_userptr(void *buf_priv)
>
> dprintk(1, "%s: Releasing userspace buffer of %d pages\n",
> __func__, buf->num_pages);
> - dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir,
> - DMA_ATTR_SKIP_CPU_SYNC);
> + dma_unmap_sgtable(buf->dev, sgt, buf->dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
> if (buf->vaddr)
> vm_unmap_ram(buf->vaddr, buf->num_pages);
> sg_free_table(buf->dma_sgt);
> @@ -408,8 +404,7 @@ static void vb2_dma_sg_dmabuf_ops_detach(struct dma_buf *dbuf,
>
> /* release the scatterlist cache */
> if (attach->dma_dir != DMA_NONE)
> - dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
> - attach->dma_dir);
> + dma_unmap_sgtable(db_attach->dev, sgt, attach->dma_dir, 0);
> sg_free_table(sgt);
> kfree(attach);
> db_attach->priv = NULL;
> @@ -434,15 +429,12 @@ static struct sg_table *vb2_dma_sg_dmabuf_ops_map(
>
> /* release any previous cache */
> if (attach->dma_dir != DMA_NONE) {
> - dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
> - attach->dma_dir);
> + dma_unmap_sgtable(db_attach->dev, sgt, attach->dma_dir, 0);
> attach->dma_dir = DMA_NONE;
> }
>
> /* mapping to the client with new direction */
> - sgt->nents = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
> - dma_dir);
> - if (!sgt->nents) {
> + if (dma_map_sgtable(db_attach->dev, sgt, dma_dir, 0)) {
> pr_err("failed to map scatterlist\n");
> mutex_unlock(lock);
> return ERR_PTR(-EIO);
> diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> index c66fda4a65e4..bf5ac63a5742 100644
> --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> @@ -229,7 +229,7 @@ static int vb2_vmalloc_dmabuf_ops_attach(struct dma_buf *dbuf,
> kfree(attach);
> return ret;
> }
> - for_each_sg(sgt->sgl, sg, sgt->nents, i) {
> + for_each_sgtable_sg(sgt, sg, i) {
> struct page *page = vmalloc_to_page(vaddr);
>
> if (!page) {
> @@ -259,8 +259,7 @@ static void vb2_vmalloc_dmabuf_ops_detach(struct dma_buf *dbuf,
>
> /* release the scatterlist cache */
> if (attach->dma_dir != DMA_NONE)
> - dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
> - attach->dma_dir);
> + dma_unmap_sgtable(db_attach->dev, sgt, attach->dma_dir, 0);
> sg_free_table(sgt);
> kfree(attach);
> db_attach->priv = NULL;
> @@ -285,15 +284,12 @@ static struct sg_table *vb2_vmalloc_dmabuf_ops_map(
>
> /* release any previous cache */
> if (attach->dma_dir != DMA_NONE) {
> - dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
> - attach->dma_dir);
> + dma_unmap_sgtable(db_attach->dev, sgt, attach->dma_dir, 0);
> attach->dma_dir = DMA_NONE;
> }
>
> /* mapping to the client with new direction */
> - sgt->nents = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
> - dma_dir);
> - if (!sgt->nents) {
> + if (dma_map_sgtable(db_attach->dev, sgt, dma_dir, 0)) {
> pr_err("failed to map scatterlist\n");
> mutex_unlock(lock);
> return ERR_PTR(-EIO);
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2020-09-01 20:19 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200826063527eucas1p21ab50cf46bad1d9ea5d7f202dd6ec722@eucas1p2.samsung.com>
2020-08-26 6:32 ` [PATCH v9 00/32] DRM: fix struct sg_table nents vs. orig_nents misuse Marek Szyprowski
2020-08-26 6:32 ` [PATCH v9 01/32] drm: prime: add common helper to check scatterlist contiguity Marek Szyprowski
2020-09-01 17:23 ` Robin Murphy
2020-08-26 6:32 ` [PATCH v9 02/32] drm: prime: use sgtable iterators in drm_prime_sg_to_page_addr_arrays() Marek Szyprowski
2020-09-01 17:24 ` Robin Murphy
2020-08-26 6:32 ` [PATCH v9 03/32] drm: core: fix common struct sg_table related issues Marek Szyprowski
2020-09-01 17:46 ` Robin Murphy
2020-08-26 6:32 ` [PATCH v9 04/32] drm: armada: " Marek Szyprowski
2020-09-01 18:26 ` Robin Murphy
2020-08-26 6:32 ` [PATCH v9 05/32] drm: etnaviv: " Marek Szyprowski
2020-09-01 18:39 ` Robin Murphy
2020-08-26 6:32 ` [PATCH v9 06/32] drm: exynos: use common helper for a scatterlist contiguity check Marek Szyprowski
2020-08-26 6:32 ` [PATCH v9 07/32] drm: exynos: fix common struct sg_table related issues Marek Szyprowski
2020-08-26 6:32 ` [PATCH v9 08/32] drm: i915: " Marek Szyprowski
2020-09-01 18:42 ` Robin Murphy
2020-09-01 19:38 ` [Intel-gfx] " Ruhl, Michael J
2020-09-01 19:54 ` Robin Murphy
2020-09-01 20:32 ` Ruhl, Michael J
2020-08-26 6:32 ` [PATCH v9 09/32] drm: lima: " Marek Szyprowski
2020-08-26 6:32 ` [PATCH v9 10/32] drm: mediatek: use common helper for a scatterlist contiguity check Marek Szyprowski
2020-09-01 18:44 ` Robin Murphy
2020-09-01 22:59 ` Chun-Kuang Hu
2020-08-26 6:32 ` [PATCH v9 11/32] drm: mediatek: use common helper for extracting pages array Marek Szyprowski
2020-09-01 18:54 ` Robin Murphy
2020-09-01 23:16 ` Chun-Kuang Hu
2020-08-26 6:32 ` [PATCH v9 12/32] drm: msm: fix common struct sg_table related issues Marek Szyprowski
2020-08-26 13:26 ` kernel test robot
2020-09-01 19:14 ` Robin Murphy
2020-09-01 23:48 ` Rob Clark
2020-08-26 6:32 ` [PATCH v9 13/32] drm: omapdrm: use common helper for extracting pages array Marek Szyprowski
2020-09-01 19:17 ` Robin Murphy
2020-08-26 6:32 ` [PATCH v9 14/32] drm: omapdrm: fix common struct sg_table related issues Marek Szyprowski
2020-09-01 19:33 ` Robin Murphy
2020-09-02 8:00 ` Tomi Valkeinen
2020-09-04 12:06 ` Marek Szyprowski
2020-09-04 12:27 ` Marek Szyprowski
2020-08-26 6:32 ` [PATCH v9 15/32] drm: panfrost: " Marek Szyprowski
2020-08-26 6:33 ` [PATCH v9 16/32] drm: rockchip: use common helper for a scatterlist contiguity check Marek Szyprowski
2020-09-01 19:34 ` Robin Murphy
2020-08-26 6:33 ` [PATCH v9 17/32] drm: rockchip: fix common struct sg_table related issues Marek Szyprowski
2020-09-01 20:00 ` Robin Murphy
2020-08-26 6:33 ` [PATCH v9 18/32] drm: tegra: " Marek Szyprowski
2020-09-01 20:11 ` Robin Murphy
2020-08-26 6:33 ` [PATCH v9 19/32] drm: v3d: " Marek Szyprowski
2020-08-26 6:33 ` [PATCH v9 20/32] drm: virtio: " Marek Szyprowski
2020-08-26 6:33 ` [PATCH v9 21/32] drm: vmwgfx: " Marek Szyprowski
2020-08-26 6:33 ` [PATCH v9 22/32] drm: xen: " Marek Szyprowski
2020-08-26 6:33 ` [PATCH v9 23/32] xen: gntdev: " Marek Szyprowski
2020-08-26 6:33 ` [PATCH v9 24/32] drm: host1x: " Marek Szyprowski
2020-09-01 20:13 ` Robin Murphy
2020-08-26 6:33 ` [PATCH v9 25/32] drm: rcar-du: " Marek Szyprowski
2020-08-26 6:33 ` [PATCH v9 26/32] dmabuf: " Marek Szyprowski
2020-08-26 6:33 ` [PATCH v9 27/32] staging: tegra-vde: " Marek Szyprowski
2020-08-26 6:33 ` [PATCH v9 28/32] misc: fastrpc: " Marek Szyprowski
2020-09-01 20:14 ` Robin Murphy
2020-08-26 6:33 ` [PATCH v9 29/32] rapidio: " Marek Szyprowski
2020-09-01 20:15 ` Robin Murphy
2020-08-26 6:33 ` [PATCH v9 30/32] samples: vfio-mdev/mbochs: " Marek Szyprowski
2020-09-01 20:16 ` Robin Murphy
2020-08-26 6:33 ` [PATCH v9 31/32] media: pci: fix common ALSA DMA-mapping related codes Marek Szyprowski
2020-09-01 20:24 ` Robin Murphy
2020-08-26 6:33 ` [PATCH v9 32/32] videobuf2: use sgtable-based scatterlist wrappers Marek Szyprowski
2020-09-01 20:19 ` Robin Murphy [this message]
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=02d07186-d97d-2309-9d9d-2f697112e7e0@arm.com \
--to=robin.murphy@arm.com \
--cc=airlied@linux.ie \
--cc=b.zolnierkie@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=kyungmin.park@samsung.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@kernel.org \
--cc=pawel@osciak.com \
--cc=tfiga@chromium.org \
/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