Re: [PATCH v5 12/27] venus: hfi_parser: add common capability parser

[Hans Verkuil]

Hi Stanimir,

While preparing a pull request I ran smatch and I found some issues with
hfi_parser.h:

On 05/07/18 15:03, Stanimir Varbanov wrote:
> This adds common capability parser for all supported Venus
> versions. Having it will help to enumerate better the supported
> raw formats and codecs and also the capabilities for every
> codec like max/min width/height, framerate, bitrate and so on.
> 
> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@xxxxxxxxxx>
> Reviewed-by: Tomasz Figa <tfiga@xxxxxxxxxxxx>
> ---
>  drivers/media/platform/qcom/venus/Makefile     |   3 +-
>  drivers/media/platform/qcom/venus/core.c       |  85 ++++++
>  drivers/media/platform/qcom/venus/core.h       |  74 ++---
>  drivers/media/platform/qcom/venus/hfi.c        |   5 +-
>  drivers/media/platform/qcom/venus/hfi_helper.h |  28 +-
>  drivers/media/platform/qcom/venus/hfi_msgs.c   | 356 ++-----------------------
>  drivers/media/platform/qcom/venus/hfi_parser.c | 283 ++++++++++++++++++++
>  drivers/media/platform/qcom/venus/hfi_parser.h |  45 ++++
>  drivers/media/platform/qcom/venus/vdec.c       |  38 +--
>  drivers/media/platform/qcom/venus/venc.c       |  52 ++--
>  10 files changed, 525 insertions(+), 444 deletions(-)
>  create mode 100644 drivers/media/platform/qcom/venus/hfi_parser.c
>  create mode 100644 drivers/media/platform/qcom/venus/hfi_parser.h
> 

<snip>

> diff --git a/drivers/media/platform/qcom/venus/hfi_parser.h b/drivers/media/platform/qcom/venus/hfi_parser.h
> new file mode 100644
> index 000000000000..2fa4a345a3eb
> --- /dev/null
> +++ b/drivers/media/platform/qcom/venus/hfi_parser.h
> @@ -0,0 +1,45 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/* Copyright (C) 2018 Linaro Ltd. */
> +#ifndef __VENUS_HFI_PARSER_H__
> +#define __VENUS_HFI_PARSER_H__
> +
> +#include "core.h"
> +
> +u32 hfi_parser(struct venus_core *core, struct venus_inst *inst,
> +	       void *buf, u32 size);
> +
> +static inline struct hfi_capability *get_cap(struct venus_inst *inst, u32 type)
> +{
> +	struct venus_core *core = inst->core;
> +	struct venus_caps *caps;
> +	unsigned int i;
> +
> +	caps = venus_caps_by_codec(core, inst->hfi_codec, inst->session_type);
> +	if (!caps)
> +		return ERR_PTR(-EINVAL);
> +
> +	for (i = 0; i < caps->num_caps; i++) {
> +		if (caps->caps[i].capability_type == type)
> +			return &caps->caps[i];
> +	}
> +
> +	return ERR_PTR(-EINVAL);
> +}
> +
> +#define CAP_MIN(inst, type)	((get_cap(inst, type))->min)
> +#define CAP_MAX(inst, type)	((get_cap(inst, type))->max)
> +#define CAP_STEP(inst, type)	((get_cap(inst, type))->step_size)
> +
> +#define FRAME_WIDTH_MIN(inst)	CAP_MIN(inst, HFI_CAPABILITY_FRAME_WIDTH)
> +#define FRAME_WIDTH_MAX(inst)	CAP_MAX(inst, HFI_CAPABILITY_FRAME_WIDTH)
> +#define FRAME_WIDTH_STEP(inst)	CAP_STEP(inst, HFI_CAPABILITY_FRAME_WIDTH)
> +
> +#define FRAME_HEIGHT_MIN(inst)	CAP_MIN(inst, HFI_CAPABILITY_FRAME_HEIGHT)
> +#define FRAME_HEIGHT_MAX(inst)	CAP_MAX(inst, HFI_CAPABILITY_FRAME_HEIGHT)
> +#define FRAME_HEIGHT_STEP(inst)	CAP_STEP(inst, HFI_CAPABILITY_FRAME_HEIGHT)
> +
> +#define FRATE_MIN(inst)		CAP_MIN(inst, HFI_CAPABILITY_FRAMERATE)
> +#define FRATE_MAX(inst)		CAP_MAX(inst, HFI_CAPABILITY_FRAMERATE)
> +#define FRATE_STEP(inst)	CAP_STEP(inst, HFI_CAPABILITY_FRAMERATE)
> +
> +#endif

When compiling vdec.c and venc.c with smatch I get a whole bunch of:

drivers/media/platform/qcom/venus/hfi_parser.h:17:14: error: not an lvalue
drivers/media/platform/qcom/venus/hfi_parser.h:21:16: error: not an lvalue
drivers/media/platform/qcom/venus/hfi_parser.h:17:14: error: not an lvalue
drivers/media/platform/qcom/venus/hfi_parser.h:21:16: error: not an lvalue

To be honest I don't quite understand what is happening here.

What I DO see is that get_cap can return ERR_PTR, but the CAP_MIN/MAX/STEP macros
do not test for that. It doesn't feel right, I think it might be better if you
move get_cap into the source and provide little cap_min/max/step inlines that
properly test the return code of get_cap and return 0 or something on error.

This is the command line I use to test with smatch:

make W=1 C=1 CHECK="smatch -p=kernel" drivers/media/platform/qcom/venus/

I use smatch from here:

https://git.linuxtv.org/mchehab/smatch.git/

Otherwise everything looked good for this series, but I think this needs to
be fixed.

Regards,

	Hans