From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10042.outbound.protection.outlook.com [40.107.1.42]) by dpdk.org (Postfix) with ESMTP id B11781B396 for ; Mon, 8 Oct 2018 20:06:30 +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=zUgVbGrAmVde1Dwvv1PiSoDbd3UoLMWo2rwcDmUCgzg=; b=UY6Gwn7vFwfi4FAcozMsfmwKuXL/WtH9FRCPNmNg260CFsA6a+tf1Fg9EgAalPHf8VAyyex/mB0G+RVyMJafAfdy0j7CnTUEyhRA8ZxlwVPGd0YEojBdCTxWNXBAII4JRzsIbzvHQcNkseqZxhpaLRlg9wOjRKTGGEMb+HPnrDY= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB3962.eurprd05.prod.outlook.com (52.134.67.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.18; Mon, 8 Oct 2018 18:06:29 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::1cb0:661b:ecab:6045]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::1cb0:661b:ecab:6045%2]) with mapi id 15.20.1207.024; Mon, 8 Oct 2018 18:06:29 +0000 From: Yongseok Koh To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh Thread-Topic: [PATCH v2] net/mlx5: support multiple groups and jump action Thread-Index: AQHUXzGiKl69OujvvkSaaq/Zudo7xQ== Date: Mon, 8 Oct 2018 18:06:29 +0000 Message-ID: <20181008180552.39671-1-yskoh@mellanox.com> References: <20181003015640.36306-1-yskoh@mellanox.com> In-Reply-To: <20181003015640.36306-1-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BN6PR1001CA0021.namprd10.prod.outlook.com (2603:10b6:405:28::34) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB3962; 6:1BLRoYry+GYPRU4O6pa+t0vRvKdqnY0qZxrpXmPRra5KGUATNRVOrqIea7GDVom5O4WR71rKfPD7MjAPgqLfxHiEty3sH/wVpyBd8JGmMtuq5DLHgGn7sdUVCNm/L/ZsFZuM1jOJIlwSnVml9IAn7zZeh7DHTTsApdxloH929hkJBhHTnbH3dwCXekeZvpTUcpNwvNpEfjbYRZtEE7nZH3+kgpnSJwTivXDijpxB1WugZHSBxyEYgugdHamGZRl8QqcsvO8On4YMGnFGkEsIXpvzu5V2cYA+QqyCpATZ4Rz3OSQOqAwEIErEDzvEa7c/k2sssqOAQrRS3LVpiskiA0M3TuqOgph/p0Hg/9MOUBayQlGNViOnLEfnbwmb+bCnL5o7M8+sWPV8QTYsWt6jbD+Zl70nGac593BlLfE62ZMsBSUZWoj1X1ZSCr9/0rfHf9RjrDVFewAK/nWf0A3BXA==; 5:iqRUouPuSDhuH8tiMcB2hpd13Jx7sihg7kIR/eD0jMrSQEGOsrFk3NNWK1MKWnEbA1AY1YMTWYyLrjAPYbg1NdopD+NFmiSNNozrucbvzm6mbgqE+XLanl5c8bs0j/U6cSDC51eEfvgbJaoQcOCKqnAZ1XmC73GckB3BbAPB8LE=; 7:rXuoLLt4tyir1CbL71psJisr9pca4KlBML2saDF6u7vvLlAXb/ltF10e7Ci+dYCrK5qfX1prn9Fp4mWT9jrGa/6s+wtbYG6Cx0ulnXb+RD+SndaV0zMwV52tWovtmnsbLd/fDwL88/Nd/c3hHsQZMdy/kWue5vd9TfmMEVihz/lc1ciHOIAiguhzdBxahMHj5IZsHiEf1rHwNS+sONaDrvfBLs5o3idxUIGaDUdxhYkwjoz6VYWDVSV0QWolLpH3 x-ms-office365-filtering-correlation-id: 46e9efa3-1801-4175-c47b-08d62d48c518 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:DB3PR0502MB3962; x-ms-traffictypediagnostic: DB3PR0502MB3962: 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)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231355)(944501410)(52105095)(10201501046)(6055026)(149066)(150057)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:DB3PR0502MB3962; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB3962; x-forefront-prvs: 081904387B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(366004)(396003)(376002)(39860400002)(346002)(199004)(189003)(6486002)(6636002)(99286004)(2906002)(81166006)(8676002)(81156014)(8936002)(11346002)(446003)(102836004)(5250100002)(68736007)(6506007)(6436002)(386003)(26005)(2900100001)(53936002)(6512007)(66066001)(36756003)(1076002)(71200400001)(71190400001)(76176011)(5660300001)(3846002)(52116002)(105586002)(37006003)(186003)(106356001)(54906003)(25786009)(107886003)(14444005)(14454004)(575784001)(86362001)(97736004)(486006)(256004)(6862004)(478600001)(4326008)(7736002)(2616005)(476003)(6116002)(316002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3962; H:DB3PR0502MB3980.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-microsoft-antispam-message-info: Sa0J0Y3jMOF7QpRyvSY0mi7Jac1S+dBV3tOypZ9mqvsWCNDCDTLRARzGsiwwt2zm2vUdzJqCpe8QfOw3spHQ5g4OUKSNpCU3jQ0DOh/SkDHJOW6pEBER8QanRcQqVi7zl/Cj4AxTeeqBQVpETMmi0oxf3DHtfxTb/aKTZT9QB47Dm1MNwkN4hd6jfsoWLs9Nx70p20PcX9o9J6Drx9EErzyJY44hLMs4z7ixE5N/8eoTq6DVzccheaHRGYmwJVDZg9VLHajpODZ8yyJWvZ4G8FrG2dYy5ox1gIsL+ax66fxhHoLewZpGPfPUdT2L0WoBd1+0X1/fvoZuCDUSjj2eYaVEcCeV2c6Ho5mBMyBuxlg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46e9efa3-1801-4175-c47b-08d62d48c518 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Oct 2018 18:06:29.2887 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3962 Subject: [dpdk-dev] [PATCH v2] net/mlx5: support multiple groups and jump action 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: Mon, 08 Oct 2018 18:06:31 -0000 rte_flow has 'group' attribute and 'jump' action in order to support multiple groups. This feature is known as multi-table support ('chain' in linux TC flower) in general because a group means a table of flows. Example commands are: flow create 0 transfer priority 1 ingress pattern eth / vlan vid is 100 / end actions jump group 1 / end flow create 0 transfer priority 1 ingress pattern eth / vlan vid is 200 / end actions jump group 2 / end flow create 0 transfer group 1 priority 2 ingress pattern eth / vlan vid is 100 / ipv4 dst spec 192.168.40.0 dst prefix 24 / end actions drop / end flow create 0 transfer group 1 priority 2 ingress pattern end actions of_pop_vlan / port_id id 1 / end flow create 0 transfer group 2 priority 2 ingress pattern eth / vlan vid is 200 / ipv4 dst spec 192.168.40.0 dst prefix 24 / end actions of_pop_vlan / port_id id 2 / end flow create 0 transfer group 2 priority 2 ingress pattern end actions port_id id 2 / end With theses flows, if a packet having vlan 200 and src_ip as 192.168.40.1, this packet will firstly hit the 1st flow. Then it will hit the 5th flow because of the 'jump' action. As a result, the packet will be forwarded to port 2 (VF representor) with vlan tag being stripped off. If the packet had vlan 100 instead, it would be dropped by the 3rd flow. Signed-off-by: Yongseok Koh --- v2: * drop ethdev patch as it had already been fixed by Adrien's patch * move TCF macros from mlx5_flow.h to mlx5_flow_tcf.c drivers/net/mlx5/Makefile | 10 +++++ drivers/net/mlx5/meson.build | 4 ++ drivers/net/mlx5/mlx5_flow.h | 1 + drivers/net/mlx5/mlx5_flow_tcf.c | 82 +++++++++++++++++++++++++++++++++++-= ---- 4 files changed, 88 insertions(+), 9 deletions(-) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index ca1de9f21..92bae9dfc 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -347,6 +347,16 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config= -h.sh enum TCA_VLAN_PUSH_VLAN_PRIORITY \ $(AUTOCONF_OUTPUT) $Q sh -- '$<' '$@' \ + HAVE_TCA_CHAIN \ + linux/rtnetlink.h \ + enum TCA_CHAIN \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_TC_ACT_GOTO_CHAIN \ + linux/pkt_cls.h \ + define TC_ACT_GOTO_CHAIN \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ HAVE_SUPPORTED_40000baseKR4_Full \ /usr/include/linux/ethtool.h \ define SUPPORTED_40000baseKR4_Full \ diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index fd93ac162..696624838 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -182,6 +182,10 @@ if build 'TCA_FLOWER_KEY_VLAN_ETH_TYPE' ], [ 'HAVE_TC_ACT_VLAN', 'linux/tc_act/tc_vlan.h', 'TCA_VLAN_PUSH_VLAN_PRIORITY' ], + [ 'HAVE_TCA_CHAIN', 'linux/rtnetlink.h', + 'TCA_CHAIN' ], + [ 'HAVE_TC_ACT_GOTO_CHAIN', 'linux/pkt_cls.h', + 'TC_ACT_GOTO_CHAIN' ], [ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h', 'RDMA_NL_NLDEV' ], [ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h', diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 12de841e8..3ed0ddc58 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -78,6 +78,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) +#define MLX5_FLOW_ACTION_JUMP (1u << 11) =20 #define MLX5_FLOW_FATE_ACTIONS \ (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS) diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_= tcf.c index 91f6ef678..fbc4c2bb7 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -148,6 +148,12 @@ struct tc_vlan { #ifndef HAVE_TCA_FLOWER_KEY_VLAN_ETH_TYPE #define TCA_FLOWER_KEY_VLAN_ETH_TYPE 25 #endif +#ifndef HAVE_TCA_CHAIN +#define TCA_CHAIN 11 +#endif +#ifndef HAVE_TC_ACT_GOTO_CHAIN +#define TC_ACT_GOTO_CHAIN 0x20000000 +#endif =20 #ifndef IPV6_ADDR_LEN #define IPV6_ADDR_LEN 16 @@ -225,7 +231,13 @@ struct flow_tcf_ptoi { unsigned int ifindex; /**< Network interface index. */ }; =20 -#define MLX5_TCF_FATE_ACTIONS (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_PO= RT_ID) +/* Due to a limitation on driver/FW. */ +#define MLX5_TCF_GROUP_ID_MAX 3 +#define MLX5_TCF_GROUP_PRIORITY_MAX 14 + +#define MLX5_TCF_FATE_ACTIONS \ + (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_PORT_ID | \ + MLX5_FLOW_ACTION_JUMP) #define MLX5_TCF_VLAN_ACTIONS \ (MLX5_FLOW_ACTION_OF_POP_VLAN | MLX5_FLOW_ACTION_OF_PUSH_VLAN | \ MLX5_FLOW_ACTION_OF_SET_VLAN_VID | MLX5_FLOW_ACTION_OF_SET_VLAN_PCP) @@ -370,14 +382,25 @@ flow_tcf_validate_attributes(const struct rte_flow_at= tr *attr, struct rte_flow_error *error) { /* - * Supported attributes: no groups, some priorities and ingress only. - * Don't care about transfer as it is the caller's problem. + * Supported attributes: groups, some priorities and ingress only. + * group is supported only if kernel supports chain. Don't care about + * transfer as it is the caller's problem. */ - if (attr->group) + if (attr->group > MLX5_TCF_GROUP_ID_MAX) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_GROUP, attr, - "groups are not supported"); - if (attr->priority > 0xfffe) + "group ID larger than " + RTE_STR(MLX5_TCF_GROUP_ID_MAX) + " isn't supported"); + else if (attr->group > 0 && + attr->priority > MLX5_TCF_GROUP_PRIORITY_MAX) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, + attr, + "lowest priority level is " + RTE_STR(MLX5_TCF_GROUP_PRIORITY_MAX) + " when group is configured"); + else if (attr->priority > 0xfffe) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, attr, @@ -428,6 +451,7 @@ flow_tcf_validate(struct rte_eth_dev *dev, } spec, mask; union { const struct rte_flow_action_port_id *port_id; + const struct rte_flow_action_jump *jump; const struct rte_flow_action_of_push_vlan *of_push_vlan; const struct rte_flow_action_of_set_vlan_vid * of_set_vlan_vid; @@ -675,6 +699,16 @@ flow_tcf_validate(struct rte_eth_dev *dev, action_flags |=3D MLX5_FLOW_ACTION_PORT_ID; port_id_dev =3D &rte_eth_devices[conf.port_id->id]; break; + case RTE_FLOW_ACTION_TYPE_JUMP: + conf.jump =3D actions->conf; + if (attr->group >=3D conf.jump->group) + return rte_flow_error_set + (error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "can't jump to a group backward"); + action_flags |=3D MLX5_FLOW_ACTION_JUMP; + break; case RTE_FLOW_ACTION_TYPE_DROP: if (action_flags & MLX5_TCF_FATE_ACTIONS) return rte_flow_error_set @@ -757,7 +791,8 @@ flow_tcf_validate(struct rte_eth_dev *dev, * Maximum size of memory for items. */ static int -flow_tcf_get_items_and_size(const struct rte_flow_item items[], +flow_tcf_get_items_and_size(const struct rte_flow_attr *attr, + const struct rte_flow_item items[], uint64_t *item_flags) { int size =3D 0; @@ -766,6 +801,8 @@ flow_tcf_get_items_and_size(const struct rte_flow_item = items[], size +=3D SZ_NLATTR_STRZ_OF("flower") + SZ_NLATTR_NEST + /* TCA_OPTIONS. */ SZ_NLATTR_TYPE_OF(uint32_t); /* TCA_CLS_FLAGS_SKIP_SW. */ + if (attr->group > 0) + size +=3D SZ_NLATTR_TYPE_OF(uint32_t); /* TCA_CHAIN. */ for (; items->type !=3D RTE_FLOW_ITEM_TYPE_END; items++) { switch (items->type) { case RTE_FLOW_ITEM_TYPE_VOID: @@ -855,6 +892,13 @@ flow_tcf_get_actions_and_size(const struct rte_flow_ac= tion actions[], SZ_NLATTR_TYPE_OF(struct tc_mirred); flags |=3D MLX5_FLOW_ACTION_PORT_ID; break; + case RTE_FLOW_ACTION_TYPE_JUMP: + 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_FLOW_ACTION_JUMP; + break; case RTE_FLOW_ACTION_TYPE_DROP: size +=3D SZ_NLATTR_NEST + /* na_act_index. */ SZ_NLATTR_STRZ_OF("gact") + @@ -940,7 +984,7 @@ flow_tcf_nl_brand(struct nlmsghdr *nlh, uint32_t handle= ) * otherwise NULL and rte_ernno is set. */ static struct mlx5_flow * -flow_tcf_prepare(const struct rte_flow_attr *attr __rte_unused, +flow_tcf_prepare(const struct rte_flow_attr *attr, const struct rte_flow_item items[], const struct rte_flow_action actions[], uint64_t *item_flags, uint64_t *action_flags, @@ -953,7 +997,7 @@ flow_tcf_prepare(const struct rte_flow_attr *attr __rte= _unused, struct nlmsghdr *nlh; struct tcmsg *tcm; =20 - size +=3D flow_tcf_get_items_and_size(items, item_flags); + size +=3D flow_tcf_get_items_and_size(attr, items, item_flags); size +=3D flow_tcf_get_actions_and_size(actions, action_flags); dev_flow =3D rte_zmalloc(__func__, size, MNL_ALIGNTO); if (!dev_flow) { @@ -1024,6 +1068,7 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct ml= x5_flow *dev_flow, } spec, mask; union { const struct rte_flow_action_port_id *port_id; + const struct rte_flow_action_jump *jump; const struct rte_flow_action_of_push_vlan *of_push_vlan; const struct rte_flow_action_of_set_vlan_vid * of_set_vlan_vid; @@ -1058,6 +1103,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct ml= x5_flow *dev_flow, */ tcm->tcm_info =3D TC_H_MAKE((attr->priority + 1) << 16, RTE_BE16(ETH_P_ALL)); + if (attr->group > 0) + mnl_attr_put_u32(nlh, TCA_CHAIN, attr->group); mnl_attr_put_strz(nlh, TCA_KIND, "flower"); na_flower =3D mnl_attr_nest_start(nlh, TCA_OPTIONS); mnl_attr_put_u32(nlh, TCA_FLOWER_FLAGS, TCA_CLS_FLAGS_SKIP_SW); @@ -1332,6 +1379,23 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct m= lx5_flow *dev_flow, mnl_attr_nest_end(nlh, na_act); mnl_attr_nest_end(nlh, na_act_index); break; + case RTE_FLOW_ACTION_TYPE_JUMP: + conf.jump =3D actions->conf; + na_act_index =3D + mnl_attr_nest_start(nlh, na_act_index_cur++); + assert(na_act_index); + mnl_attr_put_strz(nlh, TCA_ACT_KIND, "gact"); + na_act =3D mnl_attr_nest_start(nlh, TCA_ACT_OPTIONS); + assert(na_act); + mnl_attr_put(nlh, TCA_GACT_PARMS, + sizeof(struct tc_gact), + &(struct tc_gact){ + .action =3D TC_ACT_GOTO_CHAIN | + conf.jump->group, + }); + mnl_attr_nest_end(nlh, na_act); + mnl_attr_nest_end(nlh, na_act_index); + break; case RTE_FLOW_ACTION_TYPE_DROP: na_act_index =3D mnl_attr_nest_start(nlh, na_act_index_cur++); --=20 2.11.0