From patchwork Fri Sep 20 12:57:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 49352 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4EA1C7883B for ; Fri, 20 Sep 2024 12:57:19 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.17583.1726837039033272182 for ; Fri, 20 Sep 2024 05:57:19 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EBC3A139F for ; Fri, 20 Sep 2024 05:57:47 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4F1263F66E for ; Fri, 20 Sep 2024 05:57:18 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/3] arm-bsp/fvp-base: Get 6.10 kernel working Date: Fri, 20 Sep 2024 08:57:15 -0400 Message-Id: <20240920125716.13293-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240920125716.13293-1-jon.mason@arm.com> References: <20240920125716.13293-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 20 Sep 2024 12:57:19 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6093 Apply upstream patch to get virtio networking functioning again and switch to the 6.10 kernel. Signed-off-by: Jon Mason --- ...gso-csum-offset-check-in-virtio_net_.patch | 59 +++++++++++++++++++ .../linux/linux-arm-platforms.inc | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta-arm-bsp/recipes-kernel/linux/files/fvp-base/0001-net-tighten-bad-gso-csum-offset-check-in-virtio_net_.patch diff --git a/meta-arm-bsp/recipes-kernel/linux/files/fvp-base/0001-net-tighten-bad-gso-csum-offset-check-in-virtio_net_.patch b/meta-arm-bsp/recipes-kernel/linux/files/fvp-base/0001-net-tighten-bad-gso-csum-offset-check-in-virtio_net_.patch new file mode 100644 index 000000000000..9985d57966f4 --- /dev/null +++ b/meta-arm-bsp/recipes-kernel/linux/files/fvp-base/0001-net-tighten-bad-gso-csum-offset-check-in-virtio_net_.patch @@ -0,0 +1,59 @@ +From 6513eb3d3191574b58859ef2d6dc26c0277c6f81 Mon Sep 17 00:00:00 2001 +From: Willem de Bruijn +Date: Tue, 10 Sep 2024 17:35:35 -0400 +Subject: [PATCH] net: tighten bad gso csum offset check in virtio_net_hdr + +The referenced commit drops bad input, but has false positives. +Tighten the check to avoid these. + +The check detects illegal checksum offload requests, which produce +csum_start/csum_off beyond end of packet after segmentation. + +But it is based on two incorrect assumptions: + +1. virtio_net_hdr_to_skb with VIRTIO_NET_HDR_GSO_TCP[46] implies GSO. +True in callers that inject into the tx path, such as tap. +But false in callers that inject into rx, like virtio-net. +Here, the flags indicate GRO, and CHECKSUM_UNNECESSARY or +CHECKSUM_NONE without VIRTIO_NET_HDR_F_NEEDS_CSUM is normal. + +2. TSO requires checksum offload, i.e., ip_summed == CHECKSUM_PARTIAL. +False, as tcp[46]_gso_segment will fix up csum_start and offset for +all other ip_summed by calling __tcp_v4_send_check. + +Because of 2, we can limit the scope of the fix to virtio_net_hdr +that do try to set these fields, with a bogus value. + +Link: https://lore.kernel.org/netdev/20240909094527.GA3048202@port70.net/ +Fixes: 89add40066f9 ("net: drop bad gso csum_start and offset in virtio_net_hdr") +Signed-off-by: Willem de Bruijn +Acked-by: Jason Wang +Acked-by: Michael S. Tsirkin +Cc: stable@vger.kernel.org +Link: https://patch.msgid.link/20240910213553.839926-1-willemdebruijn.kernel@gmail.com +Signed-off-by: Jakub Kicinski + +Upstream-Status: Backport +Signed-off-by: Jon Mason + +--- + include/linux/virtio_net.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h +index 6c395a2600e8..276ca543ef44 100644 +--- a/include/linux/virtio_net.h ++++ b/include/linux/virtio_net.h +@@ -173,7 +173,8 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, + break; + case SKB_GSO_TCPV4: + case SKB_GSO_TCPV6: +- if (skb->csum_offset != offsetof(struct tcphdr, check)) ++ if (skb->ip_summed == CHECKSUM_PARTIAL && ++ skb->csum_offset != offsetof(struct tcphdr, check)) + return -EINVAL; + break; + } +-- +2.39.2 + diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 01803ba20561..ac7bcf7a9ab9 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -65,6 +65,7 @@ KMACHINE:fvp-base = "fvp" FILESEXTRAPATHS:prepend:fvp-base := "${ARMBSPFILESPATHS}:${ARMFILESPATHS}" SRC_URI:append:fvp-base = " \ file://0001-arm64-dts-fvp-Enable-virtio-rng-support.patch \ + file://0001-net-tighten-bad-gso-csum-offset-check-in-virtio_net_.patch \ file://tee.cfg \ ${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \ 'file://no-strict-devmem.cfg', '' , d)} \