Linux-mediatek Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Yunfei Dong <yunfei.dong@mediatek.com>
To: "Jeffrey Kardatzke" <jkardatzke@google.com>,
	"Nícolas F . R . A . Prado" <nfraprado@collabora.com>,
	"Nathan Hebert" <nhebert@chromium.org>,
	"Nicolas Dufresne" <nicolas.dufresne@collabora.com>,
	"Hans Verkuil" <hverkuil-cisco@xs4all.nl>,
	"AngeloGioacchino Del Regno"
	<angelogioacchino.delregno@collabora.com>,
	"Benjamin Gaignard" <benjamin.gaignard@collabora.com>,
	"Sebastian Fricke" <sebastian.fricke@collabora.com>,
	"Tomasz Figa" <tfiga@chromium.org>,
	"Mauro Carvalho Chehab" <mchehab@kernel.org>,
	"Marek Szyprowski" <m.szyprowski@samsung.com>
Cc: "Chen-Yu Tsai" <wenst@chromium.org>,
	"Yong Wu" <yong.wu@mediatek.com>,
	"Hsin-Yi Wang" <hsinyi@chromium.org>,
	"Fritz Koenig" <frkoenig@chromium.org>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	"Steve Cho" <stevecho@chromium.org>,
	"Yunfei Dong" <yunfei.dong@mediatek.com>,
	"Sumit Semwal" <sumit.semwal@linaro.org>,
	"Brian Starkey" <Brian.Starkey@arm.com>,
	"John Stultz" <jstultz@google.com>,
	"T . J . Mercier" <tjmercier@google.com>,
	"Christian König" <christian.koenig@amd.com>,
	"Matthias Brugger" <matthias.bgg@gmail.com>,
	linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-mediatek@lists.infradead.org,
	Project_Global_Chrome_Upstream_Group@mediatek.com
Subject: [PATCH v6,03/24] v4l2: verify restricted dmabufs are used in restricted queue
Date: Thu, 16 May 2024 20:20:41 +0800	[thread overview]
Message-ID: <20240516122102.16379-4-yunfei.dong@mediatek.com> (raw)
In-Reply-To: <20240516122102.16379-1-yunfei.dong@mediatek.com>

From: Jeffrey Kardatzke <jkardatzke@google.com>

Verfies in the dmabuf implementations that if the restricted memory
flag is set for a queue that the dmabuf submitted to the queue is
unmappable.

Signed-off-by: Jeffrey Kardatzke <jkardatzke@google.com>
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
---
 drivers/media/common/videobuf2/videobuf2-dma-contig.c | 8 ++++++++
 drivers/media/common/videobuf2/videobuf2-dma-sg.c     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
index 3d4fd4ef5310..35a3c1c01eae 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
@@ -710,6 +710,14 @@ static int vb2_dc_map_dmabuf(void *mem_priv)
 		return -EINVAL;
 	}
 
+	/* Verify the dmabuf is restricted if we are in restricted mode, this is done
+	 * by validating there is no page entry for the dmabuf.
+	 */
+	if (buf->vb->vb2_queue->restricted_mem && !sg_dma_is_restricted(sgt->sgl)) {
+		pr_err("restricted queue requires restricted dma_buf");
+		return -EINVAL;
+	}
+
 	/* checking if dmabuf is big enough to store contiguous chunk */
 	contig_size = vb2_dc_get_contiguous_size(sgt);
 	if (contig_size < buf->size) {
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
index 6975a71d740f..2399a9c074ba 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
@@ -570,6 +570,14 @@ static int vb2_dma_sg_map_dmabuf(void *mem_priv)
 		return -EINVAL;
 	}
 
+	/* Verify the dmabuf is restricted if we are in restricted mode, this is done
+	 * by validating there is no page entry for the dmabuf.
+	 */
+	if (buf->vb->vb2_queue->restricted_mem && !sg_dma_is_restricted(sgt->sgl)) {
+		pr_err("restricted queue requires restricted dma_buf");
+		return -EINVAL;
+	}
+
 	buf->dma_sgt = sgt;
 	buf->vaddr = NULL;
 
