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 69D82A0528; Mon, 20 Jan 2020 14:06:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 383552BF1; Mon, 20 Jan 2020 14:06:50 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70057.outbound.protection.outlook.com [40.107.7.57]) by dpdk.org (Postfix) with ESMTP id 9561511A4; Mon, 20 Jan 2020 14:06:48 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=STw/VF9QC7XGaKbJheWTKR7uhXQx6em9zH2J/jwcb2hwXvEI8VvpRhdbj59ynpcaxVdaano4WS8MhLznI8prph0DY+MyqNnNxKGIRkOqlm6AYchGgY67I3Q4k6OzpvKiCM8mm/uN0EJi8tTFcw2BvCnKgoSRdIYaZ3zCa6XF7sh4EjM8tYadHMWD6xXOmgsJfV+mwp7vkfFTcUFLPutcA/gcjxgG+tbHktBS90TjuVFyYtP4EDs3ZwyhVp1TK5eH1EUjHMEGkzzKX4aSqHK93cXgU4I9bx++TkagbVxIYQtdS6CHDv4Qk03I5+KHwTRijytMYVZzwUYaAMyd+bZvHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=27yay4fWI0PWQoM3hjYtqpaB7HP42DYLT5hoIi3cK2g=; b=BpYane+kZWG5UEWm91YvGxLM7BIdzQhlUkrePfPQXRlay649xKN2bS/Bn7tN1g04eAbIJT8xUUoDCQ3Kba0XJD2SuwFo5jmTQ09PxJWqaCgfKzmkpFHwSNKEYA9xtGBntWdEDkDl62DffSVYHfk2cuND+6Yml9FQ5qG5KmwUPZzMGfDbmLndEH08le/CzsRuqaW3fHkrYAqkqPvb6ZWzNR9cgRTuCuZqj9ovKeF3eaTLWXrrz2O34YD3Qw9QIo2aKbZDed74l1ddM+8KY0Hbg7aaqXrQBD/VrhNjNXlfsLjsI+bLwApV4bhyjUtELRd9qZSIf0OjeVV4sjRqE9L82w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=27yay4fWI0PWQoM3hjYtqpaB7HP42DYLT5hoIi3cK2g=; b=KuxNsgW+Dtg67ACURZR7GJCASv46rvVvhesav3axAsNf/YULrIrvWhY3U7p+9ONq0EC8aJTxVWLN64LSppcCDdPX954Bm8NzVbr89tqC/1xtzPWAxsvUh2oNN3Ih9zLEiSSekDyov2qfh6VSVKmxzMEWDDGu1XHTyaWh1V4tRVI= Received: from AM4PR05MB3265.eurprd05.prod.outlook.com (10.171.188.154) by AM4PR05MB3316.eurprd05.prod.outlook.com (10.171.187.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20; Mon, 20 Jan 2020 13:06:47 +0000 Received: from AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::68eb:ad79:71f4:110f]) by AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::68eb:ad79:71f4:110f%3]) with mapi id 15.20.2644.024; Mon, 20 Jan 2020 13:06:47 +0000 From: Slava Ovsiienko To: Ori Kam , Bing Zhao , Raslan Darawsheh , Matan Azrad CC: "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH v3] net/mlx5: fix modify actions support limitation Thread-Index: AQHVz3YN388eJsI30EWgeX2fZZxjYafzhQ+AgAAA3FA= Date: Mon, 20 Jan 2020 13:06:47 +0000 Message-ID: References: <1578844612-153139-1-git-send-email-bingz@mellanox.com> <1579513387-138985-1-git-send-email-bingz@mellanox.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=viacheslavo@mellanox.com; x-originating-ip: [77.75.144.194] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a106c222-ffb5-46ef-5d89-08d79da99b23 x-ms-traffictypediagnostic: AM4PR05MB3316:|AM4PR05MB3316: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3044; x-forefront-prvs: 0288CD37D9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(376002)(39860400002)(346002)(136003)(396003)(366004)(199004)(189003)(53546011)(30864003)(6506007)(66946007)(64756008)(66556008)(52536014)(54906003)(55016002)(66476007)(110136005)(71200400001)(86362001)(66446008)(7696005)(33656002)(76116006)(8676002)(81156014)(5660300002)(186003)(478600001)(8936002)(81166006)(2906002)(26005)(6636002)(9686003)(450100002)(4326008)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3316; H:AM4PR05MB3265.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: SblU535KHltHc4ug58vIg4Hh6LSMYutm0kFIqbSV82EwvprV90zKQZ1bzF/ImasIVTRBGdLKc7nbLn7BR3XUgs7Yp8svfPna9A8jCA/KkNv5LGNIi7pFWVubIlaVnlaxbM4xLvIhHuzfPCvdm6Lr1MX0oGJ+V75n7+EulWDemp1D6co3/e8vL1ZsNLayTeMhXScqIxnexO64mACWRnPHfvxKYL2q+ItptHDtgHu6UFOcmwW8WD1wC+6sbWgLBlr6vdkOJVKUc722CJINYSJwjETvpYJmDge5E73RSy+Gd46SrsK4eUCt6qMWLU6jsPZG5mudBXREQIzbewpqVuSCD8/QixxLI/bpkVn/03Js6OgZThmmvRZiNj2ByXOv6VOgoFJcqVd8eGAe3KybGBIj4SanSoL8UcC2Ko82EOxXdIn94SCyxVNsIqxnugFJOIGG Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a106c222-ffb5-46ef-5d89-08d79da99b23 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jan 2020 13:06:47.2615 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: u3isZtpccqarn5ZjUulaAPfJ80MJVa3Nw1vKaMOKWSVuAbgen/kRttxEzsWJpE0e0DOJ7+VHoeC7ME8jX0qYNWBkh9NC2Hij2PzpYhNNDQE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3316 Subject: Re: [dpdk-dev] [PATCH v3] net/mlx5: fix modify actions support limitation 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" > -----Original Message----- > From: Ori Kam > Sent: Monday, January 20, 2020 15:03 > To: Bing Zhao ; Slava Ovsiienko > ; Raslan Darawsheh ; > Matan Azrad > Cc: dev@dpdk.org; stable@dpdk.org > Subject: RE: [PATCH v3] net/mlx5: fix modify actions support limitation >=20 >=20 >=20 > > -----Original Message----- > > From: Bing Zhao > > Sent: Monday, January 20, 2020 11:43 AM > > To: Ori Kam ; Slava Ovsiienko > > ; Raslan Darawsheh ; > > Matan Azrad > > Cc: dev@dpdk.org; stable@dpdk.org > > Subject: [PATCH v3] net/mlx5: fix modify actions support limitation > > > > In the root table, there is some limitation of total number of header > > modify actions, 16 or 8 for each. But in other tables, there is no > > such strict limitation. In an IPv6 case, the IP fields modifying will > > occupy more actions than that in IPv4, so the total support number > > should be increased in order to support as many actions as possible > > for an IPv6 + TCP packet. > > And in the meanwhile, the memory consumption should also be taken into > > consideration because sometimes only several actions are needed. > > The root table checking could also be done in low layer driver and the > > error code will be returned if the actions number is over the maximal > > supported value. > > > > Fixes: 0e9d00027686 ("net/mlx5: check maximum modify actions number") > > Signed-off-by: Bing Zhao > > --- > Acked-by: Ori Kam Acked-by: Viacheslav Ovsiienko > Thanks, > Ori >=20 >=20 > > drivers/net/mlx5/mlx5_flow.h | 15 +++--- > > drivers/net/mlx5/mlx5_flow_dv.c | 108 ++++++++++++++++++++++--------- > > --------- > > 2 files changed, 68 insertions(+), 55 deletions(-) > > > > diff --git a/drivers/net/mlx5/mlx5_flow.h > > b/drivers/net/mlx5/mlx5_flow.h index e42c98a..2e94371 100644 > > --- a/drivers/net/mlx5/mlx5_flow.h > > +++ b/drivers/net/mlx5/mlx5_flow.h > > @@ -389,11 +389,14 @@ struct mlx5_flow_dv_tag_resource { > > > > /* > > * Number of modification commands. > > - * If extensive metadata registers are supported > > - * the maximal actions amount is 16 and 8 otherwise. > > + * If extensive metadata registers are supported, the maximal actions > > amount is > > + * 16 and 8 otherwise on root table. The validation could also be > > + done in the > > + * lower driver layer. > > + * On non-root table, there is no limitation, but 32 is enough right n= ow. > > */ > > -#define MLX5_MODIFY_NUM 16 > > -#define MLX5_MODIFY_NUM_NO_MREG 8 > > +#define MLX5_MAX_MODIFY_NUM 32 > > +#define MLX5_ROOT_TBL_MODIFY_NUM 16 > > +#define MLX5_ROOT_TBL_MODIFY_NUM_NO_MREG 8 > > > > /* Modify resource structure */ > > struct mlx5_flow_dv_modify_hdr_resource { @@ -404,9 +407,9 @@ struct > > mlx5_flow_dv_modify_hdr_resource { > > /**< Verbs modify header action object. */ > > uint8_t ft_type; /**< Flow table type, Rx or Tx. */ > > uint32_t actions_num; /**< Number of modification actions. */ > > - struct mlx5_modification_cmd actions[MLX5_MODIFY_NUM]; > > - /**< Modification actions. */ > > uint64_t flags; /**< Flags for RDMA API. */ > > + struct mlx5_modification_cmd actions[]; > > + /**< Modification actions. */ > > }; > > > > /* Jump action resource structure. */ diff --git > > a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c > > index c02517a..eec4c72 100644 > > --- a/drivers/net/mlx5/mlx5_flow_dv.c > > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > > @@ -365,7 +365,7 @@ struct field_modify_info modify_tcp[] =3D { > > uint32_t mask; > > uint32_t data; > > > > - if (i >=3D MLX5_MODIFY_NUM) > > + if (i >=3D MLX5_MAX_MODIFY_NUM) > > return rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_ACTION, NULL, > > "too many items to modify"); > > @@ -406,11 +406,11 @@ struct field_modify_info modify_tcp[] =3D { > > ++i; > > ++field; > > } while (field->size); > > - resource->actions_num =3D i; > > - if (!resource->actions_num) > > + if (resource->actions_num =3D=3D i) > > return rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_ACTION, > > NULL, > > "invalid modification flow item"); > > + resource->actions_num =3D i; > > return 0; > > } > > > > @@ -571,7 +571,7 @@ struct field_modify_info modify_tcp[] =3D { > > struct mlx5_modification_cmd *actions =3D &resource->actions[i]; > > struct field_modify_info *field =3D modify_vlan_out_first_vid; > > > > - if (i >=3D MLX5_MODIFY_NUM) > > + if (i >=3D MLX5_MAX_MODIFY_NUM) > > return rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_ACTION, NULL, > > "too many items to modify"); > > @@ -904,7 +904,7 @@ struct field_modify_info modify_tcp[] =3D { > > struct mlx5_modification_cmd *actions =3D resource->actions; > > uint32_t i =3D resource->actions_num; > > > > - if (i >=3D MLX5_MODIFY_NUM) > > + if (i >=3D MLX5_MAX_MODIFY_NUM) > > return rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_ACTION, > > NULL, > > "too many items to modify"); > > @@ -916,10 +916,6 @@ struct field_modify_info modify_tcp[] =3D { > > actions[i].data1 =3D rte_cpu_to_be_32(conf->data); > > ++i; > > resource->actions_num =3D i; > > - if (!resource->actions_num) > > - return rte_flow_error_set(error, EINVAL, > > - RTE_FLOW_ERROR_TYPE_ACTION, > > NULL, > > - "invalid modification flow item"); > > return 0; > > } > > > > @@ -2334,7 +2330,6 @@ struct field_modify_info modify_tcp[] =3D { > > domain =3D sh->rx_domain; > > else > > domain =3D sh->tx_domain; > > - > > /* Lookup a matching resource from cache. */ > > LIST_FOREACH(cache_resource, &sh->encaps_decaps, next) { > > if (resource->reformat_type =3D=3D cache_resource- > > >reformat_type && > > @@ -3445,21 +3440,27 @@ struct field_modify_info modify_tcp[] =3D { > > * > > * @param dev > > * Pointer to rte_eth_dev structure. > > + * @param flags > > + * Flags bits to check if root level. > > * > > * @return > > * Max number of modify header actions device can support. > > */ > > static unsigned int > > -flow_dv_modify_hdr_action_max(struct rte_eth_dev *dev) > > +flow_dv_modify_hdr_action_max(struct rte_eth_dev *dev, uint64_t > > +flags) > > { > > /* > > * There's no way to directly query the max cap. Although it has to b= e > > * acquried by iterative trial, it is a safe assumption that more > > * actions are supported by FW if extensive metadata register is > > - * supported. > > + * supported. (Only in the root table) > > */ > > - return mlx5_flow_ext_mreg_supported(dev) ? > > MLX5_MODIFY_NUM : > > - > > MLX5_MODIFY_NUM_NO_MREG; > > + if (!(flags & MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL)) > > + return MLX5_MAX_MODIFY_NUM; > > + else > > + return mlx5_flow_ext_mreg_supported(dev) ? > > + MLX5_ROOT_TBL_MODIFY_NUM : > > + > > MLX5_ROOT_TBL_MODIFY_NUM_NO_MREG; > > } > > > > /** > > @@ -3618,8 +3619,12 @@ struct field_modify_info modify_tcp[] =3D { > > struct mlx5_ibv_shared *sh =3D priv->sh; > > struct mlx5_flow_dv_modify_hdr_resource *cache_resource; > > struct mlx5dv_dr_domain *ns; > > + uint32_t actions_len; > > > > - if (resource->actions_num > > > flow_dv_modify_hdr_action_max(dev)) > > + resource->flags =3D > > + dev_flow->group ? 0 : > > MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL; > > + if (resource->actions_num > flow_dv_modify_hdr_action_max(dev, > > + resource->flags)) > > return rte_flow_error_set(error, EOVERFLOW, > > RTE_FLOW_ERROR_TYPE_ACTION, > > NULL, > > "too many modify header items"); > @@ -3629,17 +3634,15 @@ > > struct field_modify_info modify_tcp[] =3D { > > ns =3D sh->tx_domain; > > else > > ns =3D sh->rx_domain; > > - resource->flags =3D > > - dev_flow->group ? 0 : > > MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL; > > /* Lookup a matching resource from cache. */ > > + actions_len =3D resource->actions_num * sizeof(resource->actions[0]); > > LIST_FOREACH(cache_resource, &sh->modify_cmds, next) { > > if (resource->ft_type =3D=3D cache_resource->ft_type && > > resource->actions_num =3D=3D cache_resource->actions_num > && > > resource->flags =3D=3D cache_resource->flags && > > !memcmp((const void *)resource->actions, > > (const void *)cache_resource->actions, > > - (resource->actions_num * > > - sizeof(resource->actions[0])))) { > > + actions_len)) { > > DRV_LOG(DEBUG, "modify-header resource %p: > > refcnt %d++", > > (void *)cache_resource, > > rte_atomic32_read(&cache_resource- > > >refcnt)); > > @@ -3649,18 +3652,18 @@ struct field_modify_info modify_tcp[] =3D { > > } > > } > > /* Register new modify-header resource. */ > > - cache_resource =3D rte_calloc(__func__, 1, sizeof(*cache_resource), > > 0); > > + cache_resource =3D rte_calloc(__func__, 1, > > + sizeof(*cache_resource) + actions_len, 0); > > if (!cache_resource) > > return rte_flow_error_set(error, ENOMEM, > > > > RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, > > "cannot allocate resource > > memory"); > > *cache_resource =3D *resource; > > + rte_memcpy(cache_resource->actions, resource->actions, > > actions_len); > > cache_resource->verbs_action =3D > > mlx5_glue->dv_create_flow_action_modify_header > > - (sh->ctx, cache_resource->ft_type, > > - ns, cache_resource->flags, > > - cache_resource->actions_num * > > - sizeof(cache_resource->actions[0]), > > + (sh->ctx, cache_resource->ft_type, > > ns, > > + cache_resource->flags, actions_len, > > (uint64_t *)cache_resource- > > >actions); > > if (!cache_resource->verbs_action) { > > rte_free(cache_resource); > > @@ -6911,10 +6914,13 @@ struct field_modify_info modify_tcp[] =3D { > > }; > > int actions_n =3D 0; > > bool actions_end =3D false; > > - struct mlx5_flow_dv_modify_hdr_resource mhdr_res =3D { > > - .ft_type =3D attr->egress ? > > MLX5DV_FLOW_TABLE_TYPE_NIC_TX : > > - > > MLX5DV_FLOW_TABLE_TYPE_NIC_RX > > - }; > > + union { > > + struct mlx5_flow_dv_modify_hdr_resource res; > > + uint8_t len[sizeof(struct > > mlx5_flow_dv_modify_hdr_resource) + > > + sizeof(struct mlx5_modification_cmd) * > > + (MLX5_MAX_MODIFY_NUM + 1)]; > > + } mhdr_dummy; > > + struct mlx5_flow_dv_modify_hdr_resource *mhdr_res =3D > > &mhdr_dummy.res; > > union flow_dv_attr flow_attr =3D { .attr =3D 0 }; > > uint32_t tag_be; > > union mlx5_flow_tbl_key tbl_key; > > @@ -6926,15 +6932,19 @@ struct field_modify_info modify_tcp[] =3D { > > uint32_t table; > > int ret =3D 0; > > > > + mhdr_res->ft_type =3D attr->egress ? > > MLX5DV_FLOW_TABLE_TYPE_NIC_TX : > > + > > MLX5DV_FLOW_TABLE_TYPE_NIC_RX; > > ret =3D mlx5_flow_group_to_table(attr, dev_flow->external, attr- > > >group, > > &table, error); > > if (ret) > > return ret; > > dev_flow->group =3D table; > > if (attr->transfer) > > - mhdr_res.ft_type =3D MLX5DV_FLOW_TABLE_TYPE_FDB; > > + mhdr_res->ft_type =3D MLX5DV_FLOW_TABLE_TYPE_FDB; > > if (priority =3D=3D MLX5_FLOW_PRIO_RSVD) > > priority =3D dev_conf->flow_prio - 1; > > + /* number of actions must be set to 0 in case of dirty stack. */ > > + mhdr_res->actions_num =3D 0; > > for (; !actions_end ; actions++) { > > const struct rte_flow_action_queue *queue; > > const struct rte_flow_action_rss *rss; @@ -6972,7 +6982,7 > @@ struct > > field_modify_info modify_tcp[] =3D { > > }; > > > > if (flow_dv_convert_action_mark(dev, &mark, > > - &mhdr_res, > > + mhdr_res, > > error)) > > return -rte_errno; > > action_flags |=3D > > MLX5_FLOW_ACTION_MARK_EXT; > > @@ -6994,7 +7004,7 @@ struct field_modify_info modify_tcp[] =3D { > > actions->conf; > > > > if (flow_dv_convert_action_mark(dev, mark, > > - &mhdr_res, > > + mhdr_res, > > error)) > > return -rte_errno; > > action_flags |=3D > > MLX5_FLOW_ACTION_MARK_EXT; > > @@ -7015,7 +7025,7 @@ struct field_modify_info modify_tcp[] =3D { > > break; > > case RTE_FLOW_ACTION_TYPE_SET_META: > > if (flow_dv_convert_action_set_meta > > - (dev, &mhdr_res, attr, > > + (dev, mhdr_res, attr, > > (const struct rte_flow_action_set_meta *) > > actions->conf, error)) > > return -rte_errno; > > @@ -7023,7 +7033,7 @@ struct field_modify_info modify_tcp[] =3D { > > break; > > case RTE_FLOW_ACTION_TYPE_SET_TAG: > > if (flow_dv_convert_action_set_tag > > - (dev, &mhdr_res, > > + (dev, mhdr_res, > > (const struct rte_flow_action_set_tag *) > > actions->conf, error)) > > return -rte_errno; > > @@ -7123,7 +7133,7 @@ struct field_modify_info modify_tcp[] =3D { > > mlx5_update_vlan_vid_pcp(actions, &vlan); > > /* If no VLAN push - this is a modify header action */ > > if (flow_dv_convert_action_modify_vlan_vid > > - (&mhdr_res, actions, error)) > > + (mhdr_res, actions, error)) > > return -rte_errno; > > action_flags |=3D > > MLX5_FLOW_ACTION_OF_SET_VLAN_VID; > > break; > > @@ -7222,7 +7232,7 @@ struct field_modify_info modify_tcp[] =3D { > > case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: > > case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: > > if (flow_dv_convert_action_modify_mac > > - (&mhdr_res, actions, error)) > > + (mhdr_res, actions, error)) > > return -rte_errno; > > action_flags |=3D actions->type =3D=3D > > > > RTE_FLOW_ACTION_TYPE_SET_MAC_SRC ? > > @@ -7232,7 +7242,7 @@ struct field_modify_info modify_tcp[] =3D { > > case RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC: > > case RTE_FLOW_ACTION_TYPE_SET_IPV4_DST: > > if (flow_dv_convert_action_modify_ipv4 > > - (&mhdr_res, actions, error)) > > + (mhdr_res, actions, error)) > > return -rte_errno; > > action_flags |=3D actions->type =3D=3D > > > > RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC ? > > @@ -7242,7 +7252,7 @@ struct field_modify_info modify_tcp[] =3D { > > case RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC: > > case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST: > > if (flow_dv_convert_action_modify_ipv6 > > - (&mhdr_res, actions, error)) > > + (mhdr_res, actions, error)) > > return -rte_errno; > > action_flags |=3D actions->type =3D=3D > > > > RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC ? > > @@ -7252,7 +7262,7 @@ struct field_modify_info modify_tcp[] =3D { > > case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: > > case RTE_FLOW_ACTION_TYPE_SET_TP_DST: > > if (flow_dv_convert_action_modify_tp > > - (&mhdr_res, actions, items, > > + (mhdr_res, actions, items, > > &flow_attr, error)) > > return -rte_errno; > > action_flags |=3D actions->type =3D=3D > > @@ -7262,13 +7272,13 @@ struct field_modify_info modify_tcp[] =3D { > > break; > > case RTE_FLOW_ACTION_TYPE_DEC_TTL: > > if (flow_dv_convert_action_modify_dec_ttl > > - (&mhdr_res, items, &flow_attr, > > error)) > > + (mhdr_res, items, &flow_attr, error)) > > return -rte_errno; > > action_flags |=3D MLX5_FLOW_ACTION_DEC_TTL; > > break; > > case RTE_FLOW_ACTION_TYPE_SET_TTL: > > if (flow_dv_convert_action_modify_ttl > > - (&mhdr_res, actions, items, > > + (mhdr_res, actions, items, > > &flow_attr, error)) > > return -rte_errno; > > action_flags |=3D MLX5_FLOW_ACTION_SET_TTL; @@ - > 7276,7 +7286,7 @@ > > struct field_modify_info modify_tcp[] =3D { > > case RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ: > > case RTE_FLOW_ACTION_TYPE_DEC_TCP_SEQ: > > if (flow_dv_convert_action_modify_tcp_seq > > - (&mhdr_res, actions, error)) > > + (mhdr_res, actions, error)) > > return -rte_errno; > > action_flags |=3D actions->type =3D=3D > > > > RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ ? > > @@ -7287,7 +7297,7 @@ struct field_modify_info modify_tcp[] =3D { > > case RTE_FLOW_ACTION_TYPE_INC_TCP_ACK: > > case RTE_FLOW_ACTION_TYPE_DEC_TCP_ACK: > > if (flow_dv_convert_action_modify_tcp_ack > > - (&mhdr_res, actions, error)) > > + (mhdr_res, actions, error)) > > return -rte_errno; > > action_flags |=3D actions->type =3D=3D > > > > RTE_FLOW_ACTION_TYPE_INC_TCP_ACK ? > > @@ -7296,13 +7306,13 @@ struct field_modify_info modify_tcp[] =3D { > > break; > > case MLX5_RTE_FLOW_ACTION_TYPE_TAG: > > if (flow_dv_convert_action_set_reg > > - (&mhdr_res, actions, error)) > > + (mhdr_res, actions, error)) > > return -rte_errno; > > action_flags |=3D MLX5_FLOW_ACTION_SET_TAG; > > break; > > case MLX5_RTE_FLOW_ACTION_TYPE_COPY_MREG: > > if (flow_dv_convert_action_copy_mreg > > - (dev, &mhdr_res, actions, error)) > > + (dev, mhdr_res, actions, error)) > > return -rte_errno; > > action_flags |=3D MLX5_FLOW_ACTION_SET_TAG; > > break; > > @@ -7326,23 +7336,23 @@ struct field_modify_info modify_tcp[] =3D { > > action_flags |=3D MLX5_FLOW_ACTION_METER; > > break; > > case RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP: > > - if > > (flow_dv_convert_action_modify_ipv4_dscp(&mhdr_res, > > + if > > (flow_dv_convert_action_modify_ipv4_dscp(mhdr_res, > > actions, error)) > > return -rte_errno; > > action_flags |=3D > > MLX5_FLOW_ACTION_SET_IPV4_DSCP; > > break; > > case RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP: > > - if > > (flow_dv_convert_action_modify_ipv6_dscp(&mhdr_res, > > + if > > (flow_dv_convert_action_modify_ipv6_dscp(mhdr_res, > > actions, error)) > > return -rte_errno; > > action_flags |=3D > > MLX5_FLOW_ACTION_SET_IPV6_DSCP; > > break; > > case RTE_FLOW_ACTION_TYPE_END: > > actions_end =3D true; > > - if (mhdr_res.actions_num) { > > + if (mhdr_res->actions_num) { > > /* create modify action if needed. */ > > if (flow_dv_modify_hdr_resource_register > > - (dev, &mhdr_res, dev_flow, error)) > > + (dev, mhdr_res, dev_flow, error)) > > return -rte_errno; > > dev_flow- > > >dv.actions[modify_action_position] =3D > > dev_flow->dv.modify_hdr- > > >verbs_action; > > @@ -7351,7 +7361,7 @@ struct field_modify_info modify_tcp[] =3D { > > default: > > break; > > } > > - if (mhdr_res.actions_num && > > + if (mhdr_res->actions_num && > > modify_action_position =3D=3D UINT32_MAX) > > modify_action_position =3D actions_n++; > > } > > -- > > 1.8.3.1