2021-01-26 02:59:42

by Ben Greear

Subject: Re: [PATCH net] iwlwifi: provide gso_type to GSO packets

On 1/25/21 7:09 AM, Eric Dumazet wrote:
> From: Eric Dumazet <[email protected]>
>
> 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 <[email protected]>
> Reported-by: Ben Greear <[email protected]>
> Bisected-by: Ben Greear <[email protected]>

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 <[email protected]>
> Cc: Luca Coelho <[email protected]>
> Cc: [email protected]
> Cc: Johannes Berg <[email protected]>
> ---
> 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 <[email protected]>
Candela Technologies Inc http://www.candelatech.com

2021-01-26 05:57:12

by Eric Dumazet

Subject: Re: [PATCH net] iwlwifi: provide gso_type to GSO packets

On Mon, Jan 25, 2021 at 4:15 PM Ben Greear <[email protected]> wrote:
>
> On 1/25/21 7:09 AM, Eric Dumazet wrote:
> > From: Eric Dumazet <[email protected]>
> >
> > 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 <[email protected]>
> > Reported-by: Ben Greear <[email protected]>
> > Bisected-by: Ben Greear <[email protected]>
>
> 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
>

Well, I do not think bugzilla can display full names/emails ?