From patchwork Sat Sep 29 20:07:19 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ori Kam <orika@mellanox.com>
X-Patchwork-Id: 45693
X-Patchwork-Delegate: ferruh.yigit@amd.com
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])
	by dpdk.org (Postfix) with ESMTP id B78621B130;
	Sat, 29 Sep 2018 22:08:07 +0200 (CEST)
Received: from EUR02-VE1-obe.outbound.protection.outlook.com
	(mail-eopbgr20048.outbound.protection.outlook.com [40.107.2.48])
	by dpdk.org (Postfix) with ESMTP id 6B5C81B125
	for <dev@dpdk.org>; Sat, 29 Sep 2018 22:08:04 +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=AWqLSlsRsbKmT4AFjobS5zMKbMnnLQnVFjhMUIKN5tA=;
	b=CiATtZ/jgN1Z2L4dr7RXt4ywNL2H4xNoWRTX96erh71ES0gqdojdaGLS+ps6I7C4swNNG7tZL/osNMkXtzLGySweXmJOruw470niVSh5dyX2v/aaqTKcbybur3Txo6R3+2BVgwG1NVdr5RLr95p1LokjKShnOKY9P7+hjoF4+sE=
Authentication-Results: spf=none (sender IP is )
	smtp.mailfrom=orika@mellanox.com;
