* [PATCH net] iwlwifi: provide gso_type to GSO packets
@ 2021-01-25 15:09 Eric Dumazet
2021-01-25 15:15 ` Ben Greear
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Eric Dumazet @ 2021-01-25 15:09 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski
Cc: netdev, Eric Dumazet, Eric Dumazet, Ben Greear, Luca Coelho,
linux-wireless, Johannes Berg
From: Eric Dumazet <edumazet@google.com>
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 <edumazet@google.com>
Reported-by: Ben Greear <greearb@candelatech.com>
Bisected-by: Ben Greear <greearb@candelatech.com>
Tested-by: Ben Greear <greearb@candelatech.com>
Cc: Luca Coelho <luciano.coelho@intel.com>
Cc: linux-wireless@vger.kernel.org
Cc: Johannes Berg <johannes@sipsolutions.net>
---
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;
--
2.30.0.280.ga3ce27912f-goog
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH net] iwlwifi: provide gso_type to GSO packets
2021-01-25 15:09 [PATCH net] iwlwifi: provide gso_type to GSO packets Eric Dumazet
@ 2021-01-25 15:15 ` Ben Greear
2021-01-25 15:25 ` Eric Dumazet
2021-01-26 20:32 ` Jakub Kicinski
2021-01-26 23:20 ` patchwork-bot+netdevbpf
2 siblings, 1 reply; 7+ messages in thread
From: Ben Greear @ 2021-01-25 15:15 UTC (permalink / raw)
To: Eric Dumazet, David S . Miller, Jakub Kicinski
Cc: netdev, Eric Dumazet, Luca Coelho, linux-wireless, Johannes Berg
On 1/25/21 7:09 AM, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> 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 <edumazet@google.com>
> Reported-by: Ben Greear <greearb@candelatech.com>
> Bisected-by: Ben Greear <greearb@candelatech.com>
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 <greearb@candelatech.com>
> Cc: Luca Coelho <luciano.coelho@intel.com>
> Cc: linux-wireless@vger.kernel.org
> Cc: Johannes Berg <johannes@sipsolutions.net>
> ---
> 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 <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH net] iwlwifi: provide gso_type to GSO packets
2021-01-25 15:15 ` Ben Greear
@ 2021-01-25 15:25 ` Eric Dumazet
0 siblings, 0 replies; 7+ messages in thread
From: Eric Dumazet @ 2021-01-25 15:25 UTC (permalink / raw)
To: Ben Greear
Cc: Eric Dumazet, David S . Miller, Jakub Kicinski, netdev,
Luca Coelho, linux-wireless, Johannes Berg
On Mon, Jan 25, 2021 at 4:15 PM Ben Greear <greearb@candelatech.com> wrote:
>
> On 1/25/21 7:09 AM, Eric Dumazet wrote:
> > From: Eric Dumazet <edumazet@google.com>
> >
> > 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 <edumazet@google.com>
> > Reported-by: Ben Greear <greearb@candelatech.com>
> > Bisected-by: Ben Greear <greearb@candelatech.com>
>
> 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 ?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net] iwlwifi: provide gso_type to GSO packets
2021-01-25 15:09 [PATCH net] iwlwifi: provide gso_type to GSO packets Eric Dumazet
2021-01-25 15:15 ` Ben Greear
@ 2021-01-26 20:32 ` Jakub Kicinski
2021-01-26 20:55 ` Johannes Berg
2021-01-26 23:20 ` patchwork-bot+netdevbpf
2 siblings, 1 reply; 7+ messages in thread
From: Jakub Kicinski @ 2021-01-26 20:32 UTC (permalink / raw)
To: Johannes Berg
Cc: Eric Dumazet, David S . Miller, netdev, Eric Dumazet, Ben Greear,
Luca Coelho, linux-wireless
On Mon, 25 Jan 2021 07:09:49 -0800 Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> 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 <edumazet@google.com>
> Reported-by: Ben Greear <greearb@candelatech.com>
> Bisected-by: Ben Greear <greearb@candelatech.com>
> Tested-by: Ben Greear <greearb@candelatech.com>
> Cc: Luca Coelho <luciano.coelho@intel.com>
> Cc: linux-wireless@vger.kernel.org
> Cc: Johannes Berg <johannes@sipsolutions.net>
Johannes, Eric tagged this for net, are you okay with me taking it?
No strong preference here.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH net] iwlwifi: provide gso_type to GSO packets
2021-01-26 20:32 ` Jakub Kicinski
@ 2021-01-26 20:55 ` Johannes Berg
2021-01-27 6:02 ` Coelho, Luciano
0 siblings, 1 reply; 7+ messages in thread
From: Johannes Berg @ 2021-01-26 20:55 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Eric Dumazet, David S . Miller, netdev, Eric Dumazet, Ben Greear,
Luca Coelho, linux-wireless
On Tue, 2021-01-26 at 12:32 -0800, Jakub Kicinski wrote:
> On Mon, 25 Jan 2021 07:09:49 -0800 Eric Dumazet wrote:
> > From: Eric Dumazet <edumazet@google.com>
> >
> > 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 <edumazet@google.com>
> > Reported-by: Ben Greear <greearb@candelatech.com>
> > Bisected-by: Ben Greear <greearb@candelatech.com>
> > Tested-by: Ben Greear <greearb@candelatech.com>
> > Cc: Luca Coelho <luciano.coelho@intel.com>
> > Cc: linux-wireless@vger.kernel.org
> > Cc: Johannes Berg <johannes@sipsolutions.net>
>
> Johannes, Eric tagged this for net, are you okay with me taking it?
> No strong preference here.
I guess that really would normally go through Luca's and Kalle's trees,
but yes, please just take it, it's been long and it won't conflict with
anything.
johannes
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH net] iwlwifi: provide gso_type to GSO packets
2021-01-26 20:55 ` Johannes Berg
@ 2021-01-27 6:02 ` Coelho, Luciano
0 siblings, 0 replies; 7+ messages in thread
From: Coelho, Luciano @ 2021-01-27 6:02 UTC (permalink / raw)
To: johannes, kuba
Cc: linux-wireless, greearb, edumazet, eric.dumazet, davem, netdev
On Tue, 2021-01-26 at 21:55 +0100, Johannes Berg wrote:
> On Tue, 2021-01-26 at 12:32 -0800, Jakub Kicinski wrote:
> > On Mon, 25 Jan 2021 07:09:49 -0800 Eric Dumazet wrote:
> > > From: Eric Dumazet <edumazet@google.com>
> > >
> > > 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 <edumazet@google.com>
> > > Reported-by: Ben Greear <greearb@candelatech.com>
> > > Bisected-by: Ben Greear <greearb@candelatech.com>
> > > Tested-by: Ben Greear <greearb@candelatech.com>
> > > Cc: Luca Coelho <luciano.coelho@intel.com>
> > > Cc: linux-wireless@vger.kernel.org
> > > Cc: Johannes Berg <johannes@sipsolutions.net>
> >
> > Johannes, Eric tagged this for net, are you okay with me taking it?
> > No strong preference here.
>
> I guess that really would normally go through Luca's and Kalle's trees,
> but yes, please just take it, it's been long and it won't conflict with
> anything.
Yes, that's fine by me too. Just take it via net and we'll get it into
our trees eventually.
--
Cheers,
Luca.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net] iwlwifi: provide gso_type to GSO packets
2021-01-25 15:09 [PATCH net] iwlwifi: provide gso_type to GSO packets Eric Dumazet
2021-01-25 15:15 ` Ben Greear
2021-01-26 20:32 ` Jakub Kicinski
@ 2021-01-26 23:20 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 7+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-01-26 23:20 UTC (permalink / raw)
To: Eric Dumazet
Cc: davem, kuba, netdev, edumazet, greearb, luciano.coelho,
linux-wireless, johannes
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Mon, 25 Jan 2021 07:09:49 -0800 you wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> 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.
>
> [...]
Here is the summary with links:
- [net] iwlwifi: provide gso_type to GSO packets
https://git.kernel.org/netdev/net/c/81a86e1bd8e7
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-01-27 8:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-25 15:09 [PATCH net] iwlwifi: provide gso_type to GSO packets Eric Dumazet
2021-01-25 15:15 ` Ben Greear
2021-01-25 15:25 ` Eric Dumazet
2021-01-26 20:32 ` Jakub Kicinski
2021-01-26 20:55 ` Johannes Berg
2021-01-27 6:02 ` Coelho, Luciano
2021-01-26 23:20 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).