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 B82D0A0520; Sun, 19 Jan 2020 17:21:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BD1F71E34; Sun, 19 Jan 2020 17:21:19 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150051.outbound.protection.outlook.com [40.107.15.51]) by dpdk.org (Postfix) with ESMTP id CCF761515; Sun, 19 Jan 2020 17:21:17 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aoTTxki01GucJQxWxdFb2LdTETlQtN7QmJED3vprFluDD+d/7TmNI9Oy8J+2FycQ2ck2hNbZjSXoRMXilPLg2AbAcc1spyXpr5MDvk4mUV3uWsIznMsLPDO9gpKsRTYn/gUktxgIvpMnbT+6oiN54FgnbemgzZzjwN1B92NsTDZhndN7tScIfbQLS36fAdReYQCdXc7loBEGtwlxCb/egEfIfYODKlbaPDUt27hzSfe7Hg08RmO8YylUh+kSkNW4rFi7EeZhmKBIQmiuGzRrObr/yipbNCUjRZQdhreVGq3C1PgtSEr0wcOWNB9kYlFGc3Zx/mzBDXqI0d8TCyIhjw== 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=HINtgZD4T6Idi5ONmbzJeXV5ML6104Fus7SggePiF8s=; b=AVBCiLjK0bCHE2B8SBXCDiJz/CNlonCPtXZYLrX5Yg0p0EmohRJcwh8Kyi9Gu0FJz1/qC7Js0zzjq24nFKnDYxmK2ZM4XBtiRuLEGw7SEa5AIIlWw0wUVI7Er9MhHS8N26UUzE1KE82hEQ2U4c3YgZNz/WWGr77PdqSKmcla1UzQPVH6olV6JOneaGY0X8KphucSye/S/Z234bqUnjKr3hy9ZO/6fTN/lAMfzc35b50t3TFllP+YPMJyXI9oC4rGtAZTGITgYLcanEaNOOfx4u7y3joOApIQFp4Pbbr4Ot5QDNxEIecAhLhlwQDadpmAE+7gf7bVzKwJw5mZPnTWYQ== 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=HINtgZD4T6Idi5ONmbzJeXV5ML6104Fus7SggePiF8s=; b=OQf2/rO9fxCPLRT6ujm+b4TG8gLoydb53KfHfcXyGXqPt9BOa5GQRF4kqh3DF6gaGnqT8KeFquxR+Z4fKFJLINpSlYAgkmBY/Dk76VzvP3wuBxTsdP1hNpRyEII21qwloRByp3NH+nhPIRqHee3VdbGtH55IB6UjTx7pjFzz18E= Received: from AM0PR05MB6707.eurprd05.prod.outlook.com (10.186.174.145) by AM0PR05MB5011.eurprd05.prod.outlook.com (20.176.214.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19; Sun, 19 Jan 2020 16:21:15 +0000 Received: from AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::f0b7:a92b:aeb5:5761]) by AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::f0b7:a92b:aeb5:5761%5]) with mapi id 15.20.2644.024; Sun, 19 Jan 2020 16:21:15 +0000 From: Raslan Darawsheh To: Bing Zhao , Ori Kam , Slava Ovsiienko , Matan Azrad CC: "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH v2] net/mlx5: fix modify actions support limitation Thread-Index: AQHVyWDt4yui/B+dXU2kWyehM6mlg6fyNfIw Date: Sun, 19 Jan 2020 16:21:15 +0000 Message-ID: References: <1578292317-58225-1-git-send-email-bingz@mellanox.com> <1578844612-153139-1-git-send-email-bingz@mellanox.com> In-Reply-To: <1578844612-153139-1-git-send-email-bingz@mellanox.com> 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=rasland@mellanox.com; x-originating-ip: [212.29.221.74] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: bae75bea-d762-482b-f720-08d79cfb9b76 x-ms-traffictypediagnostic: AM0PR05MB5011:|AM0PR05MB5011: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6108; x-forefront-prvs: 0287BBA78D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(39860400002)(376002)(396003)(366004)(136003)(189003)(199004)(26005)(55016002)(86362001)(186003)(110136005)(64756008)(66556008)(5660300002)(30864003)(54906003)(66446008)(81166006)(81156014)(76116006)(8676002)(9686003)(8936002)(66946007)(33656002)(66476007)(53546011)(52536014)(2906002)(6506007)(316002)(71200400001)(7696005)(450100002)(4326008)(6636002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB5011; H:AM0PR05MB6707.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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: n0EAZkj1flOnhU1YA1aBBdW2oa3qMm/FVVl1XgY8igZT8jN+UfXaiNe7y8QGtISnJRjvgmsnPYC7eggcEvoC+FSxjzTfIsEIMvgC7EPXyrLgBvOzDLncd1kRPDxwU5V6Ktg+y7Vb8hveKWLqe9JXT48d9kVBs1yoA5pELcWMx0xnb7z8dYpyo/mvEzu6r4zTj6CSddldcSDnTqmMvjNXvtf4bgvq9n2taDTmNX8Ag/8GDPzN68JaDO7jBpSyxLgD1T/+YZi5NHv9GgAC8cQ8o6CiiScOetE23kruKgbw+tjKec+lTAI+g2LwhlKfKt+sYxFKcTpmNV3ng2+tuWxejrX7s6gagK2LCkP/WXap1+zCPQerwAA+QJbC+X/xfREKzUYO4dCJ7smI312IJRF9XQY1MdLx3Cg0tqI3igAh4qaBX1cx/hnq46WQz7ID+Qqw 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: bae75bea-d762-482b-f720-08d79cfb9b76 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2020 16:21:15.4427 (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: +j5OigjvUWg5ZbAFayMk1lPF+Az28szbJ3ycMMIgwxLgsaw9dd0x8MLnlFIVAsYhZi4jQ1c4wTn/q+9m/4nIug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5011 Subject: Re: [dpdk-dev] [PATCH v2] 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" Hi Bing, I see that your patch is causing some build failure on aarch64 with meson b= uild. -c ../../root/dpdk/drivers/net/mlx5/mlx5_flow_dv.c ../../root/dpdk/drivers/net/mlx5/mlx5_flow_dv.c: In function '__flow_dv_tra= nslate': ../../root/dpdk/drivers/net/mlx5/mlx5_flow_dv.c:7339:48: error: passing arg= ument 1 of 'flow_dv_convert_action_modify_ipv4_dscp' from incompatible poin= ter type [-Werror=3Dincompatible-pointer-types] if (flow_dv_convert_action_modify_ipv4_dscp(&mhdr_res, ^ ../../root/dpdk/drivers/net/mlx5/mlx5_flow_dv.c:1213:1: note: expected 'str= uct mlx5_flow_dv_modify_hdr_resource *' but argument is of type 'struct mlx= 5_flow_dv_modify_hdr_resource **' flow_dv_convert_action_modify_ipv4_dscp ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../root/dpdk/drivers/net/mlx5/mlx5_flow_dv.c:7345:48: error: passing arg= ument 1 of 'flow_dv_convert_action_modify_ipv6_dscp' from incompatible poin= ter type [-Werror=3Dincompatible-pointer-types] if (flow_dv_convert_action_modify_ipv6_dscp(&mhdr_res, ^ ../../root/dpdk/drivers/net/mlx5/mlx5_flow_dv.c:1248:1: note: expected 'str= uct mlx5_flow_dv_modify_hdr_resource *' but argument is of type 'struct mlx= 5_flow_dv_modify_hdr_resource **' flow_dv_convert_action_modify_ipv6_dscp ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors ninja: build stopped: subcommand failed. Can you please fix that and send a V3 for it ? Kindest regards, Raslan Darawsheh > -----Original Message----- > From: Bing Zhao > Sent: Sunday, January 12, 2020 5:57 PM > To: Ori Kam ; Slava Ovsiienko > ; Raslan Darawsheh ; > Matan Azrad > Cc: dev@dpdk.org; stable@dpdk.org > Subject: [PATCH v2] net/mlx5: fix modify actions support limitation >=20 > 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. >=20 > Fixes: 0e9d00027686 ("net/mlx5: check maximum modify actions number") > Signed-off-by: Bing Zhao > --- > drivers/net/mlx5/mlx5_flow.h | 15 +++--- > drivers/net/mlx5/mlx5_flow_dv.c | 104 ++++++++++++++++++++++--------- > --------- > 2 files changed, 66 insertions(+), 53 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index 27d82ac..4b493ee 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -385,11 +385,14 @@ struct mlx5_flow_dv_tag_resource { >=20 > /* > * 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 i= n the > + * lower driver layer. > + * On non-root table, there is no limitation, but 32 is enough right now= . > */ > -#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 >=20 > /* Modify resource structure */ > struct mlx5_flow_dv_modify_hdr_resource { > @@ -400,9 +403,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. */ > }; >=20 > /* Jump action resource structure. */ > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c > index e8a764c..398d60f 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -363,7 +363,7 @@ struct field_modify_info modify_tcp[] =3D { > uint32_t mask; > uint32_t data; >=20 > - 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"); > @@ -404,11 +404,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; > } >=20 > @@ -569,7 +569,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; >=20 > - 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"); > @@ -902,7 +902,7 @@ struct field_modify_info modify_tcp[] =3D { > struct mlx5_modification_cmd *actions =3D resource->actions; > uint32_t i =3D resource->actions_num; >=20 > - 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"); > @@ -914,10 +914,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; > } >=20 > @@ -2256,7 +2252,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 && > @@ -3367,21 +3362,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 be > * 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; > } >=20 > /** > @@ -3472,8 +3473,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; >=20 > - 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"); > @@ -3483,17 +3488,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)); > @@ -3503,18 +3506,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, >=20 > 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); > @@ -6739,10 +6742,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; > @@ -6754,15 +6760,19 @@ struct field_modify_info modify_tcp[] =3D { > uint32_t table; > int ret =3D 0; >=20 > + 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; > @@ -6800,7 +6810,7 @@ struct field_modify_info modify_tcp[] =3D { > }; >=20 > if (flow_dv_convert_action_mark(dev, > &mark, > - &mhdr_res, > + mhdr_res, > error)) > return -rte_errno; > action_flags |=3D > MLX5_FLOW_ACTION_MARK_EXT; > @@ -6822,7 +6832,7 @@ struct field_modify_info modify_tcp[] =3D { > actions->conf; >=20 > if (flow_dv_convert_action_mark(dev, mark, > - &mhdr_res, > + mhdr_res, > error)) > return -rte_errno; > action_flags |=3D > MLX5_FLOW_ACTION_MARK_EXT; > @@ -6843,7 +6853,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; > @@ -6851,7 +6861,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; > @@ -6951,7 +6961,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; > @@ -7050,7 +7060,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 >=20 > RTE_FLOW_ACTION_TYPE_SET_MAC_SRC ? > @@ -7060,7 +7070,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 >=20 > RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC ? > @@ -7070,7 +7080,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 >=20 > RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC ? > @@ -7080,7 +7090,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 > @@ -7090,13 +7100,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; > @@ -7104,7 +7114,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 >=20 > RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ ? > @@ -7115,7 +7125,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 >=20 > RTE_FLOW_ACTION_TYPE_INC_TCP_ACK ? > @@ -7124,13 +7134,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; > @@ -7155,10 +7165,10 @@ struct field_modify_info modify_tcp[] =3D { > 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; > @@ -7167,7 +7177,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