From patchwork Fri Sep 28 22:55:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongseok Koh X-Patchwork-Id: 45619 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9291E1B450; Sat, 29 Sep 2018 00:55:32 +0200 (CEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0055.outbound.protection.outlook.com [104.47.1.55]) by dpdk.org (Postfix) with ESMTP id 3E06D1B2B3 for ; Sat, 29 Sep 2018 00:55:31 +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=x5JB9gttvHW/qJauZ9WotUeV2SV2EvIgj9LZTCWMsyo=; b=jDnYeN4G5vW6mAgrMChNj1wHQLb7QImnj8WhPhm8rGqAcbJXX3C9eWsmtdzzMsIYYY7zaHKaC1PEkSz57pcUWWCaPzNUsLyhtpkTTKFyE1u15zPMEM7jGptH8B93HEjoi/7qDN9PfthoftbzuxH3mvgp0HcX8biX7qGQg6v4DWU= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB4027.eurprd05.prod.outlook.com (52.134.72.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.25; Fri, 28 Sep 2018 22:55:30 +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.1164.024; Fri, 28 Sep 2018 22:55:30 +0000 From: Yongseok Koh To: Thomas Monjalon , Thomas Monjalon CC: "dev@dpdk.org" , Yongseok Koh Thread-Topic: [PATCH] test --transfer-encoding=base64 Thread-Index: AQHUV35aMMQxwWvOp0qcYOoKJZuOPg== Date: Fri, 28 Sep 2018 22:55:29 +0000 Message-ID: <20180928225521.7973-1-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DM5PR2001CA0011.namprd20.prod.outlook.com (2603:10b6:4:16::21) 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; DB3PR0502MB4027; 6:NeAl43K76I9uWnnCEtLXNGzPOsnq22P8cOx3qKfkCRYXSeGPfkPcGefry93+bS78HP0PVJHeskqkTk9KSkKrHKMerIPpxh2eO55MEu3fHu+HbYfhzGDEI1FITYL6j9WMTTwNDQqisgNo5vnYrmTD0qPt/YmmRVje8C2ccwWOpHafvOLmcBbBckfowznHQM9u4jlAnNSUuWAMFQubd6sjYzQRpnZ4hIxfKF51EqXCHZZ4+vzXukeM16KTiiE58I9vU6wmq62eGprlcZ8ei/0h9zQE1Pp09vI1V2/XuHXUGyosRVAteGdC3hWciw4yVksG1p55bQ16FfIgdgWdHql6faiPU5KTra2qOpnG1kLgGmKfb35HSxlINAjrlyiAMYTWTIVX8ZSsEiR2xe4e/SRsGJIPX/bI+Rem3XMWLcSiX2eQ+6euWd8v+5Dp/AHWBk6krrDnjXl3j6lSl8gYpxltRg==; 5:oof1OgfUc8ehcslpQ1hEoanpVO0VOIggXKxhKTESuJEDePKA1gKG7SRqPa+bLdTYY5Y7cJhDzSBcuuAmXL7zgK11ZPZ9wHEyol40HD8ROxI2CaIYp7X7bQw+EEPdayCDL+1GvMuHFfe+9VNsJ7wI2gZt8Bzq1Aw6QkOZk4EYKxI=; 7:viGaWtCJcV239zFaBnQh95v/CPaQ2WNgk8az1VXvofKrtZSZUNTjeo5iq7L4uKV1pkoPT7gZ+soho9X7/kAWaUVeqGPndpsOEo7acuDzZX7F1hG1+XDzLVLtantQPoHZMVk1TYghuUbDSdj75aYCioWzss95qSwBpdX07hGZXvQ55lWbyOA+V6ePN9FylqZCyt+nkUEtoUFSOMkMHEXK6DsK3LhpyoMrbYuxl1bOw1qH6AS1M6hkDk12Jefmdkxf x-ms-office365-filtering-correlation-id: c44867d1-fea4-49f7-2324-08d625957ce9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB4027; x-ms-traffictypediagnostic: DB3PR0502MB4027: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr 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)(10201501046)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(201708071742011)(7699051); SRVR:DB3PR0502MB4027; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB4027; x-forefront-prvs: 0809C12563 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(346002)(376002)(39860400002)(396003)(199004)(189003)(81156014)(6512007)(8676002)(2900100001)(5250100002)(14454004)(1076002)(106356001)(14444005)(256004)(4006002)(53936002)(6436002)(316002)(6116002)(8936002)(6486002)(105586002)(25786009)(3846002)(54906003)(81166006)(68736007)(110136005)(66066001)(52116002)(6636002)(5660300001)(86362001)(71190400001)(2616005)(486006)(107886003)(476003)(36756003)(102836004)(6506007)(7736002)(99286004)(2906002)(478600001)(26005)(4326008)(386003)(1857600001)(97736004)(186003)(34290500001)(71200400001)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4027; 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: gRAdIIsYK4fwI/5x1rgQT/xIDv8QBcft+UiK35V9N6Ri/9KNxzvjfceJ1xyR+eKRVXJP5xaVk1xvNfNTBDqEZXvh8reX4g688EcxF4qOnGJn4/axk/T4AALMussBKNl1vuxaMExzaouF9X0vOYmaJjn77h9F2rodh1kpfw/FIhyYustWFG/CqWU3bq6zG7xmY8Y+5lRZb5RiGvCl+s4LrrQaEyZ3bkO/fkPWFkOmt0ZG5SYaXh0hC0mH7VMkj2/Rr+s0IJiTk6FvE3aHBDqDiEvZORRxtveIjEs4UNkie45p/ONQYuPREQbmGi3HqtQPU0MPyB4ZB/dUYTU4/YEIHkkYArEjbN41xNuoCTXrgoE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: c44867d1-fea4-49f7-2324-08d625957ce9 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Sep 2018 22:55:29.9731 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4027 Subject: [dpdk-dev] [PATCH] test --transfer-encoding=base64 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" 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 --- drivers/net/mlx5/Makefile | 10 ++++++ drivers/net/mlx5/meson.build | 4 +++ drivers/net/mlx5/mlx5_flow.h | 5 +++ drivers/net/mlx5/mlx5_flow_tcf.c | 78 +++++++++++++++++++++++++++++++++++----- 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 7117f1471..d4253110c 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) #define MLX5_FLOW_FATE_ACTIONS \ (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS) @@ -125,6 +126,10 @@ /* Max number of actions per DV flow. */ #define MLX5_DV_MAX_NUMBER_OF_ACTIONS 8 +/* Due to a limitation on driver/FW. */ +#define MLX5_FLOW_GROUP_ID_MAX 3 +#define MLX5_FLOW_GROUP_PRIORITY_MAX 14 + enum mlx5_flow_drv_type { MLX5_FLOW_TYPE_MIN, MLX5_FLOW_TYPE_DV, diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c index 9ad66ac76..5d4a2e857 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 #ifndef IPV6_ADDR_LEN #define IPV6_ADDR_LEN 16 @@ -225,7 +231,9 @@ struct flow_tcf_ptoi { unsigned int ifindex; /**< Network interface index. */ }; -#define MLX5_TCF_FATE_ACTIONS (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_PORT_ID) +#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 +378,25 @@ flow_tcf_validate_attributes(const struct rte_flow_attr *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_FLOW_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_FLOW_GROUP_ID_MAX) + " isn't supported"); + else if (attr->group > 0 && + attr->priority > MLX5_FLOW_GROUP_PRIORITY_MAX) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, + attr, + "lowest priority level is " + RTE_STR(MLX5_FLOW_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 +447,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 +695,16 @@ flow_tcf_validate(struct rte_eth_dev *dev, action_flags |= MLX5_FLOW_ACTION_PORT_ID; port_id_dev = &rte_eth_devices[conf.port_id->id]; break; + case RTE_FLOW_ACTION_TYPE_JUMP: + conf.jump = actions->conf; + if (attr->group >= 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 |= MLX5_FLOW_ACTION_JUMP; + break; case RTE_FLOW_ACTION_TYPE_DROP: if (action_flags & MLX5_TCF_FATE_ACTIONS) return rte_flow_error_set @@ -755,7 +785,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 = 0; @@ -764,6 +795,8 @@ flow_tcf_get_items_and_size(const struct rte_flow_item items[], size += 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 += SZ_NLATTR_TYPE_OF(uint32_t); /* TCA_CHAIN. */ for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) { switch (items->type) { case RTE_FLOW_ITEM_TYPE_VOID: @@ -853,6 +886,13 @@ flow_tcf_get_actions_and_size(const struct rte_flow_action actions[], SZ_NLATTR_TYPE_OF(struct tc_mirred); flags |= MLX5_FLOW_ACTION_PORT_ID; break; + case RTE_FLOW_ACTION_TYPE_JUMP: + size += 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 |= MLX5_FLOW_ACTION_JUMP; + break; case RTE_FLOW_ACTION_TYPE_DROP: size += SZ_NLATTR_NEST + /* na_act_index. */ SZ_NLATTR_STRZ_OF("gact") + @@ -938,7 +978,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, @@ -951,7 +991,7 @@ flow_tcf_prepare(const struct rte_flow_attr *attr __rte_unused, struct nlmsghdr *nlh; struct tcmsg *tcm; - size += flow_tcf_get_items_and_size(items, item_flags); + size += flow_tcf_get_items_and_size(attr, items, item_flags); size += flow_tcf_get_actions_and_size(actions, action_flags); dev_flow = rte_zmalloc(__func__, size, MNL_ALIGNTO); if (!dev_flow) { @@ -1022,6 +1062,7 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_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; @@ -1056,6 +1097,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow, */ tcm->tcm_info = 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 = mnl_attr_nest_start(nlh, TCA_OPTIONS); mnl_attr_put_u32(nlh, TCA_FLOWER_FLAGS, TCA_CLS_FLAGS_SKIP_SW); @@ -1330,6 +1373,23 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_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 = actions->conf; + na_act_index = + mnl_attr_nest_start(nlh, na_act_index_cur++); + assert(na_act_index); + mnl_attr_put_strz(nlh, TCA_ACT_KIND, "gact"); + na_act = 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 = 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 = mnl_attr_nest_start(nlh, na_act_index_cur++);