Hi Andrzej,
Thanks for your help to review this patch.
On Wed, 2024-05-22 at 14:22 +0200, Andrzej Pietrasiewicz wrote:
> Hi Yunfei & Jeffrey,
>
> W dniu 16.05.2024 o 14:20, Yunfei Dong pisze:
> > Setting msg and vsi information to shared buffer, then call tee
> > invoke
> > function to send it to optee-os.
> >
> > Signed-off-by: Yunfei Dong <yunfei.dong@xxxxxxxxxxxx>
> > ---
> > .../vcodec/decoder/mtk_vcodec_dec_optee.c | 140
> > ++++++++++++++++++
> > .../vcodec/decoder/mtk_vcodec_dec_optee.h | 51 +++++++
> > 2 files changed, 191 insertions(+)
> >
> > diff --git
> > a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_opt
> > ee.c
> > b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_opt
> > ee.c
> > index 611fb0e56480..f29a8d143fee 100644
> > ---
> > a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_opt
> > ee.c
> > +++
> > b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_opt
> > ee.c
> > @@ -241,3 +241,143 @@ void mtk_vcodec_dec_optee_release(struct
> > mtk_vdec_optee_private *optee_private)
> > mutex_unlock(&optee_private->tee_mutex);
> > }
> > EXPORT_SYMBOL_GPL(mtk_vcodec_dec_optee_release);
> > +
> > +static int mtk_vcodec_dec_optee_fill_shm(struct tee_param
> > *command_params,
> > + struct
> > mtk_vdec_optee_shm_memref *shm_memref,
> > + struct
> > mtk_vdec_optee_data_to_shm *data,
> > + int index, struct device *dev)
> > +{
> > + if (!data->msg_buf_size[index] || !data->msg_buf[index]) {
> > + pr_err(MTK_DBG_VCODEC_STR "tee invalid buf param:
> > %d.\n", index);
> > + return -EINVAL;
> > + }
> > +
> > + *command_params = (struct tee_param) {
> > + .attr = shm_memref->param_type,
> > + .u.memref = {
> > + .shm = shm_memref->msg_shm,
> > + .size = data->msg_buf_size[index],
> > + .shm_offs = 0,
> > + },
> > + };
> > +
> > + if (!shm_memref->copy_to_ta) {
> > + dev_dbg(dev, MTK_DBG_VCODEC_STR "share memref data:
> > 0x%x param_type:%llu.\n",
> > + *((unsigned int *)shm_memref->msg_shm_ca_buf),
> > shm_memref->param_type);
> > + return 0;
> > + }
> > +
> > + memset(shm_memref->msg_shm_ca_buf, 0, shm_memref-
> > >msg_shm_size);
> > + memcpy(shm_memref->msg_shm_ca_buf, data->msg_buf[index], data-
> > >msg_buf_size[index]);
> > +
> > + dev_dbg(dev, MTK_DBG_VCODEC_STR "share memref data => msg
> > id:0x%x 0x%x param_type:%llu.\n",
> > + *((unsigned int *)data->msg_buf[index]),
> > + *((unsigned int *)shm_memref->msg_shm_ca_buf),
> > + shm_memref->param_type);
> > +
> > + return 0;
> > +}
> > +
> > +void mtk_vcodec_dec_optee_set_data(struct
> > mtk_vdec_optee_data_to_shm *data,
> > + void *buf, int buf_size,
> > + enum mtk_vdec_optee_data_index
> > index)
> > +{
> > + data->msg_buf[index] = buf;
> > + data->msg_buf_size[index] = buf_size;
> > +}
> > +EXPORT_SYMBOL_GPL(mtk_vcodec_dec_optee_set_data);
> > +
> > +int mtk_vcodec_dec_optee_invokd_cmd(struct mtk_vdec_optee_private
> > *optee_private,
> > + enum mtk_vdec_hw_id hw_id,
> > + struct mtk_vdec_optee_data_to_shm
> > *data)
> > +{
> > + struct device *dev = &optee_private->vcodec_dev->plat_dev->dev;
> > + struct tee_ioctl_invoke_arg trans_args;
> > + struct tee_param command_params[MTK_OPTEE_MAX_TEE_PARAMS];
> > + struct mtk_vdec_optee_ca_info *ca_info;
> > + struct mtk_vdec_optee_shm_memref *shm_memref;
> > + int ret, index;
> > +
> > + if (hw_id == MTK_VDEC_LAT0)
> > + ca_info = &optee_private->lat_ca;
> > + else
> > + ca_info = &optee_private->core_ca;
>
> You seem to be using this in several places. Maybe create a helper?
>
> static inline struct mtk_vdec_optee_ca_info *get_ca_info(
> struct mtk_vdec_optee_private *optee_private,
> enum mtk_vdec_hw_id hw_id)
> {
> return hw_id == MTK_VDEC_LAT0 ?
> &optee_private->lat_ca : &optee_private->core_ca;
> }
>
> (you want to clean up the line breaks in this suggested function)
>
> and then
>
> ca_info = get_ca_info(optee_private, hw_id);
>
> > +
> > + memset(&trans_args, 0, sizeof(trans_args));
> > + memset(command_params, 0, sizeof(command_params));
> > +
> > + trans_args = (struct tee_ioctl_invoke_arg) {
> > + .func = ca_info->vdec_session_func,
> > + .session = ca_info->vdec_session_id,
> > + .num_params = MTK_OPTEE_MAX_TEE_PARAMS,
> > + };
> > +
> > + /* Fill msg command parameters */
> > + for (index = 0; index < MTK_OPTEE_MAX_TEE_PARAMS; index++) {
> > + shm_memref = &ca_info->shm_memref[index];
> > +
> > + if (shm_memref->param_type ==
> > TEE_IOCTL_PARAM_ATTR_TYPE_NONE ||
> > + data->msg_buf_size[index] == 0)
> > + continue;
> > +
> > + dev_dbg(dev, MTK_DBG_VCODEC_STR "tee share memory data
> > size: %d -> %d.\n",
> > + data->msg_buf_size[index], shm_memref-
> > >msg_shm_size);
> > +
> > + if (data->msg_buf_size[index] > shm_memref-
> > >msg_shm_size) {
> > + dev_err(dev, MTK_DBG_VCODEC_STR "tee buf size
> > big than shm (%d -> %d).\n",
>
> s/big/bigger ? Or s/big/greater ?
>
> > + data->msg_buf_size[index], shm_memref-
> > >msg_shm_size);
> > + return -EINVAL;
> > + }
> > +
> > + ret =
> > mtk_vcodec_dec_optee_fill_shm(&command_params[index], shm_memref,
> > + data, index, dev);
> > + if (ret)
> > + return ret;
>
> So if any of the iterations of this loop fails, then the data has
> been
> potentially copied to several shm_memref->msg_shm_ca_buf and remains
> there until
> next call to mtk_vcodec_dec_optee_fill_shm() for a corresponding
> ca_buf.
> In other words, mtk_vcodec_dec_optee_fill_shm() has maybe filled
> several
> ca_bufs, but if we return with error from this loop the tee function
> is not
> invoked but the data prepared for its invocation remains in the
> buffers.
> Don't know if this is a problem or not, but given we're dealing with
> restricted
> aka secure memory you might want to think about it.
The invoke information will be filled again when begin to decode
another frame.
The ca buffer data will be overwritten by new frame data again.
Best Regards,
Yunfei Dong
>
> > + }
> > +
> > + ret = tee_client_invoke_func(optee_private->tee_vdec_ctx,
> > &trans_args, command_params);
> > + if (ret < 0 || trans_args.ret != 0) {
> > + dev_err(dev, MTK_DBG_VCODEC_STR "tee submit command
> > fail: 0x%x 0x%x.\n",
> > + trans_args.ret, ret);
> > + return (ret < 0) ? ret : trans_args.ret;
> > + }
> > +
> > + /* clear all attrs, set all command param to unused */
> > + for (index = 0; index < MTK_OPTEE_MAX_TEE_PARAMS; index++) {
> > + data->msg_buf[index] = NULL;
> > + data->msg_buf_size[index] = 0;
> > + }
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(mtk_vcodec_dec_optee_invokd_cmd);
> > +
> > +void *mtk_vcodec_dec_get_shm_buffer_va(struct
> > mtk_vdec_optee_private *optee_private,
> > + enum mtk_vdec_hw_id hw_id,
> > + enum mtk_vdec_optee_data_index
> > data_index)
> > +{
> > + struct mtk_vdec_optee_ca_info *ca_info;
> > +
> > + if (hw_id == MTK_VDEC_LAT0)
> > + ca_info = &optee_private->lat_ca;
> > + else
> > + ca_info = &optee_private->core_ca;
> > +
> > + return ca_info->shm_memref[data_index].msg_shm_ca_buf;
> > +}
> > +EXPORT_SYMBOL_GPL(mtk_vcodec_dec_get_shm_buffer_va);
> > +
> > +int mtk_vcodec_dec_get_shm_buffer_size(struct
> > mtk_vdec_optee_private *optee_private,
> > + enum mtk_vdec_hw_id hw_id,
> > + enum mtk_vdec_optee_data_index
> > data_index)
> > +{
> > + struct mtk_vdec_optee_ca_info *ca_info;
> > +
> > + if (hw_id == MTK_VDEC_LAT0)
> > + ca_info = &optee_private->lat_ca;
> > + else
> > + ca_info = &optee_private->core_ca;
> > +
> > + return ca_info->shm_memref[data_index].msg_shm_size;
> > +}
> > +EXPORT_SYMBOL_GPL(mtk_vcodec_dec_get_shm_buffer_size);
> > diff --git
> > a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_opt
> > ee.h
> > b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_opt
> > ee.h
> > index 24aa63af9887..c24a567ec877 100644
> > ---
> > a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_opt
> > ee.h
> > +++
> > b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_opt
> > ee.h
> > @@ -62,6 +62,16 @@ enum mtk_vdec_optee_data_index {
> > OPTEE_MAX_INDEX,
> > };
> >
> > +/**
> > + * struct mtk_vdec_optee_data_to_shm - shm data used for TA
> > + * @msg_buf: msg information to TA.
> > + * @msg_buf_len: length of msg information.
> > + */
> > +struct mtk_vdec_optee_data_to_shm {
> > + void *msg_buf[MTK_OPTEE_MAX_TEE_PARAMS];
> > + int msg_buf_size[MTK_OPTEE_MAX_TEE_PARAMS];
> > +};
> > +
> > /**
> > * struct mtk_vdec_optee_private - optee private data
> > * @vcodec_dev: pointer to the mtk_vcodec_dev of the device
> > @@ -102,4 +112,45 @@ int mtk_vcodec_dec_optee_private_init(struct
> > mtk_vcodec_dec_dev *vcodec_dev);
> > */
> > void mtk_vcodec_dec_optee_release(struct mtk_vdec_optee_private
> > *optee_private);
> >
> > +/**
> > + * mtk_vcodec_dec_optee_set_data - set buffer to share memref.
> > + * @vcodec_dev: normal world data used to init optee share memory
> > + * @buf: normal world buffer address
> > + * @buf_size: buf size
> > + * @data_index: indentify each share memory informaiton
> > + */
> > +void mtk_vcodec_dec_optee_set_data(struct
> > mtk_vdec_optee_data_to_shm *data,
> > + void *buf, int buf_size,
> > + enum mtk_vdec_optee_data_index
> > data_index);
> > +
> > +/**
> > + * mtk_vcodec_dec_optee_invokd_cmd - send share memory data to
> > optee .
> > + * @optee_private: optee private context
> > + * @hw_id: hardware index
> > + * @data: normal world data used to init optee share memory
> > + */
> > +int mtk_vcodec_dec_optee_invokd_cmd(struct mtk_vdec_optee_private
> > *optee_private,
> > + enum mtk_vdec_hw_id hw_id,
> > + struct mtk_vdec_optee_data_to_shm
> > *data);
> > +
> > +/**
> > + * mtk_vcodec_dec_get_shm_buffer_va - close the communication
> > channels with TA.
>
> This comment is most likely incorrect.
>
> > + * @optee_private: optee private context
> > + * @hw_id: hardware index
> > + * @@data_index: indentify each share memory informaiton
> > + */
> > +void *mtk_vcodec_dec_get_shm_buffer_va(struct
> > mtk_vdec_optee_private *optee_private,
> > + enum mtk_vdec_hw_id hw_id,
> > + enum mtk_vdec_optee_data_index
> > data_index);
> > +
> > +/**
> > + * mtk_vcodec_dec_get_shm_buffer_size - close the communication
> > channels with TA.
>
> And so is this one.
>
> Regards,
>
> Andrzej
>
> > + * @optee_private: optee private context
> > + * @hw_id: hardware index
> > + * @@data_index: indentify each share memory informaiton
> > + */
> > +int mtk_vcodec_dec_get_shm_buffer_size(struct
> > mtk_vdec_optee_private *optee_private,
> > + enum mtk_vdec_hw_id hw_id,
> > + enum mtk_vdec_optee_data_index
> > data_index);
> > +
> > #endif /* _MTK_VCODEC_FW_OPTEE_H_ */
>
>
