From patchwork Wed Oct 10 13:11:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoyu Min X-Patchwork-Id: 46497 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 6F4E21B5C7; Wed, 10 Oct 2018 15:11:41 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0050.outbound.protection.outlook.com [104.47.0.50]) by dpdk.org (Postfix) with ESMTP id CBCE21B5C6 for ; Wed, 10 Oct 2018 15:11:39 +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=7wsv6SNrcwfBx6ObxeacHn/Qa7F+3x9aDGYVXs6U29M=; b=LXaLTTdK0JTSI53nFGHpCF53Rv2SfwiJbgfU5X++w7obmUep68CSNX/CXYymOzqmHIx3hNivIRSNPHilkkD7nK9Ky4wDejxL7ubUQJjHjpbzdQBu8y3eY39+rVOeykcGTapdM/NWbRPNe6BhOhlx0h/O3km9KT4VTNabtp722Ek= Received: from DB6PR0501MB2023.eurprd05.prod.outlook.com (10.168.9.17) by DB6PR0501MB2632.eurprd05.prod.outlook.com (10.172.225.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.23; Wed, 10 Oct 2018 13:11:38 +0000 Received: from DB6PR0501MB2023.eurprd05.prod.outlook.com ([fe80::b1fb:bad3:b5b1:f913]) by DB6PR0501MB2023.eurprd05.prod.outlook.com ([fe80::b1fb:bad3:b5b1:f913%3]) with mapi id 15.20.1228.020; Wed, 10 Oct 2018 13:11:38 +0000 From: Jack Min To: Adrien Mazarguil , John McNamara , Marko Kovacevic , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko CC: "dev@dpdk.org" Thread-Topic: [PATCH v2 1/3] ethdev: add generic MAC address rewrite actions Thread-Index: AQHUYJrHOASNX2VnEU67r5+H000spA== Date: Wed, 10 Oct 2018 13:11:38 +0000 Message-ID: <20181010131108.24167-2-jackmin@mellanox.com> References: <20180925150340.25378-1-jackmin@mellanox.com> <20181010131108.24167-1-jackmin@mellanox.com> In-Reply-To: <20181010131108.24167-1-jackmin@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR02CA0156.apcprd02.prod.outlook.com (2603:1096:201:1f::16) To DB6PR0501MB2023.eurprd05.prod.outlook.com (2603:10a6:4:6::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jackmin@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [118.201.220.138] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB6PR0501MB2632; 6:WmuhsPgejLhiE0ynLHPmQ9KuemQjYeKKS/HX17W0eKHM2m04EplLnepz0rf85HJLaewM6uGWGhVWnwYCaRbcD+en1g4rIpW/oghqWd7U5DtXhXFTupxt+4KKrbM07dcpGMTL/8u8vEcKnXxgSobUownwP1uaT4Rviavexprp285fm59//aFLTuBxMKRD3mMSEtkMasbJYP3sICditGz7CvsscmBxET7lcXNUCFa3YL9iKCioZnfn3g/K6yTEY2JQ8Vu49WGNJtkF0VCCpFJMRp/0wBscxbgaq0SFFMxsiTYnzgmMq0QoZ1/G2TfWKoJsvOaRbUdY16Zm0gG1OupLvwAqwtg5dXvOIeWfdpKZ4lvdoo6mBIp2RNyXXudlsPt0l5/mjHJeSsS1ILHpzLOqbkVXMdzmyIZXRnM7tGYOSrUE+aBjh4OyAS+5F6GBqfwZrRXR+ZdEV4AdMGyqjp7JbA==; 5:fImspnlBCJsRjwMQBbOMFTEUh6nz6T7awAlr92uWLeMRDIwYgvv2QzIVb/T9A8kKIrFVzqY3p5rcVv+OIwdlaUPk8gmmFBdyqo94Fg9P205BmQMaquFywaq1+H6m1adI+piglXu2jI/X2j/Er9N4zSSQ3eVBkucfYFItMpXAFVM=; 7:EAuLJU0Onz5vFOMIT/ffFru++vcYgo1CUF0Ipbvxbj96lpKiq3SauGWVidRgBX/OwABXC50Im6iyPpw0LZ5TZWxitBilDpHIeXYNEqEYkvouVxi9Br4jTIB0JPNbcN6Y36QoSGUCfr6CaGY4HeaPo3jCk/K/+1oZzXMkOxZ2YT045iOluUH3WIqa81adHZJ/qbbvo1SFhVCVrfqEDOPoYGMxScGoynUrCKiYJQbZStapFJXAEcki0Xy0aeuye8e8 x-ms-office365-filtering-correlation-id: 67aed93e-f765-450e-5605-08d62eb1e970 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:DB6PR0501MB2632; x-ms-traffictypediagnostic: DB6PR0501MB2632: 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)(8121501046)(5005006)(10201501046)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(20161123560045)(201708071742011)(7699051); SRVR:DB6PR0501MB2632; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0501MB2632; x-forefront-prvs: 08213D42D3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(346002)(376002)(136003)(199004)(189003)(14454004)(446003)(106356001)(105586002)(3846002)(6116002)(1076002)(110136005)(575784001)(86362001)(52116002)(186003)(14444005)(256004)(76176011)(99286004)(81166006)(81156014)(486006)(386003)(11346002)(102836004)(26005)(8676002)(8936002)(2616005)(6506007)(476003)(68736007)(7736002)(66066001)(53936002)(2906002)(305945005)(5660300001)(6436002)(6486002)(316002)(71200400001)(71190400001)(36756003)(25786009)(97736004)(2900100001)(5250100002)(4326008)(6512007)(478600001)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0501MB2632; H:DB6PR0501MB2023.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: I0iZD6+dT+/ZZWTHulZkhTHK3Pov82tLhe9h8QcWVH7THnTdlDPXillEV810T+oBiIXRjafLR0YzmXhPghyV4aRZ+ZJgBMByG6M7THW/xvK9Vw4t8ij1eMVnoysIujL7oO6UhZEW8evSmqLjTAzXmBdv85xfTiKxhZjl/k0+vNs4gbCdiPOrSQaO+PX2nCb72H17CqSkP3fHWjweE9WAmmbF+OiiPKwfsG25rvombNKY2fN053s1uYBMqegwDYjkARjCa0R2/qg1FuSfHkrC2/GtXeO3EwstwnYgPFEgqbKDW+sU/fuc381YWnz6hT58INFb3ROqaONjV+YLLZGaM1TuspO3xDBNoRBIekHm0Ps= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67aed93e-f765-450e-5605-08d62eb1e970 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2018 13:11:38.4421 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2632 Subject: [dpdk-dev] [PATCH v2 1/3] ethdev: add generic MAC address rewrite actions 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 actions: - RTE_FLOW_ACTION_TYPE_SET_MAC_SRC - RTE_FLOW_ACTION_TYPE_SET_MAC_DST added in order to offload to NIC The rte_flow_itme_eth must be present in rte_flow pattern Signed-off-by: Xiaoyu Min Acked-by: Yongseok Koh Acked-by: Andrew Rybchenko --- doc/guides/prog_guide/rte_flow.rst | 30 ++++++++++++++++++++++++++++++ lib/librte_ethdev/rte_flow.c | 2 ++ lib/librte_ethdev/rte_flow.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index e8df1e488..d0f2d8b54 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -2196,6 +2196,36 @@ Assigns a new TTL value. | ``ttl_value`` | new TTL value | +---------------+--------------------+ +Action: ``SET_MAC_SRC`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Set source MAC address + +.. _table_rte_flow_action_set_mac_src: + +.. table:: SET_MAC_SRC + + +--------------+---------------+ + | Field | Value | + +==============+===============+ + | ``mac_addr`` | MAC address | + +--------------+---------------+ + +Action: ``SET_MAC_DST`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Set source MAC address + +.. _table_rte_flow_action_set_mac_dst: + +.. table:: SET_MAC_DST + + +--------------+---------------+ + | Field | Value | + +==============+===============+ + | ``mac_addr`` | MAC address | + +--------------+---------------+ + Negative types ~~~~~~~~~~~~~~ diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 458a05994..810069935 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -137,6 +137,8 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { sizeof(struct rte_flow_action_set_tp)), MK_FLOW_ACTION(DEC_TTL, 0), MK_FLOW_ACTION(SET_TTL, sizeof(struct rte_flow_action_set_ttl)), + MK_FLOW_ACTION(SET_MAC_SRC, sizeof(struct rte_flow_action_set_mac)), + MK_FLOW_ACTION(SET_MAC_DST, sizeof(struct rte_flow_action_set_mac)), }; static int diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index bb07eba9d..4193f4e05 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -1568,6 +1568,26 @@ enum rte_flow_action_type { * See struct rte_flow_action_set_ttl */ RTE_FLOW_ACTION_TYPE_SET_TTL, + + /** + * Set source MAC address from matched flow. + * + * If flow pattern does not define a valid RTE_FLOW_ITEM_TYPE_ETH, + * the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION error. + * + * See struct rte_flow_action_set_mac. + */ + RTE_FLOW_ACTION_TYPE_SET_MAC_SRC, + + /** + * Set destination MAC address from matched flow. + * + * If flow pattern does not define a valid RTE_FLOW_ITEM_TYPE_ETH, + * the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION error. + * + * See struct rte_flow_action_set_mac. + */ + RTE_FLOW_ACTION_TYPE_SET_MAC_DST, }; /** @@ -1987,6 +2007,15 @@ struct rte_flow_action_set_ttl { uint8_t ttl_value; }; +/** + * RTE_FLOW_ACTION_TYPE_SET_MAC + * + * Set MAC address from the matched flow + */ +struct rte_flow_action_set_mac { + uint8_t mac_addr[ETHER_ADDR_LEN]; +}; + /* * Definition of a single action. * From patchwork Wed Oct 10 13:11:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoyu Min X-Patchwork-Id: 46498 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 328061B5EA; Wed, 10 Oct 2018 15:11:45 +0200 (CEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50070.outbound.protection.outlook.com [40.107.5.70]) by dpdk.org (Postfix) with ESMTP id 5207B1B5E8 for ; Wed, 10 Oct 2018 15:11:44 +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=GnBdBcstk/r21Gv7v3BCkEHbjKbllH55f7xyv7mwRjI=; b=V9arC92bc7qqPBIzgTXduSU2dZLFNfLKJSRxRiaKVcfNHS14IHWMtOKJ/i3ssquGFI9q6lI3pScbVka/QfA00Rs5V+/kh4okdKpjiuCZSKMAhAUiSzXdmn3LMkQUn6u63SI/tymYrQiMQ3YDUo2yo5QMyH1uF+2LpcnfT7r+feI= Received: from DB6PR0501MB2023.eurprd05.prod.outlook.com (10.168.9.17) by DB6PR0501MB2632.eurprd05.prod.outlook.com (10.172.225.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.23; Wed, 10 Oct 2018 13:11:43 +0000 Received: from DB6PR0501MB2023.eurprd05.prod.outlook.com ([fe80::b1fb:bad3:b5b1:f913]) by DB6PR0501MB2023.eurprd05.prod.outlook.com ([fe80::b1fb:bad3:b5b1:f913%3]) with mapi id 15.20.1228.020; Wed, 10 Oct 2018 13:11:43 +0000 From: Jack Min To: Adrien Mazarguil , Wenzhuo Lu , Jingjing Wu , Bernard Iremonger , John McNamara , Marko Kovacevic CC: "dev@dpdk.org" Thread-Topic: [PATCH v2 2/3] app/testpmd: add commands of modify MAC address Thread-Index: AQHUYJrJGiNUTJv7XkaL0aVV+OfqtQ== Date: Wed, 10 Oct 2018 13:11:42 +0000 Message-ID: <20181010131108.24167-3-jackmin@mellanox.com> References: <20180925150340.25378-1-jackmin@mellanox.com> <20181010131108.24167-1-jackmin@mellanox.com> In-Reply-To: <20181010131108.24167-1-jackmin@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR02CA0156.apcprd02.prod.outlook.com (2603:1096:201:1f::16) To DB6PR0501MB2023.eurprd05.prod.outlook.com (2603:10a6:4:6::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jackmin@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [118.201.220.138] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB6PR0501MB2632; 6:CiSYAoenswV5rTFJqtoCfPrlr2GVGbxq1A5KTFGDK5y+IZdGQjE0Cr4NJKyxsP18kG1+BWKwKpod/f4RtJTXGula6PLxBsdM69GPajacrVlL3jzDrZzq/EisEycEzEHZ+QbQHgAKVV8J+mg/lmxxKbrZlLTXYYe7pxWblolP4be6Udf0xbCKOxB9O/KSD1SNP4r6QITG6N/a1gr1TulgRcH/cEYmPPyLPp8NVHnTrGo+syJyZH84iR5E7Wl4IApcLd+5JByDroOIGzFbQkGfrf33/FkWYSiN9WAGrRvqghZyo2F5VtfVsSD94lbOwLnXT1HQnT3+orz0PQGAyzmcktbBtnerX4ydCrIeWOU+f+UvoNrBFR7ZVTWn+2GVb4XIdJGhLfZ6IgRtQJL/UmVNiWwHd+fDk6B/JWf2VHQL2NbxXdG3JhbXtBvrhddZn0HWsMK8ouJtyjK4oePGlOjy/w==; 5:/zptRmlNpq8TyqbrM5I1te+2O3UlsHQE4SoJOkbQ0Yi5EdPCHGmXZSt9u1yemNNi6nwYFbA/XZ9cMG4LLCiYo/6Q6O9Aj830cIneTi1UzRqCX13E9BssTjpGZ3zNOYEQd3CvK9wIeiHJbdMNwuSEb5frIPNVxXvEUsd6qh7b+Qo=; 7:5Wlqw+F7saTWYSNlQQxZ3hL3ejy0reXIyYJZy+mddirfXc8ZBweez/HBbeGrsWeQB4s6xZhSmcMJ1D3kE3fQiVIZ5FNQ809ckkH/0HoFdiEUJyDo7gqCGktvF1bEedZJ9kQsT5G7J1Xvxl5byjLHe8J/lAEIYWP5AYO2aN7K2uE5wgvYdY2FLdt7h7J+12mMSEK5nfwKVHeAQe+QEaacXg+i7j7qcb/nzFqCR/6iz0XjJLRqb+YKUCncYk/DReaK x-ms-office365-filtering-correlation-id: ba087f7b-ac24-48f7-6773-08d62eb1ebe3 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:DB6PR0501MB2632; x-ms-traffictypediagnostic: DB6PR0501MB2632: 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)(8121501046)(5005006)(10201501046)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(20161123560045)(201708071742011)(7699051); SRVR:DB6PR0501MB2632; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0501MB2632; x-forefront-prvs: 08213D42D3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(346002)(376002)(136003)(199004)(189003)(14454004)(446003)(106356001)(105586002)(3846002)(6116002)(1076002)(110136005)(86362001)(52116002)(186003)(256004)(76176011)(99286004)(81166006)(81156014)(486006)(386003)(11346002)(102836004)(26005)(8676002)(8936002)(2616005)(6506007)(476003)(68736007)(7736002)(66066001)(53936002)(2906002)(305945005)(5660300001)(6436002)(6486002)(316002)(71200400001)(71190400001)(36756003)(25786009)(97736004)(2900100001)(5250100002)(4326008)(6512007)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0501MB2632; H:DB6PR0501MB2023.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: MSlmghhY2tE6q4MbnWaC/xapLEMghTFAKJPUXq2HgIem1EqFejVQogLbhUpNBCpgC7D+yuKUX0DjQ1NgOSuppdxxEmupHh3rux6eth/9FRGkoHuTBEj+5T5kgCryKjTXTSLv5feJqDz7JeOfngoxlRZ0ZmvavYxb8CvWT4Y9u9pC/dnf1huIp6nQ8ZEE+bT3Wr2zMd0cV0U0pYE7U0c7R++QyNjFcaeUovX+5AjqiEmInSlOOC9RtxrfrI70awD+4vXilEHhYIQ1MQubygwh/OZqfKpDWuW6lQoIhsN269WSj4sEBiWHCSCTB76eEZJI+D80brOmB3OmHS8OmfgbGIbOvxoj/Gn2fRlcuil+39Q= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba087f7b-ac24-48f7-6773-08d62eb1ebe3 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2018 13:11:42.8954 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2632 Subject: [dpdk-dev] [PATCH v2 2/3] app/testpmd: add commands of modify MAC address 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" add commands to support following actions: - RTE_FLOW_ACTION_TYPE_SET_MAC_SRC - RTE_FLOW_ACTION_TYPE_SET_MAC_DST Signed-off-by: Xiaoyu Min Acked-by: Yongseok Koh --- app/test-pmd/cmdline_flow.c | 50 +++++++++++++++++++++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 ++++ 2 files changed, 58 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index fae825462..d06e75799 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -258,6 +258,10 @@ enum index { ACTION_DEC_TTL, ACTION_SET_TTL, ACTION_SET_TTL_TTL, + ACTION_SET_MAC_SRC, + ACTION_SET_MAC_SRC_MAC_SRC, + ACTION_SET_MAC_DST, + ACTION_SET_MAC_DST_MAC_DST, }; /** Maximum size for pattern in struct rte_flow_item_raw. */ @@ -839,6 +843,8 @@ static const enum index next_action[] = { ACTION_SET_TP_DST, ACTION_DEC_TTL, ACTION_SET_TTL, + ACTION_SET_MAC_SRC, + ACTION_SET_MAC_DST, ZERO, }; @@ -947,6 +953,12 @@ static const enum index action_set_ipv4_src[] = { ZERO, }; +static const enum index action_set_mac_src[] = { + ACTION_SET_MAC_SRC_MAC_SRC, + ACTION_NEXT, + ZERO, +}; + static const enum index action_set_ipv4_dst[] = { ACTION_SET_IPV4_DST_IPV4_DST, ACTION_NEXT, @@ -989,6 +1001,12 @@ static const enum index action_jump[] = { ZERO, }; +static const enum index action_set_mac_dst[] = { + ACTION_SET_MAC_DST_MAC_DST, + ACTION_NEXT, + ZERO, +}; + static int parse_init(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); @@ -2654,6 +2672,38 @@ static const struct token token_list[] = { (struct rte_flow_action_set_ttl, ttl_value)), .call = parse_vc_conf, }, + [ACTION_SET_MAC_SRC] = { + .name = "set_mac_src", + .help = "set source mac address", + .priv = PRIV_ACTION(SET_MAC_SRC, + sizeof(struct rte_flow_action_set_mac)), + .next = NEXT(action_set_mac_src), + .call = parse_vc, + }, + [ACTION_SET_MAC_SRC_MAC_SRC] = { + .name = "mac_addr", + .help = "new source mac address", + .next = NEXT(action_set_mac_src, NEXT_ENTRY(MAC_ADDR)), + .args = ARGS(ARGS_ENTRY_HTON + (struct rte_flow_action_set_mac, mac_addr)), + .call = parse_vc_conf, + }, + [ACTION_SET_MAC_DST] = { + .name = "set_mac_dst", + .help = "set destination mac address", + .priv = PRIV_ACTION(SET_MAC_DST, + sizeof(struct rte_flow_action_set_mac)), + .next = NEXT(action_set_mac_dst), + .call = parse_vc, + }, + [ACTION_SET_MAC_DST_MAC_DST] = { + .name = "mac_addr", + .help = "new destination mac address to set", + .next = NEXT(action_set_mac_dst, NEXT_ENTRY(MAC_ADDR)), + .args = ARGS(ARGS_ENTRY_HTON + (struct rte_flow_action_set_mac, mac_addr)), + .call = parse_vc_conf, + }, }; /** Remove and return last entry from argument stack. */ diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 16cd4468e..ab478fa96 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3733,6 +3733,14 @@ This section lists supported actions and their attributes, if any. - ``set_ttl``: Set TTL value with specificed value - ``ttl_value {unsigned}``: The new TTL value to be set +- ``set_mac_src``: set source MAC address + + - ``mac_addr {MAC-48}``: new source MAC address + +- ``set_mac_dst``: set destination MAC address + + - ``mac_addr {MAC-48}``: new destination MAC address + Destroying flow rules ~~~~~~~~~~~~~~~~~~~~~ From patchwork Wed Oct 10 13:11:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoyu Min X-Patchwork-Id: 46499 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 A88361B5CC; Wed, 10 Oct 2018 15:11:48 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0058.outbound.protection.outlook.com [104.47.0.58]) by dpdk.org (Postfix) with ESMTP id F38F41B5F9 for ; Wed, 10 Oct 2018 15:11:46 +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=Q4AQ/KpGaM+bW5o8vBGRgRaDOnvC2XccK+UyUyAO1PM=; b=wYS84W/tkKAko3nvtnIX87cQ+g0APwwP3yX9hN7ORm6DO8AivHyZPKj28OvgBkYccmGXt4oA6uQDyxu5gv3HWRMjO0pA+QXYu8bnjI3k+TSon+buL/ZItxuBuzhUiViIZrMyOkdM98wSYvoLtwB/aFBBXRYjDQcGesooFJbWAMs= Received: from DB6PR0501MB2023.eurprd05.prod.outlook.com (10.168.9.17) by DB6PR0501MB2632.eurprd05.prod.outlook.com (10.172.225.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.23; Wed, 10 Oct 2018 13:11:45 +0000 Received: from DB6PR0501MB2023.eurprd05.prod.outlook.com ([fe80::b1fb:bad3:b5b1:f913]) by DB6PR0501MB2023.eurprd05.prod.outlook.com ([fe80::b1fb:bad3:b5b1:f913%3]) with mapi id 15.20.1228.020; Wed, 10 Oct 2018 13:11:45 +0000 From: Jack Min To: Shahaf Shuler , Yongseok Koh CC: "dev@dpdk.org" Thread-Topic: [PATCH v2 3/3] net/mlx5: rewrite MAC address by E-Switch Thread-Index: AQHUYJrLu7WwdR73z0yLmlrr3npCtg== Date: Wed, 10 Oct 2018 13:11:45 +0000 Message-ID: <20181010131108.24167-4-jackmin@mellanox.com> References: <20180925150340.25378-1-jackmin@mellanox.com> <20181010131108.24167-1-jackmin@mellanox.com> In-Reply-To: <20181010131108.24167-1-jackmin@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR02CA0156.apcprd02.prod.outlook.com (2603:1096:201:1f::16) To DB6PR0501MB2023.eurprd05.prod.outlook.com (2603:10a6:4:6::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jackmin@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [118.201.220.138] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB6PR0501MB2632; 6:asCq4xpV5edPCuYdRnPwXpWHhN8FLxuWlHlxAs29Ii/knl3++dWdf84TfePTD6YYUAFIS79PGorKoptlcUvcExNou1P4YHKc1lgiITe4R26UoUZZPB8mEcAdXuH9U//eNfX6YeL0ygoWTJ0L0IVgxqbVacX8N4My1dcsDUvCThoI0WvShatx7z1IP0YyVJ6YRVwFCHB8u6+trjsS5EnNy2B6HurcQ955BCsGI/nO00vK+bYAYO66GxoOS2hoc1EMIY7C820QAhGkryX+gAD7HT9bZSgauRM412RDJVBcgsl3c5NIyIjmGkzmM4QxJAGJrWeg9rES0AgjnzG0BZC5FVIafTj0pqtt1nY0wb/iv/4gETXCK3J+c4EgL7eWKuwcm35qDmHt/s/KN/2eap6EVtW0seJzmDh8K70wurGIFZ4fZZRP6Qu37o0l4gu8qnDjCQPdgJa9oYeaui+pNCVyaw==; 5:rEPfYj3zsKYHEIf/qf4FUMkQ0ZduUASCVCVIulI1StGwlmGMl3wDVPjjzXJ27AFiVTZXOy1PWd+SmMSTNFiDZ+Asa5agUsaAke/Cij7DvpcWmjyjC5mznvyX9zULNo53+byzijv9Rhzm+YPW0yC+s46+CnRZ4vXTz4ZwcwBXrZ4=; 7:bEECeWgcqm/UjHHir5zVLr7AkPEbyMaofFBJkX+pIGZfJHPLzASekCz3jG7VZNtzsbL2Peqe9PM7h8G8hu+UQkC45F1vhjd9aZcr3aG3pZ0VBoUbxuVvwkJkw58jlymmh7UE/GVYWmzFx9fCSw9Xt9etcdi8o6l+t/tcgOjePI8MOvln63yb3obDfJGaJgPY2xSL5G0PDO4y6SzMMINPQpPfb5mOYRPlKIe3LCDzIi05VMCSjE5sNfU65e/iU7Dx x-ms-office365-filtering-correlation-id: 28a1c56c-172a-48f9-92e5-08d62eb1edaf 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:DB6PR0501MB2632; x-ms-traffictypediagnostic: DB6PR0501MB2632: 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)(10201501046)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(20161123560045)(201708071742011)(7699051); SRVR:DB6PR0501MB2632; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0501MB2632; x-forefront-prvs: 08213D42D3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(346002)(376002)(136003)(199004)(189003)(14454004)(446003)(106356001)(105586002)(3846002)(6116002)(1076002)(110136005)(85306007)(86362001)(52116002)(186003)(14444005)(256004)(76176011)(99286004)(81166006)(81156014)(486006)(386003)(11346002)(102836004)(26005)(8676002)(8936002)(2616005)(6506007)(476003)(68736007)(7736002)(66066001)(53936002)(2906002)(305945005)(5660300001)(6436002)(6486002)(316002)(71200400001)(71190400001)(6636002)(36756003)(25786009)(97736004)(2900100001)(5250100002)(4326008)(6512007)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0501MB2632; H:DB6PR0501MB2023.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: h7mwGdWFk934oBRpxHhCf5qwfiu/IGq7ctxbnrfnXPAdk6hKWinEUFfEgSjn4k4VG9SMnlhlmskFRW8juiWJN2Mprq1tyS5Mb05B/yqHY6bObzTa3qRNqkJjoP5oISU+pD4eoDeuhlTgG/bAkJqXRJP9KLisNVh83SmVt4CwQ2UVuM7aq8BfiqhVQwsCsPVvf17+nlVptc8WkeyblDKNuNQpzly6gd9YEemXRi4N5kPTuSIRDmaU3+Qxz+dRHFPNwRBFoP8kBBLwjuFh3x/qkw3O0Hd0sgtFsv1JYFWMzEpFwUyG62rh++KxWlHt5wwIp+VrPwjKnL2ygc/RhlgjLmaMj26WEPOWsQCaSZV7K4o= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28a1c56c-172a-48f9-92e5-08d62eb1edaf X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2018 13:11:45.7549 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2632 Subject: [dpdk-dev] [PATCH v2 3/3] net/mlx5: rewrite MAC address by E-Switch 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" Offload following modify MAC address actions to E-Switch via TC-Flower driver - RTE_FLOW_ACTION_TYPE_SET_MAC_SRC - RTE_FLOW_ACTION_TYPE_SET_MAC_DST The corresponding rte_flow_item_eth must be present in rte_flow pattern Only support modify outer layer MAC address The example testpmd command is: flow create 0 transfer ingress pattern eth / ipv4 / udp dst is 7000 / end actions set_mac_dst mac_addr dd:00:aa:11:bb:33 / set_mac_src mac_addr bb:00:cc:11:aa:22 / port_id id 1 / end Signed-off-by: Xiaoyu Min Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_flow.h | 2 + drivers/net/mlx5/mlx5_flow_tcf.c | 71 +++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 0ad8c12ea..22e648b36 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -86,6 +86,8 @@ #define MLX5_FLOW_ACTION_SET_TP_DST (1u << 16) #define MLX5_FLOW_ACTION_SET_TTL (1u << 17) #define MLX5_FLOW_ACTION_DEC_TTL (1u << 18) +#define MLX5_FLOW_ACTION_SET_MAC_SRC (1u << 19) +#define MLX5_FLOW_ACTION_SET_MAC_DST (1u << 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 af8a68529..c10fdd3fb 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -305,7 +305,9 @@ struct flow_tcf_ptoi { MLX5_FLOW_ACTION_SET_TP_SRC | \ MLX5_FLOW_ACTION_SET_TP_DST | \ MLX5_FLOW_ACTION_SET_TTL | \ - MLX5_FLOW_ACTION_DEC_TTL) + MLX5_FLOW_ACTION_DEC_TTL | \ + MLX5_FLOW_ACTION_SET_MAC_SRC | \ + MLX5_FLOW_ACTION_SET_MAC_DST) #define MLX5_TCF_CONFIG_ACTIONS (MLX5_FLOW_ACTION_PORT_ID | \ MLX5_FLOW_ACTION_OF_PUSH_VLAN | \ @@ -345,6 +347,42 @@ flow_tcf_calc_pedit_keys(const uint64_t size) return keys; } +/** + * Set pedit key of MAC address + * + * @param[in] actions + * pointer to action specification + * @param[in,out] p_parser + * pointer to pedit_parser + */ +static void +flow_tcf_pedit_key_set_mac(const struct rte_flow_action *actions, + struct pedit_parser *p_parser) +{ + int idx = p_parser->sel.nkeys; + uint32_t off = actions->type == RTE_FLOW_ACTION_TYPE_SET_MAC_SRC ? + offsetof(struct ether_hdr, s_addr) : + offsetof(struct ether_hdr, d_addr); + const struct rte_flow_action_set_mac *conf = + (const struct rte_flow_action_set_mac *)actions->conf; + + p_parser->keys[idx].off = off; + p_parser->keys[idx].mask = ~UINT32_MAX; + p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_ETH; + p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_SET; + memcpy(&p_parser->keys[idx].val, + conf->mac_addr, SZ_PEDIT_KEY_VAL); + idx++; + p_parser->keys[idx].off = off + SZ_PEDIT_KEY_VAL; + p_parser->keys[idx].mask = 0xFFFF0000; + p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_ETH; + p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_SET; + memcpy(&p_parser->keys[idx].val, + conf->mac_addr + SZ_PEDIT_KEY_VAL, + ETHER_ADDR_LEN - SZ_PEDIT_KEY_VAL); + p_parser->sel.nkeys = (++idx); +} + /** * Set pedit key of decrease/set ttl * @@ -529,6 +567,10 @@ flow_tcf_create_pedit_mnl_msg(struct nlmsghdr *nl, flow_tcf_pedit_key_set_dec_ttl(*actions, &p_parser, item_flags); break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: + flow_tcf_pedit_key_set_mac(*actions, &p_parser); + break; default: goto pedit_mnl_msg_done; } @@ -617,6 +659,14 @@ flow_tcf_get_pedit_actions_size(const struct rte_flow_action **actions, keys += flow_tcf_calc_pedit_keys(TTL_LEN); flags |= MLX5_FLOW_ACTION_DEC_TTL; break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + keys += flow_tcf_calc_pedit_keys(ETHER_ADDR_LEN); + flags |= MLX5_FLOW_ACTION_SET_MAC_SRC; + break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: + keys += flow_tcf_calc_pedit_keys(ETHER_ADDR_LEN); + flags |= MLX5_FLOW_ACTION_SET_MAC_DST; + break; default: goto get_pedit_action_size_done; } @@ -1141,6 +1191,12 @@ flow_tcf_validate(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_DEC_TTL: current_action_flag = MLX5_FLOW_ACTION_DEC_TTL; break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + current_action_flag = MLX5_FLOW_ACTION_SET_MAC_SRC; + break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: + current_action_flag = MLX5_FLOW_ACTION_SET_MAC_DST; + break; default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, @@ -1245,6 +1301,15 @@ flow_tcf_validate(struct rte_eth_dev *dev, actions, "no IP found in pattern"); } + if (action_flags & + (MLX5_FLOW_ACTION_SET_MAC_SRC | MLX5_FLOW_ACTION_SET_MAC_DST)) { + if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L2)) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "no ethernet found in" + " pattern"); + } return 0; } @@ -1396,6 +1461,8 @@ flow_tcf_get_actions_and_size(const struct rte_flow_action actions[], case RTE_FLOW_ACTION_TYPE_SET_TP_DST: case RTE_FLOW_ACTION_TYPE_SET_TTL: case RTE_FLOW_ACTION_TYPE_DEC_TTL: + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: size += flow_tcf_get_pedit_actions_size(&actions, &flags); break; @@ -1942,6 +2009,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow, case RTE_FLOW_ACTION_TYPE_SET_TP_DST: case RTE_FLOW_ACTION_TYPE_SET_TTL: case RTE_FLOW_ACTION_TYPE_DEC_TTL: + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: na_act_index = mnl_attr_nest_start(nlh, na_act_index_cur++); flow_tcf_create_pedit_mnl_msg(nlh,