From patchwork Thu Jun 28 06:01:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mody, Rasesh" X-Patchwork-Id: 41792 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: 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 928AA5F34; Thu, 28 Jun 2018 08:02:30 +0200 (CEST) Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680068.outbound.protection.outlook.com [40.107.68.68]) by dpdk.org (Postfix) with ESMTP id A007C5F36; Thu, 28 Jun 2018 08:02:28 +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=t1+DGCnfJfOzCLfSVQl/ffrP3TAwWRfK7yi17y5UJws=; b=gq7hLVvAOIehRMoMGlZDCug+KwzTBKwKS4lbh1XC8BT7XMBp1rG50sYXqrNPSBeLNCmisWAHnUabbIrT9/ABD+CRgmYY5lQuH06EfcGHBGn1ix64Wkh6bf0PM7hHbGSaXKRW/V3iN9tl4cC4b1WJD5vtppy1nL7AL5YlGfsgAuw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Rasesh.Mody@cavium.com; Received: from cavium.com (198.186.0.2) by MW2PR07MB4025.namprd07.prod.outlook.com (2603:10b6:907:6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.23; Thu, 28 Jun 2018 06:02:24 +0000 From: Rasesh Mody To: dev@dpdk.org Cc: Shahed Shaikh , ferruh.yigit@intel.com, Dept-EngDPDKDev@cavium.com, stable@dpdk.org Date: Wed, 27 Jun 2018 23:01:58 -0700 Message-Id: <1530165718-16218-2-git-send-email-rasesh.mody@cavium.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1530165718-16218-1-git-send-email-rasesh.mody@cavium.com> References: <1530165718-16218-1-git-send-email-rasesh.mody@cavium.com> MIME-Version: 1.0 X-Originating-IP: [198.186.0.2] X-ClientProxiedBy: BYAPR02CA0066.namprd02.prod.outlook.com (2603:10b6:a03:54::43) To MW2PR07MB4025.namprd07.prod.outlook.com (2603:10b6:907:6::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76eb6445-9ba8-4cf5-0593-08d5dcbcb83b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:MW2PR07MB4025; X-Microsoft-Exchange-Diagnostics: 1; MW2PR07MB4025; 3:Xf17h89pG168w5qE3a55h0XQ4tXgrZy74wQDiZIDfoYIVs+vaXNyjiCPO1W6oLFv9YnQdrt2u4TXuNl7eX8W3kuY26CNjuzsiy3Bqhhksc/XPX1qVrznFGNaLIvmHV7yCdCQAQ2RMF6AbqqFIepR4V8iZC/AZChqPDdU/DFT4pvi7oAPwvJOoFn8Tl8/VAAz0SYvam7BtJkffL7EzX1siK/v4hjo4vs0AsmhwUklramRQ2OTRJzHlsY9dKj9fltp; 25:CUKvZf8aGsWGGCl0sFm1I/qcOFh/Yz/pcWwBNFHWGXZlDrhOq5Wu1Xxufs5E4rH3wfEbDdV+dtnz3VpvbRWPQPHaFIDsGBViSw2atNbSBGwme9rj+H/CfGFiKLz1wxlAWlVjOI5XPb9jw+yFfo4cRP7o4eZmS276bdZMiEItAWJ3KWb29TqF9vTVuGVivERxzsQ3sEDvuhrjju6FAE5448qPcp93O11PmKqfROQDcVzQvS4X+C/eJ9arPcC1fJJMlTvk71Ky9t9+v5SMlVz/j31e4v43+BqgUrXPUwOhkLo8FDr4ywQrkw0cjoIoIpfO7ZTuvFDsjBIpNqtCrYfrdg==; 31:Vtq/U0wl6XuVezVpNBTqs34VDi22WExMBWqcD4PWolTa6rur4fVf7woWv4dXIcYptloF/isoJPWq/exumvk6bvvR3LsFPAjoYx2xRuWv7uA/tWlTWeliX6tfo3RvJm2Qf/6Sm5YkDA1YkNQsLb8t2gAoGR598x+CNGWg3IqDuJSAIr447DsoE0GLM3FZkCAUER37eO6DbEAIaGj5R4+J19tgUszegtFnEKf+Dq95ymo= X-MS-TrafficTypeDiagnostic: MW2PR07MB4025: X-Microsoft-Exchange-Diagnostics: 1; MW2PR07MB4025; 20:YLpJJOEuBpoIMJX2ft8aEqTl0KMVrfmdI7XaeYIcgUm6O4CTflUw5jyaHH8vlpqDe/E2zDWT0rMfOdhjqkTC/dYvgg2UkheJF1nxCDKFaVnNb2iN1Mvkq9qtTvM+fUBgQvkKX3X5X5Ot8GXxr2iH7lFwGmzimfhAxicGoe5ZN0mDKXmRdUGzwgIkK7QPdK+RQ061B9h1NdQqqv2+y65DjggWXdmRTII1hRV3+9RBJH3up0teA8rFiB+aZEj3fMoB6ALzz1izpZ9ZvaCBkibUZ462XARTktQGWt3PuVw5zEQbZWL5TXPV/lvpKgwiJF+agrEUSkuDuDJxlNwFCHtQwH2mLcVx3PtygmLDfpjyhb1Zr5WGDMsTDZdyJsILBoFt5JTFde4Kxeu7O1fl/Mon/83PUqr/UnT8qZJUg6QIsz9ODOW0OMW+c0aispqTNkZFFmC62AMgyvsJf01/PEcMf53oT/pZlHK0FkadIHv7Igzo5HAFY4SS0L5B6HGNxCid; 4:1hSU93qSE0Qr5tqyLZhfEIqC937OPm/BZqNTvNJAoKnK8/RQEOgXQ6dePF/Hi5X267tyqZF2woaJ8YSjxmLlzFyR9G2k/gm9yQq7yIG+G6MqlPNOQwidiYfHeIqdXgpMO+mKQKJelyHs39pyvEXeUmxeRwVVI3Ouhep+m1KJGoja0WRX91pPnTsxeV7jWvgOG/eDIiqASMHToeeIYY3kfnwkXVmtUYePrjnnWL++Nhp0+pJ3Fcx32tPNrArOvzghAthhHGNV8hYY184jLZKhOQ== 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)(8121501046)(5005006)(3231254)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:MW2PR07MB4025; BCL:0; PCL:0; RULEID:; SRVR:MW2PR07MB4025; X-Forefront-PRVS: 0717E25089 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(346002)(376002)(396003)(366004)(39860400002)(189003)(199004)(53936002)(8936002)(4326008)(2361001)(68736007)(6666003)(4720700003)(81156014)(72206003)(52116002)(97736004)(81166006)(7696005)(2906002)(36756003)(316002)(16586007)(8676002)(6916009)(478600001)(5660300001)(25786009)(50226002)(21086003)(51416003)(47776003)(106356001)(2351001)(76176011)(476003)(48376002)(50466002)(105586002)(55016002)(66066001)(2616005)(486006)(69596002)(305945005)(26005)(956004)(386003)(16526019)(446003)(11346002)(86362001)(7736002)(3846002)(186003)(6116002)(44832011); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR07MB4025; H:cavium.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MW2PR07MB4025; 23:d3EphW/8aGjgNTJVf0BTFuqJN1dfE7WIM+JX8DPoi?= 7hQAIc5E8jGte/d7HSDfh9T318OG4z8/udqT/MMapnFfseGK8zQa1Os8zvMdRJ/fA9y1itJKLoMovlRmR4DPDfZpyQoPW1s7BPANSNpM/SXRmaz8Z+HE887NERZGnk3q+CmIRJcmXVO3RX683OpY06RtG6eEOoev33+KHbHKPI7Td2NkuSLkdkq1QRTSu+n7cGrBFelJkX0G3B+GLkwAUHU9aSZLtYQ5Vud4MwbpGFtMxtUbY6MBllV0GuD1Kr1HuOj4ooGCLXqHMrCqUbygPQDjpz1gsExHsqfMlXZ11LGS1IMHWIWVxVO2FdABGxTqnHKTp65t2fQVsrQF0ox/FJS+Spg9xaLyWEgFT2jybI8NJEA4eXOq+dIIWxtbUoFE1kvHFYlb1qxf63aQiPVx1nJZWgGWJlROG00nz/c9g6vYxUf8yntmqF6s11KL2q63iu7xqu3UgIGxML8pzVFEWvMU1YaEOvkQXqFlu9QLNoLHGZkQanzfD83p7P4Lrm4JklRmWSm2dr3/EzuKAGOBX0Q+HwNVv3G9/C4T5QBCNHiHBOJ2Tdp1GgANgkrEbpUSzlaWmb0J9aMwePXqez4A27xeTe1grS6Z6ezSmtUk4QoAv66Iwfu9oo/vZJaNWBtit+CMGAXySD75DMoHpmHCMvuL2B46Mvhc9bzOP91Yo5ePwqMtyzRi/ng5ieQdTmgfRJK6sST985a/sqzNh0gfZA30OkOzzDltotNQA/neiq/rYj4Ch1D+TyA3UrxgceV1rPlsxlXg636Sx++nsl7CCSWaTseT03lBNhbzbVLmPDIVuGtAT8BFfRmSZISDmBp7+K5NNPY+qV/sl7sjtN67DTv98POxAgGXlwNU9USDVU6MW7p5dujVIbc0a2SAd6ua+7AaWTmhIbpDdiZVhtEjCfLVSB9ruo9o5q/wopuNxtMyfsu3OX4Toi77N/Owy/IwzDG2jMaEpTJ+57Q3X7Vif3bBbWA3PW1o7+Zxp9PxWnXrW7yxpiotwRvsx1LmmmGXtu/C0gWVfROvAEi1nIwGjVC6Wq4gKsNmmC3iuvGahCd9CMhH6rSHKd5ol+5k/fJQEpaOfPmTtZCjdOchcZaskyiEcNUrttwDDYQK0auP4ulypFc+vv+PI7q8lrAOJqX9ifhoDW1PdSHAbdIhbUFWFT/9E/TlLFJel+rh3QChNOSA1Oyv2g3ebZONCd5gGfnzugmUPa/swdicBIVDtgPI9bMKFz9xIKFemV5XVXHUEE9JA== X-Microsoft-Antispam-Message-Info: K4KNSoGoSHRgS8hFWPVxaic6iWNlldh+W83fAUam1MWP2EHsBPTKSsHkMtCMLTE2wrUGCaAlLAk4mB1lalIKUiKyuZbr0w80uOZUaq5/stLEiDkMf/s4AiIFDdjMWEj0WNjqRoXeE9ATPnGIRkSNwz5RZuvwvAnxAAsWclEBllBVzv99Zx1P7k5C0hxiDzdjr4MVd7gBOP3csip1bMugjtJcVytxx0IazKjyCRCJGzPpFtNLo1nFxcMgmRKUmF5Kh9jKJ9OZhd+YUqgzRGZbTPSZdql2D7fQX10sH05InIHcKJRa6n4UdidfUMuQXXlxJLCDywV3x9P9gG4CizeKf0seAHQVgGCNkRyt0h1UCXo= X-Microsoft-Exchange-Diagnostics: 1; MW2PR07MB4025; 6:GPiBiGbdR3T2L6XL6RyCm3R+jhVi++XcadK1pm3M0OQBuytj1ejTggAKbsDkz8UG+IGkHS8jW5gf5pqTNZu8RJvVuOoMnKi0xssl/LvrqTAs/5efbbpKE70EWdoDz6bUVzCmi/QQZtq3DGN2hVhmhhua4Z+7Na52Iv0KOG9HbLckmfMUbMMC78BYhdtgPl/VLT6rezsQrKOoCBPRgimaxLnGOS9IFji9I6KABRjvvkFOCI9+B7I8LiHfJ/MMSjEVRroFXTOEcA9W9EXWOGd5jIDUu2iU7/KWSgVUMgI56biKkjpuXsZ9Y6U90o0gbLzZtJxzo8vcwUxoe7N9rhtc+Yf68+bZqkbyYEwoCzV7DFotEwxwNkDyEC2Rt2NhS1tIEHvuqQLlY1qv2Z0Smaa1fRvkI2kDktSHJwyHbqtwM5nQy+FpgseOGrTU2BrlgNsSglJh1AgB7tV3sLt6Guqvow==; 5:beUEG3TxzUcpTF4g+/Q7QnvIbSxj9fr7UHVXS2RsEEP1BgNkZaiEUmPqRSroM1jxa1XzxrPMojIwsJ0l/5x3+Scq/BmJQriRB9ydhX6cY3/ecxPdE2DMGenIyp9OYqR9xFcJFZqC57cKNYSTI4hYplBGLIZDaFtQ8rMOeFM8bZ8=; 24:0AwTYzBj7iCG8w4T+629VwYdlV5LZvKt9lwzLFN3dZ8ZOT8Es8yCqUGg5kR9XD+KxEKO5b7hgbHZOAWHQ6eHDzuJmbDGL9Y6AF7bwnD4iAc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MW2PR07MB4025; 7:GeJkx9PLcXi6GXxC15BhWW5mI53fH8ZJIilJTOQKsE1Xqkxot/KrMn1NdiuAG7OceYU9GLGQ7LP1EV2/krigUcsF8L/q5lahTZRmion5CZ/RIBvk1JCRyEbEDxg520oWIlZDIKWj1GT1TmSNTu5ypePjCIuaZJIofM5vzbRUelrk66KjOECvHll0Lc9B8wvKyActAXGxSjSUBiDJ+3UrkGDkOIWDzxnGqtrUqDeMrIKmMpQWfP4YF5PgW7Nc9DVi X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2018 06:02:24.2818 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76eb6445-9ba8-4cf5-0593-08d5dcbcb83b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR07MB4025 Subject: [dpdk-dev] [PATCH 2/2] net/qede: fix Rx/Tx offload flags X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Shahed Shaikh - We don't support QinQ offload, so removing it now. - Fix incorrect offload flags in default rxconf Since qede PMD does not support per queue rx offload, it should not set default_rxconf.offload flags in .dev_infos_get(). Although these offloads are enabled by default, they are per port and not per queue. Fixes: 946dfd18a4ec ("net/qede: convert to new Rx/Tx offloads API") Cc: stable@dpdk.org Signed-off-by: Shahed Shaikh --- drivers/net/qede/qede_ethdev.c | 7 +------ drivers/net/qede/qede_rxtx.c | 2 +- drivers/net/qede/qede_rxtx.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index 2d34548..19ddac3 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -1545,7 +1545,6 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev) DEV_TX_OFFLOAD_UDP_CKSUM | DEV_TX_OFFLOAD_TCP_CKSUM | DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | - DEV_TX_OFFLOAD_QINQ_INSERT | DEV_TX_OFFLOAD_MULTI_SEGS | DEV_TX_OFFLOAD_TCP_TSO | DEV_TX_OFFLOAD_VXLAN_TNL_TSO | @@ -1559,11 +1558,7 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev) dev_info->default_rxconf = (struct rte_eth_rxconf) { /* Packets are always dropped if no descriptors are available */ .rx_drop_en = 1, - /* The below RX offloads are always enabled */ - .offloads = (DEV_RX_OFFLOAD_CRC_STRIP | - DEV_RX_OFFLOAD_IPV4_CKSUM | - DEV_RX_OFFLOAD_TCP_CKSUM | - DEV_RX_OFFLOAD_UDP_CKSUM), + .offloads = 0, }; memset(&link, 0, sizeof(struct qed_link_output)); diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index 4fa1c61..174e377 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -1971,7 +1971,7 @@ static inline uint32_t qede_rx_cqe_to_tunn_pkt_type(uint16_t flags) } /* Descriptor based VLAN insertion */ - if (tx_ol_flags & (PKT_TX_VLAN_PKT | PKT_TX_QINQ_PKT)) { + if (tx_ol_flags & PKT_TX_VLAN_PKT) { vlan = rte_cpu_to_le_16(mbuf->vlan_tci); bd1_bd_flags_bf |= 1 << ETH_TX_1ST_BD_FLAGS_VLAN_INSERTION_SHIFT; diff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h index 84a834d..37cab7e 100644 --- a/drivers/net/qede/qede_rxtx.h +++ b/drivers/net/qede/qede_rxtx.h @@ -147,7 +147,6 @@ PKT_TX_TCP_SEG) #define QEDE_TX_OFFLOAD_MASK (QEDE_TX_CSUM_OFFLOAD_MASK | \ - PKT_TX_QINQ_PKT | \ PKT_TX_VLAN_PKT | \ PKT_TX_TUNNEL_VXLAN | \ PKT_TX_TUNNEL_GENEVE | \