From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3792FC2BB9A for ; Tue, 15 Dec 2020 11:35:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D09BD22255 for ; Tue, 15 Dec 2020 11:35:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728561AbgLOLfm (ORCPT ); Tue, 15 Dec 2020 06:35:42 -0500 Received: from foss.arm.com ([217.140.110.172]:35446 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726176AbgLOLfZ (ORCPT ); Tue, 15 Dec 2020 06:35:25 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C642D1FB; Tue, 15 Dec 2020 03:34:39 -0800 (PST) Received: from [10.57.34.90] (unknown [10.57.34.90]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 857D33F66E; Tue, 15 Dec 2020 03:34:38 -0800 (PST) Subject: Re: [PATCH] media: venus: use contig vb2 ops To: Stanimir Varbanov , Alexandre Courbot , Tomasz Figa , Fritz Koenig Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org References: <20201214125703.866998-1-acourbot@chromium.org> <5319c101-f4a4-9c99-b15d-4999366f7a63@linaro.org> From: Robin Murphy Message-ID: <20d8bf0e-c15a-ffc8-4bcc-376dc5f6e414@arm.com> Date: Tue, 15 Dec 2020 11:34:34 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: <5319c101-f4a4-9c99-b15d-4999366f7a63@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-12-15 11:16, Stanimir Varbanov wrote: > Hi, > > Cc: Robin > > On 12/14/20 2:57 PM, Alexandre Courbot wrote: >> This driver uses the SG vb2 ops, but effectively only ever accesses the >> first entry of the SG table, indicating that it expects a flat layout. >> Switch it to use the contiguous ops to make sure this expected invariant > > Under what circumstances the sg table will has nents > 1? I came down to > [1] but not sure I got it right. > > I'm afraid that for systems with low amount of system memory and when > the memory become fragmented, the driver will not work. That's why I > started with sg allocator. Despite what videobuf-dma-contig seems to assume, dma_alloc_coherent() makes no guarantee of providing physically contiguous memory. What it provides is *DMA contiguous* memory, i.e. from the point of view of the device. When an IOMMU is present and managed by the DMA API, such buffers may be assembled out of physically-scattered pages (particularly under memory pressure/fragmentation). Robin. > > [1] > https://elixir.bootlin.com/linux/v5.10.1/source/drivers/iommu/dma-iommu.c#L782 > >> is always enforced. Since the device is supposed to be behind an IOMMU >> this should have little to none practical consequences beyond making the >> driver not rely on a particular behavior of the SG implementation. >> >> Reported-by: Tomasz Figa >> Signed-off-by: Alexandre Courbot >> --- >> Hi everyone, >> >> It probably doesn't hurt to fix this issue before some actual issue happens. >> I have tested this patch on Chrome OS and playback was just as fine as with >> the SG ops. >> >> drivers/media/platform/Kconfig | 2 +- >> drivers/media/platform/qcom/venus/helpers.c | 9 ++------- >> drivers/media/platform/qcom/venus/vdec.c | 6 +++--- >> drivers/media/platform/qcom/venus/venc.c | 6 +++--- >> 4 files changed, 9 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig >> index 35a18d388f3f..d9d7954111f2 100644 >> --- a/drivers/media/platform/Kconfig >> +++ b/drivers/media/platform/Kconfig >> @@ -533,7 +533,7 @@ config VIDEO_QCOM_VENUS >> depends on INTERCONNECT || !INTERCONNECT >> select QCOM_MDT_LOADER if ARCH_QCOM >> select QCOM_SCM if ARCH_QCOM >> - select VIDEOBUF2_DMA_SG >> + select VIDEOBUF2_DMA_CONTIG >> select V4L2_MEM2MEM_DEV >> help >> This is a V4L2 driver for Qualcomm Venus video accelerator >> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c >> index 50439eb1ffea..859d260f002b 100644 >> --- a/drivers/media/platform/qcom/venus/helpers.c >> +++ b/drivers/media/platform/qcom/venus/helpers.c >> @@ -7,7 +7,7 @@ >> #include >> #include >> #include >> -#include >> +#include >> #include >> #include >> >> @@ -1284,14 +1284,9 @@ int venus_helper_vb2_buf_init(struct vb2_buffer *vb) >> struct venus_inst *inst = vb2_get_drv_priv(vb->vb2_queue); >> struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb); >> struct venus_buffer *buf = to_venus_buffer(vbuf); >> - struct sg_table *sgt; >> - >> - sgt = vb2_dma_sg_plane_desc(vb, 0); >> - if (!sgt) >> - return -EFAULT; >> >> buf->size = vb2_plane_size(vb, 0); >> - buf->dma_addr = sg_dma_address(sgt->sgl); > > Can we do it: > > if (WARN_ON(sgt->nents > 1)) > return -EFAULT; > > I understand that logically using dma-sg when the flat layout is > expected by the hardware is wrong, but I haven't seen issues until now. > >> + buf->dma_addr = vb2_dma_contig_plane_dma_addr(vb, 0); >> >> if (vb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) >> list_add_tail(&buf->reg_list, &inst->registeredbufs); >> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c >> index 8488411204c3..3fb277c81aca 100644 >> --- a/drivers/media/platform/qcom/venus/vdec.c >> +++ b/drivers/media/platform/qcom/venus/vdec.c >> @@ -13,7 +13,7 @@ >> #include >> #include >> #include >> -#include >> +#include >> >> #include "hfi_venus_io.h" >> #include "hfi_parser.h" >> @@ -1461,7 +1461,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, >> src_vq->io_modes = VB2_MMAP | VB2_DMABUF; >> src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; >> src_vq->ops = &vdec_vb2_ops; >> - src_vq->mem_ops = &vb2_dma_sg_memops; >> + src_vq->mem_ops = &vb2_dma_contig_memops; >> src_vq->drv_priv = inst; >> src_vq->buf_struct_size = sizeof(struct venus_buffer); >> src_vq->allow_zero_bytesused = 1; >> @@ -1475,7 +1475,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, >> dst_vq->io_modes = VB2_MMAP | VB2_DMABUF; >> dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; >> dst_vq->ops = &vdec_vb2_ops; >> - dst_vq->mem_ops = &vb2_dma_sg_memops; >> + dst_vq->mem_ops = &vb2_dma_contig_memops; >> dst_vq->drv_priv = inst; >> dst_vq->buf_struct_size = sizeof(struct venus_buffer); >> dst_vq->allow_zero_bytesused = 1; >> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c >> index 1c61602c5de1..a09550cd1dba 100644 >> --- a/drivers/media/platform/qcom/venus/venc.c >> +++ b/drivers/media/platform/qcom/venus/venc.c >> @@ -10,7 +10,7 @@ >> #include >> #include >> #include >> -#include >> +#include >> #include >> #include >> #include >> @@ -1001,7 +1001,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, >> src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; >> src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; >> src_vq->ops = &venc_vb2_ops; >> - src_vq->mem_ops = &vb2_dma_sg_memops; >> + src_vq->mem_ops = &vb2_dma_contig_memops; >> src_vq->drv_priv = inst; >> src_vq->buf_struct_size = sizeof(struct venus_buffer); >> src_vq->allow_zero_bytesused = 1; >> @@ -1017,7 +1017,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, >> dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; >> dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; >> dst_vq->ops = &venc_vb2_ops; >> - dst_vq->mem_ops = &vb2_dma_sg_memops; >> + dst_vq->mem_ops = &vb2_dma_contig_memops; >> dst_vq->drv_priv = inst; >> dst_vq->buf_struct_size = sizeof(struct venus_buffer); >> dst_vq->allow_zero_bytesused = 1; >> >