From: Yunfei Dong <yunfei.dong@mediatek.com>
To: "Jeffrey Kardatzke" <jkardatzke@google.com>,
"Nícolas F . R . A . Prado" <nfraprado@collabora.com>,
"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>,
"Nathan Hebert" <nhebert@chromium.org>
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>,
dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org,
devicetree@vger.kernel.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 v4,03/22] v4l2: verify restricted dmabufs are used in restricted queue
Date: Mon, 29 Jan 2024 14:30:06 +0800 [thread overview]
Message-ID: <20240129063025.29251-4-yunfei.dong@mediatek.com> (raw)
In-Reply-To: <20240129063025.29251-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..f953570fef27 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_page(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..f87bd3f40b9b 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_page(sgt->sgl)) {
+ pr_err("restricted queue requires restricted dma_buf");
+ return -EINVAL;
+ }
+
buf->dma_sgt = sgt;
buf->vaddr = NULL;
--
2.18.0
next prev parent reply other threads:[~2024-01-29 6:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-29 6:30 [PATCH v4,00/22] media: add driver to support secure video decoder Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,01/22] v4l2: add restricted memory flags Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,02/22] v4l2: handle restricted memory flags in queue setup Yunfei Dong
2024-01-29 6:30 ` Yunfei Dong [this message]
2024-01-29 6:30 ` [PATCH v4,04/22] v4l: add documentation for restricted memory flag Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,05/22] dma-buf: heaps: Deduplicate docs and adopt common format Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,06/22] dma-heap: Add proper kref handling on dma-buf heaps Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,07/22] dma-heap: Provide accessors so that in-kernel drivers can allocate dmabufs from specific heaps Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,08/22] media: mediatek: vcodec: add tee client interface to communiate with optee-os Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,09/22] media: mediatek: vcodec: allocate tee share memory Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,10/22] media: mediatek: vcodec: send share memory data to optee Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,11/22] media: mediatek: vcodec: initialize msg and vsi information Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,12/22] media: mediatek: vcodec: add interface to allocate/free secure memory Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,13/22] media: mediatek: vcodec: using shared memory as vsi address Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,14/22] media: mediatek: vcodec: Add capture format to support one plane memory Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,15/22] media: mediatek: vcodec: Add one plane format Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,16/22] media: mediatek: vcodec: support one plane capture buffer Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,17/22] media: mediatek: vcodec: re-construct h264 driver to support svp mode Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,18/22] media: mediatek: vcodec: remove parse nal_info in kernel Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,19/22] media: mediatek: vcodec: disable wait interrupt for svp mode Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,20/22] media: mediatek: vcodec: support tee decoder Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,21/22] media: mediatek: vcodec: move vdec init interface to setup callback Yunfei Dong
2024-01-29 6:30 ` [PATCH v4,22/22] media: mediatek: vcodec: support hevc svp for mt8188 Yunfei Dong
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=20240129063025.29251-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=devicetree@vger.kernel.org \
--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=linaro-mm-sig@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=nfraprado@collabora.com \
--cc=nhebert@chromium.org \
--cc=nicolas.dufresne@collabora.com \
--cc=stevecho@chromium.org \
--cc=sumit.semwal@linaro.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;
as well as URLs for NNTP newsgroup(s).