From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 8E08E8045D for ; Mon, 26 Oct 2026 12:10:21 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69QC95fm010247; Mon, 26 Oct 2026 15:09:06 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69QC95fm010247 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="bqQ05Lw/" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69QC8w6d010230 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 26 Oct 2026 15:08:58 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69QC8w6d010230 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48e1291432aso2015179f8f.2 for ; Mon, 26 Oct 2026 05:08:58 -0700 (PDT) X-Gm-Message-State: AFq9FYKFFz5t3ZmxMX2+JQ1SR48EugU6W+7Lxnak3DH0sD1xsEP678uc ScN1rWeNhFACTcdCcGu6VDTVZV2mGwWagjo0Kw326Nfrj4a6zcM5tqEJrQQbii81Z/B1j0U1+Ui 1mTSsZ/rHd2Obn6/X+MhyeB2RnWPjxsUIGIwkiF2xPOTFh2AOjfN8HA== X-Gm-Gg: AYBFou105kuuL++cPhmTR3y/O++mpi431+pQn4XKNWrHK7UDzKUDDRrA520CX5oRJf7 6Z/1jFXj6MExnxaV6O9kuS30w7u/9QkiXRx3U1MZWb2+zFkgA5x04fFQg/6h72KvZW7CwKXdhj1 MW4yEK78jzXmW3ZXbYCwOOXXSvMvYswQ/IyGT43si50e7EQW3C/rL+SZLf85UEuR0nRKRhlYqFk BhXSezMdkAZEs/JZg9+LTjQHHw4vog5lekJWS+boRzzdNhQKXvKJvPV2bTWT9ZCDX3akFkJhAnz WoyIYcN8Lf0CaSTsFVwboJL/XpPO/JIkGxLczYpsXmOI0HamdbSVJ1x7DXdqIda1LAdyUGgndlE QC4zrrxr8rWxhEhS3pQLb5B3Blw== X-Received: by 2002:a05:6000:27c9:10b0:48d:e6f6:21cf with SMTP id ffacd0b85a97d-48e3eb92704mr9318448f8f.31.1793016537877; Mon, 26 Oct 2026 05:08:57 -0700 (PDT) X-Received: by 2002:a05:6000:27c9:10b0:48d:e6f6:21cf with SMTP id ffacd0b85a97d-48e3eb92704mr9318375f8f.31.1793016537147; Mon, 26 Oct 2026 05:08:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793016537; cv=none; d=google.com; s=arc-20260327; b=sopeQtW2LDJ3l+NAZzP//zQdqYBCIdUX3mOGiYMd1Bb/P0HvZTzHl5NsJZSBYB02KR qj8ABrQeXsuSPW5LIwpHJ15vKvU6uarcLStvO5qDi2+V24zz4V8jzCdclAdKrUJx40iP kuGsjtRLAmFhjZjfps8qhL87FqG59wv5m5hcI86EiRHpLfkHfw4cc2VvNGbWkF7MLkP5 QFkOoVRexAgDiokfVDjvHzVXQDaRGThq9DO4WDWz52lwpaF23aC2MTTKaU3KE+/NJfqp oCueGCGn6ObwiEZzI//jnuU6wJ772lJVYE92N5dcnGd3ZU9pXIniH9PGSRB/tDW0rX90 a44w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=vMnXa6sStaeu8qArr9Z8ddKZ13+R1nH0sn+c5R7kNPs=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=rdgW+Pb9VLs4bJaKNpmAGcSMlFfMkQnxUqB1hb3e5x6xeZigDGVoYri+temj+hBrtq gnFerEzGKCyjRkfORxC1mhdNa1G5D0LxIQFKkxarO9xIuF3tIcyoaT+0srUZBxadjmP+ PcI0VAIrmj5p18xQx1/N1YBOiurPf2ele8SuXIDtOwxYZZ1v5gqpBpCqJDQ2lOmx3Psg MPWbSzPnN8IH36hn75g2bH9yUfdeOtqWmM5PJREv/JzQaUFgSWT7MSaSqQvc8HQ9EnLc dOcfd4+im0H6bHZJTyIQOSAPQfFlwMWpx+DezosRxxv03s+9xEv2OYJlyiKKRhgk1/f8 Jm+w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="bqQ05Lw/"; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-48e3ecdbee3si13900129f8f.62.2026.10.26.05.08.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 05:08:57 -0700 (PDT) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="bqQ05Lw/"; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=vMnXa6sStaeu8qArr9Z8ddKZ13+R1nH0sn+c5R7kNPs=; b=bqQ05Lw/wC3B WTuqmbHNq5GazIeOFKJJIZAkeyprtwZlCkQfX5b1L8NOw1Dc4uGSAVSUr7FmrWq0RIOpG+CyzlLdp ZCcsN4yMZ8OJn6KaLqzuLCXeK3/yrtQX1LdIMDptW6EoZr0aqfROP1TM8NKP9iI47h9gd9AMNbc7R gVHCdDhQYMKl94hdX+Gcg+KXWwqlqIO9aJd0+Tef+Vx4jmNzkGHPzUWRmOgopMNhbXoMSynSMxIbq 2FgntBP6XZXtih8yPNmVLUAhghw5fzvLHAK+EDUeBxEuA22rRBfqhtuXm5Pr+L8uBuvBzgoi+DQSF eh5YQUqX/WytSJQnS7KDOA==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xLJRp-001qcQ-2U; Mon, 26 Oct 2026 13:08:48 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 26 Oct 2026 14:06:25 +0200 Message-ID: <20261026120854.600354-3-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261026120854.600354-1-eva.kurchatova@virtuozzo.com> References: <20261026120854.600354-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 2/2] Revert "udp: let rx-udp-gro-forwarding aggregate under encapsulation" X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org This reverts commit 8ce3afeec4cab80d99076986395ac93e891d1df6. The change made rx-udp-gro-forwarding aggregate for a socket the lookup found, which the feature never meant: it is for packets no local socket takes. A found tunnel socket without its own GRO, wireguard or L2TP, had its packets aggregated and segmented again on delivery, work the host never did before. The veth.sh checks it was made for expect local delivery aggregated, which only happens where nothing looks the socket up; the test was wrong there, not the kernel, and the previous patch fixes the test. Withdrawn upstream on the same grounds. Link: https://lore.kernel.org/netdev/179180161935.434549.5518274080541032248@kernel.org/ https://virtuozzo.atlassian.net/browse/VSTOR-151678 Feature: fix ms/udp Signed-off-by: Eva Kurchatova --- 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 375273572ecb..4245522d4201 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 ((skb->dev->features & NETIF_F_GRO_UDP_FWD) || + if ((!sk && (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