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=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 BE1B8C433E0 for ; Tue, 26 Jan 2021 02:46:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 84DCE22AAA for ; Tue, 26 Jan 2021 02:46:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729845AbhAYPi6 (ORCPT ); Mon, 25 Jan 2021 10:38:58 -0500 Received: from mail2.candelatech.com ([208.74.158.173]:44746 "EHLO mail3.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730075AbhAYPil (ORCPT ); Mon, 25 Jan 2021 10:38:41 -0500 Received: from [192.168.254.6] (unknown [50.34.179.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail3.candelatech.com (Postfix) with ESMTPSA id 90D8F13C2B0; Mon, 25 Jan 2021 07:15:05 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 90D8F13C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1611587706; bh=D72s6Vo8e4dexbEsXVvtzwjbmu/KhYklot7icQzzIgg=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=DICVx+MNcWTfvWUhTcJ/Rx5TquEP3WuZJZdwch/gBidovHK8jGHlDLlg4m6/hCcYl ajsXQb1z5st6Eruwd43LvLsYCi890ixkKSz8GDF7rYHUJzKGSjxfoNrRM5tFbWhLGD GArq1X2Gu+rBgoQoxyO4Ix+OXhS92I0jCbqGFlhc= Subject: Re: [PATCH net] iwlwifi: provide gso_type to GSO packets To: Eric Dumazet , "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Luca Coelho , linux-wireless@vger.kernel.org, Johannes Berg References: <20210125150949.619309-1-eric.dumazet@gmail.com> From: Ben Greear Organization: Candela Technologies Message-ID: <97cf98b0-d464-1901-f01f-ac5dd362561d@candelatech.com> Date: Mon, 25 Jan 2021 07:15:04 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210125150949.619309-1-eric.dumazet@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-MW Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 1/25/21 7:09 AM, Eric Dumazet wrote: > From: Eric Dumazet > > net/core/tso.c got recent support for USO, and this broke iwlfifi > because the driver implemented a limited form of GSO. > > Providing ->gso_type allows for skb_is_gso_tcp() to provide > a correct result. > > Fixes: 3d5b459ba0e3 ("net: tso: add UDP segmentation support") > Signed-off-by: Eric Dumazet > Reported-by: Ben Greear > Bisected-by: Ben Greear I appreciate the credit, but the bisect and some other initial bug hunting was done by people on this thread: https://bugzilla.kernel.org/show_bug.cgi?id=209913 Thanks, Ben > Tested-by: Ben Greear > Cc: Luca Coelho > Cc: linux-wireless@vger.kernel.org > Cc: Johannes Berg > --- > drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c > index a983c215df310776ffe67f3b3ffa203eab609bfc..3712adc3ccc2511d46bcc855efbfba41c487d8e6 100644 > --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c > +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c > @@ -773,6 +773,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, > > next = skb_gso_segment(skb, netdev_flags); > skb_shinfo(skb)->gso_size = mss; > + skb_shinfo(skb)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6; > if (WARN_ON_ONCE(IS_ERR(next))) > return -EINVAL; > else if (next) > @@ -795,6 +796,8 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, > > if (tcp_payload_len > mss) { > skb_shinfo(tmp)->gso_size = mss; > + skb_shinfo(tmp)->gso_type = ipv4 ? SKB_GSO_TCPV4 : > + SKB_GSO_TCPV6; > } else { > if (qos) { > u8 *qc; > -- Ben Greear Candela Technologies Inc http://www.candelatech.com