[PATCH v4 06/12] media: verisilicon: Check AV1 bitstreams bit depth
Benjamin Gaignard
benjamin.gaignard at collabora.com
Mon Feb 20 08:24:30 PST 2023
Le 18/02/2023 à 14:11, Ezequiel Garcia a écrit :
> On Tue, Feb 14, 2023 at 11:06 AM Benjamin Gaignard
> <benjamin.gaignard at collabora.com> wrote:
>> The driver supports 8 and 10 bits bitstreams, make sure to discard
>> other cases.
>> It could happens that userland test if V4L2_CID_STATELESS_AV1_SEQUENCE
>> exists without setting bit_depth field in this case use
>> HANTRO_DEFAULT_BIT_DEPTH value.
>>
> This shouldn't happen.
>
> If the bit_depth argument in hantro_check_depth_match()
> can be set unchecked by userspace, we have done something wrong!!
>
> Are you sure that userspace can do a S_CTRL with an invalid bit-depth?
> The try_or_set_cluster() function seems to always call try_ctrl before s_ctrl.
I have dump the stack when AV1 sequence bit depth = 0 in s_ctrl.
It is happening when opening the driver, v4l2 setup the ctrls by calling __v4l2_ctrl_handler_setup()
this led to call hantro_av1_s_ctrl() with empty structure.
For other codecs isn't a problem because bit depth is coded with a minus 8 value (ie: 8 bits = 0)
while for AV1 it is the real value (ie: 8 bits = 8).
[ 88.478751] Hardware name: Radxa Rock 5A Board (DT)
[ 88.479184] Call trace:
[ 88.479406] dump_backtrace.part.0+0xdc/0xf0
[ 88.479796] show_stack+0x18/0x30
[ 88.480099] dump_stack_lvl+0x68/0x84
[ 88.480431] dump_stack+0x18/0x34
[ 88.480732] hantro_av1_s_ctrl+0x7c/0xcc [hantro_vpu]
[ 88.481211] __v4l2_ctrl_handler_setup+0x120/0x154
[ 88.481643] v4l2_ctrl_handler_setup+0x2c/0x50
[ 88.482043] hantro_open+0x138/0x204 [hantro_vpu]
[ 88.482490] v4l2_open+0xa8/0x124
[ 88.482794] chrdev_open+0xc0/0x22c
[ 88.483114] do_dentry_open+0x13c/0x490
[ 88.483464] vfs_open+0x2c/0x40
[ 88.483749] path_openat+0x878/0xe50
[ 88.484074] do_filp_open+0x80/0x130
[ 88.484399] do_sys_openat2+0xb4/0x170
[ 88.484736] __arm64_sys_openat+0x60/0xb0
[ 88.485097] invoke_syscall+0x48/0x114
[ 88.485437] el0_svc_common.constprop.0+0x44/0xfc
[ 88.485860] do_el0_svc+0x3c/0xc0
[ 88.486163] el0_svc+0x2c/0x84
[ 88.486441] el0t_64_sync_handler+0xbc/0x140
[ 88.486826] el0t_64_sync+0x190/0x194
Regards,
Benjamin
>
> Thanks,
> Ezequiel
>
>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard at collabora.com>
>> ---
>> version 4:
>> - This patch is the result of squashing "Save bit depth for AV1 decoder"
>> and "Check AV1 bitstreams bit depth" of version 3 + adapation to
>> "[PATCH v8 0/6] media: verisilicon: HEVC: fix 10bits handling" series.
>>
>> .../media/platform/verisilicon/hantro_drv.c | 36 +++++++++++++++++++
>> .../media/platform/verisilicon/hantro_v4l2.c | 4 +++
>> 2 files changed, 40 insertions(+)
>>
>> diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
>> index bc1a85456142..666cd46902da 100644
>> --- a/drivers/media/platform/verisilicon/hantro_drv.c
>> +++ b/drivers/media/platform/verisilicon/hantro_drv.c
>> @@ -275,7 +275,13 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)
>> /* We only support profile 0 */
>> if (dec_params->profile != 0)
>> return -EINVAL;
>> + } else if (ctrl->id == V4L2_CID_STATELESS_AV1_SEQUENCE) {
>> + const struct v4l2_ctrl_av1_sequence *sequence = ctrl->p_new.p_av1_sequence;
>> +
>> + if (sequence->bit_depth != 8 && sequence->bit_depth != 10)
>> + return -EINVAL;
>> }
>> +
>> return 0;
>> }
>>
>> @@ -348,6 +354,30 @@ static int hantro_hevc_s_ctrl(struct v4l2_ctrl *ctrl)
>> return 0;
>> }
>>
>> +static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl)
>> +{
>> + struct hantro_ctx *ctx;
>> +
>> + ctx = container_of(ctrl->handler,
>> + struct hantro_ctx, ctrl_handler);
>> +
>> + switch (ctrl->id) {
>> + case V4L2_CID_STATELESS_AV1_SEQUENCE:
>> + {
>> + int bit_depth = ctrl->p_new.p_av1_sequence->bit_depth;
>> +
>> + if (ctx->bit_depth == bit_depth)
>> + return 0;
>> +
>> + return hantro_reset_raw_fmt(ctx, bit_depth);
>> + }
>> + default:
>> + return -EINVAL;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> static const struct v4l2_ctrl_ops hantro_ctrl_ops = {
>> .try_ctrl = hantro_try_ctrl,
>> };
>> @@ -365,6 +395,11 @@ static const struct v4l2_ctrl_ops hantro_hevc_ctrl_ops = {
>> .s_ctrl = hantro_hevc_s_ctrl,
>> };
>>
>> +static const struct v4l2_ctrl_ops hantro_av1_ctrl_ops = {
>> + .try_ctrl = hantro_try_ctrl,
>> + .s_ctrl = hantro_av1_s_ctrl,
>> +};
>> +
>> #define HANTRO_JPEG_ACTIVE_MARKERS (V4L2_JPEG_ACTIVE_MARKER_APP0 | \
>> V4L2_JPEG_ACTIVE_MARKER_COM | \
>> V4L2_JPEG_ACTIVE_MARKER_DQT | \
>> @@ -542,6 +577,7 @@ static const struct hantro_ctrl controls[] = {
>> .codec = HANTRO_AV1_DECODER,
>> .cfg = {
>> .id = V4L2_CID_STATELESS_AV1_SEQUENCE,
>> + .ops = &hantro_av1_ctrl_ops,
>> },
>> }, {
>> .codec = HANTRO_AV1_DECODER,
>> diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c
>> index 992c5baa929f..7e74e47c9a89 100644
>> --- a/drivers/media/platform/verisilicon/hantro_v4l2.c
>> +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c
>> @@ -86,6 +86,10 @@ hantro_check_depth_match(const struct hantro_fmt *fmt, int bit_depth)
>> if (!fmt->match_depth && !fmt->postprocessed)
>> return true;
>>
>> + /* 0 means default depth, which is 8 */
>> + if (!bit_depth)
>> + bit_depth = HANTRO_DEFAULT_BIT_DEPTH;
>> +
>> fmt_depth = hantro_get_format_depth(fmt->fourcc);
>>
>> /*
>> --
>> 2.34.1
>>
More information about the linux-arm-kernel
mailing list