From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0052.outbound.protection.outlook.com [104.47.2.52]) by dpdk.org (Postfix) with ESMTP id 6EC53AAEB for ; Tue, 5 Jun 2018 02:42:25 +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=L03tD0mQ4G1a5Cn/FHcAp7YXE46ZCLjBoBRC4R60zBk=; b=FbAk7bxAHPDqDGsGG+KoJFfZ0rlM3aCJSXjIzbiuzDl+hw1piWV1CqmGJaXt7hlC4aYp8tvLaH24Y03yKNzlPHAD4DzOZIdFXgWfwjeqkM5xb0AAl3eh8syjDyYs2I6qfUQ3O8oOTWk/NWaycLdsSP5IVzAg7LK7rMuq/OJ8ZHs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:42:22 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com, Shachar Beiser Date: Mon, 4 Jun 2018 17:41:39 -0700 Message-Id: <20180605004139.14660-8-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605004139.14660-1-yskoh@mellanox.com> References: <20180605002732.13866-1-yskoh@mellanox.com> <20180605004139.14660-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO2PR04CA0088.namprd04.prod.outlook.com (2603:10b6:104:6::14) To VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0501MB2045; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 3:qDDL9+2dOonXg6aGbBLUSk5LxJv0SwllxdGDkyfit37JAxsZQs6ZIr/vkbPHyMr3VKVvCc2m+ZRd727qIA3pOAUFfC9lNdeBLBvTLIq+dZYtKWhkwyTTBVOE64h0EjoY99Pk3gtPq0aZaxKXek9YuUwkzoYYAkD8ftxz65+YiPzktaGu4hmgYpfMmsjqpSl3C8d1a6kMNGbPohQD8EZPfK6wSElI6YR4Rr+Ig/5UJ9sv4qwe4i/GyihTc3Av85Gt; 25:HOEIYHYvoEhvUg8+CgGiWgGruwCO2CFTlx+2EpC2i2AkVrojBSnsI97RNb9GcBQI47rmsg6/yO0pDaIPztv5XtT1Jd/4WeTJn9cRFyjUiX33zjJJBCyv+VeGmL2hzSiL5e1aEUi3qonwtHAdke2aNP+fAgV7AO7OJuirU1bXeRsTVdv5PpNm4jmrqDpCx2jvHRVY1ln6u+kcjlERnFyE7vnVtqKnIIaDQSoXtDNGTXY556WCNuDIicxu2qL9nh6oLg8j3S8VjZvhC/b68Rsjjoq1IWvi+VkxUb9lPuc3EP69wmOSUzuOhfNOxrTHu0/l9ijXletx9C4hP05prc+MGA==; 31:dd/yanW7EJxCfOksAZJc1AXPXLOFFGWb7iZxSDX0gO0jkuDLK6h/FvLmj7T4TnxmVGIvqNx4pHEXhnOchNpMEl0p+9S2no2qfDvM3/ur6nH+xeDQWvC1NlGJbduwLLfzvKcZIRH1giWbVBlIQfu+T/Ce5fJ+KehOPaGjDjHG92VHtAukBjCyU5nh5LPGAkFY9Wee+SkNg7pYw1AWNmm1HGVOtcWEstEOh/PC/6cZy/o= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2045: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 20:ZyyYP9Y5FEqtKOpAFNVMd2mWsb6XbJx4rhHTOW4jVCuyzvLxIGWnUiaqk/9nPGbt4x0Q4V+2plW3X5BRZ9N6ZQE0XA4Lsq+iu3uKijMoA3UmVpSKPl5HvuqoBkBB7Eqb6IaXEr6lknME7ImdFFj4SI/jCXo1G1Dh50Aoo/kw1dNgQRXF3HmANvNd4CpwOxxQHTZmzpWWtiSF65yYeJ9/j522VT7CKKCEudx7FzIWt4Rkhu+dZjew/0IPnHRw0bOvrIXYYqe2o8d61XxK3voXHKbQg2DrzMDOBJgvsv7N+MMOcdhT2r1IXMuc17ot1hiI3jnHTf8IC+Yya0qHKf6ygBft6uCmcA+/aJESDKZu0tm3+mzBlE6oY3JmduvXBB/dmmgdILDQ4gsa6doogFiBic2/1MVGQMvdaaUzBTZrCft4xJ67dnyzu9WMUJRVoclyTkcw0FChxt7rZvlKQceG8MpSS3/YWwhYnWSW4c6x/uUMyvurB4q/K0IDoEe92Dy1; 4:vNqXaui3Hq7NzZcdGFVGREUM9S5wTO1/p0RlcYF3nsG+kXXGys+uetNe9iO+CjvTmBLNhfLVgzSDymdjYp2vTMjSBL2FEEV+2ttE8n3yyKaTV7RH+MmuCP3n0vibdAh+JeERjBU+cRhzbprdB6unspvvgZOZEo0OXMorkIqbH/3I3b6aABRzsqhCSl8ZiGBNxqONWV2t4mirCGcOuUmc+3HEwScfiEK+6YmMA83L+4KymmDrrLEFzjvO9VNHMKya9zu0oVu7xBGryc31AO/X+g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR0501MB2045; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0501MB2045; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(366004)(39380400002)(376002)(396003)(189003)(199004)(5660300001)(8936002)(3846002)(6116002)(6666003)(2351001)(55016002)(97736004)(7736002)(305945005)(8676002)(48376002)(68736007)(2361001)(6916009)(2906002)(575784001)(86362001)(81166006)(81156014)(1076002)(50466002)(53936002)(47776003)(446003)(16586007)(36756003)(105586002)(2616005)(486006)(316002)(956004)(51416003)(69596002)(52116002)(7696005)(11346002)(386003)(476003)(59450400001)(50226002)(478600001)(66066001)(4326008)(107886003)(186003)(21086003)(25786009)(106356001)(76176011)(16526019)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2045; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0501MB2045; 23:N4vRIx17tiy5x7JdiTu0yZLWWD1hMNU5VU3zavu?= =?us-ascii?Q?k4B7hHUtpKDxRRL8z9INBGW7qfgy7h64doKsmn1Be+ScbAxbVww+Dc52BT/4?= =?us-ascii?Q?39FvvS8G8ffSHNpumlyqZEdv3aVYPo8roBp1xLDoHVEZLgH7VIqI6A4kESju?= =?us-ascii?Q?8Wk3EaZNWdduHIKNleSKgbTy/7sBxHHFLZW3nVMbsvSVWVOmUpI+uy1rvgbg?= =?us-ascii?Q?aPnOhdNpA6iTrsSGsZiXESzNR41AHTwAaY9uwha7aAr9CQreRSI/ASFNlm8x?= =?us-ascii?Q?B39kJSfRN/XVWLySyNfkWHX8pgzSmhac/ue11D3l8Aik5EB7XufKZNXQVLvt?= =?us-ascii?Q?eI7P2Pj0MaRudliY4MMcRrLShu39oBG7E8f7le6W8sTpk6mbsZVtwlCT9T61?= =?us-ascii?Q?ZRDyWx1qKlVfaTD/4MXvpxuklXwt+tKiY2Jb5icAaf5oO8R8j2CK170G2owa?= =?us-ascii?Q?iIS5lnsI0elroQLCcPchS/fVLs7ReWw/UCFeeWCDCLlTcn+tIGihrwoTg3Ya?= =?us-ascii?Q?KwQ+vejhKU4ghkBN0ZTG+/hARmKKnpWP7TM3oEebxv7MfK+a7KiHA4DLP1TZ?= =?us-ascii?Q?cRSrRd9zclm72v2SMg4R4uOulbavvXubsGNfw2OcvezeMy2SBHFhxToYFAJQ?= =?us-ascii?Q?68AKCfk5xs9Zeuzj6RtJSNPCMGrIRUPqSbPdkaMPac2CsTdRpcO9RG1viUNy?= =?us-ascii?Q?vsVR4rooidsLY5emnyIPqA1If12yJ7yTkCK0jRjD9ay45QmXf8xDo1OIdBDZ?= =?us-ascii?Q?XpHLzNGrCYUfBh7L0+gb7tR4V7MKuk9P4hJINGapZMzmZEphVD6IjbC0vrbW?= =?us-ascii?Q?FVo+EaLcL9EDvQ+gNV4O8xXES0UCchQOal1rK7aJRq9t/QVvBXlX7ZE2M7xI?= =?us-ascii?Q?7BgoVb6FygtPxvEXuXCFX91KylHdFBiJ7I5Qz1RdDJWhgaVeOmAI6CFHFowz?= =?us-ascii?Q?NAvOTOq4cpy6KYXGgcq4q6Nn52scApgRTRSOfYjFzsivO7HatuPfIhlSg+Be?= =?us-ascii?Q?EJ5tWUi/y3y0piTrohyKxrxBcRLleXwjfwyWbTmaU4nB1+Gw+gRdePejXPOU?= =?us-ascii?Q?BJ19m9OYFDiqlhMhxc6MMlnYbxL409K9xG0Ge//MFMUmOl0aajKkdfR3FeCn?= =?us-ascii?Q?ISFz67pihV1MslFjU07te6G2j2aeq0Y8H8s+iYQno4YZWu9Do4n+Bk0mRqtf?= =?us-ascii?Q?JH9HD8vc6FAEc7rg97CJZhhcQCtxVECDoLOX9jybtmopNQjluBk6UKuUhCct?= =?us-ascii?Q?qL3ar5GI0HUqQ4EUa9awzjIMSmOhzATMTNmONiKalTvt7FAXowKtpssrb9WV?= =?us-ascii?Q?vZINYimIzA4pccgz9GNssIhUy10TVpgWzXVpDfuc5/gsS?= X-Microsoft-Antispam-Message-Info: nPcIUmrl1l2nAm/yo/VMqJ4TZG1x0hBbIIbT/GF5EJmAYH4fyJtay3hQggM0YZi7W6eJ0mrHx46rGfCq09ga88QPm2xQACa9fh6uPdhLYp3YKgeO9zAt8/Oxc+HPdu44JUc0BAgHSFcicBm1HM3cUa55TQf2V8o9a/MU8Y8Ya3V9alfTBxn3tcWFkvSPDOj5 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 6:fTIk3Yo9+qeNm+khGdl8Wc0dmXrIBBDgQPaMDzZcfnQyA8VorSYL9DllGhgY6HF1EdVoc5yINdVijcwc6IW7W03a36VSj3Zww6BKR7GKX/ZfZ4KL1qsnvSB8GOdexua/p+LRPhyQqyAOBKdInzVZtaFxwbUG2gUWWP67V9fKlJfzAHGE9zQtY1AbqTmq+XKQNDFQppGdATHNk4zYcRxQJeQFGa520hfpvZ4HR/5nLsF4o/sx/EzrznlDYSxel0cvG+ip2TNEBvlgtFGQNgrZQMJx5sTnIF2MrgmftUaq6pFS4BNA7WXkBDbP9cpz0Xm8AJFIo4V1FVngHXscj6arg7HF/6QAyVTHiiJCLdMQQq0cAYBB88Ek5D63jlujfChb99i31NnShgebsdiYKYRjGd250nWjUCBL+/xlGOgHx3qvaRv4OYgmX2TGM30vLBf7gE+iXb0Z17uX0M0rGCuvxg==; 5:WD8VOCs3hq3RgtFrs7MtUI3IncvfH6ddOt1oC3obx4rXvWnXe6blxMRl01b9Lo2rpYpsIAXpHF7jK+kKMMpkdD6o1OSot81bAgAyj0F2JKmXSLzo+T+20H7zzqUWy0+30fYxHuzmERRJ4MWrJKKFe0jxftTzKDIwaIHvJygiObw=; 24:3BvOZzIwEzPHXe6qDPIVfWkdzWnC8wgPow8hCiFE4+427GPitwQgQ+R/j7LdcLnXCRojMqgBtTDW4QXLwUlQbTuWKWblTPNrYqPfirwezd0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 7:BKJmYY0x9lJNJKB7OO3zpL/u8wBclz1C8pXSvLXYXYvc0D6nb7jg3ZdJi3gKzcTePhQEs6apZnxM6YTqz4/p2OOY+FaRmnKltupc2CTreQNy+b6Q4UgXKDPdRZ0njtwW2H+AgfpTka5u1sjBRerf+a+eHTMsUt6BL0q3Gjp7fgA4YMa3CGrtFgXQu6oVcpaSxDNvxgDVkkZnJ3ST9gU5CTeJhponT4BLfKITAfnBGFQ143EsDSfGMfH3frCgmtKk X-MS-Office365-Filtering-Correlation-Id: 223ad537-239a-4d45-6aa1-08d5ca7d34a2 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:42:22.9012 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 223ad537-239a-4d45-6aa1-08d5ca7d34a2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2045 Subject: [dpdk-stable] [PATCH v2 67/67] net/mlx5: fix IPv6 header fields X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 00:42:25 -0000 From: Shachar Beiser [ upstream commit e8aafd9405b9f1da345abd2d5ff0d7aabc1ce6f3 ] There are parameters that are not copy from spec to verbs structure in the vtc_label Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core") Cc: stable@dpdk.org Signed-off-by: Shachar Beiser Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_flow.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 271c71e01..57b654c35 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -49,6 +49,7 @@ #include #include #include +#include #include "mlx5.h" #include "mlx5_defs.h" @@ -1437,6 +1438,8 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item, parser->layer = HASH_RXQ_IPV6; if (spec) { unsigned int i; + uint32_t vtc_flow_val; + uint32_t vtc_flow_mask; if (!mask) mask = default_mask; @@ -1448,7 +1451,20 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item, RTE_DIM(ipv6.mask.src_ip)); memcpy(&ipv6.mask.dst_ip, mask->hdr.dst_addr, RTE_DIM(ipv6.mask.dst_ip)); - ipv6.mask.flow_label = mask->hdr.vtc_flow; + vtc_flow_val = rte_be_to_cpu_32(spec->hdr.vtc_flow); + vtc_flow_mask = rte_be_to_cpu_32(mask->hdr.vtc_flow); + ipv6.val.flow_label = + rte_cpu_to_be_32((vtc_flow_val & IPV6_HDR_FL_MASK) >> + IPV6_HDR_FL_SHIFT); + ipv6.val.traffic_class = (vtc_flow_val & IPV6_HDR_TC_MASK) >> + IPV6_HDR_TC_SHIFT; + ipv6.val.next_hdr = spec->hdr.proto; + ipv6.val.hop_limit = spec->hdr.hop_limits; + ipv6.mask.flow_label = + rte_cpu_to_be_32((vtc_flow_mask & IPV6_HDR_FL_MASK) >> + IPV6_HDR_FL_SHIFT); + ipv6.mask.traffic_class = (vtc_flow_mask & IPV6_HDR_TC_MASK) >> + IPV6_HDR_TC_SHIFT; ipv6.mask.next_hdr = mask->hdr.proto; ipv6.mask.hop_limit = mask->hdr.hop_limits; /* Remove unwanted bits from values. */ @@ -1457,6 +1473,7 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item, ipv6.val.dst_ip[i] &= ipv6.mask.dst_ip[i]; } ipv6.val.flow_label &= ipv6.mask.flow_label; + ipv6.val.traffic_class &= ipv6.mask.traffic_class; ipv6.val.next_hdr &= ipv6.mask.next_hdr; ipv6.val.hop_limit &= ipv6.mask.hop_limit; } -- 2.11.0