Received: from mellanox.com (37.142.13.130) by
	AM4PR05MB3427.eurprd05.prod.outlook.com (2603:10a6:205:6::16) with
	Microsoft SMTP Server (version=TLS1_2,
	cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
	15.20.1185.23; Sat, 29 Sep 2018 20:08:00 +0000
From: Ori Kam <orika@mellanox.com>
To: wenzhuo.lu@intel.com, jingjing.wu@intel.com, bernard.iremonger@intel.com,
	arybchenko@solarflare.com, ferruh.yigit@intel.com,
	stephen@networkplumber.org, adrien.mazarguil@6wind.com
Cc: dev@dpdk.org, dekelp@mellanox.com, thomas@monjalon.net,
	nelio.laranjeiro@6wind.com, yskoh@mellanox.com, orika@mellanox.com,
	shahafs@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
X-Originating-IP: [37.142.13.130]
X-ClientProxiedBy: HE1PR05CA0381.eurprd05.prod.outlook.com
	(2603:10a6:7:94::40) To AM4PR05MB3427.eurprd05.prod.outlook.com
	(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;
	RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);
	SRVR:AM4PR05MB3427;
X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3427;
	3:r1Ko1qEgzGgCT/SmVTvbf3rD6B8hcJUacGh6QsyGKm7+jOUDpwQitrcEYAwf9GyvFPgOYEcChLAk665sOUU6BCKIEmcsh/s6pjf8myBtk9KbNYaRr3uqlp3oRPSj611W/Le06DxgvFGltgkOuq3ycoSUCQalHbvqcC1DD1WZR2O4MF/K/WIuKXFzK0pQPJXR14d3decj+VOow+dGTIE82snTDNj3KWvFOFWkKSwqF659dBXOgvJqn2UCxXIHcw1X;
	25:fZbvem/hNcH7jmFaqzFAdaBjhqeYC93/E8U4//J/DAXf703h8radliick6pMd/jaKBNaAXE8nuUba1eldPx/hscRzK9uZxjoQH2yY4hItFSQVmX7iRVmXZPlPwMAkNh7aK65uUA2uc1wzM97t0RnDmdJzsh1NSd/E4kCmFlcHgbOeCAWRwOJ82u+o0i+hwXdddfI1erhnJRDNvpJHaNqgAmTJu0YnzCDeymjZWiiwbiKkEDAnZY9p3vC/6qqPdK3/EKD8PNn8seH/RS9L8M+lODvfAGfUFf/pJUmGaNCyWtOACll492GbIvkoNeD01cqRq2dkGHSTlfbrCMVs1fCtg==;
	31:vPZ3HMsRiPjRntgnUX058zfNCJsIUlGVfw1h90VfZUyjGfgwmM0LsJ+LtINGnzEPK5MgQjNBdYYL8Hszc3zetlQHNZxRBW/LktwYyVpJOa8qByg/VHk30kpFTCuu+6KI7ZvFaRvwblEBHbVCl5UFsX4M20dDYkB5sZWduNwhOglkCPXDwk30K/tTB0TTd8j4XyxT9AUMb0uMbrRiItSPv1juMF7YC8Fb4Y6fokz4hzw=
X-MS-TrafficTypeDiagnostic: AM4PR05MB3427:
X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr
X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3427;
	20:Gyd3yDnYCqr/+tiuIjSYIaS9yfPSEO2Tcmelfn5lohFWDkVausV4sDZr4bl0NDSNfGny+uGLAPKgjlE9zE7Nt9ETQWJ2fx872KnjYDmiwMNTxKsYVUJVSapZxroFzv4EEWeYItfch5X+eZ/mqQZosDfsK4EF69xtKCLJTrOADrpi9Z6rmOzmMtSWZn3hdRwV3Pblq/pKM67K9vYwd8rQUqjlhSDCwp9SZTHyBObMUMMsietjG7fT/ChnTGfhgV4RX/dc6r4Sv8FBVFMo2b36NXbL/BJc5PnqzCeGJpmOmkIgoztx9UX4Hn+Rx8pDHdfy2C081abA2Sl+0LNjfCvObKqMTuKUphd3WlzGXKNZfX9HFvdCuoHYfiHU5gjsVDJH062JAp2gK7rmMVT5PV6NM4gbPT+mLjqiHARdJmfd8lTBvgbnM/nBmeHDlYA/wc4zR58tzBWpAvJ4b6xE8GMu5OMqL77B1nkoyY2H3VZ+UDNG2AZmF8lvZcSxZBfKxtNg;
	4:XhzLkDzUCCkAjo0he60grn4PEs4NmhYNTd/VvCl4Vf7E1paOnG0NnMi6bZO5EYWYqyolxcKqUz6T7/JzUXZF3edBRHo8jwP1rTbAt9oPZaqsasCW8j2IB4zLalSABcEVGEL7TEiKw9iCgm5o8EQOVUgstCbSRdSc0ENMjdBblxqVlvAbz/JXStLRh/AT2mMSG+4/Vx9UFuH0WtmHLvArf4KfSNw4awoRmXDHRv/l4AgXCtUQEiE+OGcCzEE75RR3BFant3ZsW7AKSa5/167pe2FBUJ8Lj2p+rLRgDcsONrcpVJBTr4uviQWf/HiYViiX
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;
	RULEID:(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);
	SRVR:AM4PR05MB3427; BCL:0; PCL:0; RULEID:; SRVR:AM4PR05MB3427;
X-Forefront-PRVS: 0810818DA0
X-Forefront-Antispam-Report: SFV:NSPM;
	SFS:(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);
	DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3427; H:mellanox.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-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR05MB3427;
	23:Gug3+NEpQHOOK23uLjwHFSIpibhKlAP+mWHDMSPPR?=
	aYaYzo+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==
X-Microsoft-Antispam-Message-Info: 
 vT/t63Alikll7aqjn2jpHJng3VnU/VaGAh/uW6PsHx5eVyo0W2bzNi1LCFGoFuPDDqG17MAZ6QKMTV0pCI3+rSltUQKxKdV5FF2En/Q4+vJChpd7BBPIGfnA/Md3DMXpZIBrmRx/uOLxiGvuuizHZEQyoJIHdeGiXCKBFbxQzv7AqqMgXrbnFapDbvNXYtGjAk0qxk1JsGDLCqCR/aHRV3pgNdZO3Q8BukMqadk6Q3BVXDYsZp+aIcek71R/xls4knDoIl/iyojvopdWwRW6jT5kShQM+xEj1UO9VGDivtqNByMyTkalLRQTB4uqWzIhqZOOQLdHwXTWEoGqcuJCkxrsQAhkw5oxof3EuDAKRS0=
X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3427;
	6:MDFsZyYBi8ZlGkvfsfReCBBg7m+jBdcnOzwpL0IuIB6/k0IvBxEoL8dZBKJZR4DXIqBmg/NgKpPPQBEvtfoJVQGj+9YftxnINtpLYOf4at7nrfSHlEsl9ZS1xkNNCSIRYLmMNetsioSi3pceqmR/UIAH+LyEyTvSlFM5XqOcp5yUlMYLLVWbajxfOaUsh1ffEDVIJldU2hO02uBWsGDSNx6UqxS5EkZuvQ4E3i034L2K5atFSE4vJVQs57EdLUCJqQgAKKv8mAwqm97lhcuvuAk+K76JYK1LPUM/Wf57ohbNXfWlWSS/P34bEtzkxAWHWSgKzXEIUnjoN475sgA4sqejPsSPSE0DbpxS42MTQTqf/dNAQdNM1c3wc5UVcVgwwlhsL/s5MalbRMEHB12KdFv0jhiJEPvQB+ifxTYuiDLzfMWZTaoIgUUHqI+YbtH4lzV/s9JTD42g11HI9Nn/tA==;
	5:FjEWI8EfQ1kOQ1415yffRmljDyn3J6afQ7Rm9tFWu2aRgppir3lnqxD2U2g5XJcLjPUNqokyhrw5/OQ9p4CcHRkKzFSkllN75jy5VUzNtRJRCi0DNj0FCUJvtjiWqMhRxBck2XapQlHOAXcBirWPwumOcksT8bmjY8JtJoZaFj8=;
	7:zQPkGG8pnDJvjbOcuOf3PmqcgMcoX4s35j199Qz2OoocCaroAAuvSbTh9j2PJEvj99gzGvjF8NY8xpFIannISbj8p8DgjZruslEppcQ/jMqkgPBUHdba4uD7w6Jq6sDP0i7NoOA5hL62/wJ+8T8URQfL9OYGUsjKjZE3NgBdtPt/8IJbJSzgPFKb4J82Jyz+8+cIIMFfVVJPhubQxzXbJoeqYoUi5RGiWXVRB2DXZEypGcxdvHdWaS5irVPAbuWK
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2018 20:08:00.9780
	(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>,
	<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>,
	<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

MPLSoUDP is an example for L3 tunnel encapsulation.

Due to the complex encapsulation of MPLSoUDP flow action and based on the
fact testpmd does not allocate memory, this patch adds a new command in
testpmd to initialise a global structure containing the necessary
information to make the outer layer of the packet.  This same global
structure will then be used by the flow command line in testpmd when the
action mplsoudp_encap will be parsed, at this point, the conversion into
such action becomes trivial.

This global structure is only used for the encap action.

Signed-off-by: Ori Kam <orika@mellanox.com>
---
 app/test-pmd/cmdline.c                      | 175 ++++++++++++++++++++++++++++
 app/test-pmd/cmdline_flow.c                 | 123 +++++++++++++++++++
 app/test-pmd/testpmd.h                      |  17 +++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  50 ++++++++
 4 files changed, 365 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 589121d..10d9489 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15186,6 +15186,179 @@ static void cmd_set_nvgre_parsed(void *parsed_result,
 	},
 };
 
+/** Set MPLSoUDP encapsulation details */
+struct cmd_set_mplsoudp_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t mplsoudp;
+	cmdline_fixed_string_t pos_token;
+	cmdline_fixed_string_t ip_version;
+	uint32_t vlan_present:1;
+	uint32_t label;
+	uint16_t udp_src;
+	uint16_t udp_dst;
+	cmdline_ipaddr_t ip_src;
+	cmdline_ipaddr_t ip_dst;
+	uint16_t tci;
+	struct ether_addr eth_src;
+	struct ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_mplsoudp_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, set, "set");
+cmdline_parse_token_string_t cmd_set_mplsoudp_mplsoudp =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, mplsoudp, "mplsoudp");
+cmdline_parse_token_string_t cmd_set_mplsoudp_mplsoudp_with_vlan =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, mplsoudp,
+				 "mplsoudp-with-vlan");
+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_version =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+				 "ip-version");
+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_version_value =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, ip_version,
+				 "ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_mplsoudp_label =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+				 "label");
+cmdline_parse_token_num_t cmd_set_mplsoudp_label_value =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, label, UINT32);
+cmdline_parse_token_string_t cmd_set_mplsoudp_udp_src =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+				 "udp-src");
+cmdline_parse_token_num_t cmd_set_mplsoudp_udp_src_value =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, udp_src, UINT16);
+cmdline_parse_token_string_t cmd_set_mplsoudp_udp_dst =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+				 "udp-dst");
+cmdline_parse_token_num_t cmd_set_mplsoudp_udp_dst_value =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, udp_dst, UINT16);
+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_src =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+				 "ip-src");
+cmdline_parse_token_ipaddr_t cmd_set_mplsoudp_ip_src_value =
+	TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsoudp_result, ip_src);
+cmdline_parse_token_string_t cmd_set_mplsoudp_ip_dst =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+				 "ip-dst");
+cmdline_parse_token_ipaddr_t cmd_set_mplsoudp_ip_dst_value =
+	TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsoudp_result, ip_dst);
+cmdline_parse_token_string_t cmd_set_mplsoudp_vlan =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+				 "vlan-tci");
+cmdline_parse_token_num_t cmd_set_mplsoudp_vlan_value =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_result, tci, UINT16);
+cmdline_parse_token_string_t cmd_set_mplsoudp_eth_src =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+				 "eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_mplsoudp_eth_src_value =
+	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsoudp_result, eth_src);
+cmdline_parse_token_string_t cmd_set_mplsoudp_eth_dst =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_result, pos_token,
+				 "eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_mplsoudp_eth_dst_value =
+	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsoudp_result, eth_dst);
+
+static void cmd_set_mplsoudp_parsed(void *parsed_result,
+	__attribute__((unused)) struct cmdline *cl,
+	__attribute__((unused)) void *data)
+{
+	struct cmd_set_mplsoudp_result *res = parsed_result;
+	union {
+		uint32_t mplsoudp_label;
+		uint8_t label[3];
+	} id = {
+		.mplsoudp_label =
+			rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
+	};
+
+	if (strcmp(res->mplsoudp, "mplsoudp") == 0)
+		mplsoudp_encap_conf.select_vlan = 0;
+	else if (strcmp(res->mplsoudp, "mplsoudp-with-vlan") == 0)
+		mplsoudp_encap_conf.select_vlan = 1;
+	if (strcmp(res->ip_version, "ipv4") == 0)
+		mplsoudp_encap_conf.select_ipv4 = 1;
+	else if (strcmp(res->ip_version, "ipv6") == 0)
+		mplsoudp_encap_conf.select_ipv4 = 0;
+	else
+		return;
+	rte_memcpy(mplsoudp_encap_conf.label, &id.label[1], 3);
+	mplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
+	mplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
+	if (mplsoudp_encap_conf.select_ipv4) {
+		IPV4_ADDR_TO_UINT(res->ip_src, mplsoudp_encap_conf.ipv4_src);
+		IPV4_ADDR_TO_UINT(res->ip_dst, mplsoudp_encap_conf.ipv4_dst);
+	} else {
+		IPV6_ADDR_TO_ARRAY(res->ip_src, mplsoudp_encap_conf.ipv6_src);
+		IPV6_ADDR_TO_ARRAY(res->ip_dst, mplsoudp_encap_conf.ipv6_dst);
+	}
+	if (mplsoudp_encap_conf.select_vlan)
+		mplsoudp_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+	rte_memcpy(mplsoudp_encap_conf.eth_src, res->eth_src.addr_bytes,
+		   ETHER_ADDR_LEN);
+	rte_memcpy(mplsoudp_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+		   ETHER_ADDR_LEN);
+}
+
+cmdline_parse_inst_t cmd_set_mplsoudp = {
+	.f = cmd_set_mplsoudp_parsed,
+	.data = NULL,
+	.help_str = "set mplsoudp ip-version ipv4|ipv6 label <label> udp-src"
+		" <udp-src> udp-dst <udp-dst> ip-src <ip-src> ip-dst <ip-dst>"
+		" eth-src <eth-src> eth-dst <eth-dst>",
+	.tokens = {
+		(void *)&cmd_set_mplsoudp_set,
+		(void *)&cmd_set_mplsoudp_mplsoudp,
+		(void *)&cmd_set_mplsoudp_ip_version,
+		(void *)&cmd_set_mplsoudp_ip_version_value,
+		(void *)&cmd_set_mplsoudp_label,
+		(void *)&cmd_set_mplsoudp_label_value,
+		(void *)&cmd_set_mplsoudp_udp_src,
+		(void *)&cmd_set_mplsoudp_udp_src_value,
+		(void *)&cmd_set_mplsoudp_udp_dst,
+		(void *)&cmd_set_mplsoudp_udp_dst_value,
+		(void *)&cmd_set_mplsoudp_ip_src,
+		(void *)&cmd_set_mplsoudp_ip_src_value,
+		(void *)&cmd_set_mplsoudp_ip_dst,
+		(void *)&cmd_set_mplsoudp_ip_dst_value,
+		(void *)&cmd_set_mplsoudp_eth_src,
+		(void *)&cmd_set_mplsoudp_eth_src_value,
+		(void *)&cmd_set_mplsoudp_eth_dst,
+		(void *)&cmd_set_mplsoudp_eth_dst_value,
+		NULL,
+	},
+};
+
+cmdline_parse_inst_t cmd_set_mplsoudp_with_vlan = {
+	.f = cmd_set_mplsoudp_parsed,
+	.data = NULL,
+	.help_str = "set mplsoudp-with-vlan ip-version ipv4|ipv6 label <label>"
+		" udp-src <udp-src> udp-dst <udp-dst> ip-src <ip-src> ip-dst"
+		" <ip-dst> vlan-tci <vlan-tci> eth-src <eth-src> eth-dst"
+		" <eth-dst>",
+	.tokens = {
+		(void *)&cmd_set_mplsoudp_set,
+		(void *)&cmd_set_mplsoudp_mplsoudp_with_vlan,
+		(void *)&cmd_set_mplsoudp_ip_version,
+		(void *)&cmd_set_mplsoudp_ip_version_value,
+		(void *)&cmd_set_mplsoudp_label,
+		(void *)&cmd_set_mplsoudp_label_value,
+		(void *)&cmd_set_mplsoudp_udp_src,
+		(void *)&cmd_set_mplsoudp_udp_src_value,
+		(void *)&cmd_set_mplsoudp_udp_dst,
+		(void *)&cmd_set_mplsoudp_udp_dst_value,
+		(void *)&cmd_set_mplsoudp_ip_src,
+		(void *)&cmd_set_mplsoudp_ip_src_value,
+		(void *)&cmd_set_mplsoudp_ip_dst,
+		(void *)&cmd_set_mplsoudp_ip_dst_value,
+		(void *)&cmd_set_mplsoudp_vlan,
+		(void *)&cmd_set_mplsoudp_vlan_value,
+		(void *)&cmd_set_mplsoudp_eth_src,
+		(void *)&cmd_set_mplsoudp_eth_src_value,
+		(void *)&cmd_set_mplsoudp_eth_dst,
+		(void *)&cmd_set_mplsoudp_eth_dst_value,
+		NULL,
+	},
+};
+
 /* Strict link priority scheduling mode setting */
 static void
 cmd_strict_link_prio_parsed(
@@ -17814,6 +17987,8 @@ struct cmd_config_per_queue_tx_offload_result {
 	(cmdline_parse_inst_t *)&cmd_set_vxlan_with_vlan,
 	(cmdline_parse_inst_t *)&cmd_set_nvgre,
 	(cmdline_parse_inst_t *)&cmd_set_nvgre_with_vlan,
+	(cmdline_parse_inst_t *)&cmd_set_mplsoudp,
+	(cmdline_parse_inst_t *)&cmd_set_mplsoudp_with_vlan,
 	(cmdline_parse_inst_t *)&cmd_ddp_add,
 	(cmdline_parse_inst_t *)&cmd_ddp_del,
 	(cmdline_parse_inst_t *)&cmd_ddp_get_list,
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 349e822..125d09b 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -243,6 +243,7 @@ enum index {
 	ACTION_VXLAN_DECAP,
 	ACTION_NVGRE_ENCAP,
 	ACTION_NVGRE_DECAP,
+	ACTION_MPLSOUDP_ENCAP,
 };
 
 /** Maximum size for pattern in struct rte_flow_item_raw. */
@@ -271,6 +272,12 @@ struct action_tunnel_encap_data {
 	uint8_t buf[ACTION_TUNNEL_ENCAP_MAX_BUFFER_SIZE];
 };
 
+/** Storage for struct rte_flow_action_tunnel_encap including external data. */
+struct action_tunnel_encap_l3_data {
+	struct rte_flow_action_tunnel_encap_l3 conf;
+	uint8_t buf[ACTION_TUNNEL_ENCAP_MAX_BUFFER_SIZE];
+};
+
 /** Maximum number of subsequent tokens and arguments on the stack. */
 #define CTX_STACK_SIZE 16
 
@@ -792,6 +799,7 @@ struct parse_action_priv {
 	ACTION_VXLAN_DECAP,
 	ACTION_NVGRE_ENCAP,
 	ACTION_NVGRE_DECAP,
+	ACTION_MPLSOUDP_ENCAP,
 	ZERO,
 };
 
@@ -928,6 +936,9 @@ static int parse_vc_action_vxlan_encap(struct context *, const struct token *,
 static int parse_vc_action_nvgre_encap(struct context *, const struct token *,
 				       const char *, unsigned int, void *,
 				       unsigned int);
+static int parse_vc_action_mplsoudp_encap(struct context *,
+					  const struct token *, const char *,
+					  unsigned int, void *, unsigned int);
 static int parse_destroy(struct context *, const struct token *,
 			 const char *, unsigned int,
 			 void *, unsigned int);
@@ -2446,6 +2457,15 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,
 		.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
 		.call = parse_vc,
 	},
+	[ACTION_MPLSOUDP_ENCAP] = {
+		.name = "mplsoudp_encap",
+		.help = "mplsoudp encapsulation, uses configuration set by"
+			" \"set vxlan\"",
+		.priv = PRIV_ACTION(TUNNEL_ENCAP_L3,
+				    sizeof(struct action_tunnel_encap_l3_data)),
+		.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+		.call = parse_vc_action_mplsoudp_encap,
+	},
 };
 
 /** Remove and return last entry from argument stack. */
@@ -3205,6 +3225,109 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,
 	action->conf = &action_nvgre_encap_data->conf;
 	return ret;
 }
+
+/** Parse MPLSOUDP encap action. */
+static int
+parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token,
+			       const char *str, unsigned int len,
+			       void *buf, unsigned int size)
+{
+	struct buffer *out = buf;
+	struct rte_flow_action *action;
+	struct action_tunnel_encap_data *action_encap_data;
+	struct rte_flow_item_eth eth = { .type = 0, };
+	struct rte_flow_item_vlan vlan = {
+		.tci = mplsoudp_encap_conf.vlan_tci,
+		.inner_type = 0,
+	};
+	struct rte_flow_item_ipv4 ipv4 = {
+		.hdr =  {
+			.src_addr = mplsoudp_encap_conf.ipv4_src,
+			.dst_addr = mplsoudp_encap_conf.ipv4_dst,
+			.next_proto_id = IP_PROTO_UDP,
+		},
+	};
+	struct rte_flow_item_ipv6 ipv6 = {
+		.hdr =  {
+			.proto = IP_PROTO_UDP,
+		},
+	};
+	struct rte_flow_item_udp udp = {
+		.hdr = {
+			.src_port = mplsoudp_encap_conf.udp_src,
+			.dst_port = mplsoudp_encap_conf.udp_dst,
+		},
+	};
+	struct rte_flow_item_mpls mpls;
+	uint8_t *header;
+	int ret;
+
+	ret = parse_vc(ctx, token, str, len, buf, size);
+	if (ret < 0)
+		return ret;
+	/* Nothing else to do if there is no buffer. */
+	if (!out)
+		return ret;
+	if (!out->args.vc.actions_n)
+		return -1;
+	action = &out->args.vc.actions[out->args.vc.actions_n - 1];
+	/* Point to selected object. */
+	ctx->object = out->args.vc.data;
+	ctx->objmask = NULL;
+	/* Copy the headers to the buffer. */
+	action_encap_data = ctx->object;
+	*action_encap_data = (struct action_tunnel_encap_data) {
+		.conf = (struct rte_flow_action_tunnel_encap){
+			.buf = action_encap_data->buf,
+		},
+		.buf = {},
+	};
+	header = action_encap_data->buf;
+	if (mplsoudp_encap_conf.select_vlan)
+		eth.type = rte_cpu_to_be_16(ETHER_TYPE_VLAN);
+	else if (mplsoudp_encap_conf.select_ipv4)
+		eth.type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+	else
+		eth.type = rte_cpu_to_be_16(ETHER_TYPE_IPv6);
+	memcpy(eth.dst.addr_bytes,
+	       mplsoudp_encap_conf.eth_dst, ETHER_ADDR_LEN);
+	memcpy(eth.src.addr_bytes,
+	       mplsoudp_encap_conf.eth_src, ETHER_ADDR_LEN);
+	memcpy(header, &eth, sizeof(eth));
+	header += sizeof(eth);
+	if (mplsoudp_encap_conf.select_vlan) {
+		if (mplsoudp_encap_conf.select_ipv4)
+			vlan.inner_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+		else
+			vlan.inner_type = rte_cpu_to_be_16(ETHER_TYPE_IPv6);
+		memcpy(header, &vlan, sizeof(vlan));
+		header += sizeof(vlan);
+	}
+	if (mplsoudp_encap_conf.select_ipv4) {
+		memcpy(header, &ipv4, sizeof(ipv4));
+		header += sizeof(ipv4);
+	} else {
+		memcpy(&ipv6.hdr.src_addr,
+		       &mplsoudp_encap_conf.ipv6_src,
+		       sizeof(mplsoudp_encap_conf.ipv6_src));
+		memcpy(&ipv6.hdr.dst_addr,
+		       &mplsoudp_encap_conf.ipv6_dst,
+		       sizeof(mplsoudp_encap_conf.ipv6_dst));
+		memcpy(header, &ipv6, sizeof(ipv6));
+		header += sizeof(ipv6);
+	}
+	memcpy(header, &udp, sizeof(udp));
+	header += sizeof(udp);
+	memcpy(mpls.label_tc_s, mplsoudp_encap_conf.label,
+	       RTE_DIM(mplsoudp_encap_conf.label));
+	memcpy(header, &mpls, sizeof(mpls));
+	header += sizeof(mpls);
+	action_encap_data->conf.size = header -
+		action_encap_data->buf;
+	action->conf = &action_encap_data->conf;
+	return ret;
+}
+
 /** Parse tokens for destroy command. */
 static int
 parse_destroy(struct context *ctx, const struct token *token,
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index a1f6614..355aa84 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -487,6 +487,23 @@ struct nvgre_encap_conf {
 };
 struct nvgre_encap_conf nvgre_encap_conf;
 
+/* MPLSoUDP encap parameters. */
+struct mplsoudp_encap_conf {
+	uint32_t select_ipv4:1;
+	uint32_t select_vlan:1;
+	uint8_t label[3];
+	rte_be16_t udp_src;
+	rte_be16_t udp_dst;
+	rte_be32_t ipv4_src;
+	rte_be32_t ipv4_dst;
+	uint8_t ipv6_src[16];
+	uint8_t ipv6_dst[16];
+	rte_be16_t vlan_tci;
+	uint8_t eth_src[ETHER_ADDR_LEN];
+	uint8_t eth_dst[ETHER_ADDR_LEN];
+};
+struct mplsoudp_encap_conf mplsoudp_encap_conf;
+
 static inline unsigned int
 lcore_num(void)
 {
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index dde205a..a374578 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1570,6 +1570,23 @@ flow rule using the action nvgre_encap will use the last configuration set.
 To have a different encapsulation header, one of those commands must be called
 before the flow rule creation.
 
+Config MPLSoUDP Encap outer layers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Configure the outer layer to encapsulate a packet inside a MPLSoUDP tunnel::
+
+ set mplsoudp ip-version (ipv4|ipv6) label (label) udp-src (udp-src) \
+        udp-dst (udp-dst) ip-src (ip-src) ip-dst (ip-dst) \
+        eth-src (eth-src) eth-dst (eth-dst)
+ set mplsoudp-with-vlan ip-version (ipv4|ipv6) label (label) udp-src (udp-src)
+        udp-dst (udp-dst) ip-src (ip-src) ip-dst (ip-dst) vlan-tci (vlan-tci) \
+        eth-src (eth-src) eth-dst (eth-dst)
+
+Those command will set an internal configuration inside testpmd, any following
+flow rule using the action mplsoudp_encap will use the last configuration set.
+To have a different encapsulation header, one of those commands must be called
+before the flow rule creation.
+
 Port Functions
 --------------
 
@@ -3697,6 +3714,9 @@ This section lists supported actions and their attributes, if any.
 - ``nvgre_decap``: Performs a decapsulation action by stripping all headers of
   the NVGRE tunnel network overlay from the matched flow.
 
+- ``mplsoudp_encap``: Performs a MPLSoUDP encapsulation, outer layer
+  configuration is done through `Config MPLSoUDP Encap outer layers`_.
+
 Destroying flow rules
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -4025,6 +4045,36 @@ IPv6 NVGRE outer header::
  testpmd> flow create 0 ingress pattern end actions nvgre_encap /
         queue index 0 / end
 
+Sample MPLSoUDP encapsulation rule
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+MPLSoUDP encapsulation outer layer has default value pre-configured in testpmd
+source code, those can be changed by using the following commands
+
+IPv4 MPLSoUDP outer header::
+
+ testpmd> set mplsoudp ip-version ipv4 label 4 udp-src 5 udp-dst 10
+        ip-src 127.0.0.1 ip-dst 128.0.0.1 eth-src 11:11:11:11:11:11
+        eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
+
+ testpmd> set mplsoudp-with-vlan ip-version ipv4 label 4 udp-src 5 udp-dst 10
+        ip-src 127.0.0.1 ip-dst 128.0.0.1 vlan-tci 34 eth-src 11:11:11:11:11:11
+        eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
+
+IPv6 MPLSoUDP outer header::
+
+ testpmd> set mplsoudp ip-version ipv6 mask 4 udp-src 5 udp-dst 10
+        ip-src ::1 ip-dst ::2222 eth-src 11:11:11:11:11:11
+        eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
+
+ testpmd> set mplsoudp-with-vlan ip-version ipv6 mask 4 udp-src 5 udp-dst 10
+        ip-src ::1 ip-dst ::2222 vlan-tci 34 eth-src 11:11:11:11:11:11
+        eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
+
 BPF Functions
 --------------
 

From patchwork Sat Sep 29 20:07:20 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ori Kam <orika@mellanox.com>
X-Patchwork-Id: 45694
X-Patchwork-Delegate: ferruh.yigit@amd.com
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])
	by dpdk.org (Postfix) with ESMTP id E7EB51B153;
	Sat, 29 Sep 2018 22:08:10 +0200 (CEST)
Received: from EUR02-VE1-obe.outbound.protection.outlook.com
	(mail-eopbgr20049.outbound.protection.outlook.com [40.107.2.49])
	by dpdk.org (Postfix) with ESMTP id 883621B12F
	for <dev@dpdk.org>; Sat, 29 Sep 2018 22:08:06 +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=ZIaAg4Ke9t6OiHepdJDD/MhPxIa14oX/h32jDgCLE8k=;
	b=qK03qkMtYOEUyZBoP0qbTAyVNQa0C6MWdsoMBW8tq361XfYBveFt/YIjGRvYaS3wgoBgItEGXFYL0P74ocCTqg/Ll7ktrBqj2IKWhQUaAe8u2Zb6mce+aGeUmhMThWKXdfPqkqdSkij+kaFj6ImPEqsAHAL81PdY1GqscsuSmgY=
Authentication-Results: spf=none (sender IP is )
	smtp.mailfrom=orika@mellanox.com;
