[Devel] [PATCH hci-8.1 0/1] udp: let rx-udp-gro-forwarding aggregate under encapsulation

[Devel] [PATCH hci-8.1 0/1] udp: let rx-udp-gro-forwarding aggregate under encapsulation

[Eva Kurchatova]

Patchset for task https://virtuozzo.atlassian.net/browse/VSTOR-139651

Fixes the kernel UDP GRO forwarding instead of a kselftest skip.

Eva Kurchatova (1):
  udp: let rx-udp-gro-forwarding aggregate under encapsulation

 net/ipv4/udp_offload.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.56.0

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

[Devel] [PATCH hci-8.1 1/1] udp: let rx-udp-gro-forwarding aggregate under encapsulation

[Eva Kurchatova]

The rx-udp-gro-forwarding checks of the veth selftest fail with "got
10 packets, expected 1" on a host where something uses UDP encap,
for example a vxlan, and pass on a host where nothing does.

Since commit f2e9de210d50 ("udp: gro behind static key") the receiving
socket is looked up only once a tunnel socket exists, and commit
36707061d6ba ("udp: allow forwarding of plain (non-fraglisted) UDP GRO
packets") takes "no socket found" for "forwarded" and aggregates only
then. So the device setting works on a host without a tunnel and stops
working with one.

Aggregate whenever the device asks, socket found or not. That is what
every host without a tunnel has done all along: a local socket without
UDP_GRO gets the packets resegmented on delivery, and a tunnel socket
keeps its own receive path.

https://virtuozzo.atlassian.net/browse/VSTOR-139651
Feature: fix ms/udp
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
 net/ipv4/udp_offload.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 4245522d4201..375273572ecb 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -650,7 +650,7 @@ struct sk_buff *udp_gro_receive(struct list_head *head, struct sk_buff *skb,
 		if (skb->dev->features & NETIF_F_GRO_FRAGLIST)
 			NAPI_GRO_CB(skb)->is_flist = sk ? !udp_test_bit(GRO_ENABLED, sk) : 1;
 
-		if ((!sk && (skb->dev->features & NETIF_F_GRO_UDP_FWD)) ||
+		if ((skb->dev->features & NETIF_F_GRO_UDP_FWD) ||
 		    (sk && udp_test_bit(GRO_ENABLED, sk)) || NAPI_GRO_CB(skb)->is_flist)
 			return call_gro_receive(udp_gro_receive_segment, head, skb);
 
-- 
2.56.0

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

Re: [Devel] [PATCH hci-8.1 1/1] udp: let rx-udp-gro-forwarding aggregate under encapsulation

[no-reply]

> The rx-udp-gro-forwarding checks of the veth selftest fail with "got
> 10 packets, expected 1" on a host where something uses UDP encap,
> for example a vxlan, and pass on a host where nothing does.
> 
> Since commit f2e9de210d50 ("udp: gro behind static key") the receiving
> socket is looked up only once a tunnel socket exists, and commit
> 36707061d6ba ("udp: allow forwarding of plain (non-fraglisted) UDP GRO
> packets") takes "no socket found" for "forwarded" and aggregates only
> then. So the device setting works on a host without a tunnel and stops
> working with one.
> 
> Aggregate whenever the device asks, socket found or not. That is what
> every host without a tunnel has done all along: a local socket without
> UDP_GRO gets the packets resegmented on delivery, and a tunnel socket
> keeps its own receive path.
> 
> https://virtuozzo.atlassian.net/browse/VSTOR-139651
> Feature: fix ms/udp
> Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>

Sashiko has reviewed this patch and found no issues. It looks great!

-- 
Sashiko AI review · https://sashiko.vzint.dev/#/patchset/20261007202324.2719416-1-eva.kurchatova@virtuozzo.com?part=1


_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

Re: [Devel] [PATCH hci-8.1 1/1] udp: let rx-udp-gro-forwarding aggregate under encapsulation

[Konstantin Khorenko]

Please create a task and send this patch to upstream as well.

-- 
Konstantin Khorenko <khorenko@virtuozzo.com>
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

Re: [Devel] [PATCH hci-8.1 0/1] udp: let rx-udp-gro-forwarding aggregate under encapsulation

[Konstantin Khorenko]

On Wed, 07 Oct 2026 23:22:37 +0300, Eva Kurchatova <eva.kurchatova@virtuozzo.com> wrote:
> udp: let rx-udp-gro-forwarding aggregate under encapsulation
> 
> Patchset for task https://virtuozzo.atlassian.net/browse/VSTOR-139651
> 
> Fixes the kernel UDP GRO forwarding instead of a kselftest skip.
> 
> Eva Kurchatova (1):
>   udp: let rx-udp-gro-forwarding aggregate under encapsulation
> 
> [...]

Reviewed-by: Konstantin Khorenko <khorenko@virtuozzo.com>

-- 
Konstantin Khorenko <khorenko@virtuozzo.com>
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

Re: [Devel] [PATCH hci-8.1 0/1] udp: let rx-udp-gro-forwarding aggregate under encapsulation

[Konstantin Khorenko]

On Wed, 07 Oct 2026 23:22:37 +0300, Eva Kurchatova wrote:
> udp: let rx-udp-gro-forwarding aggregate under encapsulation
> 
> Patchset for task https://virtuozzo.atlassian.net/browse/VSTOR-139651
> 
> Fixes the kernel UDP GRO forwarding instead of a kselftest skip.
> 
> Eva Kurchatova (1):
>   udp: let rx-udp-gro-forwarding aggregate under encapsulation
> 
> [...]

Applied to branch-rh10-6.12.0-211.52.1.22.x.vz10-ovz, will be released in rh10-6.12.0-211.52.1.22.9.vz10, thanks!

[1/1] udp: let rx-udp-gro-forwarding aggregate under encapsulation
      https://bitbucket.org/virtuozzocore/vzkernel.vzs/commits/8ce3afeec4ca

-- 
Konstantin Khorenko <khorenko@virtuozzo.com>

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel