From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0059.outbound.protection.outlook.com [104.47.37.59]) by dpdk.org (Postfix) with ESMTP id 2F6811B167 for ; Fri, 8 Jun 2018 02:51:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1OQfutfGSs0owWlV11mOyRp9ggNcFCbKDcVUpM3WvrA=; b=GVO7x4eccs0KzWiL1y+fDfGyyIWVYRaEX8Sf10+/l96UaHuWiXFredRVNoN5kkmAy1fpjHhEDqYPmhEVBBG0ORida44HEtXwOlfamJi5AfxxbuhVr0eWt9TGjkmaCkJ6rihCWKmFVthYR/OwP5LCarqorq0gRYzTlJTT9CFOCNw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Rasesh.Mody@cavium.com; Received: from cavium.com (198.186.0.2) by SN1PR07MB4031.namprd07.prod.outlook.com (2603:10b6:802:2b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.841.16; Fri, 8 Jun 2018 00:51:30 +0000 From: Rasesh Mody To: stable@dpdk.org Cc: Harish Patil , yliu@fridaylinux.org, Dept-EngDPDKDev@cavium.com Date: Thu, 7 Jun 2018 17:51:12 -0700 Message-Id: <1528419074-18954-3-git-send-email-rasesh.mody@cavium.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1528419074-18954-1-git-send-email-rasesh.mody@cavium.com> References: <1528419074-18954-1-git-send-email-rasesh.mody@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [198.186.0.2] X-ClientProxiedBy: BYAPR01CA0014.prod.exchangelabs.com (2603:10b6:a02:80::27) To SN1PR07MB4031.namprd07.prod.outlook.com (2603:10b6:802:2b::14) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:SN1PR07MB4031; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB4031; 3:kyH2BYBwzLwMYy6qBNLwmH8GLHfYwokZOUzpeYpNB0UcZZVZKNtQi/NNTMdXmjflPvjVbZTtM1sCNnO6b0j9eGphQ8qNbLskK1idsJO45CAbxBZpbmskzfaBEGX+pND2ij5y1ZYK+UjKVIp3vYn6uyNawXrz845VBW4GttRVWWOFMjICVjjgK+j52i1FSkGzVc+YUvodl1+rxCNAS2c87ilvsQgeVMDBamk1uZE21lW3gOvMEuNKH5BgMi5mAq85; 25:XOCg7HnjAzfFJOksPhuRCJFHmp3+nT78eOa5zVTE/ZD6978C39hoX8qa4fcsBwyJBeHG8+qMG+jYWb7UgT2GrEQG/lihfXkNy0WW0oQNr7gulrdGCRsobtLNNWir93omXmIJR+UwpHcEr61pvrZVpkp/qxTaDS4PMcoKZRKHrQDzKA5OygHPHAgkqqvZBFAcszb3zTohxqTtMtH5JcxZ3ClRNy92MNIe88XfQh7qs4likxtfWk5UJ9FYLus799Pl83/bTiRTdYkuq+L63iWgq8X9UynGQN/0v7T6Qbx1omovUCZ81FyV/51JYkHvuk/eavMtEXRYDrLs3F1O8F4RkQ==; 31:WToc+hFXJV3Q4SdEYPz/bGDa5hKvgo6nrUhfC2V3FPv9GG9ziwx2nweSuiAShywJJSU3hQ0CLdl6mBHlN16cq2fj4l6tne+eZQnqzRgJmNrTEM6KNZxP9ZQZlRQmV+yLz+erlnQE2PEmkbC+nPB+bHOmt62dtiS4cmNFqANNpLyskIxITHvp3XsTNYLJPwCOEVsd0N1EfEc53y7sYazlDDoEErVaWvui7BEbXxGo87A= X-MS-TrafficTypeDiagnostic: SN1PR07MB4031: X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB4031; 20:z7PiUd2xGHeGk5ZUzAiolbrsAjR8Z4k5Rs/HKmCURwjrWfjKuXiiud08g1Q8PqDi9Cje+4h3nyIA1rLRMhX2S2iWRAjuNyJLVK73IEY4TSt5yuZW5fZgx1UCrovupsq8U+SDzxoXcEt969VfCems+0VFS3yytBqYJ21uB+5aNJcZIQ6+uik5NvtotipJG5V4z/auoyd19HH4So4srNHO9FfoU2QfCUfEuEXGK3np25YzTldGgHIHOpAkrBIcA6SRUW9VLNgRd4oekc4ETS3RRYkZvvLnVUqID2SUvFc891xDr99cYoD8E7MMqksbEUTlv13FfzivOMZK5rCIIB3PQHb4GjOJW/wyGkeaHPjAilRndfvVKb67esnGxqzY5jrK+GjHjLVFgKPtO/uRHpPMaYfnmuv/9jWDfVX2gQi+pXJfLe9PBnppLC2b3nrpOBuUCkr5I+ydtqLM7vQeow0j4126NT+KJwPhVXX8/bAb2L5/0I7MK1qXEgBWmwO1nq0p; 4:+vnH747nNLNJfn1J012JHlABvojj+SxdQMGgffrWkJ6E7oCgzb1HgrMr8HMHDiiIAXwNA2yvyIwJs1MduQtrzzLQ2hhKSgYtcpS9Hf2DHXZBNvYW385yPqSJr5Ve72VY4Fj9nH4KGT7JG+38ppSLZJIXZJwh3HKkKuYzBGoUqD18cYVcWrKDCenr+CwWBREN0+nbG4qULRj2LOqDr4K8MCR+W/qhgTrTeuBitLJqM1t/oiv1LCC6CrVTi/tM/kw8kSSJfyYk0tMptZM/8c/5xg== 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)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:SN1PR07MB4031; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB4031; X-Forefront-PRVS: 06973FFAD3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(366004)(39860400002)(346002)(396003)(376002)(199004)(189003)(25786009)(81166006)(55016002)(50226002)(6116002)(3846002)(50466002)(81156014)(21086003)(16586007)(486006)(53936002)(7736002)(72206003)(305945005)(8936002)(2616005)(26005)(476003)(48376002)(316002)(956004)(44832011)(11346002)(7696005)(52116002)(86362001)(97736004)(186003)(16526019)(51416003)(386003)(76176011)(106356001)(5660300001)(6916009)(2906002)(4720700003)(69596002)(8676002)(47776003)(59450400001)(446003)(68736007)(2361001)(6666003)(2351001)(66066001)(4326008)(36756003)(478600001)(107886003)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB4031; H:cavium.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR07MB4031; 23:gX5ipDuY/D/gVLGzYzTxC6/M4lhW+vi+qKC/pFl68?= =?us-ascii?Q?SdFPtrFVKVGYuGOcwanGHXRqKmDr0lUhI8xIuUsD5rw/abmzU3WQQr0jdv8C?= =?us-ascii?Q?BSNmYrYLQftlEV2p8mq/8jTXZebaWylCFgSqe2pifBgKrUE+WjCnQRNW3vXt?= =?us-ascii?Q?lSPz5F0qmoWtibRosiYUC8ft7+gZ0yIhGPK0BPDXsi0NRbvWPwAwzuEmJIVD?= =?us-ascii?Q?M+bWXoC215cipryLmbdrR6g16FZnqVpASI3qdBoYrEPUZNx8j/hohCUDBa2a?= =?us-ascii?Q?mLIrbssBH5ReJw9W+O/akwj7y4oUao2TiDmZit0K4ZIWZvOoFqOw5dh1F8ks?= =?us-ascii?Q?QJ2cI5Ht1VsAqK7nmaoPRt/fhbOziMlxZ4XX/op+g1KVFiv22D+ueBjQRJ9J?= =?us-ascii?Q?pvYLn4NPWJSulMiF2M5D8/NgYgVZYBlSh41aZl/fnBLO979DUZaTA5bIvm8U?= =?us-ascii?Q?lMZ9Mm93ib96CKmELMBdPZBb+hupz3/zdA9eCCTaNld5gQcvOlCXAd8GNEnx?= =?us-ascii?Q?PbjC9q1yr8pynymmife1tkSsz/ksHGIkZq9t/X1Q6czJbBEvl4kca31oFs+V?= =?us-ascii?Q?0HDblCKnI27bFvlrAYSiedkEKiYEsDvxINTMWnlMt/JFgS1ZKsTV6xGT6UBH?= =?us-ascii?Q?DpTRfjwXWSYoLVOnmthv7BlLvmDf/QPUzGPMaPd64elkROdjRJK7jrT3EOUj?= =?us-ascii?Q?u2QOkb3RHTU7AHkksnkaco8QTiX67dazFfK4cTOd9mWurkE+EGUrCUCrNMkU?= =?us-ascii?Q?uSiTlDrBqMkCE7S/4b1p/bZOAHxQ1j7PuQlcq7T27otHcG9L37J3dwuAVjrx?= =?us-ascii?Q?CMChlkINfQ8v8RoMpPLOHYZpJI7d1SjlI+Pzu0JwrDF20WtA4qvwzp0Nd+Pf?= =?us-ascii?Q?2Y24h6AFXco0oztWFxuNGQk4e4blgKUd3zU2Szfj6dmIcaJ5cK9vA/N4rEw7?= =?us-ascii?Q?Ojm2FwSL1EBx2+5nvOAGuTXNYD8NVQVNtlz3G2FqxIK5t2fYG60QpD06gxt4?= =?us-ascii?Q?ur+NIv2piE/H3xBQOtpnf1PMxW2C8LxIqnmNMpFZgRemyERzMNIQcMlyuwGt?= =?us-ascii?Q?Pfy927tWrLJAfZFomFiStjNo0nwo025v1I9r5sRSLjus7SR11vn0JV3cAdIc?= =?us-ascii?Q?ueCry43rN8VVzkMKdgU4SavxEM/xg4jpTm+Ok1wTarAp4D8QksyjCaozfk3t?= =?us-ascii?Q?OGEj4aeZE+DxbZZWdwD7yPPfyMroPVGQRoh5Dfswb69Xz2VYh+v3EICTRWMM?= =?us-ascii?Q?v1UoANtdchViw00YPGUUO2NxjFNLquv+4wHXl7s8AXdpS38wtvVbDB9OCpRz?= =?us-ascii?Q?r7nS8+32KwZu5mTm0FowVXmvZ3W3ZmW9sw4BVxWlYcR44SSyWNu+6PMGBn03?= =?us-ascii?Q?FwN8A=3D=3D?= X-Microsoft-Antispam-Message-Info: UjLwbYABO7SDihMLVnWGiNg1W1znbnRdF1MS4pgMzns7lSIYJXCTr9p2MJyCC6bdGft1oAiJdrQ8gguKXd5SLCcj8BZr9i1n+0l1c5darorUWPQk7sjnqgRxDZi/Wc1m+MIUNbpZkNDLKA3lpc2lZSBv6FUdXy+rErIkXYAm3aMHjgcHCb0fcfw0LxWxVxIa X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB4031; 6:/n/GvaUuqkDzMXsQx80dV2fsWxQfhWogyE39wQJNwzRAlftUhEmv5mY7slQmmhPSv+XAYUJxuNSc7LuEa/f4r5oC5xSYrZtC0/4dzmDR4hwWlRpLSqAHCgsSPSV/9tdLnLLVSN1GLq4zRg6wFMfcj+yE68E29+HENuPWiNrL/Ga5B7aSZcultNdrrvvicoJDY+e9K7JPP21Ap79aA9C1OB9FPEZSadvL0IoQP1YjBn9ftz68GBWaNcxpDQskEC+eXAMrG9K4HezFBBT4COSSNUUhwnVRZINCk7WR2DgZ8hNhwv1H0c7cdygDnGq7FXxzHVQwLkMCkCUbPDBa6VBHXgiRnPYlvCHIWMAc+2alkn4PLBuQakImbpjnmhFHHC2F7xCYqw4t8caLhsos1K93BsPPL+IUb0NrzucEuPxy2MLdcxyTMPak8yVB8buvHBMaYutovrVdMsx5E/38SRH7Ow==; 5:hpID5d1D+udlc2RARVBghxY0o0RheJhUy0NX8oV1BcDVKIQH7bWbHHi4qXYpTET2FwEzs9Ktbnsa1z4pIEP3JQh+tLTXg+RpjjPEGPk3teZjB8bD1HBPydxDtKhYhrADefv2q2IyfPQt69fVrSp4o0/8fUpdIVyBul2PLQU+SPc=; 24:GLBQzIQxSv25J+SjM7lluSZom6r/ZvbLgHCnz7Sf0SrWJtQt6e1lK+s9g6b9zdD2zZ9NulUXrMJsoRZqdYeQnmxahqu/N5eUBU6nF/eqJjc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB4031; 7:02AhiPtZ9awjduu6Gmp6TVTlDz11QyDdBOX3Kgvyk4fy9Zj5Y+aKPe/ScJHnFN+jto/1jf08/ogBGj6tHrY5dSp8oCsNejwqSks+ZPsIMQXeXJVg8VK0J590F+yIsKFQRkjDmhVolohW547i0gowoNUl0L0lbsdlu7HpyXVd6KsmXtpIjVnIyAQ9ERp8izsp/zzImpMqQ1N4TgBOtx16WrYxs8BtfLUAGq/Bl0+z78LTkeHiCrZjTN7d9UVVMzQt X-MS-Office365-Filtering-Correlation-Id: 417b1e73-afc1-42c5-d5b4-08d5ccd9f95a X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2018 00:51:30.3290 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 417b1e73-afc1-42c5-d5b4-08d5ccd9f95a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB4031 Subject: [dpdk-stable] [PATCH 17.11 3/5] net/qede: fix to prevent overwriting packet type 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: Fri, 08 Jun 2018 00:51:32 -0000 From: Harish Patil [ upstream commit c152cbe2522afa12e49bdc4bb19eb5adc6227218 ] Fixes: 3f72dd780e10 ("net/qede: check tunnel L3 header") Signed-off-by: Harish Patil --- drivers/net/qede/qede_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index 69c84af..49b5bc5 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -1466,6 +1466,8 @@ static inline uint32_t qede_rx_cqe_to_tunn_pkt_type(uint16_t flags) */ rx_mb->data_off = offset + RTE_PKTMBUF_HEADROOM; packet_type |= qede_rx_cqe_to_pkt_type_outer(rx_mb); + } else { + packet_type |= qede_rx_cqe_to_pkt_type(parse_flag); } /* Common handling for non-tunnel packets and for inner @@ -1487,7 +1489,6 @@ static inline uint32_t qede_rx_cqe_to_tunn_pkt_type(uint16_t flags) ol_flags |= PKT_RX_IP_CKSUM_BAD; } else { ol_flags |= PKT_RX_IP_CKSUM_GOOD; - packet_type |= qede_rx_cqe_to_pkt_type(parse_flag); } if (CQE_HAS_VLAN(parse_flag) || -- 1.7.10.3