-- 
2.25.1



  parent reply	other threads:[~2024-05-16 12:41 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-16 12:20 [PATCH v6,00/24] media: mediatek: add driver to support secure video decoder Yunfei Dong
2024-05-16 12:20 ` [PATCH v6,01/24] v4l2: add restricted memory flags Yunfei Dong
2024-05-16 12:20 ` [PATCH v6,02/24] v4l2: handle restricted memory flags in queue setup Yunfei Dong
2024-05-22 12:20   ` Andrzej Pietrasiewicz
2024-06-17  7:11     ` Yunfei Dong (董云飞)
2024-05-16 12:20 ` Yunfei Dong [this message]
2024-06-12  4:31   ` [PATCH v6,03/24] v4l2: verify restricted dmabufs are used in restricted queue Tomasz Figa
2024-05-16 12:20 ` [PATCH v6,04/24] v4l: add documentation for restricted memory flag Yunfei Dong
2024-05-22 11:16   ` Laurent Pinchart
2024-06-12  4:37     ` Tomasz Figa
2024-06-12 19:43       ` Nicolas Dufresne
2024-06-12 20:25         ` Laurent Pinchart
2024-06-12 20:58           ` Nicolas Dufresne
2024-06-17 19:02           ` Nicolas Dufresne
2024-05-22 12:24   ` Andrzej Pietrasiewicz
2024-05-16 12:20 ` [PATCH v6,05/24] dma-buf: heaps: Deduplicate docs and adopt common format Yunfei Dong
2024-05-16 12:20 ` [PATCH v6,06/24] dma-heap: Add proper kref handling on dma-buf heaps Yunfei Dong
2024-06-18  7:22   ` [PATCH v6 06/24] " Markus Elfring
2024-05-16 12:20 ` [PATCH v6,07/24] dma-heap: Provide accessors so that in-kernel drivers can allocate dmabufs from specific heaps Yunfei Dong
2024-05-16 12:20 ` [PATCH v6,08/24] media: mediatek: vcodec: add tee client interface to communiate with optee-os Yunfei Dong
2024-05-22 12:21   ` Andrzej Pietrasiewicz
2024-06-17  7:25     ` Yunfei Dong (董云飞)
2024-05-27  8:19   ` Chen-Yu Tsai
2024-05-16 12:20 ` [PATCH v6,09/24] media: mediatek: vcodec: allocate tee share memory Yunfei Dong
2024-05-22 12:23   ` Andrzej Pietrasiewicz
2024-05-16 12:20 ` [PATCH v6,10/24] media: mediatek: vcodec: send share memory data to optee Yunfei Dong
2024-05-22 12:22   ` Andrzej Pietrasiewicz
2024-06-17  7:45     ` Yunfei Dong (董云飞)
2024-05-16 12:20 ` [PATCH v6,11/24] media: mediatek: vcodec: initialize msg and vsi information Yunfei Dong
2024-05-16 12:20 ` [PATCH v6,12/24] media: mediatek: vcodec: add interface to allocate/free secure memory Yunfei Dong
2024-05-22 12:25   ` Andrzej Pietrasiewicz
2024-06-17  7:53     ` Yunfei Dong (董云飞)
2024-06-12  5:22   ` Tomasz Figa
2024-06-17  6:53     ` Yong Wu (吴勇)
2024-06-18  6:16       ` Tomasz Figa
2024-05-16 12:20 ` [PATCH v6,13/24] media: mediatek: vcodec: using shared memory as vsi address Yunfei Dong
2024-05-16 12:20 ` [PATCH v6,14/24] media: mediatek: vcodec: Add capture format to support one plane memory Yunfei Dong
2024-05-22 12:26   ` Andrzej Pietrasiewicz
2024-05-23 10:14     ` Andrzej Pietrasiewicz
2024-05-23 10:36       ` Chen-Yu Tsai
2024-05-31 13:06         ` Nicolas Dufresne
2024-06-17  9:44     ` Yunfei Dong (董云飞)
2024-05-27  7:07   ` Chen-Yu Tsai
2024-05-16 12:20 ` [PATCH v6,15/24] media: mediatek: vcodec: Add one plane format Yunfei Dong
2024-05-31 13:08   ` Nicolas Dufresne
2024-05-16 12:20 ` [PATCH v6,16/24] media: mediatek: vcodec: support one plane capture buffer Yunfei Dong
2024-05-16 12:20 ` [PATCH v6,17/24] media: mediatek: vcodec: re-construct h264 driver to support svp mode Yunfei Dong
2024-05-27  5:58   ` Chen-Yu Tsai
2024-05-28  7:37     ` Chen-Yu Tsai
2024-05-16 12:20 ` [PATCH v6,18/24] media: mediatek: vcodec: remove parse nal_info in kernel Yunfei Dong
2024-05-16 12:20 ` [PATCH v6,19/24] media: mediatek: vcodec: disable wait interrupt for svp mode Yunfei Dong
2024-05-17  9:53   ` [PATCH v6, 19/24] " CK Hu (胡俊光)
2024-06-17  6:00     ` Yunfei Dong (董云飞)
2024-05-16 12:20 ` [PATCH v6,20/24] media: mediatek: vcodec: support tee decoder Yunfei Dong
2024-05-16 12:20 ` [PATCH v6,21/24] media: mediatek: vcodec: move vdec init interface to setup callback Yunfei Dong
2024-05-16 12:21 ` [PATCH v6,22/24] media: mediatek: vcodec: support hevc svp for mt8188 Yunfei Dong
2024-05-16 12:21 ` [PATCH v6,23/24] media: mediatek: vcodec: support av1 svp decoder " Yunfei Dong
2024-05-23 13:32   ` Andrzej Pietrasiewicz
2024-05-16 12:21 ` [PATCH v6,24/24] media: mediatek: vcodec: support vp9 " Yunfei Dong
2024-05-27  7:54   ` [PATCH v6, 24/24] " Chen-Yu Tsai

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=20240516122102.16379-4-yunfei.dong@mediatek.com \
    --to=yunfei.dong@mediatek.com \
    --cc=Brian.Starkey@arm.com \
    --cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=benjamin.gaignard@collabora.com \
    --cc=christian.koenig@amd.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=frkoenig@chromium.org \
    --cc=hsinyi@chromium.org \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=jkardatzke@google.com \
    --cc=jstultz@google.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=m.szyprowski@samsung.com \
    --cc=matthias.bgg@gmail.com \
    --cc=mchehab@kernel.org \
    --cc=nfraprado@collabora.com \
    --cc=nhebert@chromium.org \
    --cc=nicolas.dufresne@collabora.com \
    --cc=sebastian.fricke@collabora.com \
    --cc=stevecho@chromium.org \
    --cc=sumit.semwal@linaro.org \
    --cc=tfiga@chromium.org \
    --cc=tjmercier@google.com \
    --cc=wenst@chromium.org \
    --cc=yong.wu@mediatek.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