Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/45694/?format=api
{ "id": 45694, "url": "http://patches.dpdk.org/api/patches/45694/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1538251641-91511-3-git-send-email-orika@mellanox.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1538251641-91511-3-git-send-email-orika@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1538251641-91511-3-git-send-email-orika@mellanox.com", "date": "2018-09-29T20:07:20", "name": "[2/3] app/testpmd: add MPLSoGRE encapsulation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2accee3606c56e1dc4c0e933f8bbd50785191f9d", "submitter": { "id": 795, "url": "http://patches.dpdk.org/api/people/795/?format=api", "name": "Ori Kam", "email": "orika@mellanox.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1538251641-91511-3-git-send-email-orika@mellanox.com/mbox/", "series": [ { "id": 1600, "url": "http://patches.dpdk.org/api/series/1600/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1600", "date": "2018-09-29T20:07:18", "name": "app/testpmd: add l3 encap/decap cmd", "version": 1, "mbox": "http://patches.dpdk.org/series/1600/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/45694/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/45694/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E7EB51B153;\n\tSat, 29 Sep 2018 22:08:10 +0200 (CEST)", "from EUR02-VE1-obe.outbound.protection.outlook.com\n\t(mail-eopbgr20049.outbound.protection.outlook.com [40.107.2.49])\n\tby dpdk.org (Postfix) with ESMTP id 883621B12F\n\tfor <dev@dpdk.org>; Sat, 29 Sep 2018 22:08:06 +0200 (CEST)", "from mellanox.com (37.142.13.130) by\n\tAM4PR05MB3427.eurprd05.prod.outlook.com (2603:10a6:205:6::16) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.1185.23; Sat, 29 Sep 2018 20:08:03 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;\n\ts=selector1;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n\tbh=ZIaAg4Ke9t6OiHepdJDD/MhPxIa14oX/h32jDgCLE8k=;\n\tb=qK03qkMtYOEUyZBoP0qbTAyVNQa0C6MWdsoMBW8tq361XfYBveFt/YIjGRvYaS3wgoBgItEGXFYL0P74ocCTqg/Ll7ktrBqj2IKWhQUaAe8u2Zb6mce+aGeUmhMThWKXdfPqkqdSkij+kaFj6ImPEqsAHAL81PdY1GqscsuSmgY=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=orika@mellanox.com; ", "From": "Ori Kam <orika@mellanox.com>", "To": "wenzhuo.lu@intel.com, jingjing.wu@intel.com, bernard.iremonger@intel.com,\n\tarybchenko@solarflare.com, ferruh.yigit@intel.com,\n\tstephen@networkplumber.org, adrien.mazarguil@6wind.com", "Cc": "dev@dpdk.org, dekelp@mellanox.com, thomas@monjalon.net,\n\tnelio.laranjeiro@6wind.com, yskoh@mellanox.com, orika@mellanox.com,\n\tshahafs@mellanox.com", "Date": "Sat, 29 Sep 2018 20:07:20 +0000", "Message-Id": "<1538251641-91511-3-git-send-email-orika@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1538251641-91511-1-git-send-email-orika@mellanox.com>", "References": "<1538251641-91511-1-git-send-email-orika@mellanox.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[37.142.13.130]", "X-ClientProxiedBy": "HE1PR05CA0381.eurprd05.prod.outlook.com\n\t(2603:10a6:7:94::40) To AM4PR05MB3427.eurprd05.prod.outlook.com\n\t(2603:10a6:205:6::16)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "c5106d82-52cf-426d-27a1-08d62647449a", "X-MS-Office365-Filtering-HT": "Tenant", "X-Microsoft-Antispam": "BCL:0; PCL:0;\n\tRULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);\n\tSRVR:AM4PR05MB3427; ", "X-Microsoft-Exchange-Diagnostics": [ "1; AM4PR05MB3427;\n\t3:SfDh22msN4Ycj7sn5V3ZrrEZg9jTtlOioYyoaXCeGnBFVA5O3Vy1XbISwBa0mfoIEMpW4mngLubtVMcUURsUtV3NZaGTLRQBaWjBrFCYWZaJ8XFlVkeU+IwCI8Rq38qnIblIYns4Vh11b9yNjUIodaF+G56Oq3nJUBBm34FmlYNXLGLd18OjUBxClJKNXLhmpv5I+9Bkp9NuBE1St2qXuh5PXBp0FxRgr1mUXLPsMyBxXSF+Gh/bR7nN7WelimIE;\n\t25:HBwAaw+qFq66tt53hP3C01A11d+h0agmuHSjrY+DeNbnN6mqhK7nWIxWrQdvyrWodaOORv3MplYgmhnwmbYKayOEBr9u5nLpLRoZjCBbrRur5Ypm6160WKrELI2Bd5FCJiGJEI2xGaDA1ob1lM1ybnKBZPqEUSYV41FblRUmwMdl6JNfIgRvRn3GjzrYKs4ibyD/8Ul2LCLWDxUQZwf8PQ5HR/X0o3/4+5w4cbAQfRy/CQxMamn+kttN9wx8QkOFi53yMOLVApq3vQinn4JVSDVK5i0y2Qyn4Vof4TV4IThkgpfKVL8R82wKmBkvoC2qpIqqKdyFSykCuQ13ElMbFA==;\n\t31:J68yb+DzQwIUN9KOJ6aa1NJxMj0EpGynA9NMRiza7PC5V9boei/QIGJoQU1xldug//AlGSYpORPhY3bb0XeV7Od3oW7Bvd1Buioj/iO1lmvevXqSmdb4P9u8c8O5HZQwQNshwCTZffYIMzrTCliM+lEvVq6wzUpPh/3Acr3FhMxvqcABebPOqAIvEg7ROhy78ob5UoJj9IQp6DqJMCWQeRy7Hftn7B6Ju2zFVoEO7JI=", "1; AM4PR05MB3427;\n\t20:FKeUBW3/MAzsB5uBbFYvy9Xlx364O54c7cs3iCrP0+RbVPGfd0mbCmJz7iCkk8xBtLn6kuche+U1egI86iECZVzF3C4890gV/0A5zFFIVnp4JntunQwKXJ/6NXDqCat9XO+qoqvmJmhfYinm5vqLEMWxdx+SZSGISM7/8z34OW+LjKT8bDZi8KEEP5TEmtzF6qO3uICkfgpPQKKIKKU2d+DdS7HtiE5tXFKYuisX4OvGOTAK3EPXiDCTy+MkHoVMB1oNsVu0usi0QOI27F4KxDAkC4BMHKNSG6G1nYHwswpgjH0jkxrYKK8gSz69GTDo/Jmmm7CYLfnlsAxQY/i/CtBsu3vW+BPLdZBNvp80zKtgdQqm692sXExOkVoeA4igqgxCUmWCni0h4Dvp2I3kxD15voVLax5Yzijbv53APoXUrlDr/6a+WPR/UXXmMale3rgg/poBErIL+4uK0gT7rewOCpkitZX+wUPjOFELeoXIvEbi8QsW3/49vCY6nvTB;\n\t4:YbHb6nwFVAqDR/USfFxJtC+ls2ctbIvjZvN1+4ObWwlLyxwIJKQrSM8bhODBYuSoA/Ms5WJHnvZxp7GC2KoEWXvVAuvnADwp1/K/+qFzQVIkzqtUXg7dv0O9r81Xg04nUf7WsGgtUEk4pxyCCS7nRmVpqUIZzes7SyspQNKCjBBlg80vFYps2kAj1g2l1FPGOktdEirDOM/9pWoSZpzNuN7RqUhMyHSeuUQyA0fCZw+3MUzcvMAFjxhbZh2sGirKlMDRNMqVO3wrIzEichuhxx+MmOHNKkv0qIdfFH7me1goQqAWbr6P0iozxZ0BdqsI", "=?us-ascii?Q?1; AM4PR05MB3427;\n\t23:7wnYS34bUQkqZP7axjNMB2HAgjnNENZ1nWlZIY8mE?=\n\tyYs9pjYQvON7Hl/JGLB38d8DM2+5694PB6drzEeW+TNjg5bGOXai3VOq8VUvtT3sakjxaekFJiEqrJbaIZ6tLNcz4MHPep/xt1CXiaw0lr+5unvYDHQDHDaF0ZNMeqIhJFco8D8ounMAvRnB7pPomNDXgmYTTqOeuODZ8B9sZyrgb/D1xHlur28BsfU6HbGXctjXEBJtEKXewfH7UTqEE/h6VHr6xyr9q33NuYDsuA9kU5wZnLVFMiPT2qKQCThbSYiJADqCbRNBdbQ4sKQWjhO0I9rNC6LHxOqIE0Ml8EFYKiAo31tUH35W6GhH4O8s7f4eDWkT8BSqjDZMI+o6StP4E9A0CPpv9Kwh63C58K8i4s6USH/VtFoIRKqSxmSdmf1+jmAL/B+wzSx0efgEwsaRNsPStW2DZuSkhY1KLAYhpjazG+lina1iVyCPdUhlYBuZ6Pi1R2IEcv9wlBu8mpN6eM8ZCBPNXpIE93zWj4gvQzboLYAooKED/73WQYr1LHlxnYu9/cKsaSSAHainwPTstbQyPoVf4yJp3LeIX2/Vn1xkoLChGYFOrlvbCr8Hsb7UvWV6C+ayjuOWBKjJLFonW3fG08kyJH3wwt/hgDw89HQcqixKfG798ywdpj5bIsNJqZEoahRJ7cIiK2VisV3GbQyAhVW3MfVX0dKBbD2yfa/XYo38Vv3iRfNnvzkF3DDNWg2wysFTXYWGiFIINFdEGS8em2yMTfNbMqwnjv2G+2cNgIicAVkM7yZ+KtcaOym/2XQhrw4MQdsj+Tn9Q7OkZZr2E6GQbDI5vapro1GSFlc5pQ7VK6gFBpOwIB5sdxePj5x0a53gVjDdzPiNjCLZvAaOMkBsJv1Gz2WHVVSyDJLOV2F9/SbTispw6UDiE69AcX8WArpQGQZwZNM4GKbdj907lbGEN9N9m68vVWirI0nJdnxgq7fTmUTqjuIZ382aeLMGbF2iI+tkoolOByv0JcKh57LGmwLIJe61EVjvJZG36ZAqeN5smij7mqWrhGX9/f5H5ZpBQvylf85OOZS/eaBJYdD0g1+AamilEcIcBdB9SFd2pg61k1Dh3AnCC51GSUU4hfqd+KzOmyOC+USIoy00yYT0h+ITPezHwMpnDAY03VL8YXefD5BgxyFEJUkR9St1MOhAfolXSGhJq8fKr3jeQXJ21O3FbtfMpqnpqJGd0rlc3yS+8ESrR7qqym4pav1Ascp9XnssnVogf88b35zyDMIVCnZRgghyaoQa8Zkd/3xZzVDiSN9yMWqQkAruMc4MmZVD8zz0wt42P/i", "1; AM4PR05MB3427;\n\t6:+BN/+I49llR5gUGuSArQ3YxK22tQNN7ozdKm/BvPMtVjyg79Lz6Uyq2YOaeRYI9xFVzdYJdc7RWPMSBb59I6IO1lyUXy+bdHx+2z0LrFqeaPBp1tqjav4E552L/ugcteRgNWhN6lqDkuPVBvj6tjfGWoKu4MIO/QYV810Q5tTRKBE1gxiKqI77pENp9Gs2Ap52rWieQg5GEIuOewZfOWzchyva0CLsM9kjrWaPrbzgRqJW5pI9tYx+HtCN9Vg4wzZSoluYAV2fx0hBolfJXQavatLys4w+wagjnCH7xAYWekh4HVOczOgPq38NbtjkcgVzhDMiLjlZAX4o2bcwQ3anAmypWBPRY376OCJRy6ifbLh4JeOwW+qLxNPYlL+iOIdqRkjEnLPKW2MCvr7s9h2GAvH1X76MBlZvwu3Se7VnhQf9nQ6zguYkVzEeAe/UDHPPlBnoBiXt3/HiqYT+wW3Q==;\n\t5:YYGGZlAdnNw8IHo6SIBWXI0/mzCb3o5+9+nSQa9cv+VeFaheToCPXGD+vic4TPHi+PgdjRtllTCEyKJjhuzTMWCSoBOHU3XTNkY7xD5kxFrCvyZ/VHmT9WraHxUgYraSomebsuo/WPB3g1A8OXOc1RsaK1V9QQiNV+qsROO65Qg=;\n\t7:mfh7mHPpaGUE8a/KtY/uudTBluQ6J1Iavot5IvILAkrMST2rUqkTJOwxiGtZzIjBe470S1fDzzsTIVtKabbe6Lwyg5URMlFhQR4U9jF6GI+lAuA7GsgO9UP2gH1qN8lZcMmBJZhTMzmB/0lKxejJg16Q277GVYpoL5+wlJceqrAtIVy0KlNa9SngAJwRXPzs6ruujm1LOOo1fcSFXMq3CcFvha0b19e07p2Z3SZk+QK9Z4yVDblxYtelzuVFX3J+" ], "X-MS-TrafficTypeDiagnostic": "AM4PR05MB3427:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr", "X-Microsoft-Antispam-PRVS": "<AM4PR05MB34278224B5C51EA6C68B8EB2DBED0@AM4PR05MB3427.eurprd05.prod.outlook.com>", "X-Exchange-Antispam-Report-Test": "UriScan:(17755550239193);", "X-MS-Exchange-SenderADCheck": "1", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231355)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201708071742011)(7699051);\n\tSRVR:AM4PR05MB3427; BCL:0; PCL:0; RULEID:; SRVR:AM4PR05MB3427; ", "X-Forefront-PRVS": "0810818DA0", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(366004)(346002)(396003)(376002)(39860400002)(136003)(199004)(189003)(53936002)(7696005)(105586002)(106356001)(4326008)(107886003)(2906002)(68736007)(478600001)(66066001)(47776003)(21086003)(7416002)(36756003)(48376002)(50466002)(8886007)(33026002)(316002)(4720700003)(6666003)(6116002)(3846002)(97736004)(5660300001)(7736002)(305945005)(55016002)(25786009)(69596002)(16586007)(476003)(2616005)(956004)(16526019)(446003)(186003)(81156014)(51416003)(11346002)(81166006)(386003)(52116002)(486006)(4006002)(76176011)(8676002)(86362001)(34290500001)(26005)(8936002)(50226002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3427; H:mellanox.com; FPR:;\n\tSPF:None; \n\tLANG:en; PTR:InfoNoRecords; A:1; MX:1; ", "Received-SPF": "None (protection.outlook.com: mellanox.com does not designate\n\tpermitted sender hosts)", "X-Microsoft-Antispam-Message-Info": "wkP74G/LDsQSrGlt7bR4UlD+SFsn/5RcQLbkXuAh67HR1LjT2FdNIShnJ/6tIwYcI+LRtNrH3Ix0yCPhvUuyPpPDGVzI9jRynswunS+KWV6hxuZJ9LX8OrYeIRE9RtIIKf3lNDY+m0ZkpSl3CaXaLms0mQR1kDkFMOXBMTeqfnRxYh0pZDStY/8x2ilYKVnfPAslkiPjkHEi9EQm+4Q/PyR1xqO2ySrkUM3jttuhQWrxwkOAvlrmd0Hc/kGX6F2M3+E+Odet4xiirimsPJmnFPpUNMQfXXISvEybGfCV4VZY2P9IJgzziolEF/OFInA25N2NME2+dGCA3Nc/hoveCEMv4PgSaw8j7lN4UaOvoNM=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "29 Sep 2018 20:08:03.4967\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "c5106d82-52cf-426d-27a1-08d62647449a", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "a652971c-7d2e-4d9b-a6a4-d149256f461b", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "AM4PR05MB3427", "Subject": "[dpdk-dev] [PATCH 2/3] app/testpmd: add MPLSoGRE encapsulation", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Due to the complex encapsulation of MPLSoGRE flow action and based on\nthe fact testpmd does not allocate memory, this patch adds a new command\nin testpmd to initialise a global structure containing the necessary\ninformation to make the outer layer of the packet. This same global\nstructure will then be used by the flow command line in testpmd when\nthe action mplsoudp_encap will be parsed, at this point, the conversion\ninto such action becomes trivial.\n\nSigned-off-by: Ori Kam <orika@mellanox.com>\n---\n app/test-pmd/cmdline.c | 153 ++++++++++++++++++++++++++++\n app/test-pmd/cmdline_flow.c | 113 ++++++++++++++++++++\n app/test-pmd/testpmd.h | 15 +++\n doc/guides/testpmd_app_ug/testpmd_funcs.rst | 46 +++++++++\n 4 files changed, 327 insertions(+)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 10d9489..2428b04 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -15359,6 +15359,157 @@ static void cmd_set_mplsoudp_parsed(void *parsed_result,\n \t},\n };\n \n+/** Set MPLSoGRE encapsulation details */\n+struct cmd_set_mplsogre_result {\n+\tcmdline_fixed_string_t set;\n+\tcmdline_fixed_string_t mplsogre;\n+\tcmdline_fixed_string_t pos_token;\n+\tcmdline_fixed_string_t ip_version;\n+\tuint32_t vlan_present:1;\n+\tuint32_t label;\n+\tcmdline_ipaddr_t ip_src;\n+\tcmdline_ipaddr_t ip_dst;\n+\tuint16_t tci;\n+\tstruct ether_addr eth_src;\n+\tstruct ether_addr eth_dst;\n+};\n+\n+cmdline_parse_token_string_t cmd_set_mplsogre_set =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, set, \"set\");\n+cmdline_parse_token_string_t cmd_set_mplsogre_mplsogre =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, mplsogre,\n+\t\t\t\t \"mplsogre\");\n+cmdline_parse_token_string_t cmd_set_mplsogre_mplsogre_with_vlan =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, mplsogre,\n+\t\t\t\t \"mplsogre-with-vlan\");\n+cmdline_parse_token_string_t cmd_set_mplsogre_ip_version =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,\n+\t\t\t\t \"ip-version\");\n+cmdline_parse_token_string_t cmd_set_mplsogre_ip_version_value =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, ip_version,\n+\t\t\t\t \"ipv4#ipv6\");\n+cmdline_parse_token_string_t cmd_set_mplsogre_label =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,\n+\t\t\t\t \"label\");\n+cmdline_parse_token_num_t cmd_set_mplsogre_label_value =\n+\tTOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_result, label, UINT32);\n+cmdline_parse_token_string_t cmd_set_mplsogre_ip_src =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,\n+\t\t\t\t \"ip-src\");\n+cmdline_parse_token_ipaddr_t cmd_set_mplsogre_ip_src_value =\n+\tTOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsogre_result, ip_src);\n+cmdline_parse_token_string_t cmd_set_mplsogre_ip_dst =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,\n+\t\t\t\t \"ip-dst\");\n+cmdline_parse_token_ipaddr_t cmd_set_mplsogre_ip_dst_value =\n+\tTOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsogre_result, ip_dst);\n+cmdline_parse_token_string_t cmd_set_mplsogre_vlan =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,\n+\t\t\t\t \"vlan-tci\");\n+cmdline_parse_token_num_t cmd_set_mplsogre_vlan_value =\n+\tTOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_result, tci, UINT16);\n+cmdline_parse_token_string_t cmd_set_mplsogre_eth_src =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,\n+\t\t\t\t \"eth-src\");\n+cmdline_parse_token_etheraddr_t cmd_set_mplsogre_eth_src_value =\n+\tTOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsogre_result, eth_src);\n+cmdline_parse_token_string_t cmd_set_mplsogre_eth_dst =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,\n+\t\t\t\t \"eth-dst\");\n+cmdline_parse_token_etheraddr_t cmd_set_mplsogre_eth_dst_value =\n+\tTOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsogre_result, eth_dst);\n+\n+static void cmd_set_mplsogre_parsed(void *parsed_result,\n+\t__attribute__((unused)) struct cmdline *cl,\n+\t__attribute__((unused)) void *data)\n+{\n+\tstruct cmd_set_mplsogre_result *res = parsed_result;\n+\tunion {\n+\t\tuint32_t mplsogre_label;\n+\t\tuint8_t label[3];\n+\t} id = {\n+\t\t.mplsogre_label =\n+\t\t\trte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),\n+\t};\n+\n+\tif (strcmp(res->mplsogre, \"mplsogre\") == 0)\n+\t\tmplsogre_encap_conf.select_vlan = 0;\n+\telse if (strcmp(res->mplsogre, \"mplsogre-with-vlan\") == 0)\n+\t\tmplsogre_encap_conf.select_vlan = 1;\n+\tif (strcmp(res->ip_version, \"ipv4\") == 0)\n+\t\tmplsogre_encap_conf.select_ipv4 = 1;\n+\telse if (strcmp(res->ip_version, \"ipv6\") == 0)\n+\t\tmplsogre_encap_conf.select_ipv4 = 0;\n+\telse\n+\t\treturn;\n+\trte_memcpy(mplsogre_encap_conf.label, &id.label[1], 3);\n+\tif (mplsogre_encap_conf.select_ipv4) {\n+\t\tIPV4_ADDR_TO_UINT(res->ip_src, mplsogre_encap_conf.ipv4_src);\n+\t\tIPV4_ADDR_TO_UINT(res->ip_dst, mplsogre_encap_conf.ipv4_dst);\n+\t} else {\n+\t\tIPV6_ADDR_TO_ARRAY(res->ip_src, mplsogre_encap_conf.ipv6_src);\n+\t\tIPV6_ADDR_TO_ARRAY(res->ip_dst, mplsogre_encap_conf.ipv6_dst);\n+\t}\n+\tif (mplsogre_encap_conf.select_vlan)\n+\t\tmplsogre_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);\n+\trte_memcpy(mplsogre_encap_conf.eth_src, res->eth_src.addr_bytes,\n+\t\t ETHER_ADDR_LEN);\n+\trte_memcpy(mplsogre_encap_conf.eth_dst, res->eth_dst.addr_bytes,\n+\t\t ETHER_ADDR_LEN);\n+}\n+\n+cmdline_parse_inst_t cmd_set_mplsogre = {\n+\t.f = cmd_set_mplsogre_parsed,\n+\t.data = NULL,\n+\t.help_str = \"set mplsogre ip-version ipv4|ipv6 label <label>\"\n+\t\t\" ip-src <ip-src> ip-dst <ip-dst> eth-src <eth-src>\"\n+\t\t\" eth-dst <eth-dst>\",\n+\t.tokens = {\n+\t\t(void *)&cmd_set_mplsogre_set,\n+\t\t(void *)&cmd_set_mplsogre_mplsogre,\n+\t\t(void *)&cmd_set_mplsogre_ip_version,\n+\t\t(void *)&cmd_set_mplsogre_ip_version_value,\n+\t\t(void *)&cmd_set_mplsogre_label,\n+\t\t(void *)&cmd_set_mplsogre_label_value,\n+\t\t(void *)&cmd_set_mplsogre_ip_src,\n+\t\t(void *)&cmd_set_mplsogre_ip_src_value,\n+\t\t(void *)&cmd_set_mplsogre_ip_dst,\n+\t\t(void *)&cmd_set_mplsogre_ip_dst_value,\n+\t\t(void *)&cmd_set_mplsogre_eth_src,\n+\t\t(void *)&cmd_set_mplsogre_eth_src_value,\n+\t\t(void *)&cmd_set_mplsogre_eth_dst,\n+\t\t(void *)&cmd_set_mplsogre_eth_dst_value,\n+\t\tNULL,\n+\t},\n+};\n+\n+cmdline_parse_inst_t cmd_set_mplsogre_with_vlan = {\n+\t.f = cmd_set_mplsogre_parsed,\n+\t.data = NULL,\n+\t.help_str = \"set mplsogre-with-vlan ip-version ipv4|ipv6 label <label>\"\n+\t\t\" ip-src <ip-src> ip-dst <ip-dst> vlan-tci <vlan-tci>\"\n+\t\t\" eth-src <eth-src> eth-dst <eth-dst>\",\n+\t.tokens = {\n+\t\t(void *)&cmd_set_mplsogre_set,\n+\t\t(void *)&cmd_set_mplsogre_mplsogre_with_vlan,\n+\t\t(void *)&cmd_set_mplsogre_ip_version,\n+\t\t(void *)&cmd_set_mplsogre_ip_version_value,\n+\t\t(void *)&cmd_set_mplsogre_label,\n+\t\t(void *)&cmd_set_mplsogre_label_value,\n+\t\t(void *)&cmd_set_mplsogre_ip_src,\n+\t\t(void *)&cmd_set_mplsogre_ip_src_value,\n+\t\t(void *)&cmd_set_mplsogre_ip_dst,\n+\t\t(void *)&cmd_set_mplsogre_ip_dst_value,\n+\t\t(void *)&cmd_set_mplsogre_vlan,\n+\t\t(void *)&cmd_set_mplsogre_vlan_value,\n+\t\t(void *)&cmd_set_mplsogre_eth_src,\n+\t\t(void *)&cmd_set_mplsogre_eth_src_value,\n+\t\t(void *)&cmd_set_mplsogre_eth_dst,\n+\t\t(void *)&cmd_set_mplsogre_eth_dst_value,\n+\t\tNULL,\n+\t},\n+};\n+\n /* Strict link priority scheduling mode setting */\n static void\n cmd_strict_link_prio_parsed(\n@@ -17989,6 +18140,8 @@ struct cmd_config_per_queue_tx_offload_result {\n \t(cmdline_parse_inst_t *)&cmd_set_nvgre_with_vlan,\n \t(cmdline_parse_inst_t *)&cmd_set_mplsoudp,\n \t(cmdline_parse_inst_t *)&cmd_set_mplsoudp_with_vlan,\n+\t(cmdline_parse_inst_t *)&cmd_set_mplsogre,\n+\t(cmdline_parse_inst_t *)&cmd_set_mplsogre_with_vlan,\n \t(cmdline_parse_inst_t *)&cmd_ddp_add,\n \t(cmdline_parse_inst_t *)&cmd_ddp_del,\n \t(cmdline_parse_inst_t *)&cmd_ddp_get_list,\ndiff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 125d09b..bedd152 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -244,6 +244,7 @@ enum index {\n \tACTION_NVGRE_ENCAP,\n \tACTION_NVGRE_DECAP,\n \tACTION_MPLSOUDP_ENCAP,\n+\tACTION_MPLSOGRE_ENCAP,\n };\n \n /** Maximum size for pattern in struct rte_flow_item_raw. */\n@@ -800,6 +801,7 @@ struct parse_action_priv {\n \tACTION_NVGRE_ENCAP,\n \tACTION_NVGRE_DECAP,\n \tACTION_MPLSOUDP_ENCAP,\n+\tACTION_MPLSOGRE_ENCAP,\n \tZERO,\n };\n \n@@ -939,6 +941,9 @@ static int parse_vc_action_nvgre_encap(struct context *, const struct token *,\n static int parse_vc_action_mplsoudp_encap(struct context *,\n \t\t\t\t\t const struct token *, const char *,\n \t\t\t\t\t unsigned int, void *, unsigned int);\n+static int parse_vc_action_mplsogre_encap(struct context *,\n+\t\t\t\t\t const struct token *, const char *,\n+\t\t\t\t\t unsigned int, void *, unsigned int);\n static int parse_destroy(struct context *, const struct token *,\n \t\t\t const char *, unsigned int,\n \t\t\t void *, unsigned int);\n@@ -2466,6 +2471,15 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n \t\t.call = parse_vc_action_mplsoudp_encap,\n \t},\n+\t[ACTION_MPLSOGRE_ENCAP] = {\n+\t\t.name = \"mplsogre_encap\",\n+\t\t.help = \"mplsogre encapsulation, uses configuration set by\"\n+\t\t\t\" \\\"set vxlan\\\"\",\n+\t\t.priv = PRIV_ACTION(TUNNEL_ENCAP_L3,\n+\t\t\t\t sizeof(struct action_tunnel_encap_l3_data)),\n+\t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n+\t\t.call = parse_vc_action_mplsogre_encap,\n+\t},\n };\n \n /** Remove and return last entry from argument stack. */\n@@ -3328,6 +3342,105 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \treturn ret;\n }\n \n+/** Parse MPLSoGRE encap action. */\n+static int\n+parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,\n+\t\t\t const char *str, unsigned int len,\n+\t\t\t void *buf, unsigned int size)\n+{\n+\tstruct buffer *out = buf;\n+\tstruct rte_flow_action *action;\n+\tstruct action_tunnel_encap_data *action_encap_data;\n+\tstruct rte_flow_item_eth eth = { .type = 0, };\n+\tstruct rte_flow_item_vlan vlan = {\n+\t\t.tci = mplsogre_encap_conf.vlan_tci,\n+\t\t.inner_type = 0,\n+\t};\n+\tstruct rte_flow_item_ipv4 ipv4 = {\n+\t\t.hdr = {\n+\t\t\t.src_addr = mplsogre_encap_conf.ipv4_src,\n+\t\t\t.dst_addr = mplsogre_encap_conf.ipv4_dst,\n+\t\t\t.next_proto_id = IP_PROTO_UDP,\n+\t\t},\n+\t};\n+\tstruct rte_flow_item_ipv6 ipv6 = {\n+\t\t.hdr = {\n+\t\t\t.proto = IP_PROTO_UDP,\n+\t\t},\n+\t};\n+\tstruct rte_flow_item_gre gre = {\n+\t\t.protocol = rte_cpu_to_be_16(0x8848),\n+\t};\n+\tstruct rte_flow_item_mpls mpls;\n+\tuint8_t *header;\n+\tint ret;\n+\n+\tret = parse_vc(ctx, token, str, len, buf, size);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\t/* Nothing else to do if there is no buffer. */\n+\tif (!out)\n+\t\treturn ret;\n+\tif (!out->args.vc.actions_n)\n+\t\treturn -1;\n+\taction = &out->args.vc.actions[out->args.vc.actions_n - 1];\n+\t/* Point to selected object. */\n+\tctx->object = out->args.vc.data;\n+\tctx->objmask = NULL;\n+\t/* Copy the headers to the buffer. */\n+\taction_encap_data = ctx->object;\n+\t*action_encap_data = (struct action_tunnel_encap_data) {\n+\t\t.conf = (struct rte_flow_action_tunnel_encap){\n+\t\t\t.buf = action_encap_data->buf,\n+\t\t},\n+\t\t.buf = {},\n+\t};\n+\theader = action_encap_data->buf;\n+\tif (mplsogre_encap_conf.select_vlan)\n+\t\teth.type = rte_cpu_to_be_16(ETHER_TYPE_VLAN);\n+\telse if (mplsogre_encap_conf.select_ipv4)\n+\t\teth.type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);\n+\telse\n+\t\teth.type = rte_cpu_to_be_16(ETHER_TYPE_IPv6);\n+\tmemcpy(eth.dst.addr_bytes,\n+\t mplsogre_encap_conf.eth_dst, ETHER_ADDR_LEN);\n+\tmemcpy(eth.src.addr_bytes,\n+\t mplsogre_encap_conf.eth_src, ETHER_ADDR_LEN);\n+\tmemcpy(header, ð, sizeof(eth));\n+\theader += sizeof(eth);\n+\tif (mplsogre_encap_conf.select_vlan) {\n+\t\tif (mplsogre_encap_conf.select_ipv4)\n+\t\t\tvlan.inner_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);\n+\t\telse\n+\t\t\tvlan.inner_type = rte_cpu_to_be_16(ETHER_TYPE_IPv6);\n+\t\tmemcpy(header, &vlan, sizeof(vlan));\n+\t\theader += sizeof(vlan);\n+\t}\n+\tif (mplsogre_encap_conf.select_ipv4) {\n+\t\tmemcpy(header, &ipv4, sizeof(ipv4));\n+\t\theader += sizeof(ipv4);\n+\t} else {\n+\t\tmemcpy(&ipv6.hdr.src_addr,\n+\t\t &mplsogre_encap_conf.ipv6_src,\n+\t\t sizeof(mplsogre_encap_conf.ipv6_src));\n+\t\tmemcpy(&ipv6.hdr.dst_addr,\n+\t\t &mplsogre_encap_conf.ipv6_dst,\n+\t\t sizeof(mplsogre_encap_conf.ipv6_dst));\n+\t\tmemcpy(header, &ipv6, sizeof(ipv6));\n+\t\theader += sizeof(ipv6);\n+\t}\n+\tmemcpy(header, &gre, sizeof(gre));\n+\theader += sizeof(gre);\n+\tmemcpy(mpls.label_tc_s, mplsogre_encap_conf.label,\n+\t RTE_DIM(mplsogre_encap_conf.label));\n+\tmemcpy(header, &mpls, sizeof(mpls));\n+\theader += sizeof(mpls);\n+\taction_encap_data->conf.size = header -\n+\t\taction_encap_data->buf;\n+\taction->conf = &action_encap_data->conf;\n+\treturn ret;\n+}\n+\n /** Parse tokens for destroy command. */\n static int\n parse_destroy(struct context *ctx, const struct token *token,\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex 355aa84..fea7418 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -504,6 +504,21 @@ struct mplsoudp_encap_conf {\n };\n struct mplsoudp_encap_conf mplsoudp_encap_conf;\n \n+/* MPLSoGRE encap parameters. */\n+struct mplsogre_encap_conf {\n+\tuint32_t select_ipv4:1;\n+\tuint32_t select_vlan:1;\n+\tuint8_t label[3];\n+\trte_be32_t ipv4_src;\n+\trte_be32_t ipv4_dst;\n+\tuint8_t ipv6_src[16];\n+\tuint8_t ipv6_dst[16];\n+\trte_be16_t vlan_tci;\n+\tuint8_t eth_src[ETHER_ADDR_LEN];\n+\tuint8_t eth_dst[ETHER_ADDR_LEN];\n+};\n+struct mplsogre_encap_conf mplsogre_encap_conf;\n+\n static inline unsigned int\n lcore_num(void)\n {\ndiff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\nindex a374578..4308109 100644\n--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n@@ -1587,6 +1587,21 @@ flow rule using the action mplsoudp_encap will use the last configuration set.\n To have a different encapsulation header, one of those commands must be called\n before the flow rule creation.\n \n+Config MPLSoGRE Encap outer layers\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n+Configure the outer layer to encapsulate a packet inside a MPLSoGRE tunnel::\n+\n+ set mplsoudp ip-version (ipv4|ipv6) label (label) ip-src (ip-src) \\\n+ ip-dst (ip-dst) eth-src (eth-src) eth-dst (eth-dst)\n+ set mplsoudp-with-vlan ip-version (ipv4|ipv6) label (label) ip-src (ip-src) \\\n+ ip-dst (ip-dst) vlan-tci (vlan-tci) eth-src (eth-src) eth-dst (eth-dst)\n+\n+Those command will set an internal configuration inside testpmd, any following\n+flow rule using the action mplsogre_encap will use the last configuration set.\n+To have a different encapsulation header, one of those commands must be called\n+before the flow rule creation.\n+\n Port Functions\n --------------\n \n@@ -3717,6 +3732,9 @@ This section lists supported actions and their attributes, if any.\n - ``mplsoudp_encap``: Performs a MPLSoUDP encapsulation, outer layer\n configuration is done through `Config MPLSoUDP Encap outer layers`_.\n \n+- ``mplsogre_encap``: Performs a MPLSoGRE encapsulation, outer layer\n+ configuration is done through `Config MPLSoGRE Encap outer layers`_.\n+\n Destroying flow rules\n ~~~~~~~~~~~~~~~~~~~~~\n \n@@ -4075,6 +4093,34 @@ IPv6 MPLSoUDP outer header::\n eth-dst 22:22:22:22:22:22\n testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end\n \n+Sample MPLSoGRE encapsulation rule\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n+MPLSoGRE encapsulation outer layer has default value pre-configured in testpmd\n+source code, those can be changed by using the following commands\n+\n+IPv4 MPLSoGRE outer header::\n+\n+ testpmd> set mplsoudp ip-version ipv4 label 4 ip-src 127.0.0.1 ip-dst 128.0.0.1\n+ eth-src 11:11:11:11:11:11 eth-dst 22:22:22:22:22:22\n+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end\n+\n+ testpmd> set mplsoudp-with-vlan ip-version ipv4 label 4 ip-src 127.0.0.1\n+ ip-dst 128.0.0.1 vlan-tci 34 eth-src 11:11:11:11:11:11\n+ eth-dst 22:22:22:22:22:22\n+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end\n+\n+IPv6 MPLSoUDP outer header::\n+\n+ testpmd> set mplsoudp ip-version ipv6 mask 4 ip-src ::1 ip-dst ::2222\n+ eth-src 11:11:11:11:11:11 eth-dst 22:22:22:22:22:22\n+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end\n+\n+ testpmd> set mplsoudp-with-vlan ip-version ipv6 mask 4 ip-src ::1\n+ ip-dst ::2222 vlan-tci 34 eth-src 11:11:11:11:11:11\n+ eth-dst 22:22:22:22:22:22\n+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end\n+\n BPF Functions\n --------------\n \n", "prefixes": [ "2/3" ] }