Received: from mellanox.com (37.142.13.130) by
	AM4PR05MB3427.eurprd05.prod.outlook.com (2603:10a6:205:6::16) with
	Microsoft SMTP Server (version=TLS1_2,
	cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
	15.20.1185.23; Sat, 29 Sep 2018 20:08:03 +0000
From: Ori Kam <orika@mellanox.com>
To: wenzhuo.lu@intel.com, jingjing.wu@intel.com, bernard.iremonger@intel.com,
	arybchenko@solarflare.com, ferruh.yigit@intel.com,
	stephen@networkplumber.org, adrien.mazarguil@6wind.com
Cc: dev@dpdk.org, dekelp@mellanox.com, thomas@monjalon.net,
	nelio.laranjeiro@6wind.com, yskoh@mellanox.com, orika@mellanox.com,
	shahafs@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
X-Originating-IP: [37.142.13.130]
X-ClientProxiedBy: HE1PR05CA0381.eurprd05.prod.outlook.com
	(2603:10a6:7:94::40) To AM4PR05MB3427.eurprd05.prod.outlook.com
	(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;
	RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);
	SRVR:AM4PR05MB3427;
X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3427;
	3:SfDh22msN4Ycj7sn5V3ZrrEZg9jTtlOioYyoaXCeGnBFVA5O3Vy1XbISwBa0mfoIEMpW4mngLubtVMcUURsUtV3NZaGTLRQBaWjBrFCYWZaJ8XFlVkeU+IwCI8Rq38qnIblIYns4Vh11b9yNjUIodaF+G56Oq3nJUBBm34FmlYNXLGLd18OjUBxClJKNXLhmpv5I+9Bkp9NuBE1St2qXuh5PXBp0FxRgr1mUXLPsMyBxXSF+Gh/bR7nN7WelimIE;
	25:HBwAaw+qFq66tt53hP3C01A11d+h0agmuHSjrY+DeNbnN6mqhK7nWIxWrQdvyrWodaOORv3MplYgmhnwmbYKayOEBr9u5nLpLRoZjCBbrRur5Ypm6160WKrELI2Bd5FCJiGJEI2xGaDA1ob1lM1ybnKBZPqEUSYV41FblRUmwMdl6JNfIgRvRn3GjzrYKs4ibyD/8Ul2LCLWDxUQZwf8PQ5HR/X0o3/4+5w4cbAQfRy/CQxMamn+kttN9wx8QkOFi53yMOLVApq3vQinn4JVSDVK5i0y2Qyn4Vof4TV4IThkgpfKVL8R82wKmBkvoC2qpIqqKdyFSykCuQ13ElMbFA==;
	31:J68yb+DzQwIUN9KOJ6aa1NJxMj0EpGynA9NMRiza7PC5V9boei/QIGJoQU1xldug//AlGSYpORPhY3bb0XeV7Od3oW7Bvd1Buioj/iO1lmvevXqSmdb4P9u8c8O5HZQwQNshwCTZffYIMzrTCliM+lEvVq6wzUpPh/3Acr3FhMxvqcABebPOqAIvEg7ROhy78ob5UoJj9IQp6DqJMCWQeRy7Hftn7B6Ju2zFVoEO7JI=
X-MS-TrafficTypeDiagnostic: AM4PR05MB3427:
X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr
X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3427;
	20:FKeUBW3/MAzsB5uBbFYvy9Xlx364O54c7cs3iCrP0+RbVPGfd0mbCmJz7iCkk8xBtLn6kuche+U1egI86iECZVzF3C4890gV/0A5zFFIVnp4JntunQwKXJ/6NXDqCat9XO+qoqvmJmhfYinm5vqLEMWxdx+SZSGISM7/8z34OW+LjKT8bDZi8KEEP5TEmtzF6qO3uICkfgpPQKKIKKU2d+DdS7HtiE5tXFKYuisX4OvGOTAK3EPXiDCTy+MkHoVMB1oNsVu0usi0QOI27F4KxDAkC4BMHKNSG6G1nYHwswpgjH0jkxrYKK8gSz69GTDo/Jmmm7CYLfnlsAxQY/i/CtBsu3vW+BPLdZBNvp80zKtgdQqm692sXExOkVoeA4igqgxCUmWCni0h4Dvp2I3kxD15voVLax5Yzijbv53APoXUrlDr/6a+WPR/UXXmMale3rgg/poBErIL+4uK0gT7rewOCpkitZX+wUPjOFELeoXIvEbi8QsW3/49vCY6nvTB;
	4:YbHb6nwFVAqDR/USfFxJtC+ls2ctbIvjZvN1+4ObWwlLyxwIJKQrSM8bhODBYuSoA/Ms5WJHnvZxp7GC2KoEWXvVAuvnADwp1/K/+qFzQVIkzqtUXg7dv0O9r81Xg04nUf7WsGgtUEk4pxyCCS7nRmVpqUIZzes7SyspQNKCjBBlg80vFYps2kAj1g2l1FPGOktdEirDOM/9pWoSZpzNuN7RqUhMyHSeuUQyA0fCZw+3MUzcvMAFjxhbZh2sGirKlMDRNMqVO3wrIzEichuhxx+MmOHNKkv0qIdfFH7me1goQqAWbr6P0iozxZ0BdqsI
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;
	RULEID:(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);
	SRVR:AM4PR05MB3427; BCL:0; PCL:0; RULEID:; SRVR:AM4PR05MB3427;
X-Forefront-PRVS: 0810818DA0
X-Forefront-Antispam-Report: SFV:NSPM;
	SFS:(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);
	DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3427; H:mellanox.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-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR05MB3427;
	23:7wnYS34bUQkqZP7axjNMB2HAgjnNENZ1nWlZIY8mE?=
	yYs9pjYQvON7Hl/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
X-Microsoft-Antispam-Message-Info: 
 wkP74G/LDsQSrGlt7bR4UlD+SFsn/5RcQLbkXuAh67HR1LjT2FdNIShnJ/6tIwYcI+LRtNrH3Ix0yCPhvUuyPpPDGVzI9jRynswunS+KWV6hxuZJ9LX8OrYeIRE9RtIIKf3lNDY+m0ZkpSl3CaXaLms0mQR1kDkFMOXBMTeqfnRxYh0pZDStY/8x2ilYKVnfPAslkiPjkHEi9EQm+4Q/PyR1xqO2ySrkUM3jttuhQWrxwkOAvlrmd0Hc/kGX6F2M3+E+Odet4xiirimsPJmnFPpUNMQfXXISvEybGfCV4VZY2P9IJgzziolEF/OFInA25N2NME2+dGCA3Nc/hoveCEMv4PgSaw8j7lN4UaOvoNM=
X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3427;
	6:+BN/+I49llR5gUGuSArQ3YxK22tQNN7ozdKm/BvPMtVjyg79Lz6Uyq2YOaeRYI9xFVzdYJdc7RWPMSBb59I6IO1lyUXy+bdHx+2z0LrFqeaPBp1tqjav4E552L/ugcteRgNWhN6lqDkuPVBvj6tjfGWoKu4MIO/QYV810Q5tTRKBE1gxiKqI77pENp9Gs2Ap52rWieQg5GEIuOewZfOWzchyva0CLsM9kjrWaPrbzgRqJW5pI9tYx+HtCN9Vg4wzZSoluYAV2fx0hBolfJXQavatLys4w+wagjnCH7xAYWekh4HVOczOgPq38NbtjkcgVzhDMiLjlZAX4o2bcwQ3anAmypWBPRY376OCJRy6ifbLh4JeOwW+qLxNPYlL+iOIdqRkjEnLPKW2MCvr7s9h2GAvH1X76MBlZvwu3Se7VnhQf9nQ6zguYkVzEeAe/UDHPPlBnoBiXt3/HiqYT+wW3Q==;
	5:YYGGZlAdnNw8IHo6SIBWXI0/mzCb3o5+9+nSQa9cv+VeFaheToCPXGD+vic4TPHi+PgdjRtllTCEyKJjhuzTMWCSoBOHU3XTNkY7xD5kxFrCvyZ/VHmT9WraHxUgYraSomebsuo/WPB3g1A8OXOc1RsaK1V9QQiNV+qsROO65Qg=;
	7:mfh7mHPpaGUE8a/KtY/uudTBluQ6J1Iavot5IvILAkrMST2rUqkTJOwxiGtZzIjBe470S1fDzzsTIVtKabbe6Lwyg5URMlFhQR4U9jF6GI+lAuA7GsgO9UP2gH1qN8lZcMmBJZhTMzmB/0lKxejJg16Q277GVYpoL5+wlJceqrAtIVy0KlNa9SngAJwRXPzs6ruujm1LOOo1fcSFXMq3CcFvha0b19e07p2Z3SZk+QK9Z4yVDblxYtelzuVFX3J+
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2018 20:08:03.4967
	(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>,
	<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>,
	<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Due to the complex encapsulation of MPLSoGRE flow action and based on
the fact testpmd does not allocate memory, this patch adds a new command
in testpmd to initialise a global structure containing the necessary
information to make the outer layer of the packet.  This same global
structure will then be used by the flow command line in testpmd when
the action mplsoudp_encap will be parsed, at this point, the conversion
into such action becomes trivial.

Signed-off-by: Ori Kam <orika@mellanox.com>
---
 app/test-pmd/cmdline.c                      | 153 ++++++++++++++++++++++++++++
 app/test-pmd/cmdline_flow.c                 | 113 ++++++++++++++++++++
 app/test-pmd/testpmd.h                      |  15 +++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  46 +++++++++
 4 files changed, 327 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 10d9489..2428b04 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15359,6 +15359,157 @@ static void cmd_set_mplsoudp_parsed(void *parsed_result,
 	},
 };
 
+/** Set MPLSoGRE encapsulation details */
+struct cmd_set_mplsogre_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t mplsogre;
+	cmdline_fixed_string_t pos_token;
+	cmdline_fixed_string_t ip_version;
+	uint32_t vlan_present:1;
+	uint32_t label;
+	cmdline_ipaddr_t ip_src;
+	cmdline_ipaddr_t ip_dst;
+	uint16_t tci;
+	struct ether_addr eth_src;
+	struct ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_mplsogre_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, set, "set");
+cmdline_parse_token_string_t cmd_set_mplsogre_mplsogre =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, mplsogre,
+				 "mplsogre");
+cmdline_parse_token_string_t cmd_set_mplsogre_mplsogre_with_vlan =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, mplsogre,
+				 "mplsogre-with-vlan");
+cmdline_parse_token_string_t cmd_set_mplsogre_ip_version =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+				 "ip-version");
+cmdline_parse_token_string_t cmd_set_mplsogre_ip_version_value =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, ip_version,
+				 "ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_mplsogre_label =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+				 "label");
+cmdline_parse_token_num_t cmd_set_mplsogre_label_value =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_result, label, UINT32);
+cmdline_parse_token_string_t cmd_set_mplsogre_ip_src =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+				 "ip-src");
+cmdline_parse_token_ipaddr_t cmd_set_mplsogre_ip_src_value =
+	TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsogre_result, ip_src);
+cmdline_parse_token_string_t cmd_set_mplsogre_ip_dst =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+				 "ip-dst");
+cmdline_parse_token_ipaddr_t cmd_set_mplsogre_ip_dst_value =
+	TOKEN_IPADDR_INITIALIZER(struct cmd_set_mplsogre_result, ip_dst);
+cmdline_parse_token_string_t cmd_set_mplsogre_vlan =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+				 "vlan-tci");
+cmdline_parse_token_num_t cmd_set_mplsogre_vlan_value =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_result, tci, UINT16);
+cmdline_parse_token_string_t cmd_set_mplsogre_eth_src =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+				 "eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_mplsogre_eth_src_value =
+	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsogre_result, eth_src);
+cmdline_parse_token_string_t cmd_set_mplsogre_eth_dst =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_result, pos_token,
+				 "eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_mplsogre_eth_dst_value =
+	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_mplsogre_result, eth_dst);
+
+static void cmd_set_mplsogre_parsed(void *parsed_result,
+	__attribute__((unused)) struct cmdline *cl,
+	__attribute__((unused)) void *data)
+{
+	struct cmd_set_mplsogre_result *res = parsed_result;
+	union {
+		uint32_t mplsogre_label;
+		uint8_t label[3];
+	} id = {
+		.mplsogre_label =
+			rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
+	};
+
+	if (strcmp(res->mplsogre, "mplsogre") == 0)
+		mplsogre_encap_conf.select_vlan = 0;
+	else if (strcmp(res->mplsogre, "mplsogre-with-vlan") == 0)
+		mplsogre_encap_conf.select_vlan = 1;
+	if (strcmp(res->ip_version, "ipv4") == 0)
+		mplsogre_encap_conf.select_ipv4 = 1;
+	else if (strcmp(res->ip_version, "ipv6") == 0)
+		mplsogre_encap_conf.select_ipv4 = 0;
+	else
+		return;
+	rte_memcpy(mplsogre_encap_conf.label, &id.label[1], 3);
+	if (mplsogre_encap_conf.select_ipv4) {
+		IPV4_ADDR_TO_UINT(res->ip_src, mplsogre_encap_conf.ipv4_src);
+		IPV4_ADDR_TO_UINT(res->ip_dst, mplsogre_encap_conf.ipv4_dst);
+	} else {
+		IPV6_ADDR_TO_ARRAY(res->ip_src, mplsogre_encap_conf.ipv6_src);
+		IPV6_ADDR_TO_ARRAY(res->ip_dst, mplsogre_encap_conf.ipv6_dst);
+	}
+	if (mplsogre_encap_conf.select_vlan)
+		mplsogre_encap_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+	rte_memcpy(mplsogre_encap_conf.eth_src, res->eth_src.addr_bytes,
+		   ETHER_ADDR_LEN);
+	rte_memcpy(mplsogre_encap_conf.eth_dst, res->eth_dst.addr_bytes,
+		   ETHER_ADDR_LEN);
+}
+
+cmdline_parse_inst_t cmd_set_mplsogre = {
+	.f = cmd_set_mplsogre_parsed,
+	.data = NULL,
+	.help_str = "set mplsogre ip-version ipv4|ipv6 label <label>"
+		" ip-src <ip-src> ip-dst <ip-dst> eth-src <eth-src>"
+		" eth-dst <eth-dst>",
+	.tokens = {
+		(void *)&cmd_set_mplsogre_set,
+		(void *)&cmd_set_mplsogre_mplsogre,
+		(void *)&cmd_set_mplsogre_ip_version,
+		(void *)&cmd_set_mplsogre_ip_version_value,
+		(void *)&cmd_set_mplsogre_label,
+		(void *)&cmd_set_mplsogre_label_value,
+		(void *)&cmd_set_mplsogre_ip_src,
+		(void *)&cmd_set_mplsogre_ip_src_value,
+		(void *)&cmd_set_mplsogre_ip_dst,
+		(void *)&cmd_set_mplsogre_ip_dst_value,
+		(void *)&cmd_set_mplsogre_eth_src,
+		(void *)&cmd_set_mplsogre_eth_src_value,
+		(void *)&cmd_set_mplsogre_eth_dst,
+		(void *)&cmd_set_mplsogre_eth_dst_value,
+		NULL,
+	},
+};
+
+cmdline_parse_inst_t cmd_set_mplsogre_with_vlan = {
+	.f = cmd_set_mplsogre_parsed,
+	.data = NULL,
+	.help_str = "set mplsogre-with-vlan ip-version ipv4|ipv6 label <label>"
+		" ip-src <ip-src> ip-dst <ip-dst> vlan-tci <vlan-tci>"
+		" eth-src <eth-src> eth-dst <eth-dst>",
+	.tokens = {
+		(void *)&cmd_set_mplsogre_set,
+		(void *)&cmd_set_mplsogre_mplsogre_with_vlan,
+		(void *)&cmd_set_mplsogre_ip_version,
+		(void *)&cmd_set_mplsogre_ip_version_value,
+		(void *)&cmd_set_mplsogre_label,
+		(void *)&cmd_set_mplsogre_label_value,
+		(void *)&cmd_set_mplsogre_ip_src,
+		(void *)&cmd_set_mplsogre_ip_src_value,
+		(void *)&cmd_set_mplsogre_ip_dst,
+		(void *)&cmd_set_mplsogre_ip_dst_value,
+		(void *)&cmd_set_mplsogre_vlan,
+		(void *)&cmd_set_mplsogre_vlan_value,
+		(void *)&cmd_set_mplsogre_eth_src,
+		(void *)&cmd_set_mplsogre_eth_src_value,
+		(void *)&cmd_set_mplsogre_eth_dst,
+		(void *)&cmd_set_mplsogre_eth_dst_value,
+		NULL,
+	},
+};
+
 /* Strict link priority scheduling mode setting */
 static void
 cmd_strict_link_prio_parsed(
@@ -17989,6 +18140,8 @@ struct cmd_config_per_queue_tx_offload_result {
 	(cmdline_parse_inst_t *)&cmd_set_nvgre_with_vlan,
 	(cmdline_parse_inst_t *)&cmd_set_mplsoudp,
 	(cmdline_parse_inst_t *)&cmd_set_mplsoudp_with_vlan,
+	(cmdline_parse_inst_t *)&cmd_set_mplsogre,
+	(cmdline_parse_inst_t *)&cmd_set_mplsogre_with_vlan,
 	(cmdline_parse_inst_t *)&cmd_ddp_add,
 	(cmdline_parse_inst_t *)&cmd_ddp_del,
 	(cmdline_parse_inst_t *)&cmd_ddp_get_list,
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 125d09b..bedd152 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -244,6 +244,7 @@ enum index {
 	ACTION_NVGRE_ENCAP,
 	ACTION_NVGRE_DECAP,
 	ACTION_MPLSOUDP_ENCAP,
+	ACTION_MPLSOGRE_ENCAP,
 };
 
 /** Maximum size for pattern in struct rte_flow_item_raw. */
@@ -800,6 +801,7 @@ struct parse_action_priv {
 	ACTION_NVGRE_ENCAP,
 	ACTION_NVGRE_DECAP,
 	ACTION_MPLSOUDP_ENCAP,
+	ACTION_MPLSOGRE_ENCAP,
 	ZERO,
 };
 
@@ -939,6 +941,9 @@ static int parse_vc_action_nvgre_encap(struct context *, const struct token *,
 static int parse_vc_action_mplsoudp_encap(struct context *,
 					  const struct token *, const char *,
 					  unsigned int, void *, unsigned int);
+static int parse_vc_action_mplsogre_encap(struct context *,
+					  const struct token *, const char *,
+					  unsigned int, void *, unsigned int);
 static int parse_destroy(struct context *, const struct token *,
 			 const char *, unsigned int,
 			 void *, unsigned int);
@@ -2466,6 +2471,15 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,
 		.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
 		.call = parse_vc_action_mplsoudp_encap,
 	},
+	[ACTION_MPLSOGRE_ENCAP] = {
+		.name = "mplsogre_encap",
+		.help = "mplsogre encapsulation, uses configuration set by"
+			" \"set vxlan\"",
+		.priv = PRIV_ACTION(TUNNEL_ENCAP_L3,
+				    sizeof(struct action_tunnel_encap_l3_data)),
+		.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+		.call = parse_vc_action_mplsogre_encap,
+	},
 };
 
 /** Remove and return last entry from argument stack. */
@@ -3328,6 +3342,105 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,
 	return ret;
 }
 
