From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 17992A04F3; Wed, 8 Jan 2020 16:09:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E14CA1D6C3; Wed, 8 Jan 2020 16:09:09 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 73D891D679 for ; Wed, 8 Jan 2020 16:09:08 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2020 07:09:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,410,1571727600"; d="scan'208";a="215978307" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.237.221.35]) ([10.237.221.35]) by orsmga008.jf.intel.com with ESMTP; 08 Jan 2020 07:09:06 -0800 From: Ferruh Yigit To: Raslan Darawsheh , Tonghao Zhang , Suanming Mou Cc: Matan Azrad , Shahaf Shuler , "dev@dpdk.org" References: <1576246894-31496-1-git-send-email-xiangxia.m.yue@gmail.com> <6eeae27d-afe4-a72b-584a-20c9e7fb39a5@intel.com> Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= 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 cA== Message-ID: <96461808-c1dd-48cc-8d24-bc8921eae836@intel.com> Date: Wed, 8 Jan 2020 15:09:05 +0000 MIME-Version: 1.0 In-Reply-To: <6eeae27d-afe4-a72b-584a-20c9e7fb39a5@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH v2] net/mlx5: avoid crash when meter action conf is NULL X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 On Behalf Of Tonghao Zhang >>> Sent: Tuesday, January 7, 2020 8:39 AM >>> To: Suanming Mou >>> Cc: Matan Azrad ; Shahaf Shuler >>> ; dev@dpdk.org >>> 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 >>> wrote: >>>> >>>> >>>>> -----Original Message----- >>>>> From: Tonghao Zhang >>>>> Sent: Monday, December 16, 2019 9:29 AM >>>>> To: Matan Azrad ; Shahaf Shuler >>>>> >>>>> Cc: dev@dpdk.org; Suanming Mou >>>>> Subject: Re: [PATCH v2] net/mlx5: avoid crash when meter action conf is >>>>> NULL >>>>> >>>>> On Fri, Dec 13, 2019 at 10:21 PM wrote: >>>>>> >>>>>> From: Tonghao Zhang >>>>>> >>>>>> 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 >>>>>> >>>>>> Signed-off-by: Tonghao Zhang >>>>>> --- >>>>>> 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 >>> 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?