Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4628479ybl; Wed, 22 Jan 2020 01:34:33 -0800 (PST) X-Google-Smtp-Source: APXvYqxGXbH8seKjbeTlQXwLQK9tbeYgeCBysNhGX4L5rS6+q7bX78UE0CYsBh879OTDVkKyTXeB X-Received: by 2002:a05:6830:11d2:: with SMTP id v18mr7071872otq.151.1579685673456; Wed, 22 Jan 2020 01:34:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579685673; cv=none; d=google.com; s=arc-20160816; b=0FuPzVJXpoyE1mVFDA7iOKByaU7HTTSdP3+Behne7eKpeL1j2J4TIMGat0uts6UrxQ mZx1PdJwxbLNh5iaJVLPyHGOzfIYTrI8bqjrVTaoLKDztbDk4XXEbzGaqpXvUlXbnUE9 EY3RQw2ybW349YIDXmbqWugD5RvaOqGzpz/d97NT4okNUZP3ImNhHefLX8at7wQKZBXM hTp+KUD409DgPZVdjXr7epCwU4p4MPpnP48NVST1LsVzn5JqNp+JIjaH8DIhaBW7aZ/0 GgVjbAqmcSN05wPgcfkWOua2EJ0q+NigDl15xyt6SiJbSxnb1zV3pfmFHgcyDppt5eOi VhQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eBsGI65JVLPbv+9ERtyo1OOLlhBbLubc3q8LW9BKApk=; b=guYbjhYpFqzE3klT9wqSH/OQKBd3mv2Wz1++zjwf+e3ZgdeDO7Cq9aL1Bc6mlFGjva suVfnX9437sc9VYek/u8p6q8G9F73VY1Ngdn0Vk07WnazjhS73ltlGitTJ9daqjjcDuN oXdoNxQjZvI6OTc6sWP0ft/78S8+5P6KHAEH75s6qGWax6NaJzNE5bd1UOibbwzhQT9x 605OxrnwewPB3Hv46cs13+Q/Cf94pA1+lfmJHPw6+bCKQzl1dKswkT4S0fSkK/GcAwZe C2e13qe8lswb/yd/aw/fAehzKLezNnR3tiHcdh9GFw3LLdyTVznwc10XvUMbdtSgGkQ1 KYwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZoQsZ4LD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u5si25758405otg.99.2020.01.22.01.34.21; Wed, 22 Jan 2020 01:34:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZoQsZ4LD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730252AbgAVJcv (ORCPT + 99 others); Wed, 22 Jan 2020 04:32:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:46006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729247AbgAVJcu (ORCPT ); Wed, 22 Jan 2020 04:32:50 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 26EBE2071E; Wed, 22 Jan 2020 09:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685569; bh=UQ5VAOVQ+FVHhGXA0WA7/9hntlL6iFc09BvrShyOi6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZoQsZ4LDRsDsJC+VZfJLdE+zAHJhVBnPEHyFR8v4koD1+8oq1s7mGyK/AidQc3EtD 7+yMrzsdCubPXw9lMDPMnVJnVvUF9kE1tKjORn6K9I37bRr8Mz3pyx4HhABGDSWNhD 9qW+NQ6hzbFrs8Z68eoQYdxSoC/r3wruGPjY3SCY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , RENARD Pierre-Francois , Stefan Wahren , Woojung Huh , Microchip Linux Driver Support , "David S. Miller" Subject: [PATCH 4.4 66/76] net: usb: lan78xx: limit size of local TSO packets Date: Wed, 22 Jan 2020 10:29:22 +0100 Message-Id: <20200122092801.422221341@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092751.587775548@linuxfoundation.org> References: <20200122092751.587775548@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit f8d7408a4d7f60f8b2df0f81decdc882dd9c20dc ] lan78xx_tx_bh() makes sure to not exceed MAX_SINGLE_PACKET_SIZE bytes in the aggregated packets it builds, but does nothing to prevent large GSO packets being submitted. Pierre-Francois reported various hangs when/if TSO is enabled. For localy generated packets, we can use netif_set_gso_max_size() to limit the size of TSO packets. Note that forwarded packets could still hit the issue, so a complete fix might require implementing .ndo_features_check for this driver, forcing a software segmentation if the size of the TSO packet exceeds MAX_SINGLE_PACKET_SIZE. Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver") Signed-off-by: Eric Dumazet Reported-by: RENARD Pierre-Francois Tested-by: RENARD Pierre-Francois Cc: Stefan Wahren Cc: Woojung Huh Cc: Microchip Linux Driver Support Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/lan78xx.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2961,6 +2961,7 @@ static int lan78xx_probe(struct usb_inte if (netdev->mtu > (dev->hard_mtu - netdev->hard_header_len)) netdev->mtu = dev->hard_mtu - netdev->hard_header_len; + netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER); dev->ep_blkin = (intf->cur_altsetting)->endpoint + 0; dev->ep_blkout = (intf->cur_altsetting)->endpoint + 1;