From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80089.outbound.protection.outlook.com [40.107.8.89]) by dpdk.org (Postfix) with ESMTP id CC4BD5A44 for ; Tue, 9 Oct 2018 09:43:21 +0200 (CEST) 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=MbXhClL1ix+l9Jy558I8fKZyxa4N8ukoE/oNuxHyS+E=; b=bsNAmuQdzoJImOyFYxY8nVT8sNusxcRTnoEVhlgd54aveH0opCl/TxEOaEWjCKB0RFxoAwaEj+DjAKjvufRNkcJZ5xzmHSvi/Y2p6CMkHJWfFRvbc/I8m0eVNu53Pysjsq5bLOMICw7poj/HcoUmny74emkAiLMkKJ6eQnRhdMw= Received: from AM4PR05MB3425.eurprd05.prod.outlook.com (10.171.187.142) by AM4PR05MB1540.eurprd05.prod.outlook.com (10.164.79.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.23; Tue, 9 Oct 2018 07:43:18 +0000 Received: from AM4PR05MB3425.eurprd05.prod.outlook.com ([fe80::fdeb:3890:f0f0:2202]) by AM4PR05MB3425.eurprd05.prod.outlook.com ([fe80::fdeb:3890:f0f0:2202%4]) with mapi id 15.20.1207.024; Tue, 9 Oct 2018 07:43:18 +0000 From: Ori Kam To: Yongseok Koh , Shahaf Shuler CC: "dev@dpdk.org" Thread-Topic: [PATCH 3/7] net/mlx5: rename flow macros Thread-Index: AQHUXzEKUvcEWtYrx0+ccOADEfvbsqUWiLhQ Date: Tue, 9 Oct 2018 07:43:18 +0000 Message-ID: References: <20181008180150.39273-1-yskoh@mellanox.com> <20181008180150.39273-4-yskoh@mellanox.com> In-Reply-To: <20181008180150.39273-4-yskoh@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=orika@mellanox.com; x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM4PR05MB1540; 6:Xsi/410+sOZC/eXwfakjdsnbspzCtR0CYo0tabaqK75PRj7X6Xemi3AJYKtt5Fw3woeezK6KEmuINbjN+7CmHLojUaZbxjI15uNOkVdUAMdB9x0uwUfM3wl/R4dVmr5KZStp6uDIwC1e/z4wQADR5WFaW7To8zT70L2RXST2LD8JqT6RNSIc9mmB9tDhHdAVJvy5l5ZxaBhvc3oC/BVLBUD25RNEj1FbgfJbRR2FG02wX8P4q2cCTuYKPt6I33rhE6oOJXLlW7Ug26wNVAHe9uN6aXHMsGTmYTXIP4CuboGRMjcq3GM1wcy1iEc9BmppAapWHKFKKjaM0KxBtbZ87+1ehlH+XrveLvN3GDqhpJW8AUWKhyN+AdipwIu1pe1UZhBSiwokpBT9tRgipkDhpPR/qUjNvV2Mp5TASj1wN28OZsp1RM5OEjATF8SAsr5WH5SWc23n/ERqGdJjTfbl0A==; 5:TFEFnZkciPVZAjL+dRJYRvk9uz57ZtcIQkVEnQYBtLv/TSH6a67E6UKAUfVNVmFiWlhuPTesGhy+tA0C9nWJle3lqWaW9hrybCyO4cyKx4tJOo0bjB8+NlzpkVAgFtcwFEHR68GBNHAcBt395c3evEVEXjIr223X2J7iDfqJgBY=; 7:7vWTEvmew1sAUuzzxLVuxCH/us+C/jNLYyKAgXxstR7lgT2Pc8OguETIGCbAe+Hv2sCuwLT/eLe87tjNbYqth1TLMrdmxDSE9u/o3VbNZkh1/kKXioXY+tyRs/v/ksD7npIQilbh7HLR8NBZGp4G585NoeQCsy+C7mgQwz5fM2oUO0TceOSUF4xurdKnZ1Sl/5taS/AYgOhIjf10Qgh6OSrqDXYIOnUbM4PwJ+95FBa3oJVirG7wECbH7HLA5YZ1 x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 7faaa7fc-e1a4-459f-b54d-08d62dbae132 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM4PR05MB1540; x-ms-traffictypediagnostic: AM4PR05MB1540: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231355)(944501410)(52105095)(10201501046)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051); SRVR:AM4PR05MB1540; BCL:0; PCL:0; RULEID:; SRVR:AM4PR05MB1540; x-forefront-prvs: 08200063E9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(39860400002)(396003)(376002)(346002)(189003)(199004)(13464003)(51234002)(81166006)(81156014)(11346002)(476003)(3846002)(256004)(14444005)(74316002)(14454004)(446003)(66066001)(305945005)(8936002)(7736002)(5250100002)(8676002)(99286004)(186003)(486006)(6246003)(478600001)(2906002)(86362001)(6116002)(110136005)(316002)(102836004)(7696005)(53936002)(106356001)(71200400001)(71190400001)(53946003)(68736007)(9686003)(105586002)(97736004)(55016002)(33656002)(2900100001)(4326008)(76176011)(229853002)(6436002)(26005)(6636002)(53546011)(6506007)(25786009)(4744004)(5660300001)(579004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB1540; H:AM4PR05MB3425.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-microsoft-antispam-message-info: ShXv+0+GqsO2pVhhh6Ub3OG2/iAUpGUoL1gGctj/6Y+j6NR0Y0T5I+c3WQHkeh1eH9MPOQIzizmHoTr9Fs3Vl8ts9ZyNa03fyZBZKwTtzRTHpBqN9nHm06m8HcY1EnofvurvNZqms4+HdHeA9t1jP74tvwDYlG0sUWF86ufqD+ElU0AYogVfEI4U8m6tjCkyBzbimwg+hDMblmq324WkJDE8ooUIe6NDY7pg3ZY7ia7EXV3uWenpte7DeGvD4ef8TZtNrbrulsZ/eXeJPwjvW/jlerqN5cHjOnlv74OxP1jPtxwr7+WWmQQSDEi+RSoQIGL4SMn9Sx2QKeMaWiBhNTeuyqMH4eATb2nAsEdmNrc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM 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: 7faaa7fc-e1a4-459f-b54d-08d62dbae132 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Oct 2018 07:43:18.3617 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB1540 Subject: Re: [dpdk-dev] [PATCH 3/7] net/mlx5: rename flow macros 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: , X-List-Received-Date: Tue, 09 Oct 2018 07:43:22 -0000 > -----Original Message----- > From: Yongseok Koh > Sent: Monday, October 8, 2018 9:02 PM > To: Shahaf Shuler > Cc: dev@dpdk.org; Yongseok Koh ; Ori Kam > > Subject: [PATCH 3/7] net/mlx5: rename flow macros >=20 > MLX5_ACTION_* -> MLX5_FLOW_ACTION_* > MLX5_VXLAN* -> MLX5_UDP_PORT_VXLAN* >=20 > Fixes: 0f8775dd8f1c ("net/mlx5: add support for multiple flow drivers") > Fixes: edcdef4e5fe4 ("net/mlx5: add Linux TC flower driver for E-Switch f= low") > Cc: Ori Kam >=20 I don't think this is a fix since there is no issue with the implementation= , you are just beautify the code. Otherwise acked: > Signed-off-by: Yongseok Koh > --- > drivers/net/mlx5/mlx5_flow.c | 31 +++++++++++++++------------ > drivers/net/mlx5/mlx5_flow.h | 28 ++++++++++++------------ > drivers/net/mlx5/mlx5_flow_dv.c | 24 ++++++++++----------- > drivers/net/mlx5/mlx5_flow_tcf.c | 26 +++++++++++----------- > drivers/net/mlx5/mlx5_flow_verbs.c | 44 +++++++++++++++++++-------------= ----- > - > 5 files changed, 78 insertions(+), 75 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index ef5e4684f..69afd4625 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -537,7 +537,7 @@ mlx5_flow_rxq_flags_set(struct rte_eth_dev *dev, > struct rte_flow *flow) > { > struct priv *priv =3D dev->data->dev_private; > const int mark =3D !!(flow->actions & > - (MLX5_ACTION_FLAG | MLX5_ACTION_MARK)); > + (MLX5_FLOW_ACTION_FLAG | > MLX5_FLOW_ACTION_MARK)); > const int tunnel =3D !!(flow->layers & MLX5_FLOW_LAYER_TUNNEL); > unsigned int i; >=20 > @@ -581,7 +581,7 @@ mlx5_flow_rxq_flags_trim(struct rte_eth_dev *dev, > struct rte_flow *flow) > { > struct priv *priv =3D dev->data->dev_private; > const int mark =3D !!(flow->actions & > - (MLX5_ACTION_FLAG | MLX5_ACTION_MARK)); > + (MLX5_FLOW_ACTION_FLAG | > MLX5_FLOW_ACTION_MARK)); > const int tunnel =3D !!(flow->layers & MLX5_FLOW_LAYER_TUNNEL); > unsigned int i; >=20 > @@ -656,15 +656,15 @@ mlx5_flow_validate_action_flag(uint64_t > action_flags, > struct rte_flow_error *error) > { >=20 > - if (action_flags & MLX5_ACTION_DROP) > + if (action_flags & MLX5_FLOW_ACTION_DROP) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't drop and flag in same flow"); > - if (action_flags & MLX5_ACTION_MARK) > + if (action_flags & MLX5_FLOW_ACTION_MARK) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't mark and flag in same flow"); > - if (action_flags & MLX5_ACTION_FLAG) > + if (action_flags & MLX5_FLOW_ACTION_FLAG) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't have 2 flag" > @@ -703,15 +703,15 @@ mlx5_flow_validate_action_mark(const struct > rte_flow_action *action, > &mark->id, > "mark id must in 0 <=3D id < " >=20 > RTE_STR(MLX5_FLOW_MARK_MAX)); > - if (action_flags & MLX5_ACTION_DROP) > + if (action_flags & MLX5_FLOW_ACTION_DROP) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't drop and mark in same flow"); > - if (action_flags & MLX5_ACTION_FLAG) > + if (action_flags & MLX5_FLOW_ACTION_FLAG) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't flag and mark in same flow"); > - if (action_flags & MLX5_ACTION_MARK) > + if (action_flags & MLX5_FLOW_ACTION_MARK) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't have 2 flag actions in same" > @@ -734,16 +734,17 @@ int > mlx5_flow_validate_action_drop(uint64_t action_flags, > struct rte_flow_error *error) > { > - if (action_flags & MLX5_ACTION_FLAG) > + if (action_flags & MLX5_FLOW_ACTION_FLAG) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't drop and flag in same flow"); > - if (action_flags & MLX5_ACTION_MARK) > + if (action_flags & MLX5_FLOW_ACTION_MARK) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't drop and mark in same flow"); > if (action_flags & > - (MLX5_ACTION_DROP | MLX5_ACTION_QUEUE | > MLX5_ACTION_RSS)) > + (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | > + MLX5_FLOW_ACTION_RSS)) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't have 2 fate actions in" > @@ -776,7 +777,8 @@ mlx5_flow_validate_action_queue(const struct > rte_flow_action *action, > const struct rte_flow_action_queue *queue =3D action->conf; >=20 > if (action_flags & > - (MLX5_ACTION_DROP | MLX5_ACTION_QUEUE | > MLX5_ACTION_RSS)) > + (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | > + MLX5_FLOW_ACTION_RSS)) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't have 2 fate actions in" > @@ -820,7 +822,8 @@ mlx5_flow_validate_action_rss(const struct > rte_flow_action *action, > unsigned int i; >=20 > if (action_flags & > - (MLX5_ACTION_DROP | MLX5_ACTION_QUEUE | > MLX5_ACTION_RSS)) > + (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | > + MLX5_FLOW_ACTION_RSS)) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "can't have 2 fate actions" > @@ -2304,7 +2307,7 @@ mlx5_flow_query_count(struct rte_flow *flow > __rte_unused, > struct rte_flow_error *error) > { > #ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT > - if (flow->actions & MLX5_ACTION_COUNT) { > + if (flow->actions & MLX5_FLOW_ACTION_COUNT) { > struct rte_flow_query_count *qc =3D data; > uint64_t counters[2] =3D {0, 0}; > struct ibv_query_counter_set_attr query_cs_attr =3D { > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index 1ac871b3a..309e4d4f2 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -67,25 +67,25 @@ > MLX5_FLOW_LAYER_INNER_L4) >=20 > /* Actions */ > -#define MLX5_ACTION_DROP (1u << 0) > -#define MLX5_ACTION_QUEUE (1u << 1) > -#define MLX5_ACTION_RSS (1u << 2) > -#define MLX5_ACTION_FLAG (1u << 3) > -#define MLX5_ACTION_MARK (1u << 4) > -#define MLX5_ACTION_COUNT (1u << 5) > -#define MLX5_ACTION_PORT_ID (1u << 6) > -#define MLX5_ACTION_OF_POP_VLAN (1u << 7) > -#define MLX5_ACTION_OF_PUSH_VLAN (1u << 8) > -#define MLX5_ACTION_OF_SET_VLAN_VID (1u << 9) > -#define MLX5_ACTION_OF_SET_VLAN_PCP (1u << 10) > +#define MLX5_FLOW_ACTION_DROP (1u << 0) > +#define MLX5_FLOW_ACTION_QUEUE (1u << 1) > +#define MLX5_FLOW_ACTION_RSS (1u << 2) > +#define MLX5_FLOW_ACTION_FLAG (1u << 3) > +#define MLX5_FLOW_ACTION_MARK (1u << 4) > +#define MLX5_FLOW_ACTION_COUNT (1u << 5) > +#define MLX5_FLOW_ACTION_PORT_ID (1u << 6) > +#define MLX5_FLOW_ACTION_OF_POP_VLAN (1u << 7) > +#define MLX5_FLOW_ACTION_OF_PUSH_VLAN (1u << 8) > +#define MLX5_FLOW_ACTION_OF_SET_VLAN_VID (1u << 9) > +#define MLX5_FLOW_ACTION_OF_SET_VLAN_PCP (1u << 10) >=20 > #ifndef IPPROTO_MPLS > #define IPPROTO_MPLS 137 > #endif >=20 > -/* Internent Protocol versions. */ > -#define MLX5_VXLAN 4789 > -#define MLX5_VXLAN_GPE 4790 > +/* UDP port numbers for VxLAN. */ > +#define MLX5_UDP_PORT_VXLAN 4789 > +#define MLX5_UDP_PORT_VXLAN_GPE 4790 >=20 > /* Priority reserved for default flows. */ > #define MLX5_FLOW_PRIO_RSVD ((uint32_t)-1) > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c > index 5678dc35f..e6c84d444 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -236,7 +236,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struc= t > rte_flow_attr *attr, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_FLAG; > + action_flags |=3D MLX5_FLOW_ACTION_FLAG; > ++actions_n; > break; > case RTE_FLOW_ACTION_TYPE_MARK: > @@ -245,7 +245,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struc= t > rte_flow_attr *attr, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_MARK; > + action_flags |=3D MLX5_FLOW_ACTION_MARK; > ++actions_n; > break; > case RTE_FLOW_ACTION_TYPE_DROP: > @@ -253,7 +253,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struc= t > rte_flow_attr *attr, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_DROP; > + action_flags |=3D MLX5_FLOW_ACTION_DROP; > ++actions_n; > break; > case RTE_FLOW_ACTION_TYPE_QUEUE: > @@ -262,7 +262,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struc= t > rte_flow_attr *attr, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_QUEUE; > + action_flags |=3D MLX5_FLOW_ACTION_QUEUE; > ++actions_n; > break; > case RTE_FLOW_ACTION_TYPE_RSS: > @@ -271,14 +271,14 @@ flow_dv_validate(struct rte_eth_dev *dev, const > struct rte_flow_attr *attr, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_RSS; > + action_flags |=3D MLX5_FLOW_ACTION_RSS; > ++actions_n; > break; > case RTE_FLOW_ACTION_TYPE_COUNT: > ret =3D mlx5_flow_validate_action_count(dev, error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_COUNT; > + action_flags |=3D MLX5_FLOW_ACTION_COUNT; > ++actions_n; > break; > default: > @@ -838,8 +838,8 @@ flow_dv_translate_item_vxlan(void *matcher, void > *key, > outer_headers); > headers_v =3D MLX5_ADDR_OF(fte_match_param, key, > outer_headers); > } > - dport =3D item->type =3D=3D RTE_FLOW_ITEM_TYPE_VXLAN ? MLX5_VXLAN : > - MLX5_VXLAN_GPE; > + dport =3D item->type =3D=3D RTE_FLOW_ITEM_TYPE_VXLAN ? > + MLX5_UDP_PORT_VXLAN : MLX5_UDP_PORT_VXLAN_GPE; > if (!MLX5_GET16(fte_match_set_lyr_2_4, headers_v, udp_dport)) { > MLX5_SET(fte_match_set_lyr_2_4, headers_m, udp_dport, > 0xFFFF); > MLX5_SET(fte_match_set_lyr_2_4, headers_v, udp_dport, > dport); > @@ -978,7 +978,7 @@ flow_dv_create_action(const struct rte_flow_action > *action, > break; > case RTE_FLOW_ACTION_TYPE_DROP: > dev_flow->dv.actions[actions_n].type =3D > MLX5DV_FLOW_ACTION_DROP; > - flow->actions |=3D MLX5_ACTION_DROP; > + flow->actions |=3D MLX5_FLOW_ACTION_DROP; > break; > case RTE_FLOW_ACTION_TYPE_QUEUE: > queue =3D action->conf; > @@ -1195,7 +1195,7 @@ flow_dv_apply(struct rte_eth_dev *dev, struct > rte_flow *flow, > LIST_FOREACH(dev_flow, &flow->dev_flows, next) { > dv =3D &dev_flow->dv; > n =3D dv->actions_n; > - if (flow->actions & MLX5_ACTION_DROP) { > + if (flow->actions & MLX5_FLOW_ACTION_DROP) { > dv->hrxq =3D mlx5_hrxq_drop_new(dev); > if (!dv->hrxq) { > rte_flow_error_set > @@ -1251,7 +1251,7 @@ flow_dv_apply(struct rte_eth_dev *dev, struct > rte_flow *flow, > LIST_FOREACH(dev_flow, &flow->dev_flows, next) { > struct mlx5_flow_dv *dv =3D &dev_flow->dv; > if (dv->hrxq) { > - if (flow->actions & MLX5_ACTION_DROP) > + if (flow->actions & MLX5_FLOW_ACTION_DROP) > mlx5_hrxq_drop_release(dev); > else > mlx5_hrxq_release(dev, dv->hrxq); > @@ -1318,7 +1318,7 @@ flow_dv_remove(struct rte_eth_dev *dev, struct > rte_flow *flow) > dv->flow =3D NULL; > } > if (dv->hrxq) { > - if (flow->actions & MLX5_ACTION_DROP) > + if (flow->actions & MLX5_FLOW_ACTION_DROP) > mlx5_hrxq_drop_release(dev); > else > mlx5_hrxq_release(dev, dv->hrxq); > diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c > b/drivers/net/mlx5/mlx5_flow_tcf.c > index 14376188e..c87046365 100644 > --- a/drivers/net/mlx5/mlx5_flow_tcf.c > +++ b/drivers/net/mlx5/mlx5_flow_tcf.c > @@ -225,7 +225,7 @@ struct flow_tcf_ptoi { > unsigned int ifindex; /**< Network interface index. */ > }; >=20 > -#define MLX5_TCF_FATE_ACTIONS (MLX5_ACTION_DROP | > MLX5_ACTION_PORT_ID) > +#define MLX5_TCF_FATE_ACTIONS (MLX5_FLOW_ACTION_DROP | > MLX5_FLOW_ACTION_PORT_ID) >=20 > /** > * Retrieve mask for pattern item. > @@ -668,7 +668,7 @@ flow_tcf_validate(struct rte_eth_dev *dev, > conf.port_id, > "missing data to convert port ID to" > " ifindex"); > - action_flags |=3D MLX5_ACTION_PORT_ID; > + action_flags |=3D MLX5_FLOW_ACTION_PORT_ID; > break; > case RTE_FLOW_ACTION_TYPE_DROP: > if (action_flags & MLX5_TCF_FATE_ACTIONS) > @@ -676,19 +676,19 @@ flow_tcf_validate(struct rte_eth_dev *dev, > (error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ACTION, > actions, > "can't have multiple fate actions"); > - action_flags |=3D MLX5_ACTION_DROP; > + action_flags |=3D MLX5_FLOW_ACTION_DROP; > break; > case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: > - action_flags |=3D MLX5_ACTION_OF_POP_VLAN; > + action_flags |=3D MLX5_FLOW_ACTION_OF_POP_VLAN; > break; > case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: > - action_flags |=3D MLX5_ACTION_OF_PUSH_VLAN; > + action_flags |=3D > MLX5_FLOW_ACTION_OF_PUSH_VLAN; > break; > case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID: > - action_flags |=3D MLX5_ACTION_OF_SET_VLAN_VID; > + action_flags |=3D > MLX5_FLOW_ACTION_OF_SET_VLAN_VID; > break; > case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP: > - action_flags |=3D MLX5_ACTION_OF_SET_VLAN_PCP; > + action_flags |=3D > MLX5_FLOW_ACTION_OF_SET_VLAN_PCP; > break; > default: > return rte_flow_error_set(error, ENOTSUP, > @@ -809,26 +809,26 @@ flow_tcf_get_actions_and_size(const struct > rte_flow_action actions[], > SZ_NLATTR_STRZ_OF("mirred") + > SZ_NLATTR_NEST + /* TCA_ACT_OPTIONS. */ > SZ_NLATTR_TYPE_OF(struct tc_mirred); > - flags |=3D MLX5_ACTION_PORT_ID; > + flags |=3D MLX5_FLOW_ACTION_PORT_ID; > break; > case RTE_FLOW_ACTION_TYPE_DROP: > size +=3D SZ_NLATTR_NEST + /* na_act_index. */ > SZ_NLATTR_STRZ_OF("gact") + > SZ_NLATTR_NEST + /* TCA_ACT_OPTIONS. */ > SZ_NLATTR_TYPE_OF(struct tc_gact); > - flags |=3D MLX5_ACTION_DROP; > + flags |=3D MLX5_FLOW_ACTION_DROP; > break; > case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: > - flags |=3D MLX5_ACTION_OF_POP_VLAN; > + flags |=3D MLX5_FLOW_ACTION_OF_POP_VLAN; > goto action_of_vlan; > case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: > - flags |=3D MLX5_ACTION_OF_PUSH_VLAN; > + flags |=3D MLX5_FLOW_ACTION_OF_PUSH_VLAN; > goto action_of_vlan; > case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID: > - flags |=3D MLX5_ACTION_OF_SET_VLAN_VID; > + flags |=3D MLX5_FLOW_ACTION_OF_SET_VLAN_VID; > goto action_of_vlan; > case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP: > - flags |=3D MLX5_ACTION_OF_SET_VLAN_PCP; > + flags |=3D MLX5_FLOW_ACTION_OF_SET_VLAN_PCP; > goto action_of_vlan; > action_of_vlan: > size +=3D SZ_NLATTR_NEST + /* na_act_index. */ > diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c > b/drivers/net/mlx5/mlx5_flow_verbs.c > index 076bb39e6..0ecbc8121 100644 > --- a/drivers/net/mlx5/mlx5_flow_verbs.c > +++ b/drivers/net/mlx5/mlx5_flow_verbs.c > @@ -755,7 +755,7 @@ flow_verbs_translate_action_drop(uint64_t > *action_flags, > }; >=20 > flow_verbs_spec_add(dev_flow, &drop, size); > - *action_flags |=3D MLX5_ACTION_DROP; > + *action_flags |=3D MLX5_FLOW_ACTION_DROP; > } >=20 > /** > @@ -781,7 +781,7 @@ flow_verbs_translate_action_queue(const struct > rte_flow_action *action, > if (flow->queue) > (*flow->queue)[0] =3D queue->index; > flow->rss.queue_num =3D 1; > - *action_flags |=3D MLX5_ACTION_QUEUE; > + *action_flags |=3D MLX5_FLOW_ACTION_QUEUE; > } >=20 > /** > @@ -811,7 +811,7 @@ flow_verbs_translate_action_rss(const struct > rte_flow_action *action, > memcpy(flow->key, rss->key, MLX5_RSS_HASH_KEY_LEN); > flow->rss.types =3D rss->types; > flow->rss.level =3D rss->level; > - *action_flags |=3D MLX5_ACTION_RSS; > + *action_flags |=3D MLX5_FLOW_ACTION_RSS; > } >=20 > /** > @@ -838,7 +838,7 @@ flow_verbs_translate_action_flag > .size =3D size, > .tag_id =3D mlx5_flow_mark_set(MLX5_FLOW_MARK_DEFAULT), > }; > - *action_flags |=3D MLX5_ACTION_MARK; > + *action_flags |=3D MLX5_FLOW_ACTION_MARK; > flow_verbs_spec_add(dev_flow, &tag, size); > } >=20 > @@ -898,14 +898,14 @@ flow_verbs_translate_action_mark(const struct > rte_flow_action *action, > }; > struct mlx5_flow_verbs *verbs =3D &dev_flow->verbs; >=20 > - if (*action_flags & MLX5_ACTION_FLAG) { > + if (*action_flags & MLX5_FLOW_ACTION_FLAG) { > flow_verbs_mark_update(verbs, mark->id); > size =3D 0; > } else { > tag.tag_id =3D mlx5_flow_mark_set(mark->id); > flow_verbs_spec_add(dev_flow, &tag, size); > } > - *action_flags |=3D MLX5_ACTION_MARK; > + *action_flags |=3D MLX5_FLOW_ACTION_MARK; > } >=20 > /** > @@ -954,7 +954,7 @@ flow_verbs_translate_action_count(struct rte_eth_dev > *dev, > "cannot get counter" > " context."); > } > - *action_flags |=3D MLX5_ACTION_COUNT; > + *action_flags |=3D MLX5_FLOW_ACTION_COUNT; > #ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT > counter.counter_set_handle =3D flow->counter->cs->handle; > flow_verbs_spec_add(dev_flow, &counter, size); > @@ -1116,7 +1116,7 @@ flow_verbs_validate(struct rte_eth_dev *dev, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_FLAG; > + action_flags |=3D MLX5_FLOW_ACTION_FLAG; > break; > case RTE_FLOW_ACTION_TYPE_MARK: > ret =3D mlx5_flow_validate_action_mark(actions, > @@ -1124,14 +1124,14 @@ flow_verbs_validate(struct rte_eth_dev *dev, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_MARK; > + action_flags |=3D MLX5_FLOW_ACTION_MARK; > break; > case RTE_FLOW_ACTION_TYPE_DROP: > ret =3D mlx5_flow_validate_action_drop(action_flags, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_DROP; > + action_flags |=3D MLX5_FLOW_ACTION_DROP; > break; > case RTE_FLOW_ACTION_TYPE_QUEUE: > ret =3D mlx5_flow_validate_action_queue(actions, > @@ -1139,7 +1139,7 @@ flow_verbs_validate(struct rte_eth_dev *dev, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_QUEUE; > + action_flags |=3D MLX5_FLOW_ACTION_QUEUE; > break; > case RTE_FLOW_ACTION_TYPE_RSS: > ret =3D mlx5_flow_validate_action_rss(actions, > @@ -1147,13 +1147,13 @@ flow_verbs_validate(struct rte_eth_dev *dev, > error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_RSS; > + action_flags |=3D MLX5_FLOW_ACTION_RSS; > break; > case RTE_FLOW_ACTION_TYPE_COUNT: > ret =3D mlx5_flow_validate_action_count(dev, error); > if (ret < 0) > return ret; > - action_flags |=3D MLX5_ACTION_COUNT; > + action_flags |=3D MLX5_FLOW_ACTION_COUNT; > break; > default: > return rte_flow_error_set(error, ENOTSUP, > @@ -1191,27 +1191,27 @@ flow_verbs_get_actions_and_size(const struct > rte_flow_action actions[], > break; > case RTE_FLOW_ACTION_TYPE_FLAG: > size +=3D sizeof(struct ibv_flow_spec_action_tag); > - detected_actions |=3D MLX5_ACTION_FLAG; > + detected_actions |=3D MLX5_FLOW_ACTION_FLAG; > break; > case RTE_FLOW_ACTION_TYPE_MARK: > size +=3D sizeof(struct ibv_flow_spec_action_tag); > - detected_actions |=3D MLX5_ACTION_MARK; > + detected_actions |=3D MLX5_FLOW_ACTION_MARK; > break; > case RTE_FLOW_ACTION_TYPE_DROP: > size +=3D sizeof(struct ibv_flow_spec_action_drop); > - detected_actions |=3D MLX5_ACTION_DROP; > + detected_actions |=3D MLX5_FLOW_ACTION_DROP; > break; > case RTE_FLOW_ACTION_TYPE_QUEUE: > - detected_actions |=3D MLX5_ACTION_QUEUE; > + detected_actions |=3D MLX5_FLOW_ACTION_QUEUE; > break; > case RTE_FLOW_ACTION_TYPE_RSS: > - detected_actions |=3D MLX5_ACTION_RSS; > + detected_actions |=3D MLX5_FLOW_ACTION_RSS; > break; > case RTE_FLOW_ACTION_TYPE_COUNT: > #ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT > size +=3D sizeof(struct ibv_flow_spec_counter_action); > #endif > - detected_actions |=3D MLX5_ACTION_COUNT; > + detected_actions |=3D MLX5_FLOW_ACTION_COUNT; > break; > default: > break; > @@ -1519,7 +1519,7 @@ flow_verbs_remove(struct rte_eth_dev *dev, struct > rte_flow *flow) > verbs->flow =3D NULL; > } > if (verbs->hrxq) { > - if (flow->actions & MLX5_ACTION_DROP) > + if (flow->actions & MLX5_FLOW_ACTION_DROP) > mlx5_hrxq_drop_release(dev); > else > mlx5_hrxq_release(dev, verbs->hrxq); > @@ -1578,7 +1578,7 @@ flow_verbs_apply(struct rte_eth_dev *dev, struct > rte_flow *flow, >=20 > LIST_FOREACH(dev_flow, &flow->dev_flows, next) { > verbs =3D &dev_flow->verbs; > - if (flow->actions & MLX5_ACTION_DROP) { > + if (flow->actions & MLX5_FLOW_ACTION_DROP) { > verbs->hrxq =3D mlx5_hrxq_drop_new(dev); > if (!verbs->hrxq) { > rte_flow_error_set > @@ -1628,7 +1628,7 @@ flow_verbs_apply(struct rte_eth_dev *dev, struct > rte_flow *flow, > LIST_FOREACH(dev_flow, &flow->dev_flows, next) { > verbs =3D &dev_flow->verbs; > if (verbs->hrxq) { > - if (flow->actions & MLX5_ACTION_DROP) > + if (flow->actions & MLX5_FLOW_ACTION_DROP) > mlx5_hrxq_drop_release(dev); > else > mlx5_hrxq_release(dev, verbs->hrxq); > -- > 2.11.0 Acked-by: Ori Kam Thanks, Ori