+/** Parse MPLSoGRE encap action. */
+static int
+parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,
+			       const char *str, unsigned int len,
+			       void *buf, unsigned int size)
+{
+	struct buffer *out = buf;
+	struct rte_flow_action *action;
+	struct action_tunnel_encap_data *action_encap_data;
+	struct rte_flow_item_eth eth = { .type = 0, };
+	struct rte_flow_item_vlan vlan = {
+		.tci = mplsogre_encap_conf.vlan_tci,
+		.inner_type = 0,
+	};
+	struct rte_flow_item_ipv4 ipv4 = {
+		.hdr =  {
+			.src_addr = mplsogre_encap_conf.ipv4_src,
+			.dst_addr = mplsogre_encap_conf.ipv4_dst,
+			.next_proto_id = IP_PROTO_UDP,
+		},
+	};
+	struct rte_flow_item_ipv6 ipv6 = {
+		.hdr =  {
+			.proto = IP_PROTO_UDP,
+		},
+	};
+	struct rte_flow_item_gre gre = {
+		.protocol = rte_cpu_to_be_16(0x8848),
+	};
+	struct rte_flow_item_mpls mpls;
+	uint8_t *header;
+	int ret;
+
+	ret = parse_vc(ctx, token, str, len, buf, size);
+	if (ret < 0)
+		return ret;
+	/* Nothing else to do if there is no buffer. */
+	if (!out)
+		return ret;
+	if (!out->args.vc.actions_n)
+		return -1;
+	action = &out->args.vc.actions[out->args.vc.actions_n - 1];
+	/* Point to selected object. */
+	ctx->object = out->args.vc.data;
+	ctx->objmask = NULL;
+	/* Copy the headers to the buffer. */
+	action_encap_data = ctx->object;
+	*action_encap_data = (struct action_tunnel_encap_data) {
+		.conf = (struct rte_flow_action_tunnel_encap){
+			.buf = action_encap_data->buf,
+		},
+		.buf = {},
+	};
+	header = action_encap_data->buf;
+	if (mplsogre_encap_conf.select_vlan)
+		eth.type = rte_cpu_to_be_16(ETHER_TYPE_VLAN);
+	else if (mplsogre_encap_conf.select_ipv4)
+		eth.type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+	else
+		eth.type = rte_cpu_to_be_16(ETHER_TYPE_IPv6);
+	memcpy(eth.dst.addr_bytes,
+	       mplsogre_encap_conf.eth_dst, ETHER_ADDR_LEN);
+	memcpy(eth.src.addr_bytes,
+	       mplsogre_encap_conf.eth_src, ETHER_ADDR_LEN);
+	memcpy(header, &eth, sizeof(eth));
+	header += sizeof(eth);
+	if (mplsogre_encap_conf.select_vlan) {
+		if (mplsogre_encap_conf.select_ipv4)
+			vlan.inner_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+		else
+			vlan.inner_type = rte_cpu_to_be_16(ETHER_TYPE_IPv6);
+		memcpy(header, &vlan, sizeof(vlan));
+		header += sizeof(vlan);
+	}
+	if (mplsogre_encap_conf.select_ipv4) {
+		memcpy(header, &ipv4, sizeof(ipv4));
+		header += sizeof(ipv4);
+	} else {
+		memcpy(&ipv6.hdr.src_addr,
+		       &mplsogre_encap_conf.ipv6_src,
+		       sizeof(mplsogre_encap_conf.ipv6_src));
+		memcpy(&ipv6.hdr.dst_addr,
+		       &mplsogre_encap_conf.ipv6_dst,
+		       sizeof(mplsogre_encap_conf.ipv6_dst));
+		memcpy(header, &ipv6, sizeof(ipv6));
+		header += sizeof(ipv6);
+	}
+	memcpy(header, &gre, sizeof(gre));
+	header += sizeof(gre);
+	memcpy(mpls.label_tc_s, mplsogre_encap_conf.label,
+	       RTE_DIM(mplsogre_encap_conf.label));
+	memcpy(header, &mpls, sizeof(mpls));
+	header += sizeof(mpls);
+	action_encap_data->conf.size = header -
+		action_encap_data->buf;
+	action->conf = &action_encap_data->conf;
+	return ret;
+}
+
 /** Parse tokens for destroy command. */
 static int
 parse_destroy(struct context *ctx, const struct token *token,
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 355aa84..fea7418 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -504,6 +504,21 @@ struct mplsoudp_encap_conf {
 };
 struct mplsoudp_encap_conf mplsoudp_encap_conf;
 
+/* MPLSoGRE encap parameters. */
+struct mplsogre_encap_conf {
+	uint32_t select_ipv4:1;
+	uint32_t select_vlan:1;
+	uint8_t label[3];
+	rte_be32_t ipv4_src;
+	rte_be32_t ipv4_dst;
+	uint8_t ipv6_src[16];
+	uint8_t ipv6_dst[16];
+	rte_be16_t vlan_tci;
+	uint8_t eth_src[ETHER_ADDR_LEN];
+	uint8_t eth_dst[ETHER_ADDR_LEN];
+};
+struct mplsogre_encap_conf mplsogre_encap_conf;
+
 static inline unsigned int
 lcore_num(void)
 {
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index a374578..4308109 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1587,6 +1587,21 @@ flow rule using the action mplsoudp_encap will use the last configuration set.
 To have a different encapsulation header, one of those commands must be called
 before the flow rule creation.
 
+Config MPLSoGRE Encap outer layers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Configure the outer layer to encapsulate a packet inside a MPLSoGRE tunnel::
+
+ set mplsoudp ip-version (ipv4|ipv6) label (label) ip-src (ip-src) \
+        ip-dst (ip-dst) eth-src (eth-src) eth-dst (eth-dst)
+ set mplsoudp-with-vlan ip-version (ipv4|ipv6) label (label) ip-src (ip-src) \
+        ip-dst (ip-dst) vlan-tci (vlan-tci) eth-src (eth-src) eth-dst (eth-dst)
+
+Those command will set an internal configuration inside testpmd, any following
+flow rule using the action mplsogre_encap will use the last configuration set.
+To have a different encapsulation header, one of those commands must be called
+before the flow rule creation.
+
 Port Functions
 --------------
 
@@ -3717,6 +3732,9 @@ This section lists supported actions and their attributes, if any.
 - ``mplsoudp_encap``: Performs a MPLSoUDP encapsulation, outer layer
   configuration is done through `Config MPLSoUDP Encap outer layers`_.
 
+- ``mplsogre_encap``: Performs a MPLSoGRE encapsulation, outer layer
+  configuration is done through `Config MPLSoGRE Encap outer layers`_.
+
 Destroying flow rules
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -4075,6 +4093,34 @@ IPv6 MPLSoUDP outer header::
         eth-dst 22:22:22:22:22:22
  testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
 
+Sample MPLSoGRE encapsulation rule
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+MPLSoGRE encapsulation outer layer has default value pre-configured in testpmd
+source code, those can be changed by using the following commands
+
+IPv4 MPLSoGRE outer header::
+
+ testpmd> set mplsoudp ip-version ipv4 label 4 ip-src 127.0.0.1 ip-dst 128.0.0.1
+        eth-src 11:11:11:11:11:11 eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
+
+ testpmd> set mplsoudp-with-vlan ip-version ipv4 label 4 ip-src 127.0.0.1
+        ip-dst 128.0.0.1 vlan-tci 34 eth-src 11:11:11:11:11:11
+        eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
+
+IPv6 MPLSoUDP outer header::
+
+ testpmd> set mplsoudp ip-version ipv6 mask 4 ip-src ::1 ip-dst ::2222
+        eth-src 11:11:11:11:11:11 eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
+
+ testpmd> set mplsoudp-with-vlan ip-version ipv6 mask 4 ip-src ::1
+        ip-dst ::2222 vlan-tci 34 eth-src 11:11:11:11:11:11
+        eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
+
 BPF Functions
 --------------
 

From patchwork Sat Sep 29 20:07:21 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ori Kam <orika@mellanox.com>
X-Patchwork-Id: 45695
X-Patchwork-Delegate: ferruh.yigit@amd.com
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])
	by dpdk.org (Postfix) with ESMTP id DE2051B160;
	Sat, 29 Sep 2018 22:08:12 +0200 (CEST)
