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 E8F72A0598 for ; Tue, 21 Apr 2020 16:59:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B04021D542; Tue, 21 Apr 2020 16:59:15 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150084.outbound.protection.outlook.com [40.107.15.84]) by dpdk.org (Postfix) with ESMTP id 074E71D532; Tue, 21 Apr 2020 16:59:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JLN+Hy0cGDTGtbwAK2J6ioSbeSbspwC2J3E75kyF9CdX2EjQIdFLC3bd+z5mP4XUm72sb44nMYy4+MXtggCCCh0CrHpA3RSgkqzG8GmTaPRn/lkpmF24ZiNa6RInM17ADWzJ2O8QgiTQMKWYeb4/yxajyCfYHffRyRpvK22UI4ZKTzI/+nsbcK8wpJrhlYfdm/mpZGJXHC5tNagVOmhc7mBTnKvjn/XfskKAQcY9vTElANkRaCp2+ZycvGPM2cAI/esiFrzi9vnxyX5gaIKGlHmp7K96p+OgnuC9pz6BMAl26KQEIaj6GBH1S5Gf6EqZ0ssJaPT0g8RQr8c8NLgO8Q== 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=qb1Thj/66tnxSP5LQtIBjCK+jcrQZ10WnyjXn80YYJE=; b=RAf9v6RM+Rn+2fKccyUeKu1SNRd7jJFWrkzyZ9CmdzIHmviZdoERfHBuDtn55ngIZ1f+leb3QbBmm0bW0m/MtcwLn/zyQJE0xBbwsoTPo51eXAMftQ0pbpgxiHYuc3U+D+cpvVwtQdKn5NqMLPpQXoa5t3XwFehi5eaM8qa3nzPKlCc2MAGu2kK0dZ0ICMKPXb180ScXSK5weIHL+BT6b8lQSZWOFRKJOFJDKBvhRnkLaaNFBt9uOKzUuaXcyadkbq+F8q6ssjaKpDyxQz3X1OHZPARNTt1eJwj1BEWdVfg8mYJuqNJmoAFLfecP/MlfbTUx/mIrl1yigolf77tjpg== 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=qb1Thj/66tnxSP5LQtIBjCK+jcrQZ10WnyjXn80YYJE=; b=meBDbvcnr7XXBdvwxWqIRBHvv9FtBaU14nruaRdch6Yw6luKetQ3ASZ6IK+on3Jt9ckKj1T7PWqhuZbjxmaruN1PhbvrCQEeVEQZ5Q/zzmEdoUS4TkRKGar1pFuljsc0fhDlaGkj+bOMPEKM9t8yqF7vTtTuujeiv+3rhxFjI4A= Received: from AM0PR05MB6707.eurprd05.prod.outlook.com (2603:10a6:20b:15b::17) by AM0PR05MB6420.eurprd05.prod.outlook.com (2603:10a6:208:13f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.27; Tue, 21 Apr 2020 14:59:11 +0000 Received: from AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::508:747b:cc12:5f6e]) by AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::508:747b:cc12:5f6e%6]) with mapi id 15.20.2921.030; Tue, 21 Apr 2020 14:59:11 +0000 From: Raslan Darawsheh To: Bing Zhao , Slava Ovsiienko CC: Ori Kam , Matan Azrad , "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH v4] net/mlx5: fix header modify action validation Thread-Index: AQHWF+W0SxuEEP4VREqZw14XB5P7bKiDquzA Date: Tue, 21 Apr 2020 14:59:11 +0000 Message-ID: References: <1586850812-269223-1-git-send-email-bingz@mellanox.com> <1587477814-207655-1-git-send-email-bingz@mellanox.com> In-Reply-To: <1587477814-207655-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: [188.161.228.234] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: e7e70882-2cec-47d6-dc35-08d7e6048d1d x-ms-traffictypediagnostic: AM0PR05MB6420:|AM0PR05MB6420: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:291; x-forefront-prvs: 038002787A x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR05MB6707.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10009020)(4636009)(366004)(54906003)(5660300002)(7696005)(52536014)(186003)(4326008)(86362001)(498600001)(71200400001)(450100002)(30864003)(2906002)(8676002)(66556008)(64756008)(66446008)(55016002)(66476007)(66946007)(110136005)(81156014)(76116006)(33656002)(6506007)(53546011)(8936002)(6636002)(9686003)(26005)(309714004); DIR:OUT; SFP:1101; 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: rZoXEE8qYSnhjLcXbQFwByVsUqpxz42TWLOfkIlcfqW5BUY8eemyoLDkB2dvCSfYFsVCLdX1/myCcVJUCc+ceXynG6gS8RhIIzwi/MivO2NeSdEIQ1AtnqoddmLyy2VckjBwpefU70KmjJ/5IQZdv6xStDiMgBCrYPBReRpNj70R/ADv7oHz47AxksuYOVqW43VodsY6+H16M1mxKAhNEf72EOba05nLEdCtuJxmmzYpSTY+NmJYrS6j9icSjpbnTsXia2aPW+W4sNif4Z/fF9h7XSctavCUETs+FHwnZEpUmh6ae696flhm2S2yFeF6j4i0eYaX/N1Lih1fpHEBS83i+7ioa4CGzTEBBrJ9E1yLweMD7F4OGhSl5N9jfTVKt6coIaIqWnh5iFOlqI50SerZ1I2ZcflMQs2orWd53k6O466S5rztQDcnYVT7Ntir0E33IngNJ/8cGCjKdR4C4Ao76TtSSkhwosMMw9tFEzqN/nD0J7lS2FfVxKXHfXfH x-ms-exchange-antispam-messagedata: yOjegsk9/UhL1IljBj7Gs5HLUN2DfuqA6X8RMNCjITJss9TgZDO2l8MLbd0ltFWxUsfM3PVyuci+h2MWwKqAXnATdpkrTIKctJjGU8FN6hkGMft0C0rmiNunQn7MRB4Xzdjnm2Pk2Sr0+lFsBT2oSQ== 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: e7e70882-2cec-47d6-dc35-08d7e6048d1d X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Apr 2020 14:59:11.6841 (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: T7CslPhc6q81vJSoXNKbeQVDeEo35SZXmM5kwGso/tcSrCVF7a7DNxprqnaBObgs2kaFeviRGBzmZSxp81rXeg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB6420 Subject: Re: [dpdk-stable] [PATCH v4] net/mlx5: fix header modify action validation X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, > -----Original Message----- > From: Bing Zhao > Sent: Tuesday, April 21, 2020 5:04 PM > To: Slava Ovsiienko ; Raslan Darawsheh > > Cc: Ori Kam ; Matan Azrad ; > dev@dpdk.org; stable@dpdk.org > Subject: [PATCH v4] net/mlx5: fix header modify action validation >=20 > The header modify actions number supported now has some limitation, > and it is decided by both driver and hardware. If the configuration > is different or the table to insert the flow is different, the result > might be different if the flow contains header modify actions. > Currently, the actual action number could only be calculated in the > later stage called translate, from user specified value to the driver > format. And the action numbers checking is missed in the flow > validation. So PMD will return incorrect result to indicate the > flow actions are valid by rte_flow_validate but then it will fail > when calling rte_flow_create. >=20 > Adding some simple checking in the validation will help to get rid > of this incorrect checking. Most of the actions will only consume 1 > SW action field except the MAC address and IPv6 address. And from > SW POV, the maximal action fields for these will be consumed even if > only part of such field will be modified because that there is no > mask in the flow actions and the mask will always be all ONEs. >=20 > The metering or extra metadata supports will cost one more action. >=20 > Fixes: 9597330c6844 ("net/mlx5: update modify header action translator") > Cc: viacheslavo@mellanox.com > Cc: stable@dpdk.org >=20 > Signed-off-by: Bing Zhao > Acked-by: Viacheslav Ovsiienko > --- > v4: rebase to solve the conflict > v3: change the title of commit message > v2: take hairpin, metadata and meter into consideration > --- > drivers/net/mlx5/mlx5_flow.c | 58 +++++++++++++++++++-------------= --- > drivers/net/mlx5/mlx5_flow.h | 18 +++++++++++ > drivers/net/mlx5/mlx5_flow_dv.c | 63 > +++++++++++++++++++++++++++++++++----- > drivers/net/mlx5/mlx5_flow_verbs.c | 3 ++ > 4 files changed, 108 insertions(+), 34 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index 109d71e..84aa069 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -2342,6 +2342,7 @@ uint32_t mlx5_flow_adjust_priority(struct > rte_eth_dev *dev, int32_t priority, > const struct rte_flow_item items[] __rte_unused, > const struct rte_flow_action actions[] __rte_unused, > bool external __rte_unused, > + int hairpin __rte_unused, > struct rte_flow_error *error) > { > return rte_flow_error_set(error, ENOTSUP, > @@ -2457,6 +2458,8 @@ uint32_t mlx5_flow_adjust_priority(struct > rte_eth_dev *dev, int32_t priority, > * Pointer to the list of actions. > * @param[in] external > * This flow rule is created by request external to PMD. > + * @param[in] hairpin > + * Number of hairpin TX actions, 0 means classic flow. > * @param[out] error > * Pointer to the error structure. > * > @@ -2468,13 +2471,14 @@ uint32_t mlx5_flow_adjust_priority(struct > rte_eth_dev *dev, int32_t priority, > const struct rte_flow_attr *attr, > const struct rte_flow_item items[], > const struct rte_flow_action actions[], > - bool external, struct rte_flow_error *error) > + bool external, int hairpin, struct rte_flow_error *error) > { > const struct mlx5_flow_driver_ops *fops; > enum mlx5_flow_drv_type type =3D flow_get_drv_type(dev, attr); >=20 > fops =3D flow_get_drv_ops(type); > - return fops->validate(dev, attr, items, actions, external, error); > + return fops->validate(dev, attr, items, actions, external, > + hairpin, error); > } >=20 > /** > @@ -2636,27 +2640,6 @@ uint32_t mlx5_flow_adjust_priority(struct > rte_eth_dev *dev, int32_t priority, > } >=20 > /** > - * Validate a flow supported by the NIC. > - * > - * @see rte_flow_validate() > - * @see rte_flow_ops > - */ > -int > -mlx5_flow_validate(struct rte_eth_dev *dev, > - const struct rte_flow_attr *attr, > - const struct rte_flow_item items[], > - const struct rte_flow_action actions[], > - struct rte_flow_error *error) > -{ > - int ret; > - > - ret =3D flow_drv_validate(dev, attr, items, actions, true, error); > - if (ret < 0) > - return ret; > - return 0; > -} > - > -/** > * Get RSS action from the action list. > * > * @param[in] actions > @@ -4271,15 +4254,16 @@ uint32_t mlx5_flow_adjust_priority(struct > rte_eth_dev *dev, int32_t priority, > const struct rte_flow_action *p_actions_rx =3D actions; > uint32_t i; > uint32_t idx =3D 0; > - int hairpin_flow =3D 0; > + int hairpin_flow; > uint32_t hairpin_id =3D 0; > struct rte_flow_attr attr_tx =3D { .priority =3D 0 }; > - int ret =3D flow_drv_validate(dev, attr, items, p_actions_rx, external, > - error); > + int ret; >=20 > + hairpin_flow =3D flow_check_hairpin_split(dev, attr, actions); > + ret =3D flow_drv_validate(dev, attr, items, p_actions_rx, > + external, hairpin_flow, error); > if (ret < 0) > return 0; > - hairpin_flow =3D flow_check_hairpin_split(dev, attr, actions); > if (hairpin_flow > 0) { > if (hairpin_flow > MLX5_MAX_SPLIT_ACTIONS) { > rte_errno =3D EINVAL; > @@ -4471,6 +4455,26 @@ struct rte_flow * > } >=20 > /** > + * Validate a flow supported by the NIC. > + * > + * @see rte_flow_validate() > + * @see rte_flow_ops > + */ > +int > +mlx5_flow_validate(struct rte_eth_dev *dev, > + const struct rte_flow_attr *attr, > + const struct rte_flow_item items[], > + const struct rte_flow_action actions[], > + struct rte_flow_error *error) > +{ > + int hairpin_flow; > + > + hairpin_flow =3D flow_check_hairpin_split(dev, attr, actions); > + return flow_drv_validate(dev, attr, items, actions, > + true, hairpin_flow, error); > +} > + > +/** > * Create a flow. > * > * @see rte_flow_create() > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index 74017cf..e9ed793 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -332,6 +332,23 @@ enum mlx5_feature_name { > #define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct > rte_flow_item_eth) + \ > sizeof(struct rte_flow_item_ipv4)) >=20 > +/* Software header modify action numbers of a flow. */ > +#define MLX5_ACT_NUM_MDF_IPV4 1 > +#define MLX5_ACT_NUM_MDF_IPV6 4 > +#define MLX5_ACT_NUM_MDF_MAC 2 > +#define MLX5_ACT_NUM_MDF_VID 1 > +#define MLX5_ACT_NUM_MDF_PORT 2 > +#define MLX5_ACT_NUM_MDF_TTL 1 > +#define MLX5_ACT_NUM_DEC_TTL MLX5_ACT_NUM_MDF_TTL > +#define MLX5_ACT_NUM_MDF_TCPSEQ 1 > +#define MLX5_ACT_NUM_MDF_TCPACK 1 > +#define MLX5_ACT_NUM_SET_REG 1 > +#define MLX5_ACT_NUM_SET_TAG 1 > +#define MLX5_ACT_NUM_CPY_MREG > MLX5_ACT_NUM_SET_TAG > +#define MLX5_ACT_NUM_SET_MARK > MLX5_ACT_NUM_SET_TAG > +#define MLX5_ACT_NUM_SET_META > MLX5_ACT_NUM_SET_TAG > +#define MLX5_ACT_NUM_SET_DSCP 1 > + > enum mlx5_flow_drv_type { > MLX5_FLOW_TYPE_MIN, > MLX5_FLOW_TYPE_DV, > @@ -812,6 +829,7 @@ typedef int (*mlx5_flow_validate_t)(struct > rte_eth_dev *dev, > const struct rte_flow_item items[], > const struct rte_flow_action actions[], > bool external, > + int hairpin, > struct rte_flow_error *error); > typedef struct mlx5_flow *(*mlx5_flow_prepare_t) > (struct rte_eth_dev *dev, const struct rte_flow_attr *attr, > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c > index e156c79..fe6072d 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -434,6 +434,7 @@ struct field_modify_info modify_tcp[] =3D { > /* Fetch variable byte size mask from the array. */ > mask =3D flow_dv_fetch_field((const uint8_t *)item->mask + > field->offset, field->size); > + MLX5_ASSERT(mask); > if (!mask) { > ++field; > continue; > @@ -4490,7 +4491,9 @@ struct field_modify_info modify_tcp[] =3D { > * Pointer to error structure. > * > * @return > - * 0 on success, a negative errno value otherwise and rte_errno is set= . > + * - 0 on success and non root table. > + * - 1 on success and root table. > + * - a negative errno value otherwise and rte_errno is set. > */ > static int > flow_dv_validate_attributes(struct rte_eth_dev *dev, > @@ -4500,6 +4503,7 @@ struct field_modify_info modify_tcp[] =3D { > { > struct mlx5_priv *priv =3D dev->data->dev_private; > uint32_t priority_max =3D priv->config.flow_prio - 1; > + int ret =3D 0; >=20 > #ifndef HAVE_MLX5DV_DR > if (attributes->group) > @@ -4508,14 +4512,15 @@ struct field_modify_info modify_tcp[] =3D { > NULL, > "groups are not supported"); > #else > - uint32_t table; > - int ret; > + uint32_t table =3D 0; >=20 > ret =3D mlx5_flow_group_to_table(attributes, external, > attributes->group, !!priv->fdb_def_rule, > &table, error); > if (ret) > return ret; > + if (!table) > + ret =3D MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL; > #endif > if (attributes->priority !=3D MLX5_FLOW_PRIO_RSVD && > attributes->priority >=3D priority_max) > @@ -4545,7 +4550,7 @@ struct field_modify_info modify_tcp[] =3D { > RTE_FLOW_ERROR_TYPE_ATTR, > NULL, > "must specify exactly one of " > "ingress or egress"); > - return 0; > + return ret; > } >=20 > /** > @@ -4561,6 +4566,8 @@ struct field_modify_info modify_tcp[] =3D { > * Pointer to the list of actions. > * @param[in] external > * This flow rule is created by request external to PMD. > + * @param[in] hairpin > + * Number of hairpin TX actions, 0 means classic flow. > * @param[out] error > * Pointer to the error structure. > * > @@ -4571,7 +4578,7 @@ struct field_modify_info modify_tcp[] =3D { > flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *at= tr, > const struct rte_flow_item items[], > const struct rte_flow_action actions[], > - bool external, struct rte_flow_error *error) > + bool external, int hairpin, struct rte_flow_error *error) > { > int ret; > uint64_t action_flags =3D 0; > @@ -4618,12 +4625,15 @@ struct field_modify_info modify_tcp[] =3D { > struct mlx5_dev_config *dev_conf =3D &priv->config; > uint16_t queue_index =3D 0xFFFF; > const struct rte_flow_item_vlan *vlan_m =3D NULL; > + int16_t rw_act_num =3D 0; > + uint64_t is_root; >=20 > if (items =3D=3D NULL) > return -1; > ret =3D flow_dv_validate_attributes(dev, attr, external, error); > if (ret < 0) > return ret; > + is_root =3D (uint64_t)ret; > for (; items->type !=3D RTE_FLOW_ITEM_TYPE_END; items++) { > int tunnel =3D !!(item_flags & MLX5_FLOW_LAYER_TUNNEL); > int type =3D items->type; > @@ -4900,6 +4910,7 @@ struct field_modify_info modify_tcp[] =3D { > action_flags |=3D MLX5_FLOW_ACTION_FLAG; > ++actions_n; > } > + rw_act_num +=3D MLX5_ACT_NUM_SET_MARK; > break; > case RTE_FLOW_ACTION_TYPE_MARK: > ret =3D flow_dv_validate_action_mark(dev, actions, > @@ -4918,6 +4929,7 @@ struct field_modify_info modify_tcp[] =3D { > action_flags |=3D MLX5_FLOW_ACTION_MARK; > ++actions_n; > } > + rw_act_num +=3D MLX5_ACT_NUM_SET_MARK; > break; > case RTE_FLOW_ACTION_TYPE_SET_META: > ret =3D flow_dv_validate_action_set_meta(dev, > actions, > @@ -4929,6 +4941,7 @@ struct field_modify_info modify_tcp[] =3D { > if (!(action_flags & > MLX5_FLOW_MODIFY_HDR_ACTIONS)) > ++actions_n; > action_flags |=3D MLX5_FLOW_ACTION_SET_META; > + rw_act_num +=3D MLX5_ACT_NUM_SET_META; > break; > case RTE_FLOW_ACTION_TYPE_SET_TAG: > ret =3D flow_dv_validate_action_set_tag(dev, actions, > @@ -4940,6 +4953,7 @@ struct field_modify_info modify_tcp[] =3D { > if (!(action_flags & > MLX5_FLOW_MODIFY_HDR_ACTIONS)) > ++actions_n; > action_flags |=3D MLX5_FLOW_ACTION_SET_TAG; > + rw_act_num +=3D MLX5_ACT_NUM_SET_TAG; > break; > case RTE_FLOW_ACTION_TYPE_DROP: > ret =3D mlx5_flow_validate_action_drop(action_flags, > @@ -5017,6 +5031,7 @@ struct field_modify_info modify_tcp[] =3D { > return ret; > /* Count VID with push_vlan command. */ > action_flags |=3D > MLX5_FLOW_ACTION_OF_SET_VLAN_VID; > + rw_act_num +=3D MLX5_ACT_NUM_MDF_VID; > break; > case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: > case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: > @@ -5078,8 +5093,15 @@ struct field_modify_info modify_tcp[] =3D { >=20 > RTE_FLOW_ACTION_TYPE_SET_MAC_SRC ? >=20 > MLX5_FLOW_ACTION_SET_MAC_SRC : >=20 > MLX5_FLOW_ACTION_SET_MAC_DST; > + /* > + * Even if the source and destination MAC addresses > have > + * overlap in the header with 4B alignment, the > convert > + * function will handle them separately and 4 SW > actions > + * will be created. And 2 actions will be added each > + * time no matter how many bytes of address will be > set. > + */ > + rw_act_num +=3D MLX5_ACT_NUM_MDF_MAC; > break; > - > case RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC: > case RTE_FLOW_ACTION_TYPE_SET_IPV4_DST: > ret =3D > flow_dv_validate_action_modify_ipv4(action_flags, > @@ -5095,6 +5117,7 @@ struct field_modify_info modify_tcp[] =3D { >=20 > RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC ? >=20 > MLX5_FLOW_ACTION_SET_IPV4_SRC : >=20 > MLX5_FLOW_ACTION_SET_IPV4_DST; > + rw_act_num +=3D MLX5_ACT_NUM_MDF_IPV4; > break; > case RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC: > case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST: > @@ -5117,6 +5140,7 @@ struct field_modify_info modify_tcp[] =3D { >=20 > RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC ? >=20 > MLX5_FLOW_ACTION_SET_IPV6_SRC : >=20 > MLX5_FLOW_ACTION_SET_IPV6_DST; > + rw_act_num +=3D MLX5_ACT_NUM_MDF_IPV6; > break; > case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: > case RTE_FLOW_ACTION_TYPE_SET_TP_DST: > @@ -5133,6 +5157,7 @@ struct field_modify_info modify_tcp[] =3D { >=20 > RTE_FLOW_ACTION_TYPE_SET_TP_SRC ? >=20 > MLX5_FLOW_ACTION_SET_TP_SRC : >=20 > MLX5_FLOW_ACTION_SET_TP_DST; > + rw_act_num +=3D MLX5_ACT_NUM_MDF_PORT; > break; > case RTE_FLOW_ACTION_TYPE_DEC_TTL: > case RTE_FLOW_ACTION_TYPE_SET_TTL: > @@ -5149,6 +5174,7 @@ struct field_modify_info modify_tcp[] =3D { > RTE_FLOW_ACTION_TYPE_SET_TTL ? >=20 > MLX5_FLOW_ACTION_SET_TTL : >=20 > MLX5_FLOW_ACTION_DEC_TTL; > + rw_act_num +=3D MLX5_ACT_NUM_MDF_TTL; > break; > case RTE_FLOW_ACTION_TYPE_JUMP: > ret =3D flow_dv_validate_action_jump(actions, > @@ -5176,6 +5202,7 @@ struct field_modify_info modify_tcp[] =3D { >=20 > RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ ? >=20 > MLX5_FLOW_ACTION_INC_TCP_SEQ : >=20 > MLX5_FLOW_ACTION_DEC_TCP_SEQ; > + rw_act_num +=3D MLX5_ACT_NUM_MDF_TCPSEQ; > break; > case RTE_FLOW_ACTION_TYPE_INC_TCP_ACK: > case RTE_FLOW_ACTION_TYPE_DEC_TCP_ACK: > @@ -5193,10 +5220,13 @@ struct field_modify_info modify_tcp[] =3D { >=20 > RTE_FLOW_ACTION_TYPE_INC_TCP_ACK ? >=20 > MLX5_FLOW_ACTION_INC_TCP_ACK : >=20 > MLX5_FLOW_ACTION_DEC_TCP_ACK; > + rw_act_num +=3D MLX5_ACT_NUM_MDF_TCPACK; > break; > - case MLX5_RTE_FLOW_ACTION_TYPE_TAG: > case MLX5_RTE_FLOW_ACTION_TYPE_MARK: > + break; > + case MLX5_RTE_FLOW_ACTION_TYPE_TAG: > case MLX5_RTE_FLOW_ACTION_TYPE_COPY_MREG: > + rw_act_num +=3D MLX5_ACT_NUM_SET_TAG; > break; > case RTE_FLOW_ACTION_TYPE_METER: > ret =3D mlx5_flow_validate_action_meter(dev, > @@ -5207,6 +5237,8 @@ struct field_modify_info modify_tcp[] =3D { > return ret; > action_flags |=3D MLX5_FLOW_ACTION_METER; > ++actions_n; > + /* Meter action will add one more TAG action. */ > + rw_act_num +=3D MLX5_ACT_NUM_SET_TAG; > break; > case RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP: > ret =3D flow_dv_validate_action_modify_ipv4_dscp > @@ -5220,6 +5252,7 @@ struct field_modify_info modify_tcp[] =3D { > if (!(action_flags & > MLX5_FLOW_MODIFY_HDR_ACTIONS)) > ++actions_n; > action_flags |=3D > MLX5_FLOW_ACTION_SET_IPV4_DSCP; > + rw_act_num +=3D MLX5_ACT_NUM_SET_DSCP; > break; > case RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP: > ret =3D flow_dv_validate_action_modify_ipv6_dscp > @@ -5233,6 +5266,7 @@ struct field_modify_info modify_tcp[] =3D { > if (!(action_flags & > MLX5_FLOW_MODIFY_HDR_ACTIONS)) > ++actions_n; > action_flags |=3D > MLX5_FLOW_ACTION_SET_IPV6_DSCP; > + rw_act_num +=3D MLX5_ACT_NUM_SET_DSCP; > break; > default: > return rte_flow_error_set(error, ENOTSUP, > @@ -5305,6 +5339,21 @@ struct field_modify_info modify_tcp[] =3D { > NULL, "encap is not > supported" > " for ingress traffic"); > } > + /* Hairpin flow will add one more TAG action. */ > + if (hairpin > 0) > + rw_act_num +=3D MLX5_ACT_NUM_SET_TAG; > + /* extra metadata enabled: one more TAG action will be add. */ > + if (dev_conf->dv_flow_en && > + dev_conf->dv_xmeta_en !=3D MLX5_XMETA_MODE_LEGACY && > + mlx5_flow_ext_mreg_supported(dev)) > + rw_act_num +=3D MLX5_ACT_NUM_SET_TAG; > + if ((uint32_t)rw_act_num >=3D > + flow_dv_modify_hdr_action_max(dev, is_root)) { > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, "too many header modify" > + " actions to support"); > + } > return 0; > } >=20 > diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c > b/drivers/net/mlx5/mlx5_flow_verbs.c > index 722220c..d20098c 100644 > --- a/drivers/net/mlx5/mlx5_flow_verbs.c > +++ b/drivers/net/mlx5/mlx5_flow_verbs.c > @@ -1108,6 +1108,8 @@ > * Pointer to the list of actions. > * @param[in] external > * This flow rule is created by request external to PMD. > + * @param[in] hairpin > + * Number of hairpin TX actions, 0 means classic flow. > * @param[out] error > * Pointer to the error structure. > * > @@ -1120,6 +1122,7 @@ > const struct rte_flow_item items[], > const struct rte_flow_action actions[], > bool external __rte_unused, > + int hairpin __rte_unused, > struct rte_flow_error *error) > { > int ret; > -- > 1.8.3.1 Patch applied to next-net-mlx, Kindest regards, Raslan Darawsheh