From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B4DAC43381 for ; Thu, 21 Feb 2019 12:40:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DC3C2086A for ; Thu, 21 Feb 2019 12:40:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="bpJYCdyo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727897AbfBUMk3 (ORCPT ); Thu, 21 Feb 2019 07:40:29 -0500 Received: from mail-eopbgr20078.outbound.protection.outlook.com ([40.107.2.78]:6395 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727887AbfBUMk2 (ORCPT ); Thu, 21 Feb 2019 07:40:28 -0500 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=zXW/ciFot/Fgl8XKrMXhNEUWH8FEJGa632aPUSGWaR4=; b=bpJYCdyoWdpeq2TFpnV02+JWeoVqQ0eNqKTkV6lP2TVd76PGJjIZUnXNNghUN8GBljBAZvuhfZ0ZhrFAauE/W8T5pYz+CQS2qw2PBj+wjAVwWRowsW61EMs6qlA47ka5BoZ0w6Zjv+9L7+YvTQ5ozSFcqYoW+tD8IBLzI/cKbcE= Received: from AM6PR05MB5879.eurprd05.prod.outlook.com (20.179.0.76) by AM6PR05MB5816.eurprd05.prod.outlook.com (20.178.94.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.16; Thu, 21 Feb 2019 12:40:05 +0000 Received: from AM6PR05MB5879.eurprd05.prod.outlook.com ([fe80::98c7:b5be:ac6b:144]) by AM6PR05MB5879.eurprd05.prod.outlook.com ([fe80::98c7:b5be:ac6b:144%5]) with mapi id 15.20.1643.014; Thu, 21 Feb 2019 12:40:05 +0000 From: Maxim Mikityanskiy To: "David S. Miller" , Saeed Mahameed , Willem de Bruijn , Jason Wang , Eric Dumazet CC: "netdev@vger.kernel.org" , Eran Ben Elisha , Tariq Toukan , Maxim Mikityanskiy Subject: [PATCH net-next v2 7/7] net/mlx5e: Trust kernel regarding transport offset Thread-Topic: [PATCH net-next v2 7/7] net/mlx5e: Trust kernel regarding transport offset Thread-Index: AQHUyeKSSD8dXM7ApEa20+t+hCVWOQ== Date: Thu, 21 Feb 2019 12:40:05 +0000 Message-ID: <20190221123908.7196-8-maximmi@mellanox.com> References: <20190221123908.7196-1-maximmi@mellanox.com> In-Reply-To: <20190221123908.7196-1-maximmi@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LNXP265CA0070.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5d::34) To AM6PR05MB5879.eurprd05.prod.outlook.com (2603:10a6:20b:a2::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=maximmi@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.19.1 x-originating-ip: [141.226.120.58] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1419affd-8836-4fae-302b-08d697f9b48f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB5816; x-ms-traffictypediagnostic: AM6PR05MB5816: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB5816;23:miNxgHxydlGIj0FWMPTBf3RdyGufEwPPIzTkmhF?= =?iso-8859-1?Q?zJGj1MRYPgdR5cqaO12rU5wvh6hBRLgZZHwBT121PHFrVboxWmJwwn3/O8?= =?iso-8859-1?Q?0DLIzdVOHZoSAB9IUBsWHXPGNXaJwozzIzsXjs4qGzHUjo6HH2d/WpyrFk?= =?iso-8859-1?Q?+wsPnUjd9iTdv/fxo1aXgFaoPFbdDRLpWEXy95ITHPpdUrsZxHB3JjaiZu?= =?iso-8859-1?Q?2CcCy7wvg3Tj3+NvlJQg9YsPN8fw8HRzWvMZQWnKbH48cZsm7aPJtc/G21?= =?iso-8859-1?Q?vQ4o4FutJ2zhqK5d2+ChXTUrjlMzZ9ozHF3Na3fu5hNZJP8cztPWO10Hir?= =?iso-8859-1?Q?xVvtMfE9lbo6WW+0sm/TCZprH24hQc2DTZ3TQQDagej9IPai0NHVtBWabp?= =?iso-8859-1?Q?MryCH39KGODp9L8HsQduDo+HkPeiKRHLEO9cGevXXKlzwXb7Q/g4Ov8YDp?= =?iso-8859-1?Q?6t7lIV5n0srdD17bJ1/iIWy5X2dclkjOpV39oGTPSzIP3vzF7DvAWku1d1?= =?iso-8859-1?Q?euxd3KRZifzPQ73S0qCTamBJFSnSanwCQ3oMRdpYFFKJvxJigfnfL+p00j?= =?iso-8859-1?Q?uJj8KuxcG7QdqVo7xRBS2ZH3K0/IK4SjNBHeILnIeWr5pIfbtJYZz5J2Kb?= =?iso-8859-1?Q?WhYM3xUStyZ7LyMhOjPdrFBtR4qbpREXxpyPs/A4y1v50593jpHY+7OHr1?= =?iso-8859-1?Q?r465wyNpaE3Pn0O1JmJpHznKghGmNFsegnk1hnihBXb5iG9Eav7/qdT302?= =?iso-8859-1?Q?0/M4Kfljmlpg3+KIO3bC0UZI6Aj+zbjpYzlED2NxttMYV528vFHR8Rp2T4?= =?iso-8859-1?Q?MiuLEPQrg02Twf4UdVsQj6vaE5Thv1aT7AEmewK9C1MjtftMIdG9XKzuaj?= =?iso-8859-1?Q?iYm2Pvgp+vtKsuoKlVotGERXdjnm9feuxsHHOaTmvV6KoN9ORC7oDwGTgD?= =?iso-8859-1?Q?MYx3jvT71istY/TtwZJofvsZZ9YSb0mNGxipO4uaD6PA7qs+TW0FbSONB0?= =?iso-8859-1?Q?D0fsTACkTp5ztCBjzUZasnxz16rFCsq4BhhwLVbMXC7JNTUNy2RskTsKKO?= =?iso-8859-1?Q?9ZDWdjaaD+E2g562AR3t/jzTyNWEygnkOOt6cZlw41sBUzy0N0qjSSrS5j?= =?iso-8859-1?Q?hlCq3+KVXfc+dqrwlsUBkDhqW1cKj9EOJHi8MovXD76WUvzr9qWu4KMFbI?= =?iso-8859-1?Q?4pdXpz730v8hAsCLVVoPZSOjVNFAS0zMQHS815x7Tc36+5dKOr/vptmtij?= =?iso-8859-1?Q?9kw+Wvibi5+y17hy4obDgIn3Zad/oJSe2n7t3WgL09geBMlcpZuwc7BkZA?= =?iso-8859-1?Q?yQ=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09555FB1AD x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(39860400002)(366004)(376002)(396003)(346002)(189003)(199004)(6512007)(316002)(1076003)(54906003)(305945005)(25786009)(478600001)(7736002)(66066001)(81166006)(99286004)(53936002)(110136005)(4744005)(68736007)(8676002)(8936002)(76176011)(71200400001)(71190400001)(6436002)(52116002)(5660300002)(81156014)(50226002)(6486002)(4326008)(256004)(107886003)(86362001)(102836004)(26005)(476003)(186003)(11346002)(2906002)(3846002)(6116002)(105586002)(386003)(36756003)(6506007)(446003)(97736004)(14454004)(486006)(2616005)(106356001);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB5816;H:AM6PR05MB5879.eurprd05.prod.outlook.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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: oS1ZhYFvkbeFSLowpM1fVWdF+YhoiEJZpHRVXak8jfX7ntS87GHxOT+ceKUum3444iBg44WBVN5MvNXY+wY5OMiHSS4I8AA3Tiky1e1xWcsMO2me9Dxh2CsYxj0oOiOXBEI0T3PyEc1J57+8YMt1AGzaQqGWtz2pqpC8Su/l5TC98TeE/JQ5h6hLKJVwGN3A1YZG3dVIg9YzPEK0ou+JL5Ma4gp3oQVeI7Gf+9pZyEP5Xgv8iAtFjmxDg6R8aesWKoglr2jktyNcD9+L5RsjWBiZ+uxaHhQPlXmErwVvSZmXapRobFZB5nfB7gk9Knouyw+gjH9hMbGdfekWfX32xKSyzCCrvFdi6cqW4bagmzkpYeJKf2lisXvGlMOcYSNvkWjwG8NJPXbsPrEvTPuZFRzOjPsyh5jwvvgTcOCfWIs= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1419affd-8836-4fae-302b-08d697f9b48f X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Feb 2019 12:40:04.2621 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5816 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After AF_PACKET is fixed to calculate the transport header offset correctly, trust the value set by the kernel. If the offset wasn't set, it means there is no transport header in the packet. Signed-off-by: Maxim Mikityanskiy Reviewed-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/= ethernet/mellanox/mlx5/core/en_tx.c index 6ca834702306..e7aae45a01f8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c @@ -148,12 +148,8 @@ static inline int mlx5e_skb_l2_header_offset(struct sk= _buff *skb) =20 static inline int mlx5e_skb_l3_header_offset(struct sk_buff *skb) { - struct flow_keys keys; - if (skb_transport_header_was_set(skb)) return skb_transport_offset(skb); - else if (skb_flow_dissect_flow_keys(skb, &keys, 0)) - return keys.control.thoff; else return mlx5e_skb_l2_header_offset(skb); } --=20 2.19.1