Received: from EUR02-VE1-obe.outbound.protection.outlook.com
	(mail-eopbgr20041.outbound.protection.outlook.com [40.107.2.41])
	by dpdk.org (Postfix) with ESMTP id BACA27CEB
	for <dev@dpdk.org>; Sat, 29 Sep 2018 22:08:08 +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=aRNs7gNQr8UFpn1TC6S1SzlugmENOdLSa+ElvglzJUo=;
	b=osfQ/3f2Y7I2fWO9jBB9h/PhCf6z5HbuLFg/qxm8MCRX7MaUzKd5phe0AN+YCC/qs+MJWKN+bfbxJbDyctKwHYcovpxMW6bC7wo+7nlKO9pwVSZtLKNNazaNNNYkkb8i1jf0fyrrUOWrilTO2OEJoeJ5RPd1wJnncYMTB4qbEvs=
Authentication-Results: spf=none (sender IP is )
	smtp.mailfrom=orika@mellanox.com;
Received: from mellanox.com (37.142.13.130) by
	AM4PR05MB3427.eurprd05.prod.outlook.com (2603:10a6:205:6::16) with
	Microsoft SMTP Server (version=TLS1_2,
	cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
	15.20.1185.23; Sat, 29 Sep 2018 20:08:05 +0000
From: Ori Kam <orika@mellanox.com>
To: wenzhuo.lu@intel.com, jingjing.wu@intel.com, bernard.iremonger@intel.com,
	arybchenko@solarflare.com, ferruh.yigit@intel.com,
	stephen@networkplumber.org, adrien.mazarguil@6wind.com
Cc: dev@dpdk.org, dekelp@mellanox.com, thomas@monjalon.net,
	nelio.laranjeiro@6wind.com, yskoh@mellanox.com, orika@mellanox.com,
	shahafs@mellanox.com
Date: Sat, 29 Sep 2018 20:07:21 +0000
Message-Id: <1538251641-91511-4-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
X-Originating-IP: [37.142.13.130]
X-ClientProxiedBy: HE1PR05CA0381.eurprd05.prod.outlook.com
	(2603:10a6:7:94::40) To AM4PR05MB3427.eurprd05.prod.outlook.com
	(2603:10a6:205:6::16)
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 67fc5514-6862-4953-29b1-08d6264745fd
X-MS-Office365-Filtering-HT: Tenant
X-Microsoft-Antispam: BCL:0; PCL:0;
	RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);
	SRVR:AM4PR05MB3427;
X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3427;
	3:mYKK1bSahB7ExS+GZz1VjvOuvMOyDFS9rtDgTtAbkpabDnnGEt5ZuhDb0uBexz3EHogyqQz2p1FEErI6/M82Hk705Tq7TkZ8/t3gJop1WRg0y8cPdcbfzQfFaMx3PfAqKylviS/ehRwsRtsTyUD4rG6ZuEwTZh04c8Ea+DFMkEnM1qTnIBcctTX8O//bOlFwprjo2t/q4zRg2lLXO8mVbFpyv8kt5XhrOLQJtwLS7+8OdmUFClrOUgbbYR1g7A4R;
	25:Pr+SR/17Guzg7aEQwWNUvPwMPSANNcINeAVSvKzZ24r3eEXqMTC46aL9V4WexbPtZGZw08AYaqss/4w20f3BdTygQ0MIapEOVhbsZuOx8qL82JUnowj1udC131bb3cKv5r4E5YwdicUtx1R2iw7S7DGhMhrqJMpG0qoAyO+X5KhCA6oYCvn+1zrwRmZiTu6fhDK/CsKRLUZZa+nH2XCpZeqnvki0uk5MRWdjZ9nF5JQxxpYqbwk0xWtmadir5pJAX3c/TBqoFRrnzZMuecL/mabBXMmmUDgysYiZAZ/SOXLLit+UWwLV569DfCA9Pvr4O+O+fNdWGkCS7RitD6oE5A==;
	31:bySwlmRWiO3fV51pOImb6eWcYXQs3iZoEWCMBY9wRlUDTUc13SzDSLXiIidfEUL28B2GKR53Ust25Q78RjUoiplB5ULPO80xF2WyEMQNxQaeRFEHPKKjAe9MChWXUFnkLKuYdKy1LbWzG1V6JGf4hg2ddhfezXVkcUJ0myN4NixJExIMtojkisZSL9RsRAHQ0XAUWiyee+ZuTrmcgkW9Dg7vS8QElFEVYtpm0nZg1F0=
X-MS-TrafficTypeDiagnostic: AM4PR05MB3427:
X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr
X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3427;
	20:ixWN5Y6JhA/Ft3CUgFJxvLX4y+mHZeaniIlD/XLq9/HLk2O+ip7cC+nenuSarxyyvOqMh2BdbnOnUUxpscEa2xyNYwMH6HCNPB/wvPjQxY4+/QruRKY49rc+yepTpj9hwnVdu/wFB/FUx9LSo+q1uSliaO6xYSRvCdLylvBi02YgD52GVPkXsMvbcPbahPeTZCFiVjiYcRP0eIiDl7Wz51wy68oNjfp7tdtRi/eg9CJ/oKfVcJfSmLV6ukVCaTslIBPDup3iuIOr5+UCloIrh7DgbJg0JCyZ/gnnY/MdGNRcukTOelBFGjEjMVkUp7rvPX3ayNJbzqqMPia6jpoCO9kjsxiEfaQG5ozX8mmjrNTlcufTGeeYkFQLOj+L6X808x3mfZJvPmuopnnKpsJxgnw5/Kk+l4jJPFfCbKA6amL1zjvjpK+xU3OBl97ENo19ylhsMvcf5angDpkKN8PnkO7hENFdjcIfr9Ze1PUUE5PwVxJQOsUzNwGNU/eIJlqt;
	4:xIyvDYvWrRbcXhBIEBDjDLW+Z002hc8AmLoMjFWAfKpSdHcq7GM+hPlHKD/2pgbTTQ6enJAiw5nTxl1J0sRpL2Lq27mdyT6Cw/x3eSDuDlZE2gDqo/Iv1zVlaeAvSJAyb5H3sh+mwmWr7VkN22aXCjJdMXtC6fhzQEqyT/3aB3Ju2jyHXnE++sGUPBR8H7suDv9zMdGeO9xtmvPAvEFJ3itjvQYfTJd3spljp0BsVU6bA45t7LQ0BQpyBTK73JPP6UzDYFPxD/UASrWDVYsjqNA49Cr+VmATAStKt+MCmVFnnh5U4tqs9/YR8GXiFFoA
