Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/44766/?format=api
{ "id": 44766, "url": "http://patches.dpdk.org/api/patches/44766/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1537116824-191205-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": "<1537116824-191205-3-git-send-email-orika@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1537116824-191205-3-git-send-email-orika@mellanox.com", "date": "2018-09-16T16:53:43", "name": "[2/3] ethdev: convert testpmd encap commands to new API", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6fc4654e8961b5867292abeff293bc1e1bc2bdee", "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/1537116824-191205-3-git-send-email-orika@mellanox.com/mbox/", "series": [ { "id": 1340, "url": "http://patches.dpdk.org/api/series/1340/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1340", "date": "2018-09-16T16:53:41", "name": "add generic L2/L3 tunnel encapsulation actions", "version": 1, "mbox": "http://patches.dpdk.org/series/1340/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/44766/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/44766/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 D09A35B26;\n\tSun, 16 Sep 2018 18:56:38 +0200 (CEST)", "from EUR02-AM5-obe.outbound.protection.outlook.com\n\t(mail-eopbgr00089.outbound.protection.outlook.com [40.107.0.89])\n\tby dpdk.org (Postfix) with ESMTP id 824BE5B1E\n\tfor <dev@dpdk.org>; Sun, 16 Sep 2018 18:56:37 +0200 (CEST)", "from mellanox.com (37.142.13.130) by\n\tHE1PR05MB3434.eurprd05.prod.outlook.com (2603:10a6:7:33::24) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.1143.15; Sun, 16 Sep 2018 16:56:33 +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=JGN00lqg8V7hbmRGEKG1d0GC+NaP2Bf4B41+ZcsGPHQ=;\n\tb=yEpjC/PFozFOgN1mkR02Rqb9LX5UbOxjAM5E6RspWeaoyLHCXWMggTs+U58vOpdVzx18FYhQANEWwRkkxCsELI8jzjH1A4DU467ueEtJodyIKRYtKEbJC4ycM0IXsg8Fw0hVWLewkviPA9I/cQHdk6UP4Tmg1UDAUhhItf8eweA=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=orika@mellanox.com; ", "From": "Ori Kam <orika@mellanox.com>", "To": "arybchenko@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", "Date": "Sun, 16 Sep 2018 16:53:43 +0000", "Message-Id": "<1537116824-191205-3-git-send-email-orika@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1537116824-191205-1-git-send-email-orika@mellanox.com>", "References": "<1537116824-191205-1-git-send-email-orika@mellanox.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[37.142.13.130]", "X-ClientProxiedBy": "DB6P193CA0021.EURP193.PROD.OUTLOOK.COM\n\t(2603:10a6:6:29::31)\n\tTo HE1PR05MB3434.eurprd05.prod.outlook.com\n\t(2603:10a6:7:33::24)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "99759dbc-494a-4028-086e-08d61bf55cd8", "X-MS-Office365-Filtering-HT": "Tenant", "X-Microsoft-Antispam": "BCL:0; PCL:0;\n\tRULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);\n\tSRVR:HE1PR05MB3434; ", "X-Microsoft-Exchange-Diagnostics": [ "1; HE1PR05MB3434;\n\t3:gX3bwoZzREnGcjMR2f3L0WIN2URbciu0iVhwSL87MYTrH8UhVk/22sn2/Ed/jotymw0jH9AZkXfE15oLbl7N1qsE+1GPbRFJIBmq+eKVrLtb5UXk45OLuZ1QTXT2/GcEMgQYjbx0QnHsuePWAjJX84XxQCV+5lWUznS18v0AknhqBwjRxSpLkC34hx1AA5fsbEYNz3H1xYAQQwTq5XHzYFDr2X4h8rM/JRC5jq/9SWpt3pxtebFPMN0laNdZLg6i;\n\t25:IyJAXBVKt+/tN6yfn9IxTec2iACDFfuggLReyyy3H6r1ZwudLw23Hyhpn6eoMEifEuNZEwyCxKGJQ9qVv+mnOzKSFV//dB6PC3upSiBG+uC+SADhU/q6se+iwg0PNxT29XvucMzYECcUeWdJ0xAngtekrnX3qGN+8uara8UN5NZHBJ6eAsA/DQ/17sgCsVDtbRA3uY7kQLuLKPFEI4IyS64fsmPVW4gYfl3AsMFPdYlzK1ayLq/lOOADZx25v0/sNh9m05pf8tZkyZtWr0MFvT2oaIP58Rk2lJOb72SqWZ6T+yW6Z+lb857iVnwNs1OcFXHGNihmXj3AZk+HbYKSNA==;\n\t31:r39o1pG/gDxJA5WYAXTUs4qOVYyOdN5iqPCr1fqNCtw5rjKFHFCPuxl8PqAkQgtvqzVhj6vYnRZ1kXz2k+GGu/TEapU4V61BSYk4bAPCk+uOnQ/iLXDExkqV5jPaNQUvs8wbMbS2Or+qZQgcSOtdBEbo1DNh+VtskwC7tI9GVTq4n3UP+twrMW7iy2JLkR4o/QGJTsbc2PV52O+thRoB6zx1GdWYyK26xJzVk1M/wnM=", "1; HE1PR05MB3434;\n\t20:eyfuuaR1fWduVtRKDAGnX+O4RbmKtj2SjjCTkqnkAP3SmV0gykuUrNPVchTmLQ/ofgw2UVeK7ShyzeT5aldbIEabItdE7aCAap0Addc6L4ogctQ3JCchlLIfbjX5aB51NNr+IBEJCVfNRkEYqUuYZeSsj58YwoOrCvIRdIa6pi1PIze7XKNdbjcQwwtp9b7/oFN9QX1238FA3GyC4Xa6FQDvhvQKyoNM+iBgg0xqCigoTu8SMizuNPitCiyFelzggW13u5EkfIOsyENFnadBS7hmGtIATKvYkgCg1KiPMolHg71LJRzqW/0Iw+yahxPU9ebWDuqTEUIrFN9C5umO4VUrHehx5D/0NaiddCrCVAlt9SKB3XC6tVYRiqF1wjYe56TyV+PbPIl7CxYZgi9RJqBWttqJrzitU3A4K82h8k4vWUbtei3z0zm78LP5IcTr6en4i6sNe9TDUceai7hNXxFgHCdq2cZdASVh85ctl20oKtwzy4plB1yAn8NjlhWF;\n\t4:RdQX1T21n1OmAi4Pm5Bj2qD4qrNlZOt0mjOG0zSZ4SJspvOkCMY0K4oidNvJ3qd29FGU5RPeRjUp9EbQHhCmf3OpGGb5gNcVrtzrf7S+g79/6GRtPPBgZ7ZAkGUVZr5PeMf4msky4vhUzFuyJYWPySQ/kbdW8LFXyjN80Upnv6vMlEyupVGjfxR1EOHtM/0qyw5G4Nuyz5MOHux7qm4bPfm907cuZZZqN6K6ae4Tt2/ZM5uUkY4KgU2G/EYXSXnlSsiGitPPUtMSI7nZwEm2uQ==", "=?us-ascii?Q?1; HE1PR05MB3434;\n\t23:vhH1RDpxHhEw6W8EyvANolnn+LGRoTXIjODtU9aZG?=\n\tFL9iFyt99i/oYgeikmZLw+RGGpeqRCQH7zCmyzhoQX6F2knfNUg5vY2W/7SX+Fj0XTMIiaFQc8DXr/ysU3sA0KSICQ/G0jIzmBSKbD9wZQXYIjnrDzWLe8ANkJWPfaFaemnXoN1snSEYDalC4ZN339MXXKAevMflKo6L4HSx2+J2LFx45eKaGOUWCiTrSuhnPT8ltUXSko6Vzxe6LDj+7NUlFNSTIQExw3/WoKetzQXmJZpI53pL0Yad2/arJNdmvKgECoKVZyNcJgw2p3haSNfrBaVQ/BncjSkPwk6BaghuZnanQWqkFUNXUxcIdQqdN+G5GGAxQ5/903IpNlbCgbvhFuBRbZlzCOkY7wwz8vJJ6tlwOeZ8G4sx600OGyX+z+oVkhHnHbWIs9CAeBLjQ+P7OXnzV2hf4cC9p5rD2jInehSJdaALLEhbIM80JG2/jIg3H3i3a5XxyMDv7oo64siAdBkNiDMB7Dh/EOA52fnyvVeHLQRxyCIXCLOKdH5IAgsn8WZ37SofWJSG0OumYatnHOQPXsYlvYbQdmed8D5++x1HVBbwMH4W2ztQfmm8iad+R/jBSgGNBxJ+A6YCu9Iao7S6qO+Dff7D6b7h3Ap+ZyVQnyez13jeVVxlwC2VwWBq4EOm8xz9RrmSi7H3MaSzN045xDdF6LMETlNNfm+C72kDorAifzDNAoTzpX7z+uT+NSJjfTV0MfCHPrBRDc+ezDYiSkY87HaOsgXN+zD4tMZ6/51yekTujHMDXTFD/Stb9kUwhplyFoYegfUOeplz4zTSUyg3f9VmXn0LJ+GFBA27h3ZUJ6EsHXXPl+lVFfZN2FR+Y52NEEKQaF95d0kv3lcmC0pq+3AJk7GUILSzLaL6YCu7y/2PdPoilwHpNUN8ujjkKmAJJzrDGIuU4/PZ2tXwoQ3FjdxCt8PdkcKeejyB06D7UZLH24GLlC0jVYdx2N3aPGquxAAmDXJo62Rm3Kgt/dvCYYNMlv+BstXFejOhtCMzb/4Rbon2N/9c/oMb7F3krzCbylyn5sVsrYxuYZSIeCFYigCgoIZzQCDyMWCZXeMwnK16drK9q7zlftK8M6vF6TKDABZhN3xyTHMwA70lFlN7oOeTHcWHBR9e9W5ckxN95FJyw2sa+AxTjtEvXER0mFQElOfPG/VqHytKXfyaQorWvoJjR6hElkOaDBY7L0zovRJcVYMPWkO7eQ1qukEBgkpiAqqw0Weq0Nj6/X+FCaYuVwMQU/9dpYHgg==", "1; HE1PR05MB3434;\n\t6:sk82tArYbn07OS/HmhA548eGp4J4OXnqHYAVNSpxMh9h68+JTjcqBsrcqMioYFOnb1Av3N7p58Dixyq4GSAZyr/TF4ilvjav7NYw8LShiznMNP+v07xWu5ZsJplE2ORBgJrtwA5a8jJyQODsqF9IZwqyMHN0CffzpRb3fMgoi1afAaJXkqOQ9IVzCo94W1/+PSyCeadrzroXl9VLaefiWZUK2cxUoRHu5BGcE9ia043Qu26jed7XT+dBlsb2uSkd0cxzEoQ+Vm0CpNuCITKTrNqtq7+fCMy1Od/bPz8OI6p06poECaVGYbK43L7hl+hiUjr8DevIHCqbzNBRuoFiFP1pWzVWkKCZk12FTyjnVVbt0x34xjUNIyqpGEfFoE/j/7De03P3udpsG41oD8iRRpyI49X04dDCylxZCTpiCHJstIrOpVRD13JuheedOgyZ4FrCgJxzfEsXEoZ51lFP4A==;\n\t5:t9tlqum7GfKWc/+oDpOeP+i5ckVAAzpbZiEdXn6VjTRNScVl/a9LczdQcuaXGAf/8n5ll4jA3qHeESSLCw7JqZ6HI+WKLrep+bz4KuBsayFyDKkeIyG+2VNHW8XrggK5GUQZE3cSWUMXTHWVK1Sc061qTE31ojlInNm3fCNUWf4=;\n\t7:0qzzwHqObBOzoB6KaXxAx7a9GZ/RW5sOSZ7kq7vQIvb9F254bhhobZZFj/TOxUD2b3SEsTaczM3khxXDvMF0fmDRX4tNm6nceSyd7dCfikhUy/MObGTq7JKXYUX79IzvEJB5iVx/bL37i79ngnCmFLezJmF9maTAv2U7Nft+LbXT7MDZNM2QafTcK8WhyqzXiq9Mvv9hWF3qf6mCMLWUkG2Cr58J6oQ9zqVAn+KaIz/Qov3R+YB6ddft5306Z1/s" ], "X-MS-TrafficTypeDiagnostic": "HE1PR05MB3434:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr", "X-Microsoft-Antispam-PRVS": "<HE1PR05MB343471A10026E464B4E1402EDB1F0@HE1PR05MB3434.eurprd05.prod.outlook.com>", "X-Exchange-Antispam-Report-Test": "UriScan:;", "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)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699050);\n\tSRVR:HE1PR05MB3434; BCL:0; PCL:0; RULEID:; SRVR:HE1PR05MB3434; ", "X-Forefront-PRVS": "079756C6B9", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(136003)(346002)(366004)(396003)(39860400002)(376002)(189003)(199004)(16586007)(47776003)(81156014)(6666003)(50226002)(8936002)(25786009)(5660300001)(68736007)(81166006)(8676002)(4326008)(106356001)(105586002)(2906002)(4720700003)(69596002)(316002)(21086003)(305945005)(8886007)(7736002)(66066001)(33026002)(107886003)(956004)(3846002)(476003)(48376002)(51416003)(478600001)(97736004)(7696005)(52116002)(55016002)(53936002)(14444005)(26005)(36756003)(186003)(16526019)(386003)(50466002)(76176011)(2616005)(86362001)(6116002)(11346002)(446003)(486006);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB3434; H:mellanox.com; FPR:;\n\tSPF:None; \n\tLANG:en; PTR:InfoNoRecords; MX:1; A:1; ", "Received-SPF": "None (protection.outlook.com: mellanox.com does not designate\n\tpermitted sender hosts)", "X-Microsoft-Antispam-Message-Info": "kcnrZ9JYAS5V3vArD+KpV4mYw/i5KEew6PTdHofrPx5v2kNxwdxY/kpYVl5ixsSoUMALsZKx/h/9uFj99aVCkugrIf2i9COUiA3KWrDpY/gxR2FoP7JXdB2NyhXK0fPKFjZqMk36Dpv5r4lS+ACVHnV5B4kiKAeS4dWnYMHjSzt2299XYgmUbz9ORFxUhHZOcFA09pukVPNvRPR4DIe5s7LTBYevakD3iJbzwjbTL8edVjDZT61T2UrfNiMnO9Ptbca0UehxS19Sw79cpAvYszRSsKQoOaE/ev3h2pE4vrayQIySGjal4ijVpiB8Yvjrvnb+SYpw5xMvlpZthxH8jmxc+fPxA8xIMmR8rWm1xRg=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "16 Sep 2018 16:56:33.8572\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "99759dbc-494a-4028-086e-08d61bf55cd8", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "a652971c-7d2e-4d9b-a6a4-d149256f461b", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "HE1PR05MB3434", "Subject": "[dpdk-dev] [PATCH 2/3] ethdev: convert testpmd encap commands to\n\tnew API", "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": "Currently there are 2 encapsulation commands in testpmd one for VXLAN\nand one for NVGRE, both of those commands are using the old rte encap\ncommand.\n\nThis commit update the commands to work with the new tunnel encap\nactions.\n\nThe reason that we have different encapsulation commands, one for VXLAN\nand one for NVGRE is the ease of use in testpmd, both commands are using\nthe same rte flow action for tunnel encap.\n\nSigned-off-by: Ori Kam <orika@mellanox.com>\n---\n app/test-pmd/cmdline_flow.c | 294 +++++++++++++++++++++-----------------------\n 1 file changed, 137 insertions(+), 157 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex f926060..349e822 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -262,37 +262,13 @@ struct action_rss_data {\n \tuint16_t queue[ACTION_RSS_QUEUE_NUM];\n };\n \n-/** Maximum number of items in struct rte_flow_action_vxlan_encap. */\n-#define ACTION_VXLAN_ENCAP_ITEMS_NUM 6\n-\n-/** Storage for struct rte_flow_action_vxlan_encap including external data. */\n-struct action_vxlan_encap_data {\n-\tstruct rte_flow_action_vxlan_encap conf;\n-\tstruct rte_flow_item items[ACTION_VXLAN_ENCAP_ITEMS_NUM];\n-\tstruct rte_flow_item_eth item_eth;\n-\tstruct rte_flow_item_vlan item_vlan;\n-\tunion {\n-\t\tstruct rte_flow_item_ipv4 item_ipv4;\n-\t\tstruct rte_flow_item_ipv6 item_ipv6;\n-\t};\n-\tstruct rte_flow_item_udp item_udp;\n-\tstruct rte_flow_item_vxlan item_vxlan;\n-};\n+/** Maximum buffer size for the encap data. */\n+#define ACTION_TUNNEL_ENCAP_MAX_BUFFER_SIZE 64\n \n-/** Maximum number of items in struct rte_flow_action_nvgre_encap. */\n-#define ACTION_NVGRE_ENCAP_ITEMS_NUM 5\n-\n-/** Storage for struct rte_flow_action_nvgre_encap including external data. */\n-struct action_nvgre_encap_data {\n-\tstruct rte_flow_action_nvgre_encap conf;\n-\tstruct rte_flow_item items[ACTION_NVGRE_ENCAP_ITEMS_NUM];\n-\tstruct rte_flow_item_eth item_eth;\n-\tstruct rte_flow_item_vlan item_vlan;\n-\tunion {\n-\t\tstruct rte_flow_item_ipv4 item_ipv4;\n-\t\tstruct rte_flow_item_ipv6 item_ipv6;\n-\t};\n-\tstruct rte_flow_item_nvgre item_nvgre;\n+/** Storage for struct rte_flow_action_tunnel_encap including external data. */\n+struct action_tunnel_encap_data {\n+\tstruct rte_flow_action_tunnel_encap 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@@ -2438,8 +2414,8 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \t\t.name = \"vxlan_encap\",\n \t\t.help = \"VXLAN encapsulation, uses configuration set by \\\"set\"\n \t\t\t\" vxlan\\\"\",\n-\t\t.priv = PRIV_ACTION(VXLAN_ENCAP,\n-\t\t\t\t sizeof(struct action_vxlan_encap_data)),\n+\t\t.priv = PRIV_ACTION(TUNNEL_ENCAP,\n+\t\t\t\t sizeof(struct action_tunnel_encap_data)),\n \t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n \t\t.call = parse_vc_action_vxlan_encap,\n \t},\n@@ -2448,7 +2424,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \t\t.help = \"Performs a decapsulation action by stripping all\"\n \t\t\t\" headers of the VXLAN tunnel network overlay from the\"\n \t\t\t\" matched flow.\",\n-\t\t.priv = PRIV_ACTION(VXLAN_DECAP, 0),\n+\t\t.priv = PRIV_ACTION(TUNNEL_DECAP, 0),\n \t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n \t\t.call = parse_vc,\n \t},\n@@ -2456,8 +2432,8 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \t\t.name = \"nvgre_encap\",\n \t\t.help = \"NVGRE encapsulation, uses configuration set by \\\"set\"\n \t\t\t\" nvgre\\\"\",\n-\t\t.priv = PRIV_ACTION(NVGRE_ENCAP,\n-\t\t\t\t sizeof(struct action_nvgre_encap_data)),\n+\t\t.priv = PRIV_ACTION(TUNNEL_ENCAP,\n+\t\t\t\t sizeof(struct action_tunnel_encap_data)),\n \t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n \t\t.call = parse_vc_action_nvgre_encap,\n \t},\n@@ -2466,7 +2442,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \t\t.help = \"Performs a decapsulation action by stripping all\"\n \t\t\t\" headers of the NVGRE tunnel network overlay from the\"\n \t\t\t\" matched flow.\",\n-\t\t.priv = PRIV_ACTION(NVGRE_DECAP, 0),\n+\t\t.priv = PRIV_ACTION(TUNNEL_DECAP, 0),\n \t\t.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),\n \t\t.call = parse_vc,\n \t},\n@@ -3034,6 +3010,9 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \treturn len;\n }\n \n+/** IP next protocol UDP. */\n+#define IP_PROTO_UDP 0x11\n+\n /** Parse VXLAN encap action. */\n static int\n parse_vc_action_vxlan_encap(struct context *ctx, const struct token *token,\n@@ -3042,7 +3021,32 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n {\n \tstruct buffer *out = buf;\n \tstruct rte_flow_action *action;\n-\tstruct action_vxlan_encap_data *action_vxlan_encap_data;\n+\tstruct action_tunnel_encap_data *action_vxlan_encap_data;\n+\tstruct rte_flow_item_eth eth = { .type = 0, };\n+\tstruct rte_flow_item_vlan vlan = {\n+\t\t.tci = vxlan_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 = vxlan_encap_conf.ipv4_src,\n+\t\t\t.dst_addr = vxlan_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 = vxlan_encap_conf.udp_src,\n+\t\t\t.dst_port = vxlan_encap_conf.udp_dst,\n+\t\t},\n+\t};\n+\tstruct rte_flow_item_vxlan vxlan = { .flags = 0, };\n+\tuint8_t *header;\n \tint ret;\n \n \tret = parse_vc(ctx, token, str, len, buf, size);\n@@ -3057,83 +3061,58 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \t/* Point to selected object. */\n \tctx->object = out->args.vc.data;\n \tctx->objmask = NULL;\n-\t/* Set up default configuration. */\n+\t/* Copy the headers to the buffer. */\n \taction_vxlan_encap_data = ctx->object;\n-\t*action_vxlan_encap_data = (struct action_vxlan_encap_data){\n-\t\t.conf = (struct rte_flow_action_vxlan_encap){\n-\t\t\t.definition = action_vxlan_encap_data->items,\n-\t\t},\n-\t\t.items = {\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_ETH,\n-\t\t\t\t.spec = &action_vxlan_encap_data->item_eth,\n-\t\t\t\t.mask = &rte_flow_item_eth_mask,\n-\t\t\t},\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_VLAN,\n-\t\t\t\t.spec = &action_vxlan_encap_data->item_vlan,\n-\t\t\t\t.mask = &rte_flow_item_vlan_mask,\n-\t\t\t},\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_IPV4,\n-\t\t\t\t.spec = &action_vxlan_encap_data->item_ipv4,\n-\t\t\t\t.mask = &rte_flow_item_ipv4_mask,\n-\t\t\t},\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_UDP,\n-\t\t\t\t.spec = &action_vxlan_encap_data->item_udp,\n-\t\t\t\t.mask = &rte_flow_item_udp_mask,\n-\t\t\t},\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_VXLAN,\n-\t\t\t\t.spec = &action_vxlan_encap_data->item_vxlan,\n-\t\t\t\t.mask = &rte_flow_item_vxlan_mask,\n-\t\t\t},\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_END,\n-\t\t\t},\n-\t\t},\n-\t\t.item_eth.type = 0,\n-\t\t.item_vlan = {\n-\t\t\t.tci = vxlan_encap_conf.vlan_tci,\n-\t\t\t.inner_type = 0,\n-\t\t},\n-\t\t.item_ipv4.hdr = {\n-\t\t\t.src_addr = vxlan_encap_conf.ipv4_src,\n-\t\t\t.dst_addr = vxlan_encap_conf.ipv4_dst,\n+\t*action_vxlan_encap_data = (struct action_tunnel_encap_data) {\n+\t\t.conf = (struct rte_flow_action_tunnel_encap){\n+\t\t\t.buf = action_vxlan_encap_data->buf,\n \t\t},\n-\t\t.item_udp.hdr = {\n-\t\t\t.src_port = vxlan_encap_conf.udp_src,\n-\t\t\t.dst_port = vxlan_encap_conf.udp_dst,\n-\t\t},\n-\t\t.item_vxlan.flags = 0,\n+\t\t.buf = {},\n \t};\n-\tmemcpy(action_vxlan_encap_data->item_eth.dst.addr_bytes,\n+\theader = action_vxlan_encap_data->buf;\n+\tif (vxlan_encap_conf.select_vlan)\n+\t\teth.type = rte_cpu_to_be_16(ETHER_TYPE_VLAN);\n+\telse if (vxlan_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 vxlan_encap_conf.eth_dst, ETHER_ADDR_LEN);\n-\tmemcpy(action_vxlan_encap_data->item_eth.src.addr_bytes,\n+\tmemcpy(eth.src.addr_bytes,\n \t vxlan_encap_conf.eth_src, ETHER_ADDR_LEN);\n-\tif (!vxlan_encap_conf.select_ipv4) {\n-\t\tmemcpy(&action_vxlan_encap_data->item_ipv6.hdr.src_addr,\n+\tmemcpy(header, ð, sizeof(eth));\n+\theader += sizeof(eth);\n+\tif (vxlan_encap_conf.select_vlan) {\n+\t\tif (vxlan_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 (vxlan_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 &vxlan_encap_conf.ipv6_src,\n \t\t sizeof(vxlan_encap_conf.ipv6_src));\n-\t\tmemcpy(&action_vxlan_encap_data->item_ipv6.hdr.dst_addr,\n+\t\tmemcpy(&ipv6.hdr.dst_addr,\n \t\t &vxlan_encap_conf.ipv6_dst,\n \t\t sizeof(vxlan_encap_conf.ipv6_dst));\n-\t\taction_vxlan_encap_data->items[2] = (struct rte_flow_item){\n-\t\t\t.type = RTE_FLOW_ITEM_TYPE_IPV6,\n-\t\t\t.spec = &action_vxlan_encap_data->item_ipv6,\n-\t\t\t.mask = &rte_flow_item_ipv6_mask,\n-\t\t};\n+\t\tmemcpy(header, &ipv6, sizeof(ipv6));\n+\t\theader += sizeof(ipv6);\n \t}\n-\tif (!vxlan_encap_conf.select_vlan)\n-\t\taction_vxlan_encap_data->items[1].type =\n-\t\t\tRTE_FLOW_ITEM_TYPE_VOID;\n-\tmemcpy(action_vxlan_encap_data->item_vxlan.vni, vxlan_encap_conf.vni,\n-\t RTE_DIM(vxlan_encap_conf.vni));\n+\tmemcpy(header, &udp, sizeof(udp));\n+\theader += sizeof(udp);\n+\tmemcpy(vxlan.vni, vxlan_encap_conf.vni, RTE_DIM(vxlan_encap_conf.vni));\n+\tmemcpy(header, &vxlan, sizeof(vxlan));\n+\theader += sizeof(vxlan);\n+\taction_vxlan_encap_data->conf.size = header -\n+\t\taction_vxlan_encap_data->buf;\n \taction->conf = &action_vxlan_encap_data->conf;\n \treturn ret;\n }\n-\n /** Parse NVGRE encap action. */\n static int\n parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token,\n@@ -3142,7 +3121,26 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n {\n \tstruct buffer *out = buf;\n \tstruct rte_flow_action *action;\n-\tstruct action_nvgre_encap_data *action_nvgre_encap_data;\n+\tstruct action_tunnel_encap_data *action_nvgre_encap_data;\n+\tstruct rte_flow_item_eth eth = { .type = 0, };\n+\tstruct rte_flow_item_vlan vlan = {\n+\t\t.tci = nvgre_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 = nvgre_encap_conf.ipv4_src,\n+\t\t\t.dst_addr = nvgre_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_nvgre nvgre = { .flow_id = 0, };\n+\tuint8_t *header;\n \tint ret;\n \n \tret = parse_vc(ctx, token, str, len, buf, size);\n@@ -3157,74 +3155,56 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,\n \t/* Point to selected object. */\n \tctx->object = out->args.vc.data;\n \tctx->objmask = NULL;\n-\t/* Set up default configuration. */\n+\t/* Copy the headers to the buffer. */\n \taction_nvgre_encap_data = ctx->object;\n-\t*action_nvgre_encap_data = (struct action_nvgre_encap_data){\n-\t\t.conf = (struct rte_flow_action_nvgre_encap){\n-\t\t\t.definition = action_nvgre_encap_data->items,\n-\t\t},\n-\t\t.items = {\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_ETH,\n-\t\t\t\t.spec = &action_nvgre_encap_data->item_eth,\n-\t\t\t\t.mask = &rte_flow_item_eth_mask,\n-\t\t\t},\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_VLAN,\n-\t\t\t\t.spec = &action_nvgre_encap_data->item_vlan,\n-\t\t\t\t.mask = &rte_flow_item_vlan_mask,\n-\t\t\t},\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_IPV4,\n-\t\t\t\t.spec = &action_nvgre_encap_data->item_ipv4,\n-\t\t\t\t.mask = &rte_flow_item_ipv4_mask,\n-\t\t\t},\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_NVGRE,\n-\t\t\t\t.spec = &action_nvgre_encap_data->item_nvgre,\n-\t\t\t\t.mask = &rte_flow_item_nvgre_mask,\n-\t\t\t},\n-\t\t\t{\n-\t\t\t\t.type = RTE_FLOW_ITEM_TYPE_END,\n-\t\t\t},\n-\t\t},\n-\t\t.item_eth.type = 0,\n-\t\t.item_vlan = {\n-\t\t\t.tci = nvgre_encap_conf.vlan_tci,\n-\t\t\t.inner_type = 0,\n-\t\t},\n-\t\t.item_ipv4.hdr = {\n-\t\t .src_addr = nvgre_encap_conf.ipv4_src,\n-\t\t .dst_addr = nvgre_encap_conf.ipv4_dst,\n+\t*action_nvgre_encap_data = (struct action_tunnel_encap_data) {\n+\t\t.conf = (struct rte_flow_action_tunnel_encap){\n+\t\t\t.buf = action_nvgre_encap_data->buf,\n \t\t},\n-\t\t.item_nvgre.flow_id = 0,\n+\t\t.buf = {},\n \t};\n-\tmemcpy(action_nvgre_encap_data->item_eth.dst.addr_bytes,\n+\theader = action_nvgre_encap_data->buf;\n+\tif (nvgre_encap_conf.select_vlan)\n+\t\teth.type = rte_cpu_to_be_16(ETHER_TYPE_VLAN);\n+\telse if (nvgre_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 nvgre_encap_conf.eth_dst, ETHER_ADDR_LEN);\n-\tmemcpy(action_nvgre_encap_data->item_eth.src.addr_bytes,\n+\tmemcpy(eth.src.addr_bytes,\n \t nvgre_encap_conf.eth_src, ETHER_ADDR_LEN);\n-\tif (!nvgre_encap_conf.select_ipv4) {\n-\t\tmemcpy(&action_nvgre_encap_data->item_ipv6.hdr.src_addr,\n+\tmemcpy(header, ð, sizeof(eth));\n+\theader += sizeof(eth);\n+\tif (nvgre_encap_conf.select_vlan) {\n+\t\tif (nvgre_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 (nvgre_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 &nvgre_encap_conf.ipv6_src,\n \t\t sizeof(nvgre_encap_conf.ipv6_src));\n-\t\tmemcpy(&action_nvgre_encap_data->item_ipv6.hdr.dst_addr,\n+\t\tmemcpy(&ipv6.hdr.dst_addr,\n \t\t &nvgre_encap_conf.ipv6_dst,\n \t\t sizeof(nvgre_encap_conf.ipv6_dst));\n-\t\taction_nvgre_encap_data->items[2] = (struct rte_flow_item){\n-\t\t\t.type = RTE_FLOW_ITEM_TYPE_IPV6,\n-\t\t\t.spec = &action_nvgre_encap_data->item_ipv6,\n-\t\t\t.mask = &rte_flow_item_ipv6_mask,\n-\t\t};\n+\t\tmemcpy(header, &ipv6, sizeof(ipv6));\n+\t\theader += sizeof(ipv6);\n \t}\n-\tif (!nvgre_encap_conf.select_vlan)\n-\t\taction_nvgre_encap_data->items[1].type =\n-\t\t\tRTE_FLOW_ITEM_TYPE_VOID;\n-\tmemcpy(action_nvgre_encap_data->item_nvgre.tni, nvgre_encap_conf.tni,\n-\t RTE_DIM(nvgre_encap_conf.tni));\n+\tmemcpy(nvgre.tni, nvgre_encap_conf.tni, RTE_DIM(nvgre_encap_conf.tni));\n+\tmemcpy(header, &nvgre, sizeof(nvgre));\n+\theader += sizeof(nvgre);\n+\taction_nvgre_encap_data->conf.size = header -\n+\t\taction_nvgre_encap_data->buf;\n \taction->conf = &action_nvgre_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,\n", "prefixes": [ "2/3" ] }