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,URIBL_BLOCKED,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 01BBDC43381 for ; Fri, 22 Feb 2019 12:55:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCB232075C for ; Fri, 22 Feb 2019 12:55:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="XoA8AQD0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726928AbfBVMz2 (ORCPT ); Fri, 22 Feb 2019 07:55:28 -0500 Received: from mail-eopbgr50072.outbound.protection.outlook.com ([40.107.5.72]:64018 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725926AbfBVMz2 (ORCPT ); Fri, 22 Feb 2019 07:55: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=smaU78tr6HAz1CBw/P5Ayaf+bVezkbGFuRy6japr/aY=; b=XoA8AQD0fVNvyik4YtletPzc1dJ+/ENrgrWOnrFreO8WbkHQYmT9IBtkAEkAtnGZvMeFmWCOez1kX6fSh47QO9zXtbeMK5MyVDqhzslkF+Wcdm9e+PChc56pO7akAdh0PcmImnZ+ZxuJ6VzO8HAbBqq99DOxvQ0IJBzOVYbf5QU= Received: from AM6PR05MB5879.eurprd05.prod.outlook.com (20.179.0.76) by AM6PR05MB4824.eurprd05.prod.outlook.com (20.177.33.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.18; Fri, 22 Feb 2019 12:55:23 +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; Fri, 22 Feb 2019 12:55:23 +0000 From: Maxim Mikityanskiy To: "David S. Miller" , Willem de Bruijn , Saeed Mahameed , Jason Wang , Eric Dumazet CC: "netdev@vger.kernel.org" , Eran Ben Elisha , Tariq Toukan , Maxim Mikityanskiy Subject: [PATCH net-next] net: Skip GSO length estimation if transport header is not set Thread-Topic: [PATCH net-next] net: Skip GSO length estimation if transport header is not set Thread-Index: AQHUyq3fWhBOjGo0uEq7rvj8FMF8/Q== Date: Fri, 22 Feb 2019 12:55:22 +0000 Message-ID: <20190222125457.8509-1-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: LO2P265CA0310.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::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: 9bc5be46-cc8f-4d6d-8235-08d698c501d3 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:AM6PR05MB4824; x-ms-traffictypediagnostic: AM6PR05MB4824: x-ms-exchange-purlcount: 2 x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB4824;23:hzXeEwtgMTLrRhVWgQeuGeO/ouWVV1a9pm5nw76?= =?iso-8859-1?Q?3DIEneue8iTwBMHYqRnjyFtaYU8V8jw+fk25HZOW3vf2jZZOWDi3nmsrQT?= =?iso-8859-1?Q?/c/dV0EGs+ukBBGozHO0Haon9b/o6Tu4yDNQjaaxai81VRXCl99GZ56KAK?= =?iso-8859-1?Q?OY3rDeMNFHxi9ql9VlDkwXHnd1uWxo/ZSCOHvyLzkvTNrvDFWmXN8I1pv/?= =?iso-8859-1?Q?zKohnapp74orrLq+OUoV4xl7c7X6GlYjrOyEwyZwbnFvtTAkmfrPTbYzC0?= =?iso-8859-1?Q?5UPsWqb7IoW4bDQkLoSM1v8nBIvmAgB6k2/g02qmvBurVMfLzrXuuiIkNs?= =?iso-8859-1?Q?e9rQrOOFORFI9Q6MD7Dd/R5/AWinQ6V5kiy2yAaodGkSHgzy80I38jRMxj?= =?iso-8859-1?Q?lnKNPp0Ts3VEElBXW2EedolzUDbH2ck7+b/tkxb4jIXcjLkCVTlXqMJBBc?= =?iso-8859-1?Q?sgYfZfPracHe6h8NIfQYDW0hk4NXz07TM5WkFbgt9KYYhdhv6uFuW/YNV0?= =?iso-8859-1?Q?/dkyMDcZZ9NBh912nO8dGswM6xX9QVzLdXw/NMS/CKxS6HOR8n4vKd+FOK?= =?iso-8859-1?Q?bq09Pwq17qiiY3gBjiPkcz0rqY/jdyBHqxfq3IuPThqZvi7JXUa+T741B0?= =?iso-8859-1?Q?9tZt8uXRMrn5MmjxuXbPHc3h/lVe2OyQjtL0Y9LGirrsVa/zFBQ7MLjbc9?= =?iso-8859-1?Q?cZYPM4WfImPU45MmfTINQGdexr7S+rRQVScPDzEz6K89EzDCVbEpmIeS5N?= =?iso-8859-1?Q?bK2xdS3n2OREefIDvmC+mRsDKJil5fbZr/o0l3ZrBSyf/klCcBV0AR4zxq?= =?iso-8859-1?Q?8cU/z4p8e/DCakivj7Dx4gaZCEqJ2Cedxp6uO25hnNZcO1q1RZUMoLUAPk?= =?iso-8859-1?Q?yrGwOAlIiSINkyne7aV5S5cIwHn65SmawlDShNjQSB0//BZ4b24xPrdHjx?= =?iso-8859-1?Q?teOdQw692pOPRkI+msgEYE1KulmkfR0nX5nbt3ZS3Qo2HH1ycGCtgzEyZq?= =?iso-8859-1?Q?/CeD2J2KhJfyrMgPuBg8Af2u6huriiJk5PBPo8c6on+wOskOhUo0+pXbu+?= =?iso-8859-1?Q?nWGpaZpUXUx8l2XYL4hIjqXkI1yRyDTwtcR2FqWG3WRPmffDWdBiAt/BrQ?= =?iso-8859-1?Q?LUbfM0nG2RMLdu8gRCrRY698BPVGR9XXQB0ZkU4lpEnDT3lgKEXmahTzYS?= =?iso-8859-1?Q?XTK49xdJOgFn5aO9vb0y6CBY6kvr53cUTA6+MOGUUy56ET2Cq9nXdKnZNW?= =?iso-8859-1?Q?JvdHxFCZwPLN13ixxkHqG4/RXyNSyAZBFx5pxLVWWLumrvcAHQwWQQqXRZ?= =?iso-8859-1?Q?vEPuKhuHuaXzZTyVsoJ6p6ICd7L2zzyCqre2uiPgWcO9g=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09565527D6 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(376002)(396003)(366004)(136003)(39860400002)(189003)(199004)(76176011)(68736007)(6486002)(50226002)(53936002)(25786009)(316002)(107886003)(54906003)(186003)(106356001)(105586002)(446003)(26005)(11346002)(4326008)(8936002)(66066001)(476003)(2616005)(486006)(97736004)(6512007)(6306002)(110136005)(52116002)(99286004)(6436002)(256004)(6506007)(386003)(102836004)(14444005)(966005)(2906002)(478600001)(6116002)(3846002)(305945005)(7736002)(86362001)(1076003)(36756003)(71190400001)(71200400001)(8676002)(81156014)(81166006)(5660300002)(14454004);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB4824;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: 9YjR0QnQRqviubHDV6yTgNt6lwMsQSgB38cvASdkBdp2aagKihTzj+/XCN5zPtuq+lTHoUCIjCyCYzBBmglL8SgRGOWBQI2JU1G6xSj9eAgopP8omUVj7qXubkwWQwFoCGuGoeai2H9PoOP1+CEY5gEaJPyngDsm2Mfit1ITQ5dl/0Qu4h4bSw0wy4JPwXk7Gqvjc9lgZ/LNdJJCV6b6FxoTy+8FV0G3w1kwGOxcEXu/TTAtAn3c2x6DyXBSeCZZ7+Idt/SLs5x6z9V5T64ecDsrCCDT7haYycATSUkk5aOTWOaR53KP5rkRL8rHm5QGsxB+7x4bIbL6Enm1bqyXQdv5a0d9mAuUiUrxOepf6MlQtWHyGrFYJMiiswOUWb3QIWz8nmqSUyXb609f16o6ATBI8OJuRWkkrTDMxVLoIXU= 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: 9bc5be46-cc8f-4d6d-8235-08d698c501d3 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Feb 2019 12:55:21.6655 (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: AM6PR05MB4824 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org qdisc_pkt_len_init expects transport_header to be set for GSO packets. Patch [1] skips transport_header validation for GSO packets that don't have network_header set at the moment of calling virtio_net_hdr_to_skb, and allows them to pass into the stack. After patch [2] no placeholder value is assigned to transport_header if dissection fails, so this patch adds a check to the place where the value of transport_header is used. [1] https://patchwork.ozlabs.org/patch/1044429/ [2] https://patchwork.ozlabs.org/patch/1046122/ Signed-off-by: Maxim Mikityanskiy --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index a3d13f5e2bfc..8a0da95ff4cc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3421,7 +3421,7 @@ static void qdisc_pkt_len_init(struct sk_buff *skb) /* To get more precise estimation of bytes sent on wire, * we add to pkt_len the headers size of all segments */ - if (shinfo->gso_size) { + if (shinfo->gso_size && skb_transport_header_was_set(skb)) { unsigned int hdr_len; u16 gso_segs =3D shinfo->gso_segs; =20 --=20 2.19.1