mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-06-02 01:20:09 +00:00
arm-bsp/fvp-base: Get 6.10 kernel working
Apply upstream patch to get virtio networking functioning again and switch to the 6.10 kernel. Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
+59
@@ -0,0 +1,59 @@
|
|||||||
|
From 6513eb3d3191574b58859ef2d6dc26c0277c6f81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Willem de Bruijn <willemb@google.com>
|
||||||
|
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 <willemb@google.com>
|
||||||
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
||||||
|
Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
||||||
|
Cc: stable@vger.kernel.org
|
||||||
|
Link: https://patch.msgid.link/20240910213553.839926-1-willemdebruijn.kernel@gmail.com
|
||||||
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
Signed-off-by: Jon Mason <jon.mason@arm.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
@@ -66,6 +66,7 @@ KMACHINE:fvp-base = "fvp"
|
|||||||
FILESEXTRAPATHS:prepend:fvp-base := "${ARMBSPFILESPATHS}:${ARMFILESPATHS}"
|
FILESEXTRAPATHS:prepend:fvp-base := "${ARMBSPFILESPATHS}:${ARMFILESPATHS}"
|
||||||
SRC_URI:append:fvp-base = " \
|
SRC_URI:append:fvp-base = " \
|
||||||
file://0001-arm64-dts-fvp-Enable-virtio-rng-support.patch \
|
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 \
|
file://tee.cfg \
|
||||||
${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
|
${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
|
||||||
'file://no-strict-devmem.cfg', '' , d)} \
|
'file://no-strict-devmem.cfg', '' , d)} \
|
||||||
|
|||||||
Reference in New Issue
Block a user