On 1/8/2020 2:38 PM, Ferruh Yigit wrote: > On 1/8/2020 9:17 AM, Raslan Darawsheh wrote: >> Hi, >> >>> -----Original Message----- >>> From: dev <[email protected]> On Behalf Of Tonghao Zhang >>> Sent: Tuesday, January 7, 2020 8:39 AM >>> To: Suanming Mou <[email protected]> >>> Cc: Matan Azrad <[email protected]>; Shahaf Shuler >>> <[email protected]>; [email protected] >>> Subject: Re: [dpdk-dev] [PATCH v2] net/mlx5: avoid crash when meter action >>> conf is NULL >>> >>> On Mon, Dec 16, 2019 at 2:50 PM Suanming Mou >>> <[email protected]> wrote: >>>> >>>> >>>>> -----Original Message----- >>>>> From: Tonghao Zhang <[email protected]> >>>>> Sent: Monday, December 16, 2019 9:29 AM >>>>> To: Matan Azrad <[email protected]>; Shahaf Shuler >>>>> <[email protected]> >>>>> Cc: [email protected]; Suanming Mou <[email protected]> >>>>> Subject: Re: [PATCH v2] net/mlx5: avoid crash when meter action conf is >>>>> NULL >>>>> >>>>> On Fri, Dec 13, 2019 at 10:21 PM <[email protected]> wrote: >>>>>> >>>>>> From: Tonghao Zhang <[email protected]> >>>>>> >>>>>> When offloading the meter, should check the action conf and make >>> sure >>>>>> it is valid. >>>>>> >>>>>> Fixes: f46bf7488705 ("net/mlx5: support meter flow action") >>>>>> Cc: Suanming Mou <[email protected]> >>>>>> >>>>>> Signed-off-by: Tonghao Zhang <[email protected]> >>>>>> --- >>>>>> v2: coding style issues: >>>>>> >>> https://eur03.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch >>>>>> >>>>> >>> es.dpdk.org%2Fpatch%2F63849%2F&data=02%7C01%7Csuanmingm%4 >>>>> 0mellanox >>>>>> >>> .com%7C65507f811a6c4e942c1d08d781c77b2a%7Ca652971c7d2e4d9ba6a4 >>>>> d149256f >>>>>> >>>>> >>> 461b%7C0%7C0%7C637120566090170306&sdata=0qTU8puaLH8IQkUm >>>>> %2B4nIDG8G >>>>>> 3dTi9ktvYKp%2BcxJ8dE4%3D&reserved=0 >>>>>> --- >>>>>> drivers/net/mlx5/mlx5_flow_dv.c | 9 ++++++++- >>>>>> 1 file changed, 8 insertions(+), 1 deletion(-) >>>>>> >>>>>> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c >>>>>> b/drivers/net/mlx5/mlx5_flow_dv.c index 73aaea4..7528556 100644 >>>>>> --- a/drivers/net/mlx5/mlx5_flow_dv.c >>>>>> +++ b/drivers/net/mlx5/mlx5_flow_dv.c >>>>>> @@ -3402,7 +3402,12 @@ struct field_modify_info modify_tcp[] = { { >>>>>> struct mlx5_priv *priv = dev->data->dev_private; >>>>>> const struct rte_flow_action_meter *am = action->conf; >>>>>> - struct mlx5_flow_meter *fm = mlx5_flow_meter_find(priv, am- >>>>>> mtr_id); >>>>>> + struct mlx5_flow_meter *fm; >>>>>> + >>>>>> + if (!am) >>>>>> + return rte_flow_error_set(error, EINVAL, >>>>>> + RTE_FLOW_ERROR_TYPE_ACTION, >>>>>> NULL, >>>>>> + "meter action conf is >>>>>> + NULL"); >>>>>> >>>>>> if (action_flags & MLX5_FLOW_ACTION_METER) >>>>>> return rte_flow_error_set(error, ENOTSUP, @@ -3417,6 >>>>>> +3422,8 @@ struct field_modify_info modify_tcp[] = { >>>>>> >>>>>> RTE_FLOW_ERROR_TYPE_UNSPECIFIED, >>>>>> NULL, >>>>>> "meter action not >>>>>> supported"); >>>>>> + >>>> >>>> Redundant empty line. >>>> Reviewed-by: Suanming Mou <[email protected]> >>> so this patch will be applied ? >>>>>> + fm = mlx5_flow_meter_find(priv, am->mtr_id); >>>>>> if (!fm) >>>>>> return rte_flow_error_set(error, EINVAL, >>>>>> RTE_FLOW_ERROR_TYPE_ACTION, >>>>>> NULL, >>>>>> -- >>>>>> 1.8.3.1 >>>>>> >>>>> ping >> >> >> Removed redundant empty line and applied patch to next-net-mlx, >> > > Hi Raslan, > > The stable tag seems missing, can you please add it in your tree? Also can you > please drop the cc'ed names from commit log while merging? >
Also can you please prefer the 'fix' instead of 'avoid', 'fix' became kind of keyword we are using, so better to stick to it for consistency, can you please fix in you tree?