X-Microsoft-Antispam-PRVS: 
 <AM4PR05MB342781A0A3BF74517D11189EDBED0@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;
	RULEID:(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);
	SRVR:AM4PR05MB3427; BCL:0; PCL:0; RULEID:; SRVR:AM4PR05MB3427;
X-Forefront-PRVS: 0810818DA0
X-Forefront-Antispam-Report: SFV:NSPM;
	SFS:(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);
	DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3427; H:mellanox.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-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR05MB3427;
	23:UPXCuF/RpIKCTdPi3o3VygvcwxGdvRie7t5N9XfFv?=
	h4rpuq+lw3pqXnOBvsXi4IEDtKE1LXFQ7He6Evrbi8TEaBgfkH/eKuHzJy4EoO1Vvm+Q0i0sBjik+VKZ2xdZ1awTqurx4UW3AJ7JdiHrkMXneR15MUrHlBVM/4prW61wjB4++FR7ka7c5fJLqCE75Sq7pAHZj07QswrJ0LTg6rSPZ3emdbplJn6buRZ5vcFzv28YBQ5VMvLuh2y7F11x/MoewL6j4UawTsmzJE0cnJSu3/wUQoq5nYvt7M2D63Iacz61aeAHP/7nr0u495unZFscYRVKO+QmvBXE2GH6O1N8489YO4I6DDsdke3Parpqxx0hCTcK8p1IbmnELjz4TJ7FD6ocRZjMmduRBF7rqWOyHQO41+LNlIE/pzPECY5zNq+4j8VZhxcHpsw9NIO6qSYobfTMNmXbRVAajn4jJZF9ogc+PYtnDbC1o9sl/lQrq3P2Yk9z6h0pFWoJUIINXFz7FRhSbyCQ7VNHndRpK0x3A2oQ/vYT9LtglLn5wGZNnbArh7NMR2EyKtLq5ZsENkF5cknT7QlCV3GmdlvkRBwuupiNK/oOE5U9eQiqtC4CuiGQljz+RSNcdEpMCDTQ6pkOOFddylNyi3rNcG0WMXXAkqFJqXCH5mNnFD4ah/ojuhmLo3ASADb2ZyAmnFSpaS5y4Binb9WWId30W+Me6jM0OrTE9OVTXRCTOKdKVj9gIRwU7vwNbhBpcZGWO1sB6rXFaUS9XmUgA+fKkJ4evxpQBrqtPUImxbK3L8U4Wm2mCk+vDpXh/cO3HOCCfJXHJPoCgdLOZVuZ+fnk4Dea8+RzqN6LgH9d3Oe1t0l2pVw19sQhCYCs85EzdGPW6J4+RwM5cZD6R9tKohQVTnY9WE6LuTwQQBpIxo7SsFGRWu8lt+uAhrgrsigRvUnCL/+ny4XW3r8Vr0AM262+dIO1Y7S2lUXwxPeTXdTUOdGRyyEooJFAIhApfnzIaME/WfL/t4TEEoyZc3cvAlZN9aPSGku9N0yFusY+L0ujkrRzVc/Pclgrw21LTzKk5JEMk6xSmPi8l8LRlRPHVaYD1rY17d/k3VpCFJe/0STNwWdFHynSX1t+V4PwTM+XOowb978usrZ/LilJzjmTgMyicJDRbjhTEusml+Xc2Pp3O7KBiLeYXIjDsunqdKzauMGuCHlC8BFC3m2nAU5BNisRCLxwG1+tUSoAtapvklM/XOii/f8n7txo96de+rPj3p/IB05EyJe6rdb7ByrkjnWWpd+3I6riGkLIXSzgReSOBEgyqrkV6prSo2ouhnOtUviYAN+/ILVyJT2ISE7IVcaED9iHbwCyQ==
X-Microsoft-Antispam-Message-Info: 
 T+kAB+R2gd1sS8uo1uqRl2ZKVxCsnoVqUzbF+fNn+ZLkMOHim6XgSGT2uYMF2wWa+KSRzn0xM/DWq9QfiIPAyQyTcHw7TWxxGJj1F+oESDPJxhJt5c99HYAAZSk1x+XzIfIp646KYO+Ue8ivGTsNehaPGGkL9cpYjgFF615J8XuyntrRyuuQtkxptnqO/51njmaHmznQ3DWyu1mRl+1h8fGqa4CsqcohEUdpbiYWRFBFcxt5rXKPp/aTf7pWHHtWUi2VV4J4CWvLKwo/bxF/tSqruNsmpSafMZ2q5NAS+04QkcBZXyRRP4Pvs+iK3jSAKj9lyjjPu+qnFHA08fNKNW+XD+K4L64kpwZJn3oL0Y4=
X-Microsoft-Exchange-Diagnostics: 1; AM4PR05MB3427;
	6:SajdKJ4HXfjrWwCdRay6mi1HD/N9ud5DrjOwJ7xHHltGzS2c1PFCNHV3R/qiUJZ+fV3D4AU2Pf7scf+hrdsd14owZzJDFK5o+dZYrcdRPpJSMYK2LphC/PnjPFyIcuW15bC5D4eTPs9s/TELtix+sGHWSrO5mt9JcW1O1i5M9QZM4ut5ys7RTWz84Vp0bdyngLtgESJEICG5cqFFVb0Tyoy7hc7gRk/IHCwve457voj4MgnjVwPG6zBfcZ4+whNXtA/NHLDkgAD/xHXPYF2YnPAT3u/NPgT7NwzhlFc4xRrOclqGQdh+yQJkqCv0TaGTB0wbYnYQ0VcNf40bcIYj4n8dYTDaKaoHSIzWOCs6qhIiIA2GSAHsBCDwkFLtq9L36z7Z48y0/Uh4Zb6QroyEHlN9CR7BAj8HLrFYkMksWi/KntN+nde47F2vMn098D2VNiWT/VEJs9rd/comY/iWnw==;
	5:mzFk5ChZASiEKDOj4oRYyjj4X6hP4/UertZUyfixsSJCwKp907U90/JCSEd7dXD8WR02Q/DSutMqdghxIEuCndfbZDwk2FINO2drWceCQhAEzBOgIQaiZt7CQNknka74CE4TIqc1S4tTa2PA2k7vAoWl2JgiWnqqKTGWk4WiRZs=;
	7:u8GYEX1Pu8WUHQ9cvBW7sTmMxDcE9vD+rxEefUpmHEky5wPrpUtSQVuB3RTK3Mjw1Xa9spnUGtv68IwlGMKzHsk1X2PDGxwnCPmDSl9Tzh0E7IlhbyNeeU+WyCCYLsjMZbvPRRtEb2Wvx3/2H02bSnvftJOJmWHQG1WzfJ5U+1ggNj1FMIZIvY7759f5xqEJ84EWazdN910v8eG4jswzq+AUJP6K7C2HFlbyQO9ZtULIykRFYZ+q/Y/XUwRXi8BI
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2018 20:08:05.8212
	(UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 67fc5514-6862-4953-29b1-08d6264745fd
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 3/3] app/testpmd: add decap l3 command
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>,
	<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>,
	<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

This commit introduce the decapsulation of L3 tunnels.
L3 tunnels are tunnels that the inner packet is missing the L3 layer.
This command uses the generic L3 decap command and decapsulate any
tunnel by replacing the outer layers with the supplied L2.

Signed-off-by: Ori Kam <orika@mellanox.com>
---
 app/test-pmd/cmdline.c                      | 106 ++++++++++++++++++++++++++++
 app/test-pmd/cmdline_flow.c                 |  81 +++++++++++++++++++++
 app/test-pmd/testpmd.h                      |  10 +++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  35 +++++++++
 4 files changed, 232 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 2428b04..8fa241f 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -15510,6 +15510,110 @@ static void cmd_set_mplsogre_parsed(void *parsed_result,
 	},
 };
 
