github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 09:04:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'net-gro-fix-outer-network-offset'

Browse Source 
Paolo Abeni says:

====================
net: gro: fix outer network offset

The GRO stage has still problems in some edge scenarios when dealing
with encapsulated traffic: the first patch address an issue there
leading to bad checksums.

The second patch introduces a test case covering the relevant scenario:
S/W segmentation after GRO for encapsulated traffic.
====================

Link: https://patch.msgid.link/cover.1770032084.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2026-02-03 19:23:46 -08:00
commit 6788d44b93
2 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/core/gro.c
View File

@ -265,6 +265,8 @@ static void gro_complete(struct gro_node *gro, struct sk_buff *skb)
goto out;
}
/* NICs can feed encapsulated packets into GRO */
skb->encapsulation = 0;
rcu_read_lock();
list_for_each_entry_rcu(ptype, head, list) {
if (ptype->type != type || !ptype->callbacks.gro_complete)

64
tools/testing/selftests/net/udpgro_fwd.sh
View File

@ -162,6 +162,39 @@ run_test() {
echo " ok"
}
run_test_csum() {
local -r msg="$1"
local -r dst="$2"
local csum_error_filter=UdpInCsumErrors
local csum_errors
printf "%-40s" "$msg"
is_ipv6 "$dst" && csum_error_filter=Udp6InCsumErrors
ip netns exec "$NS_DST" iperf3 -s -1 >/dev/null &
wait_local_port_listen "$NS_DST" 5201 tcp
local spid="$!"
ip netns exec "$NS_SRC" iperf3 -c "$dst" -t 2 >/dev/null
local retc="$?"
wait "$spid"
local rets="$?"
if [ "$rets" -ne 0 ] || [ "$retc" -ne 0 ]; then
echo " fail client exit code $retc, server $rets"
ret=1
return
fi
csum_errors=$(ip netns exec "$NS_DST" nstat -as "$csum_error_filter" |
grep "$csum_error_filter" | awk '{print $2}')
if [ -n "$csum_errors" ] && [ "$csum_errors" -gt 0 ]; then
echo " fail - csum error on receive $csum_errors, expected 0"
ret=1
return
fi
echo " ok"
}
run_bench() {
local -r msg=$1
local -r dst=$2
@ -260,6 +293,37 @@ for family in 4 6; do
ip netns exec $NS_SRC $PING -q -c 1 $OL_NET$DST_NAT >/dev/null
run_test "GRO fwd over UDP tunnel" $OL_NET$DST_NAT 10 10 $OL_NET$DST
cleanup
# force segmentation and re-aggregation
create_vxlan_pair
ip netns exec "$NS_DST" ethtool -K veth"$DST" generic-receive-offload on
ip netns exec "$NS_SRC" ethtool -K veth"$SRC" tso off
ip -n "$NS_SRC" link set dev veth"$SRC" mtu 1430
# forward to a 2nd veth pair
ip -n "$NS_DST" link add br0 type bridge
ip -n "$NS_DST" link set dev veth"$DST" master br0
# segment the aggregated TSO packet, without csum offload
ip -n "$NS_DST" link add veth_segment type veth peer veth_rx
for FEATURE in tso tx-udp-segmentation tx-checksumming; do
ip netns exec "$NS_DST" ethtool -K veth_segment "$FEATURE" off
done
ip -n "$NS_DST" link set dev veth_segment master br0 up
ip -n "$NS_DST" link set dev br0 up
ip -n "$NS_DST" link set dev veth_rx up
# move the lower layer IP in the last added veth
for ADDR in "$BM_NET_V4$DST/24" "$BM_NET_V6$DST/64"; do
# the dad argument will let iproute emit a unharmful warning
# with ipv4 addresses
ip -n "$NS_DST" addr del dev veth"$DST" "$ADDR"
ip -n "$NS_DST" addr add dev veth_rx "$ADDR" \
nodad 2>/dev/null
done
run_test_csum "GSO after GRO" "$OL_NET$DST"
cleanup
done
exit $ret