| Message ID | 20190114131841.1932-8-maximmi@mellanox.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="WUn331ay"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43dYw56lpZz9s9G for <patchwork-incoming-netdev@ozlabs.org>; Tue, 15 Jan 2019 00:19:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726656AbfANNTQ (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Mon, 14 Jan 2019 08:19:16 -0500 Received: from mail-eopbgr40064.outbound.protection.outlook.com ([40.107.4.64]:35733 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726640AbfANNTP (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 14 Jan 2019 08:19:15 -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=aPJDhSfXKbx246/IO2+3uhpdLrWHaM5598tH/e+gwC8=; b=WUn331ayhQJmBNS45fxZ3wSpePrl5DnbRfGSsSwb7/leFjaWHQIXl0JgykqS8YQG4qF4ez2ggAoPl2Gxubs0VHGUHTQuB8IWMCvxl/zei8PzJXsFi0U5l7LZCaICempZqFepcJ8qI/ZTCK28n1Wz0biYc5M1SAgUdWdtwmZHMfk= Received: from AM6PR05MB5879.eurprd05.prod.outlook.com (20.179.0.76) by AM6PR05MB4869.eurprd05.prod.outlook.com (20.177.34.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1516.14; Mon, 14 Jan 2019 13:19:10 +0000 Received: from AM6PR05MB5879.eurprd05.prod.outlook.com ([fe80::210c:168f:7b52:a165]) by AM6PR05MB5879.eurprd05.prod.outlook.com ([fe80::210c:168f:7b52:a165%4]) with mapi id 15.20.1516.019; Mon, 14 Jan 2019 13:19:10 +0000 From: Maxim Mikityanskiy <maximmi@mellanox.com> To: "David S. Miller" <davem@davemloft.net>, Saeed Mahameed <saeedm@mellanox.com>, Willem de Bruijn <willemb@google.com>, Jason Wang <jasowang@redhat.com>, Eric Dumazet <edumazet@google.com> CC: "netdev@vger.kernel.org" <netdev@vger.kernel.org>, Eran Ben Elisha <eranbe@mellanox.com>, Tariq Toukan <tariqt@mellanox.com>, Maxim Mikityanskiy <maximmi@mellanox.com> Subject: [PATCH 7/7] net/mlx5e: Trust kernel regarding transport offset Thread-Topic: [PATCH 7/7] net/mlx5e: Trust kernel regarding transport offset Thread-Index: AQHUrAu6kwYyzL+SFkiL6oYWE/52YQ== Date: Mon, 14 Jan 2019 13:19:07 +0000 Message-ID: <20190114131841.1932-8-maximmi@mellanox.com> References: <20190114131841.1932-1-maximmi@mellanox.com> In-Reply-To: <20190114131841.1932-1-maximmi@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0423.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::27) 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-microsoft-exchange-diagnostics: 1; AM6PR05MB4869; 6:hwGEjCt2L7piLXrYKaVfsgCk09yBhEqXjifndZsRAQFAWxVH2AZtlr86l2WIGBqj0CzRfS0NQYLNGO3IQijO/gXBgHrv5BYUqxyDd6b2NamXL+/OHGVVAylu5Nq3fxorXZ6tmrLnu+oFbprMIrQu4U0grA3/kto5jNZ1s/8I3Ec246UkWRqgGpGRyxcXsziLDTHbLmqcP8DJVmk8rUeIqMOAGUEkkhVwmqmaSWv/Zfv7kqoVa6NeFLgvotGj1/FbzjSAUxPO13XSMxObs6HTcF7Tf+B5XbOeccTjcgkqeRUapqy5AFqgT2MudVYiyJbNUDNZzyBaFsFRjhxEPiHcAKsHP+gqEHuUgcDzrMq9oOHur5k3iHPH5g4EjNRUhvCKRIZquOhSNedsc2HapCRQDNXKYNZ24UosNDoaZnl0gjkR8AdtBiA8N/PsUGypNG7vMq3d9uG/gere/2mhELb4Vw==; 5:a282X0PbvZrFy79SrO2LqokguLxsXkvc48I6W1JKkpQdyQYiihYB8gLND865gbfjaBNsRiNGY2gNnt0KMr56sYhRAxpi9czqzXIKzjjWZ7C7X9/IavW9GTn1bUZ2ukYzSLnpyrr4kIrkLAKEStpTj05Q3lQ0GAO57aJAJ5S6UN+cVcsmGZgC08n33ZT6teAjy5HWziFMk+I3gWoqWcp38A==; 7:VbYEXeLToNiCI20je47iiAH8f5BCcf1MnJoZ0EY+ApNs+LESWLlHzRHTwtgP04PKwY6C6q5G1Sg6radScjnJDyQESpsgR8JIZEenWouuPOEsXEMo/XK1Po04EBnHYDR0c/QxihUDUl26CHT6p3KKWg== x-ms-office365-filtering-correlation-id: d4f68be2-5267-4e85-4698-08d67a22dcca x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4869; x-ms-traffictypediagnostic: AM6PR05MB4869: x-microsoft-antispam-prvs: <AM6PR05MB48696054CF0A3E7B5274210BD1800@AM6PR05MB4869.eurprd05.prod.outlook.com> x-forefront-prvs: 0917DFAC67 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(376002)(396003)(136003)(366004)(39860400002)(199004)(189003)(476003)(2616005)(11346002)(102836004)(1076003)(6436002)(8936002)(25786009)(6512007)(5660300001)(7736002)(386003)(6506007)(305945005)(68736007)(3846002)(6116002)(478600001)(6486002)(186003)(14454004)(26005)(50226002)(81166006)(81156014)(8676002)(446003)(110136005)(54906003)(71190400001)(71200400001)(486006)(6666004)(36756003)(99286004)(316002)(2906002)(66066001)(76176011)(97736004)(53936002)(52116002)(256004)(86362001)(106356001)(4326008)(107886003)(39060400002)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4869; H:AM6PR05MB5879.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: IGpCxyhC3lzl9KdkXhiM8VNjNPninKFJ0Ai6L3nkMAp+H4/6tXxatgBpi+ihWr6KjRWxCLC2EwcjAbv0OxEq7xz9nbdRPIvpdkVbftTgIWt2wQ/3Utl4JPdS8zd9pC4yZk/ZBgZS6M2M9IpKjsbBvU2wvbYKheGI0LslNMTybDCL4qrRgjUm6ITFQzeClTrFv+20DvM41Y24Hivzi3AAt2BggM+r+e07BtZloSR39GSb4rqmwAttbjBtoqpiFcQpDyCAp/T6KGhYgaYPECqRyxQcpoo+GfNVDRnELlErUdMk7Mm8eDTKiyMloZdgKhQ550KO+Bd0c+9lTWlBv9x93PxyumMrAi/Fz7vgEYXvLKGvYT44k1wu9MNyKvKkPQAZGviYG0OnReu03kROXpZN/1cDbhL1t4Xwhk8AL8ZPK+A= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM 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: d4f68be2-5267-4e85-4698-08d67a22dcca X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jan 2019 13:19:05.9205 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4869 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
| Series |
AF_PACKET transport_offset fix
|
expand
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c index 563fdb1dd15e..119bbbbe4ad0 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) 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); }
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 <maximmi@mellanox.com> --- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 4 ---- 1 file changed, 4 deletions(-)