+/** Set decapsulation L3 details */
+struct cmd_set_decap_l3_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t decap_l3;
+	cmdline_fixed_string_t pos_token;
+	cmdline_fixed_string_t ip_version;
+	uint32_t vlan_present:1;
+	uint16_t tci;
+	struct ether_addr eth_src;
+	struct ether_addr eth_dst;
+};
+
+cmdline_parse_token_string_t cmd_set_decap_l3_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, set, "set");
+cmdline_parse_token_string_t cmd_set_decap_l3_decap_l3 =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, decap_l3,
+				 "decap_l3");
+cmdline_parse_token_string_t cmd_set_decap_l3_decap_l3_with_vlan =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, decap_l3,
+				 "decap_l3-with-vlan");
+cmdline_parse_token_string_t cmd_set_decap_l3_ip_version =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, pos_token,
+				 "ip-version");
+cmdline_parse_token_string_t cmd_set_decap_l3_ip_version_value =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, ip_version,
+				 "ipv4#ipv6");
+cmdline_parse_token_string_t cmd_set_decap_l3_vlan =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, pos_token,
+				 "vlan-tci");
+cmdline_parse_token_num_t cmd_set_decap_l3_vlan_value =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_decap_l3_result, tci, UINT16);
+cmdline_parse_token_string_t cmd_set_decap_l3_eth_src =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, pos_token,
+				 "eth-src");
+cmdline_parse_token_etheraddr_t cmd_set_decap_l3_eth_src_value =
+	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_decap_l3_result, eth_src);
+cmdline_parse_token_string_t cmd_set_decap_l3_eth_dst =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_decap_l3_result, pos_token,
+				 "eth-dst");
+cmdline_parse_token_etheraddr_t cmd_set_decap_l3_eth_dst_value =
+	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_decap_l3_result, eth_dst);
+
+static void cmd_set_decap_l3_parsed(void *parsed_result,
+	__attribute__((unused)) struct cmdline *cl,
+	__attribute__((unused)) void *data)
+{
+	struct cmd_set_decap_l3_result *res = parsed_result;
+
+	if (strcmp(res->decap_l3, "decap_l3") == 0)
+		decap_l3_conf.select_vlan = 0;
+	else if (strcmp(res->decap_l3, "decap_l3-with-vlan") == 0)
+		decap_l3_conf.select_vlan = 1;
+	if (strcmp(res->ip_version, "ipv4") == 0)
+		decap_l3_conf.select_ipv4 = 1;
+	else if (strcmp(res->ip_version, "ipv6") == 0)
+		decap_l3_conf.select_ipv4 = 0;
+	else
+		return;
+	if (decap_l3_conf.select_vlan)
+		decap_l3_conf.vlan_tci = rte_cpu_to_be_16(res->tci);
+	rte_memcpy(decap_l3_conf.eth_src, res->eth_src.addr_bytes,
+		   ETHER_ADDR_LEN);
+	rte_memcpy(decap_l3_conf.eth_dst, res->eth_dst.addr_bytes,
+		   ETHER_ADDR_LEN);
+}
+
+cmdline_parse_inst_t cmd_set_decap_l3 = {
+	.f = cmd_set_decap_l3_parsed,
+	.data = NULL,
+	.help_str = "set decap_l3 ip-version ipv4|ipv6 eth-src <eth-src>"
+		" eth-dst <eth-dst>",
+	.tokens = {
+		(void *)&cmd_set_decap_l3_set,
+		(void *)&cmd_set_decap_l3_decap_l3,
+		(void *)&cmd_set_decap_l3_ip_version,
+		(void *)&cmd_set_decap_l3_ip_version_value,
+		(void *)&cmd_set_decap_l3_eth_src,
+		(void *)&cmd_set_decap_l3_eth_src_value,
+		(void *)&cmd_set_decap_l3_eth_dst,
+		(void *)&cmd_set_decap_l3_eth_dst_value,
+		NULL,
+	},
+};
+
+cmdline_parse_inst_t cmd_set_decap_l3_with_vlan = {
+	.f = cmd_set_decap_l3_parsed,
+	.data = NULL,
+	.help_str = "set decap_l3-with-vlan ip-version ipv4|ipv6"
+		" vlan-tci <vlan-tci> eth-src <eth-src> eth-dst <eth-dst>",
+	.tokens = {
+		(void *)&cmd_set_decap_l3_set,
+		(void *)&cmd_set_decap_l3_decap_l3_with_vlan,
+		(void *)&cmd_set_decap_l3_ip_version,
+		(void *)&cmd_set_decap_l3_ip_version_value,
+		(void *)&cmd_set_decap_l3_vlan,
+		(void *)&cmd_set_decap_l3_vlan_value,
+		(void *)&cmd_set_decap_l3_eth_src,
+		(void *)&cmd_set_decap_l3_eth_src_value,
+		(void *)&cmd_set_decap_l3_eth_dst,
+		(void *)&cmd_set_decap_l3_eth_dst_value,
+		NULL,
+	},
+};
+
 /* Strict link priority scheduling mode setting */
 static void
 cmd_strict_link_prio_parsed(
@@ -18142,6 +18246,8 @@ struct cmd_config_per_queue_tx_offload_result {
 	(cmdline_parse_inst_t *)&cmd_set_mplsoudp_with_vlan,
 	(cmdline_parse_inst_t *)&cmd_set_mplsogre,
 	(cmdline_parse_inst_t *)&cmd_set_mplsogre_with_vlan,
+	(cmdline_parse_inst_t *)&cmd_set_decap_l3,
+	(cmdline_parse_inst_t *)&cmd_set_decap_l3_with_vlan,
 	(cmdline_parse_inst_t *)&cmd_ddp_add,
 	(cmdline_parse_inst_t *)&cmd_ddp_del,
 	(cmdline_parse_inst_t *)&cmd_ddp_get_list,
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index bedd152..a4f1398 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -245,6 +245,7 @@ enum index {
 	ACTION_NVGRE_DECAP,
 	ACTION_MPLSOUDP_ENCAP,
 	ACTION_MPLSOGRE_ENCAP,
+	ACTION_DECAP_L3,
 };
 
 /** Maximum size for pattern in struct rte_flow_item_raw. */
@@ -279,6 +280,16 @@ struct action_tunnel_encap_l3_data {
 	uint8_t buf[ACTION_TUNNEL_ENCAP_MAX_BUFFER_SIZE];
 };
 
+/** Maximum buffer size for the decap L3 data. */
+#define ACTION_TUNNEL_DECAP_L3_MAX_BUFFER_SIZE \
+	(sizeof(struct rte_flow_item_eth) + sizeof(struct rte_flow_item_vlan))
+
+/** Storage for struct rte_flow_action_tunnel_decap_l3 with external data. */
+struct action_tunnel_decap_l3_data {
+	struct rte_flow_action_tunnel_decap_l3 conf;
+	uint8_t buf[ACTION_TUNNEL_DECAP_L3_MAX_BUFFER_SIZE];
+};
+
 /** Maximum number of subsequent tokens and arguments on the stack. */
 #define CTX_STACK_SIZE 16
 
@@ -802,6 +813,7 @@ struct parse_action_priv {
 	ACTION_NVGRE_DECAP,
 	ACTION_MPLSOUDP_ENCAP,
 	ACTION_MPLSOGRE_ENCAP,
+	ACTION_DECAP_L3,
 	ZERO,
 };
 
@@ -944,6 +956,9 @@ static int parse_vc_action_mplsoudp_encap(struct context *,
 static int parse_vc_action_mplsogre_encap(struct context *,
 					  const struct token *, const char *,
 					  unsigned int, void *, unsigned int);
+static int parse_vc_action_decap_l3(struct context *, const struct token *,
+				    const char *, unsigned int, void *,
+				    unsigned int);
 static int parse_destroy(struct context *, const struct token *,
 			 const char *, unsigned int,
 			 void *, unsigned int);
@@ -2480,6 +2495,15 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,
 		.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
 		.call = parse_vc_action_mplsogre_encap,
 	},
+	[ACTION_DECAP_L3] = {
+		.name = "decap_l3",
+		.help = "decap l3 packet, uses configuration set by"
+			" \"set decap_l3\"",
+		.priv = PRIV_ACTION(TUNNEL_DECAP_L3,
+				    sizeof(struct action_tunnel_decap_l3_data)),
+		.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+		.call = parse_vc_action_decap_l3,
+	},
 };
 
 /** Remove and return last entry from argument stack. */
@@ -3441,6 +3465,63 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *,
 	return ret;
 }
 
+/** Parse decap_l3 action. */
+static int
+parse_vc_action_decap_l3(struct context *ctx, const struct token *token,
+			 const char *str, unsigned int len,
+			 void *buf, unsigned int size)
+{
+	struct buffer *out = buf;
+	struct rte_flow_action *action;
+	struct action_tunnel_decap_l3_data *action_decap_data;
+	struct rte_flow_item_eth eth = { .type = 0, };
+	struct rte_flow_item_vlan vlan = {
+		.tci = mplsogre_encap_conf.vlan_tci,
+		.inner_type = 0,
+	};
+	uint8_t *header;
+	int ret;
+
+	ret = parse_vc(ctx, token, str, len, buf, size);
+	if (ret < 0)
+		return ret;
+	/* Nothing else to do if there is no buffer. */
+	if (!out)
+		return ret;
+	if (!out->args.vc.actions_n)
+		return -1;
+	action = &out->args.vc.actions[out->args.vc.actions_n - 1];
+	/* Point to selected object. */
+	ctx->object = out->args.vc.data;
+	ctx->objmask = NULL;
+	/* Copy the headers to the buffer. */
+	action_decap_data = ctx->object;
+	*action_decap_data = (struct action_tunnel_decap_l3_data) {
+		.conf = (struct rte_flow_action_tunnel_decap_l3){
+			.buf = action_decap_data->buf,
+		},
+		.buf = {},
+	};
+	header = action_decap_data->buf;
+	if (decap_l3_conf.select_vlan)
+		eth.type = rte_cpu_to_be_16(ETHER_TYPE_VLAN);
+	memcpy(eth.dst.addr_bytes, decap_l3_conf.eth_dst, ETHER_ADDR_LEN);
+	memcpy(eth.src.addr_bytes, decap_l3_conf.eth_src, ETHER_ADDR_LEN);
+	memcpy(header, &eth, sizeof(eth));
+	header += sizeof(eth);
+	if (decap_l3_conf.select_vlan) {
+		if (decap_l3_conf.select_ipv4)
+			vlan.inner_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+		else
+			vlan.inner_type = rte_cpu_to_be_16(ETHER_TYPE_IPv6);
+		memcpy(header, &vlan, sizeof(vlan));
+		header += sizeof(vlan);
+	}
+	action_decap_data->conf.size = header - action_decap_data->buf;
+	action->conf = &action_decap_data->conf;
+	return ret;
+}
+
 /** Parse tokens for destroy command. */
 static int
 parse_destroy(struct context *ctx, const struct token *token,
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index fea7418..e43529f 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -519,6 +519,16 @@ struct mplsogre_encap_conf {
 };
 struct mplsogre_encap_conf mplsogre_encap_conf;
 
+/* decap l3 parameters. */
+struct decap_l3_conf {
+	uint32_t select_ipv4:1;
+	uint32_t select_vlan:1;
+	rte_be16_t vlan_tci;
+	uint8_t eth_src[ETHER_ADDR_LEN];
+	uint8_t eth_dst[ETHER_ADDR_LEN];
+};
+struct decap_l3_conf decap_l3_conf;
+
 static inline unsigned int
 lcore_num(void)
 {
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 4308109..46a764c 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1602,6 +1602,20 @@ flow rule using the action mplsogre_encap will use the last configuration set.
 To have a different encapsulation header, one of those commands must be called
 before the flow rule creation.
 
+Config decapsulation L3
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Configure the layer 2 header value of the inner packet::
+
+ set decap_l3 ip-version (ipv4|ipv6) eth-src (eth-src) eth-dst (eth-dst)
+ set mplsoudp-with-vlan ip-version (ipv4|ipv6) vlan-tci (vlan-tci) \
+ eth-src (eth-src) eth-dst (eth-dst)
+
+Those command will set an internal configuration inside testpmd, any following
+flow rule using the action decap_l3 will use the last configuration set.
+To have a different decapsulation header, one of those commands must be called
+before the flow rule creation.
+
 Port Functions
 --------------
 
@@ -3735,6 +3749,9 @@ This section lists supported actions and their attributes, if any.
 - ``mplsogre_encap``: Performs a MPLSoGRE encapsulation, outer layer
   configuration is done through `Config MPLSoGRE Encap outer layers`_.
 
+- ``decap_l3``: Performs a decapsulation of l3 tunnel, L2 configuratin
+  is done through `Config decapsulation L3`_.
+
 Destroying flow rules
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -4121,6 +4138,24 @@ IPv6 MPLSoUDP outer header::
         eth-dst 22:22:22:22:22:22
  testpmd> flow create 0 egress pattern end actions mplsoudp_encap / end
 
+Sample decapsulation l3 rule
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Decapsulation of L3 tunnel has default L2 value pre-configured in testpmd
+source code, those can be changed by using the following commands
+
+IPv4 L2 header::
+
+ testpmd> set decap_l3 ip-version ipv4 eth-src 11:11:11:11:11:11
+        eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 ingress pattern eth / ipv4 / udp / mpls / end actions
+        decap_l3 / end
+
+ testpmd> set decap_l3-with-vlan ip-version ipv4 vlan-tci 34
+        eth-src 11:11:11:11:11:11 eth-dst 22:22:22:22:22:22
+ testpmd> flow create 0 ingress pattern eth / ipv4 / udp / mpls / end actions
+        decap_l3 / end
+
 BPF Functions
 --------------