From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-eopbgr770072.outbound.protection.outlook.com [40.107.77.72]) by dpdk.org (Postfix) with ESMTP id A36A71B61F for ; Wed, 19 Dec 2018 01:42:43 +0100 (CET) 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=P9UMhap1Y5nAqUdGc+6WYO07UpPtYnB4ygf5rLpdiuE=; b=WoB2t8rd1lCgC0qL9mfwlvCur5Tze2ea/am7Ry8b1hLCe6RCMYhEMX9z51eimbDgmZEoViy0x3MD2fwkwBARCiA4DK8ZgeacSUkBAqLVy7JCbsGhsw3s38TDvlqoX8RU/NyaGY5dinqNdBjRSWqaOFyECpCMOBPm4qaAJfLepLs= Received: from BYAPR07MB5365.namprd07.prod.outlook.com (20.177.125.18) by BYAPR07MB4311.namprd07.prod.outlook.com (52.135.223.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.22; Wed, 19 Dec 2018 00:42:42 +0000 Received: from BYAPR07MB5365.namprd07.prod.outlook.com ([fe80::514:ce1d:4236:9b9]) by BYAPR07MB5365.namprd07.prod.outlook.com ([fe80::514:ce1d:4236:9b9%3]) with mapi id 15.20.1425.021; Wed, 19 Dec 2018 00:42:42 +0000 From: "Mody, Rasesh" To: "stable@dpdk.org" CC: "Shaikh, Shahed" , "yskoh@mellanox.com" , Dept-Eng DPDK Dev Thread-Topic: [PATCH 17.11 4/5] net/qede: fix Tx tunnel offload support mask Thread-Index: AQHUlzPAqaHiALdrF0yNmOQ6MDjeJg== Date: Wed, 19 Dec 2018 00:42:42 +0000 Message-ID: <1545180127-3202-4-git-send-email-rasesh.mody@cavium.com> References: <1545180127-3202-1-git-send-email-rasesh.mody@cavium.com> In-Reply-To: <1545180127-3202-1-git-send-email-rasesh.mody@cavium.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR05CA0098.namprd05.prod.outlook.com (2603:10b6:a03:e0::39) To BYAPR07MB5365.namprd07.prod.outlook.com (2603:10b6:a03:64::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Rasesh.Mody@cavium.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [198.186.1.5] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR07MB4311; 6:Ovbww5YK2U7oKP0RqCLYgpVtR9TYtVfj1/EmwId/QwR403qhaHqMgAAk9ZwUusXo3lCypJVbaRcFh6MG2wK4zRVd4djLq/+NEqiPTwCOY29+n3Ln6nE3MRzy/Baf2fwBPLq0AAeqdGHRF9AEink4lCgTqyn5ynGNe4bsLY3AvXSAfDQcGaDa7Kmr1CH5X2MAiwbuqcB2J4DuLL5O10IaPPw9pC0V7MGRnwDMqmgPedYYkVEQcKyJ2VYDu+NHNddru3vUJDD+rWD71NyLcBCbKsUs2Jo/vOwYy42doLt+nGXu5JguN7QXqHVFnrl2Z+pBWCSmMUAj5+ZeOMfWH9D9adsCUUYydFAJ9h2Mg/MbiQVVDIYQsGxQZJaapnrd+5AEeT8xb+QNV/KE5mL1d7EmCnnYStdDbzlmbYELYwj5E7IjTgT+ymTx/he4ujiZ2994CHbR36EcMo2UbTFci7X3Pg==; 5:GlknfY6PZcKa9bv2lzZiLIT/ZCVU8gVuNYllv6wZweX4LecA88LT+9sIzwU/jRyGX1glqOph7KfoT+WltSylyLxbzy2uO+ffTVLmYe1ufiJ/hN+S67D8uasLp0hjtzbW8FiYw4hgyhbdoVSDpcBO08L0pMtpX7yKA1xhx6QY9Jc=; 7:7EaeaOZVaE3uBE7VW9Oq6VMSPncR1W5TpG+Q3OXdXIS9gQvm/7EQh4yw6qdo9SzPPgFivvitN/7pxgdUUEt60DxLrkzr1ZLt/gSoNvUNYTfGwqVY+XqyINLTi5jcaukih/mGPI8oj0cH2AXu8eXczA== x-ms-office365-filtering-correlation-id: 9d22bfe9-d92c-47fc-cbcd-08d6654ae22d x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB4311; x-ms-traffictypediagnostic: BYAPR07MB4311: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(5005006)(8121501046)(823302103)(3231475)(944501520)(52105112)(93006095)(93001095)(3002001)(10201501046)(148016)(149066)(150057)(6041310)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:BYAPR07MB4311; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4311; x-forefront-prvs: 0891BC3F3D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(136003)(346002)(396003)(366004)(376002)(189003)(199004)(68736007)(6486002)(305945005)(6436002)(36756003)(25786009)(66066001)(72206003)(76176011)(99286004)(102836004)(7736002)(26005)(6506007)(386003)(575784001)(71200400001)(71190400001)(256004)(86362001)(478600001)(8936002)(316002)(2616005)(11346002)(8676002)(4326008)(476003)(81156014)(1730700003)(81166006)(107886003)(186003)(53936002)(54906003)(5640700003)(2501003)(97736004)(14454004)(6512007)(2351001)(6916009)(52116002)(2906002)(106356001)(105586002)(3846002)(446003)(5660300001)(6116002)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4311; H:BYAPR07MB5365.namprd07.prod.outlook.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-antispam-message-info: 7b1yMcrw68VkNHaePazpuBgMwoXvFlCH3/We4Y0oNjEUxeF4Y9qaZZJn1dByHxnxa7CakTz1jKVE2kypcUFxeDVTJhVbp8Euullo6/d6nw2RthIw7nkXmYFm0kimgqGs5WW2M75inOdXKHXTi6u9KLSoWgZszxm4RbVUov1SMHgZau288tmT6/weN+GdxDmU4i1ATQMm6RAxOUhtz/Bpn9YgzDLG61SZfhZCwnwNinSV05W6zQy2fP3gpdC/OFv9NjbllkD0RCw8x4TdPlbY4zB1DIHVvR7M2XHDlPSlhHF6JVngNMZc/x8DFcv5ZGIs spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d22bfe9-d92c-47fc-cbcd-08d6654ae22d X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Dec 2018 00:42:42.1297 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4311 Subject: [dpdk-stable] [PATCH 17.11 4/5] net/qede: fix Tx tunnel offload support mask 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: Wed, 19 Dec 2018 00:42:44 -0000 From: Shahed Shaikh [ backported from upstream commit 49d3978d5723a3a71c348e1623cd10d489c0d4c0 = ] Tunneling offloads are represented by multi-bit values. So, feature wise tunneling offload can only be entirely supported/unsupported using PKT_TX_TUNNEL_MASK. Its upon PMDs to further isolate which of the tunneling offload types are supported by respective PMD. Using subset of bits from PKT_TX_TUNNEL_MASK to indicate supported vs unsupported offloads can lead to undesired result. Use PKT_TX_TUNNEL_MASK in QEDE_TX_OFFLOAD_MASK and use independent value of supported PKT_TX_TUNNEL_* in .tx_pkt_prepare() to mark supported tunnel offloads. Fixes: 44346c24b790 ("net/qede: fix VXLAN tunnel Tx offload flag setting") Suggested-by: Ferruh Yigit Signed-off-by: Shahed Shaikh Reviewed-by: Rasesh Mody --- drivers/net/qede/qede_rxtx.c | 10 ++++++++++ drivers/net/qede/qede_rxtx.h | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index 32eae81..cdb85c2 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -1764,6 +1764,16 @@ static inline uint32_t qede_rx_cqe_to_tunn_pkt_type(= uint16_t flags) } } if (ol_flags & QEDE_TX_OFFLOAD_NOTSUP_MASK) { + /* We support only limited tunnel protocols */ + if (ol_flags & PKT_TX_TUNNEL_MASK) { + uint64_t temp; + + temp =3D ol_flags & PKT_TX_TUNNEL_MASK; + if (temp =3D=3D PKT_TX_TUNNEL_VXLAN || + temp =3D=3D PKT_TX_TUNNEL_MPLSINUDP) + break; + } + rte_errno =3D -ENOTSUP; break; } diff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h index 3ab1894..fe80237 100644 --- a/drivers/net/qede/qede_rxtx.h +++ b/drivers/net/qede/qede_rxtx.h @@ -159,8 +159,7 @@ #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_MPLSINUDP) + PKT_TX_TUNNEL_MASK) =20 #define QEDE_TX_OFFLOAD_NOTSUP_MASK \ (PKT_TX_OFFLOAD_MASK ^ QEDE_TX_OFFLOAD_MASK) --=20 1.7.10.3