From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C80DF1CF92 for ; Tue, 19 Sep 2023 19:43:13 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D495D9C; Tue, 19 Sep 2023 12:43:11 -0700 (PDT) Received: from nicolas-tpx395.localdomain (unknown [IPv6:2606:6d00:15:bae9::7a9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nicolas) by madras.collabora.co.uk (Postfix) with ESMTPSA id 8695566030BF; Tue, 19 Sep 2023 20:43:08 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1695152590; bh=44RIe0kYEwhzyJtIkdaGANZBbga/2Bkk/eQYmeA4V8g=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=En5blzl9LuyIbQadzIEYAKmtBbIbfWB8FHPT/3EK+JqmeQD6jXQ3/VROlyyI1Vm2c I8UdtrLwv6uNl2FLpF2ge91xNEODsjtRzpAW0IXW/sKN+hM+G1RmVrGF9cpomGnMwM nWB0ke8YMSIiicbpH63OCtqbrrnu/0Po03O+pcW6DMoH7cZBVqDDhDjPGotadG77SA QFpkqrJlfrP/7J310z1oonbUYvKxpXR8S4Yn30vH5uJmNV/+aAz6r9K7n2fly8YQkP TfYU6WtLBG0PHLpa04psFsX/mDpFYXIov+VRStW2sGBU32//QFo9TppPHFZS/cFNgt ugWGi7YrbAkHw== Message-ID: Subject: Re: [PATCH 11/14] media: medkatek: vcodec: covert secure fd to secure handle From: Nicolas Dufresne To: Yunfei Dong , =?ISO-8859-1?Q?N=EDcolas?= "F . R . A . Prado" , Hans Verkuil , AngeloGioacchino Del Regno , Benjamin Gaignard , Nathan Hebert Cc: Chen-Yu Tsai , Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , Steve Cho , linux-media@vger.kernel.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 Date: Tue, 19 Sep 2023 15:42:59 -0400 In-Reply-To: <20230911125936.10648-12-yunfei.dong@mediatek.com> References: <20230911125936.10648-1-yunfei.dong@mediatek.com> <20230911125936.10648-12-yunfei.dong@mediatek.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Le lundi 11 septembre 2023 =C3=A0 20:59 +0800, Yunfei Dong a =C3=A9crit=C2= =A0: > User driver will fill or parse data in optee-os with secure handle, > need to covert secure fd to secure handle in kernel. >=20 > Signed-off-by: Yunfei Dong > --- > .../vcodec/decoder/mtk_vcodec_dec_drv.c | 1 + > .../vcodec/decoder/mtk_vcodec_dec_stateless.c | 54 ++++++++++++++++++- > drivers/media/v4l2-core/v4l2-ctrls-defs.c | 5 ++ > include/uapi/linux/v4l2-controls.h | 4 ++ > 4 files changed, 62 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_de= c_drv.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv= .c > index 0a89ce452ac3..64e006820f43 100644 > --- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c > +++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c > @@ -571,3 +571,4 @@ module_platform_driver(mtk_vcodec_dec_driver); > =20 > MODULE_LICENSE("GPL v2"); > MODULE_DESCRIPTION("Mediatek video codec V4L2 decoder driver"); > +MODULE_IMPORT_NS(DMA_BUF); > diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_de= c_stateless.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_d= ec_stateless.c > index 2ea517883a86..d2b09ce9f1cf 100644 > --- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_state= less.c > +++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_state= less.c > @@ -426,6 +426,46 @@ static int mtk_vcodec_get_pic_info(struct mtk_vcodec= _dec_ctx *ctx) > return ret; > } > =20 > +static int mtk_dma_contig_get_secure_handle(struct mtk_vcodec_dec_ctx *c= tx, int fd) > +{ > + int secure_handle =3D 0; > + struct dma_buf *buf; > + struct dma_buf_attachment *dba; > + struct sg_table *sgt; > + struct device *dev =3D &ctx->dev->plat_dev->dev; > + > + buf =3D dma_buf_get(fd); > + if (IS_ERR(buf)) { > + mtk_v4l2_vdec_err(ctx, "dma_buf_get fail fd:%d", fd); > + return 0; > + } > + > + dba =3D dma_buf_attach(buf, dev); > + if (IS_ERR(dba)) { > + mtk_v4l2_vdec_err(ctx, "dma_buf_attach fail fd:%d", fd); > + goto err_attach; > + } > + > + sgt =3D dma_buf_map_attachment(dba, DMA_BIDIRECTIONAL); > + if (IS_ERR(sgt)) { > + mtk_v4l2_vdec_err(ctx, "dma_buf_map_attachment fail fd:%d", fd); > + goto err_map; > + } > + secure_handle =3D sg_dma_address(sgt->sgl); Does it mean if your secure dmabuf is passed to a driver that didn't know i= t was secure it will pick the handle as a memory address and program the HW with = it ? That seems unsafe, the handle should be stored in a dedicated place and map= ping should either fail, or provide a dummy buffer. > + > + dma_buf_unmap_attachment(dba, sgt, DMA_BIDIRECTIONAL); > + dma_buf_detach(buf, dba); > + dma_buf_put(buf); > + > + return secure_handle; > +err_map: > + dma_buf_detach(buf, dba); > +err_attach: > + dma_buf_put(buf); > + > + return 0; > +} > + > static int mtk_vdec_s_ctrl(struct v4l2_ctrl *ctrl) > { > struct mtk_vcodec_dec_ctx *ctx =3D ctrl_to_dec_ctx(ctrl); > @@ -436,7 +476,7 @@ static int mtk_vdec_s_ctrl(struct v4l2_ctrl *ctrl) > struct v4l2_ctrl *hdr_ctrl; > const struct mtk_vcodec_dec_pdata *dec_pdata =3D ctx->dev->vdec_pdata; > const struct mtk_video_fmt *fmt; > - int i =3D 0, ret =3D 0; > + int i =3D 0, ret =3D 0, sec_fd; > =20 > hdr_ctrl =3D ctrl; > if (!hdr_ctrl || !hdr_ctrl->p_new.p) > @@ -489,6 +529,12 @@ static int mtk_vdec_s_ctrl(struct v4l2_ctrl *ctrl) > return -EINVAL; > } > break; > + case V4L2_CID_MPEG_MTK_GET_SECURE_HANDLE: > + sec_fd =3D ctrl->val; > + > + ctrl->val =3D mtk_dma_contig_get_secure_handle(ctx, ctrl->val); > + mtk_v4l2_vdec_dbg(3, ctx, "get secure handle: %d =3D> 0x%x", sec_fd, c= trl->val); > + break; > default: > mtk_v4l2_vdec_dbg(3, ctx, "Not supported to set ctrl id: 0x%x\n", hdr_= ctrl->id); > return ret; > @@ -525,8 +571,9 @@ static const struct v4l2_ctrl_ops mtk_vcodec_dec_ctrl= _ops =3D { > static int mtk_vcodec_dec_ctrls_setup(struct mtk_vcodec_dec_ctx *ctx) > { > unsigned int i; > + struct v4l2_ctrl *ctrl; > =20 > - v4l2_ctrl_handler_init(&ctx->ctrl_hdl, NUM_CTRLS); > + v4l2_ctrl_handler_init(&ctx->ctrl_hdl, NUM_CTRLS + 1); > if (ctx->ctrl_hdl.error) { > mtk_v4l2_vdec_err(ctx, "v4l2_ctrl_handler_init failed\n"); > return ctx->ctrl_hdl.error; > @@ -543,6 +590,9 @@ static int mtk_vcodec_dec_ctrls_setup(struct mtk_vcod= ec_dec_ctx *ctx) > } > } > =20 > + ctrl =3D v4l2_ctrl_new_std(&ctx->ctrl_hdl, &mtk_vcodec_dec_ctrl_ops, > + V4L2_CID_MPEG_MTK_GET_SECURE_HANDLE, 0, 65535, 1, 0); > + > v4l2_ctrl_handler_setup(&ctx->ctrl_hdl); > =20 > return 0; > diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4= l2-core/v4l2-ctrls-defs.c > index 8696eb1cdd61..d8cf01f76aab 100644 > --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c > +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c > @@ -1041,6 +1041,7 @@ const char *v4l2_ctrl_get_name(u32 id) > case V4L2_CID_MPEG_VIDEO_HEVC_SIZE_OF_LENGTH_FIELD: return "HEVC Size o= f Length Field"; > case V4L2_CID_MPEG_VIDEO_REF_NUMBER_FOR_PFRAMES: return "Reference Fram= es for a P-Frame"; > case V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR: return "Prepend SPS an= d PPS to IDR"; > + case V4L2_CID_MPEG_MTK_GET_SECURE_HANDLE: return "MediaTek Decoder get= secure handle"; > =20 > /* AV1 controls */ > case V4L2_CID_MPEG_VIDEO_AV1_PROFILE: return "AV1 Profile"; > @@ -1437,6 +1438,10 @@ void v4l2_ctrl_fill(u32 id, const char **name, enu= m v4l2_ctrl_type *type, > case V4L2_CID_MPEG_VIDEO_VPX_NUM_REF_FRAMES: > *type =3D V4L2_CTRL_TYPE_INTEGER_MENU; > break; > + case V4L2_CID_MPEG_MTK_GET_SECURE_HANDLE: > + *type =3D V4L2_CTRL_TYPE_INTEGER; > + *flags |=3D V4L2_CTRL_FLAG_WRITE_ONLY; > + break; > case V4L2_CID_USER_CLASS: > case V4L2_CID_CAMERA_CLASS: > case V4L2_CID_CODEC_CLASS: > diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2= -controls.h > index c3604a0a3e30..7b3694985366 100644 > --- a/include/uapi/linux/v4l2-controls.h > +++ b/include/uapi/linux/v4l2-controls.h > @@ -954,6 +954,10 @@ enum v4l2_mpeg_mfc51_video_force_frame_type { > #define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC (V4L2_CID_COD= EC_MFC51_BASE+53) > #define V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P (V4L2_CID_CODE= C_MFC51_BASE+54) > =20 > +/* MPEG-class control IDs specific to the MediaTek Decoder driver as de= fined by V4L2 */ > +#define V4L2_CID_MPEG_MTK_BASE (V4L2_CTRL_CLASS_CODEC | 0x2000) > +#define V4L2_CID_MPEG_MTK_GET_SECURE_HANDLE (V4L2_CID_MPEG_MTK_BASE+8) > + > /* Camera class control IDs */ > =20 > #define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900)