Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/45693/?format=api
{ "id": 45693, "url": "http://patches.dpdk.org/api/patches/45693/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1538251641-91511-2-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-2-git-send-email-orika@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1538251641-91511-2-git-send-email-orika@mellanox.com", "date": "2018-09-29T20:07:19", "name": "[1/3] app/testpmd: add MPLSoUDP encapsulation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "868e70ddd16b5c7e60b65733b0062a9c611261e4", "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-2-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/45693/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/45693/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 B78621B130;\n\tSat, 29 Sep 2018 22:08:07 +0200 (CEST)", "from EUR02-VE1-obe.outbound.protection.outlook.com\n\t(mail-eopbgr20048.outbound.protection.outlook.com [40.107.2.48])\n\tby dpdk.org (Postfix) with ESMTP id 6B5C81B125\n\tfor <dev@dpdk.org>; Sat, 29 Sep 2018 22:08:04 +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:00 +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=AWqLSlsRsbKmT4AFjobS5zMKbMnnLQnVFjhMUIKN5tA=;\n\tb=CiATtZ/jgN1Z2L4dr7RXt4ywNL2H4xNoWRTX96erh71ES0gqdojdaGLS+ps6I7C4swNNG7tZL/osNMkXtzLGySweXmJOruw470niVSh5dyX2v/aaqTKcbybur3Txo6R3+2BVgwG1NVdr5RLr95p1LokjKShnOKY9P7+hjoF4+sE=", "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:19 +0000", "Message-Id": "<1538251641-91511-2-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": "15115536-0fff-4159-6ff2-08d626474339", "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:r1Ko1qEgzGgCT/SmVTvbf3rD6B8hcJUacGh6QsyGKm7+jOUDpwQitrcEYAwf9GyvFPgOYEcChLAk665sOUU6BCKIEmcsh/s6pjf8myBtk9KbNYaRr3uqlp3oRPSj611W/Le06DxgvFGltgkOuq3ycoSUCQalHbvqcC1DD1WZR2O4MF/K/WIuKXFzK0pQPJXR14d3decj+VOow+dGTIE82snTDNj3KWvFOFWkKSwqF659dBXOgvJqn2UCxXIHcw1X;\n\t25:fZbvem/hNcH7jmFaqzFAdaBjhqeYC93/E8U4//J/DAXf703h8radliick6pMd/jaKBNaAXE8nuUba1eldPx/hscRzK9uZxjoQH2yY4hItFSQVmX7iRVmXZPlPwMAkNh7aK65uUA2uc1wzM97t0RnDmdJzsh1NSd/E4kCmFlcHgbOeCAWRwOJ82u+o0i+hwXdddfI1erhnJRDNvpJHaNqgAmTJu0YnzCDeymjZWiiwbiKkEDAnZY9p3vC/6qqPdK3/EKD8PNn8seH/RS9L8M+lODvfAGfUFf/pJUmGaNCyWtOACll492GbIvkoNeD01cqRq2dkGHSTlfbrCMVs1fCtg==;\n\t31:vPZ3HMsRiPjRntgnUX058zfNCJsIUlGVfw1h90VfZUyjGfgwmM0LsJ+LtINGnzEPK5MgQjNBdYYL8Hszc3zetlQHNZxRBW/LktwYyVpJOa8qByg/VHk30kpFTCuu+6KI7ZvFaRvwblEBHbVCl5UFsX4M20dDYkB5sZWduNwhOglkCPXDwk30K/tTB0TTd8j4XyxT9AUMb0uMbrRiItSPv1juMF7YC8Fb4Y6fokz4hzw=", "1; AM4PR05MB3427;\n\t20:Gyd3yDnYCqr/+tiuIjSYIaS9yfPSEO2Tcmelfn5lohFWDkVausV4sDZr4bl0NDSNfGny+uGLAPKgjlE9zE7Nt9ETQWJ2fx872KnjYDmiwMNTxKsYVUJVSapZxroFzv4EEWeYItfch5X+eZ/mqQZosDfsK4EF69xtKCLJTrOADrpi9Z6rmOzmMtSWZn3hdRwV3Pblq/pKM67K9vYwd8rQUqjlhSDCwp9SZTHyBObMUMMsietjG7fT/ChnTGfhgV4RX/dc6r4Sv8FBVFMo2b36NXbL/BJc5PnqzCeGJpmOmkIgoztx9UX4Hn+Rx8pDHdfy2C081abA2Sl+0LNjfCvObKqMTuKUphd3WlzGXKNZfX9HFvdCuoHYfiHU5gjsVDJH062JAp2gK7rmMVT5PV6NM4gbPT+mLjqiHARdJmfd8lTBvgbnM/nBmeHDlYA/wc4zR58tzBWpAvJ4b6xE8GMu5OMqL77B1nkoyY2H3VZ+UDNG2AZmF8lvZcSxZBfKxtNg;\n\t4:XhzLkDzUCCkAjo0he60grn4PEs4NmhYNTd/VvCl4Vf7E1paOnG0NnMi6bZO5EYWYqyolxcKqUz6T7/JzUXZF3edBRHo8jwP1rTbAt9oPZaqsasCW8j2IB4zLalSABcEVGEL7TEiKw9iCgm5o8EQOVUgstCbSRdSc0ENMjdBblxqVlvAbz/JXStLRh/AT2mMSG+4/Vx9UFuH0WtmHLvArf4KfSNw4awoRmXDHRv/l4AgXCtUQEiE+OGcCzEE75RR3BFant3ZsW7AKSa5/167pe2FBUJ8Lj2p+rLRgDcsONrcpVJBTr4uviQWf/HiYViiX", "=?us-ascii?Q?1; AM4PR05MB3427;\n\t23:Gug3+NEpQHOOK23uLjwHFSIpibhKlAP+mWHDMSPPR?=\n\taYaYzo+fS3HDI+iiuDjh00JDy73oL8caPtFStFICpNIkQ+2Jt7nfH4E2G6SA25KqrXXthR1+xZnV2e0DDZ8VFITzUnXQwN+gCVSfGDREq/eLlhn/2fw+FjB4Xw5te2gAXDfBCY4/GyuY6lZEBDB7SDOFbJVtFd2onukDbCX9/CNRrVQVEw3ONPURztpYyvPmUYq4pcjLWqUvldLvaMvM59p+eMuuQ1QJ84wiRGcJa17LrMP95Xim+eBbJT/SBUonGCbU6mnWaExSjdKu2M3QS8EL49cq2Cw2K/oMLSEcaO2BKCMfl7c8O7+esTqdvdNNmP1bwKGOzfmO2kSi91L+ieNsiV91L9vzwfGdiBeJKglFS0Wv3v0VqXibH1tSRWjeXjLCVkbrU1Njxcu19T2wk2f2+8qsG+DKMI/29r9ZOrDXi+ygPws3PagRBosX33sd1rvf7F5gt7DGFxzuLGQnVFVisRmho2Lb2Wyv7wDWQP/UvP6LOv9Mji9puXBh0XYiCDTlV0C8fqIY11ZtC5j4enkGirOKpmALT6BphDQyx1HMvDTgtRZovk19yuhlqOkPRgzpAxZpEo6QlFXyuZh3P3Yoabkqc2HQaCHYmUjCfiZeEeKQjkAnX0RTDBxPQ2C1ALaMSCLajvGZfYG3+qVciHxFxQfR/0eSXxyTg8XXQfrUR/NJNmzTsBzlOIkZ6hoOJQoOet0kZsnFFVtQssMk5OxgmqojVDks6r1W+XPFERmf6jQLYOSuMhgLRWjGGXjPomEVSGpe1y4lO2nQPWtuTSO6wr0JdubNU4InQAlt1SFD8DCysB8aMFPTS+KXialAJ96E5YqHKvnwAR4yEH3LD4A9M5fiJ0FoMuDztoZID0GvNO15BLAo14nE039BhFe//l7kdFc0dv3tvG2b8qXsUIjzuB/XzfvHsFsjnetah3j/96SC4UayPZsp0/p/ClmgOytT5thhxtDHTM4AyFx1kx3rsRGAkaERYPR8AzdKACpA4fePcfOHiv7pS4jFNZTgKtg8Fs/8wiKb1IRavheygtyIVPggUlpU0hSnxa+dLkNaIkGtLvy08bt1G60ysiPKmFpeeYaMpTRBNY6CIZ8S62ij5vJtbEs/gYJfIbSl33SrHtkvfNmnSYbPWRhR0knJQjXuMhaxCfN39Cq8mqYzoFT28d3I6JmrvLI8wJjRDXz1GO8P0tErnA4mD0G4aJlx5ATYElCSQxdqIIu334dVaXU9v7ctex3x1zXkUGs36nJYuR+qIebZjck4rVje/jf+f9ZAivZmKo6MOkVQrm4fOGY8tH+tdr1YzNmlOq3/puwQw==", "1; AM4PR05MB3427;\n\t6:MDFsZyYBi8ZlGkvfsfReCBBg7m+jBdcnOzwpL0IuIB6/k0IvBxEoL8dZBKJZR4DXIqBmg/NgKpPPQBEvtfoJVQGj+9YftxnINtpLYOf4at7nrfSHlEsl9ZS1xkNNCSIRYLmMNetsioSi3pceqmR/UIAH+LyEyTvSlFM5XqOcp5yUlMYLLVWbajxfOaUsh1ffEDVIJldU2hO02uBWsGDSNx6UqxS5EkZuvQ4E3i034L2K5atFSE4vJVQs57EdLUCJqQgAKKv8mAwqm97lhcuvuAk+K76JYK1LPUM/Wf57ohbNXfWlWSS/P34bEtzkxAWHWSgKzXEIUnjoN475sgA4sqejPsSPSE0DbpxS42MTQTqf/dNAQdNM1c3wc5UVcVgwwlhsL/s5MalbRMEHB12KdFv0jhiJEPvQB+ifxTYuiDLzfMWZTaoIgUUHqI+YbtH4lzV/s9JTD42g11HI9Nn/tA==;\n\t5:FjEWI8EfQ1kOQ1415yffRmljDyn3J6afQ7Rm9tFWu2aRgppir3lnqxD2U2g5XJcLjPUNqokyhrw5/OQ9p4CcHRkKzFSkllN75jy5VUzNtRJRCi0DNj0FCUJvtjiWqMhRxBck2XapQlHOAXcBirWPwumOcksT8bmjY8JtJoZaFj8=;\n\t7:zQPkGG8pnDJvjbOcuOf3PmqcgMcoX4s35j199Qz2OoocCaroAAuvSbTh9j2PJEvj99gzGvjF8NY8xpFIannISbj8p8DgjZruslEppcQ/jMqkgPBUHdba4uD7w6Jq6sDP0i7NoOA5hL62/wJ+8T8URQfL9OYGUsjKjZE3NgBdtPt/8IJbJSzgPFKb4J82Jyz+8+cIIMFfVVJPhubQxzXbJoeqYoUi5RGiWXVRB2DXZEypGcxdvHdWaS5irVPAbuWK" ], "X-MS-TrafficTypeDiagnostic": "AM4PR05MB3427:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr", "X-Microsoft-Antispam-PRVS": "<AM4PR05MB3427BE5514507BEC0757BCCFDBED0@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)(14444005)(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": "vT/t63Alikll7aqjn2jpHJng3VnU/VaGAh/uW6PsHx5eVyo0W2bzNi1LCFGoFuPDDqG17MAZ6QKMTV0pCI3+rSltUQKxKdV5FF2En/Q4+vJChpd7BBPIGfnA/Md3DMXpZIBrmRx/uOLxiGvuuizHZEQyoJIHdeGiXCKBFbxQzv7AqqMgXrbnFapDbvNXYtGjAk0qxk1JsGDLCqCR/aHRV3pgNdZO3Q8BukMqadk6Q3BVXDYsZp+aIcek71R/xls4knDoIl/iyojvopdWwRW6jT5kShQM+xEj1UO9VGDivtqNByMyTkalLRQTB4uqWzIhqZOOQLdHwXTWEoGqcuJCkxrsQAhkw5oxof3EuDAKRS0=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "29 Sep 2018 20:08:00.9780\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "15115536-0fff-4159-6ff2-08d626474339", "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 1/3] app/testpmd: add MPLSoUDP 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": "MPLSoUDP is an example for L3 tunnel encapsulation.\n\nDue to the complex encapsulation of MPLSoUDP flow action and based on the\nfact testpmd does not allocate memory, this patch adds a new command in\ntestpmd 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 the\naction mplsoudp_encap will be parsed, at this point, the conversion into\nsuch action becomes trivial.\n\nThis global structure is only used for the encap action.\n\nSigned-off-by: Ori Kam <orika@mellanox.com>\n---\n app/test-pmd/cmdline.c | 175 ++++++++++++++++++++++++++++\n app/test-pmd/cmdline_flow.c | 123 +++++++++++++++++++\n app/test-pmd/testpmd.h | 17 +++\n doc/guides/testpmd_app_ug/testpmd_funcs.rst | 50 ++++++++\n 4 files changed, 365 insertions(+)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 589121d..10d9489 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -15186,6 +15186,179 @@ static void cmd_set_nvgre_parsed(void *parsed_result,\n \t},\n };\n \n+/** Set MPLSoUDP encapsulation details */\n+struct cmd_set_mplsoudp_result {\n+\tcmdline_fixed_string_t set;\n+\tcmdline_fixed_string_t mplsoudp;\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+\tuint16_t udp_src;\n+\tuint16_t udp_dst;\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_mplsoudp_set =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, set, \"set\");\n+cmdline_parse_token_string_t cmd_set_mplsoudp_mplsoudp =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, mplsoudp, \"mplsoudp\");\n+cmdline_parse_token_string_t cmd_set_mplsoudp_mplsoudp_with_vlan =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, mplsoudp,\n+\t\t\t\t \"mplsoudp-with-vlan\");\n+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_version =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,\n+\t\t\t\t \"ip-version\");\n+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_version_value =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, ip_version,\n+\t\t\t\t \"ipv4#ipv6\");\n+cmdline_parse_token_string_t cmd_set_mplsoudp_label =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,\n+\t\t\t\t \"label\");\n+cmdline_parse_token_num_t cmd_set_mplsoudp_label_value =\n+\tTOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, label, UINT32);\n+cmdline_parse_token_string_t cmd_set_mplsoudp_udp_src =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,\n+\t\t\t\t \"udp-src\");\n+cmdline_parse_token_num_t cmd_set_mplsoudp_udp_src_value =\n+\tTOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, udp_src, UINT16);\n+cmdline_parse_token_string_t cmd_set_mplsoudp_udp_dst =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,\n+\t\t\t\t \"udp-dst\");\n+cmdline_parse_token_num_t cmd_set_mplsoudp_udp_dst_value =\n+\tTOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, udp_dst, UINT16);\n+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_src =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,\n+\t\t\t\t \"ip-src\");\n+cmdline_parse_token_ipaddr_t cmd_set_mplsoudp_ip_src_value =\n+\tTOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsoudp_result, ip_src);\n+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_dst =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,\n+\t\t\t\t \"ip-dst\");\n+cmdline_parse_token_ipaddr_t cmd_set_mplsoudp_ip_dst_value =\n+\tTOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsoudp_result, ip_dst);\n+cmdline_parse_token_string_t cmd_set_mplsoudp_vlan =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,\n+\t\t\t\t \"vlan-tci\");\n+cmdline_parse_token_num_t cmd_set_mplsoudp_vlan_value =\n+\tTOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, tci, UINT16);\n+cmdline_parse_token_string_t cmd_set_mplsoudp_eth_src =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,\n+\t\t\t\t \"eth-src\");\n+cmdline_parse_token_etheraddr_t cmd_set_mplsoudp_eth_src_value =\n+\tTOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsoudp_result, eth_src);\n+cmdline_parse_token_string_t cmd_set_mplsoudp_eth_dst =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,\n+\t\t\t\t \"eth-dst\");\n+cmdline_parse_token_etheraddr_t cmd_set_mplsoudp_eth_dst_value =\n+\tTOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsoudp_result, eth_dst);\n+\n+static void cmd_set_mplsoudp_parsed(void *parsed_result,\n+\t__attribute__((unused)) struct cmdline *cl,\n+\t__attribute__((unused)) void *data)\n+{\n+\tstruct cmd_set_mplsoudp_result *res = parsed_result;\n+\tunion {\n+\t\tuint32_t mplsoudp_label;\n+\t\tuint8_t label[3];\n+\t} id = {\n+\t\t.mplsoudp_label =\n+\t\t\trte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),\n+\t};\n+\n+\tif (strcmp(res->mplsoudp, \"mplsoudp\") == 0)\n+\t\tmplsoudp_encap_conf.select_vlan = 0;\n+\telse if (strcmp(res->mplsoudp, \"mplsoudp-with-vlan\") == 0)\n+\t\tmplsoudp_encap_conf.select_vlan = 1;\n+\tif (strcmp(res->ip_version, \"ipv4\") == 0)\n+\t\tmplsoudp_encap_conf.select_ipv4 = 1;\n+\telse if (strcmp(res->ip_version, \"ipv6\") == 0)\n+\t\tmplsoudp_encap_conf.select_ipv4 = 0;\n+\telse\n+\t\treturn;\n+\trte_memcpy(mplsoudp_encap_conf.label, &id.label[1], 3);\n+\tmplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);\n+\tmplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);\n+\tif (mplsoudp_encap_conf.select_ipv4) {\n+\t\tIPV4_ADDR_TO_UINT(res->ip_src, mplsoudp_encap_conf.ipv4_src);\n+\t\tIPV4_ADDR_TO_UINT(res->ip_dst, mplsoudp_encap_conf.ipv4_dst);\n+\t} else {\n+\t\tIPV6_ADDR_TO_ARRAY(res->ip_src, mplsoudp_encap_conf.ipv6_src);\n+\t\tIPV6_ADDR_TO_ARRAY(res->ip_dst, mplsoudp_encap_conf.ipv6_dst);\n+\t}\n+\tif (mplsoudp_encap_conf.select_vlan)\n+\t\tmplsoudp_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);\n+\trte_memcpy(mplsoudp_encap_conf.eth_src, res->eth_src.addr_bytes,\n+\t\t ETHER_ADDR_LEN);\n+\trte_memcpy(mplsoudp_encap_conf.eth_dst, res->eth_dst.addr_bytes,\n+\t\t ETHER_ADDR_LEN);\n+}\n+\n+cmdline_parse_inst_t cmd_set_mplsoudp = {\n+\t.f = cmd_set_mplsoudp_parsed,\n+\t.data = NULL,\n+\t.help_str = \"set mplsoudp ip-version ipv4|ipv6 label <label> udp-src\"\n+\t\t\" <udp-src> udp-dst <udp-dst> ip-src <ip-src> ip-dst <ip-dst>\"\n+\t\t\" eth-src <eth-src> eth-dst <eth-dst>\",\n+\t.tokens = {\n+\t\t(void *)&cmd_set_mplsoudp_set,\n+\t\t(void *)&cmd_set_mplsoudp_mplsoudp,\n+\t\t(void *)&cmd_set_mplsoudp_ip_version,\n+\t\t(void *)&cmd_set_mplsoudp_ip_version_value,\n+\t\t(void *)&cmd_set_mplsoudp_label,\n+\t\t(void *)&cmd_set_mplsoudp_label_value,\n+\t\t(void *)&cmd_set_mplsoudp_udp_src,\n+\t\t(void *)&cmd_set_mplsoudp_udp_src_value,\n+\t\t(void *)&cmd_set_mplsoudp_udp_dst,\n+\t\t(void *)&cmd_set_mplsoudp_udp_dst_value,\n+\t\t(void *)&cmd_set_mplsoudp_ip_src,\n+\t\t(void *)&cmd_set_mplsoudp_ip_src_value,\n+\t\t(void *)&cmd_set_mplsoudp_ip_dst,\n+\t\t(void *)&cmd_set_mplsoudp_ip_dst_value,\n+\t\t(void *)&cmd_set_mplsoudp_eth_src,\n+\t\t(void *)&cmd_set_mplsoudp_eth_src_value,\n+\t\t(void *)&cmd_set_mplsoudp_eth_dst,\n+\t\t(void *)&cmd_set_mplsoudp_eth_dst_value,\n+\t\tNULL,\n+\t},\n+};\n+\n+cmdline_parse_inst_t cmd_set_mplsoudp_with_vlan = {\n+\t.f = cmd_set_mplsoudp_parsed,\n+\t.data = NULL,\n+\t.help_str = \"set mplsoudp-with-vlan ip-version ipv4|ipv6 label <label>\"\n+\t\t\" udp-src <udp-src> udp-dst <udp-dst> ip-src <ip-src> ip-dst\"\n+\t\t\" <ip-dst> vlan-tci <vlan-tci> eth-src <eth-src> eth-dst\"\n+\t\t\" <eth-dst>\",\n+\t.tokens = {\n+\t\t(void *)&cmd_set_mplsoudp_set,\n+\t\t(void *)&cmd_set_mplsoudp_mplsoudp_with_vlan,\n+\t\t(void *)&cmd_set_mplsoudp_ip_version,\n+\t\t(void *)&cmd_set_mplsoudp_ip_version_value,\n+\t\t(void *)&cmd_set_mplsoudp_label,\n+\t\t(void *)&cmd_set_mplsoudp_label_value,\n+\t\t(void *)&cmd_set_mplsoudp_udp_src,\n+\t\t(void *)&cmd_set_mplsoudp_udp_src_value,\n+\t\t(void *)&cmd_set_mplsoudp_udp_dst,\n+\t\t(void *)&cmd_set_mplsoudp_udp_dst_value,\n+\t\t(void *)&cmd_set_mplsoudp_ip_src,\n+\t\t(void *)&cmd_set_mplsoudp_ip_src_value,\n+\t\t(void *)&cmd_set_mplsoudp_ip_dst,\n+\t\t(void *)&cmd_set_mplsoudp_ip_dst_value,\n+\t\t(void *)&cmd_set_mplsoudp_vlan,\n+\t\t(void *)&cmd_set_mplsoudp_vlan_value,\n+\t\t(void *)&cmd_set_mplsoudp_eth_src,\n+\t\t(void *)&cmd_set_mplsoudp_eth_src_value,\n+\t\t(void *)&cmd_set_mplsoudp_eth_dst,\n+\t\t(void *)&cmd_set_mplsoudp_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@@ -17814,6 +17987,8 @@ struct cmd_config_per_queue_tx_offload_result {\n \t(cmdline_parse_inst_t *)&cmd_set_vxlan_with_vlan,\n \t(cmdline_parse_inst_t *)&cmd_set_nvgre,\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_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 349e822..125d09b 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -243,6 +243,7 @@ enum index {\n \tACTION_VXLAN_DECAP,\n \tACTION_NVGRE_ENCAP,\n \tACTION_NVGRE_DECAP,\n+\tACTION_MPLSOUDP_ENCAP,\n };\n \n /** Maximum size for pattern in struct rte_flow_item_raw. */\n@@ -271,6 +272,12 @@ struct action_tunnel_encap_data {\n \tuint8_t buf[ACTION_TUNNEL_ENCAP_MAX_BUFFER_SIZE];\n };\n \n+/** Storage for struct rte_flow_action_tunnel_encap including external data. */\n+struct action_tunnel_encap_l3_data {\n+\tstruct rte_flow_action_tunnel_encap_l3 conf;\n+\tuint8_t buf[ACTION_TUNNEL_ENCAP_MAX_BUFFER_SIZE];\n+};\n+\n /** Maximum number of subsequent tokens and arguments on the stack. */\n #define CTX_STACK_SIZE 16\n \n@@ -792,6 +799,7 @@ struct parse_action_priv {\n \tACTION_VXLAN_DECAP,\n \tACTION_NVGRE_ENCAP,\n \tACTION_NVGRE_DECAP,\n+\tACTION_MPLSOUDP_ENCAP,\n \tZERO,\n };\n \n@@ -928,6 +936,9 @@ static int parse_vc_action_vxlan_encap(struct context *, const struct token *,\n static int parse_vc_action_nvgre_encap(struct context *, const struct token *,\n \t\t\t\t const char *, unsigned int, void *,\n \t\t\t\t unsigned int);\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_destroy(struct context *, const struct token *,\n \t\t\t const char *, unsigned int,\n \t\t\t void *, unsigned int);\n@@ -2446,6 +2457,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,\n \t},\n+\t[ACTION_MPLSOUDP_ENCAP] = {\n+\t\t.name = \"mplsoudp_encap\",\n+\t\t.help = \"mplsoudp 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_mplsoudp_encap,\n+\t},\n };\n \n /** Remove and return last entry from argument stack. */\n@@ -3205,6 +3225,109 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \taction->conf = &action_nvgre_encap_data->conf;\n \treturn ret;\n }\n+\n+/** Parse MPLSOUDP encap action. */\n+static int\n+parse_vc_action_mplsoudp_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 = mplsoudp_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 = mplsoudp_encap_conf.ipv4_src,\n+\t\t\t.dst_addr = mplsoudp_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_udp udp = {\n+\t\t.hdr = {\n+\t\t\t.src_port = mplsoudp_encap_conf.udp_src,\n+\t\t\t.dst_port = mplsoudp_encap_conf.udp_dst,\n+\t\t},\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 (mplsoudp_encap_conf.select_vlan)\n+\t\teth.type = rte_cpu_to_be_16(ETHER_TYPE_VLAN);\n+\telse if (mplsoudp_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 mplsoudp_encap_conf.eth_dst, ETHER_ADDR_LEN);\n+\tmemcpy(eth.src.addr_bytes,\n+\t mplsoudp_encap_conf.eth_src, ETHER_ADDR_LEN);\n+\tmemcpy(header, ð, sizeof(eth));\n+\theader += sizeof(eth);\n+\tif (mplsoudp_encap_conf.select_vlan) {\n+\t\tif (mplsoudp_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 (mplsoudp_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 &mplsoudp_encap_conf.ipv6_src,\n+\t\t sizeof(mplsoudp_encap_conf.ipv6_src));\n+\t\tmemcpy(&ipv6.hdr.dst_addr,\n+\t\t &mplsoudp_encap_conf.ipv6_dst,\n+\t\t sizeof(mplsoudp_encap_conf.ipv6_dst));\n+\t\tmemcpy(header, &ipv6, sizeof(ipv6));\n+\t\theader += sizeof(ipv6);\n+\t}\n+\tmemcpy(header, &udp, sizeof(udp));\n+\theader += sizeof(udp);\n+\tmemcpy(mpls.label_tc_s, mplsoudp_encap_conf.label,\n+\t RTE_DIM(mplsoudp_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 a1f6614..355aa84 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -487,6 +487,23 @@ struct nvgre_encap_conf {\n };\n struct nvgre_encap_conf nvgre_encap_conf;\n \n+/* MPLSoUDP encap parameters. */\n+struct mplsoudp_encap_conf {\n+\tuint32_t select_ipv4:1;\n+\tuint32_t select_vlan:1;\n+\tuint8_t label[3];\n+\trte_be16_t udp_src;\n+\trte_be16_t udp_dst;\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 mplsoudp_encap_conf mplsoudp_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 dde205a..a374578 100644\n--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n@@ -1570,6 +1570,23 @@ flow rule using the action nvgre_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 MPLSoUDP Encap outer layers\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n+Configure the outer layer to encapsulate a packet inside a MPLSoUDP tunnel::\n+\n+ set mplsoudp ip-version (ipv4|ipv6) label (label) udp-src (udp-src) \\\n+ udp-dst (udp-dst) ip-src (ip-src) ip-dst (ip-dst) \\\n+ eth-src (eth-src) eth-dst (eth-dst)\n+ set mplsoudp-with-vlan ip-version (ipv4|ipv6) label (label) udp-src (udp-src)\n+ udp-dst (udp-dst) ip-src (ip-src) ip-dst (ip-dst) vlan-tci (vlan-tci) \\\n+ 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 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 Port Functions\n --------------\n \n@@ -3697,6 +3714,9 @@ This section lists supported actions and their attributes, if any.\n - ``nvgre_decap``: Performs a decapsulation action by stripping all headers of\n the NVGRE tunnel network overlay from the matched flow.\n \n+- ``mplsoudp_encap``: Performs a MPLSoUDP encapsulation, outer layer\n+ configuration is done through `Config MPLSoUDP Encap outer layers`_.\n+\n Destroying flow rules\n ~~~~~~~~~~~~~~~~~~~~~\n \n@@ -4025,6 +4045,36 @@ IPv6 NVGRE outer header::\n testpmd> flow create 0 ingress pattern end actions nvgre_encap /\n queue index 0 / end\n \n+Sample MPLSoUDP encapsulation rule\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n+MPLSoUDP 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 MPLSoUDP outer header::\n+\n+ testpmd> set mplsoudp ip-version ipv4 label 4 udp-src 5 udp-dst 10\n+ ip-src 127.0.0.1 ip-dst 128.0.0.1 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+ testpmd> set mplsoudp-with-vlan ip-version ipv4 label 4 udp-src 5 udp-dst 10\n+ ip-src 127.0.0.1 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 udp-src 5 udp-dst 10\n+ ip-src ::1 ip-dst ::2222 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+ testpmd> set mplsoudp-with-vlan ip-version ipv6 mask 4 udp-src 5 udp-dst 10\n+ ip-src ::1 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": [ "1/3" ] }