Received-SPF: pass (google.com: domain of linux-kernel+bounces-206218-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Fri, 07 Jun 2024 10:07:55 -0400
From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
To: joshwash@google.com, 
 netdev@vger.kernel.org
Cc: davem@davemloft.net, 
 kuba@kernel.org, 
 stable@kernel.org, 
 Joshua Washington <joshwash@google.com>, 
 Praveen Kaligineedi <pkaligineedi@google.com>, 
 Harshitha Ramamurthy <hramamurthy@google.com>, 
 Willem de Bruijn <willemb@google.com>, 
 Eric Dumazet <edumazet@google.com>, 
 Andrei Vagin <avagin@gmail.com>, 
 Jeroen de Borst <jeroendb@google.com>, 
 Shailend Chand <shailend@google.com>, 
 Paolo Abeni <pabeni@redhat.com>, 
 Rushil Gupta <rushilg@google.com>, 
 Bailey Forrest <bcf@google.com>, 
 Catherine Sullivan <csully@google.com>, 
 open list <linux-kernel@vger.kernel.org>
Message-ID: <6663143b90996_2f27b2949@willemb.c.googlers.com.notmuch>
In-Reply-To: <20240607060958.2789886-1-joshwash@google.com>
References: <20240606192139.1872461-1-joshwash@google.com>
 <20240607060958.2789886-1-joshwash@google.com>
Subject: Re: [PATCH net v2] gve: ignore nonrelevant GSO type bits when
 processing TSO headers
Precedence: bulk
Mime-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: 7bit

joshwash@ wrote:
> From: Joshua Washington <joshwash@google.com>
> 
> TSO currently fails when the skb's gso_type field has more than one bit
> set.
> 
> TSO packets can be passed from userspace using PF_PACKET, TUNTAP and a
> few others, using virtio_net_hdr (e.g., PACKET_VNET_HDR). This includes
> virtualization, such as QEMU, a real use-case.
> 
> The gso_type and gso_size fields as passed from userspace in
> virtio_net_hdr are not trusted blindly by the kernel. It adds gso_type
> |= SKB_GSO_DODGY to force the packet to enter the software GSO stack
> for verification.
> 
> This issue might similarly come up when the CWR bit is set in the TCP
> header for congestion control, causing the SKB_GSO_TCP_ECN gso_type bit
> to be set.
> 
> Fixes: a57e5de476be ("gve: DQO: Add TX path")
> Signed-off-by: Joshua Washington <joshwash@google.com>
> Reviewed-by: Praveen Kaligineedi <pkaligineedi@google.com>
> Reviewed-by: Harshitha Ramamurthy <hramamurthy@google.com>
> Reviewed-by: Willem de Bruijn <willemb@google.com>
> Suggested-by: Eric Dumazet <edumazet@google.com>
> Acked-by: Andrei Vagin <avagin@gmail.com>

I did not mean to ask for a revision. When you send a v2, please do include
a changelog

> ---
>  drivers/net/ethernet/google/gve/gve_tx_dqo.c | 21 +++++---------------
>  1 file changed, 5 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet/google/gve/gve_tx_dqo.c
> index fe1b26a4d736..a76b407a981b 100644
> --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c
> +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c
> @@ -551,32 +551,21 @@ static int gve_prep_tso(struct sk_buff *skb)
>  	 * - Hypervisor enforces a limit of 9K MTU
>  	 * - Kernel will not produce a TSO larger than 64k
>  	 */
> -

Accidental removal?

>  	if (unlikely(skb_shinfo(skb)->gso_size < GVE_TX_MIN_TSO_MSS_DQO))
>  		return -1;
>  
> +	if (!(skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))
> +		return -EINVAL;
> +