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 1CF328045D for ; Tue, 27 Oct 2026 17:29:15 +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 69RHRw4g031713; Tue, 27 Oct 2026 20:27:59 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69RHRw4g031713 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="xdrbxSe8" 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 69RHRvFw031701 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 27 Oct 2026 20:27:57 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69RHRvFw031701 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48dea677afcso46939f8f.1 for ; Tue, 27 Oct 2026 10:27:57 -0700 (PDT) X-Gm-Message-State: AFq9FYIOCTD9dNv7/JD//wq1vl+tBQr8ctEwc7fts8YK3mzBOfxEdWoN hd7dlu6fB+dxEmMhyQN10VjDdMMMAvsOl7BnhKRp7r/7qiNuv6Cpt5Vuyq8qhYknYXqkgPscGDc QyMTLWligcZsNFKzkXrK3fYlGWq6Ao2XOWONUda5KXKi+Bthq/avKrQ== X-Gm-Gg: AYBFou0R9hbHeJ+rtxSxnLGXKkpDYlZRKAtnZjlXG48UpolbKW7xfLq+1lka7FofY6/ 5xFwdfv+fELb9gzWUMyKMo6OG0XtV7GChlTKACT8GMjFB7dkHRg/st+33wmnEgB6sXwNflaZuqz PeLAgZ8oc4Sf2zqYYfStLEmzh/Sl2oRQT94WwFv4eRZH77AEOxkWElsVb1IsRWr5JQslkypKh/V ulK0yHa5X3Qd5XHKVSfaEeqb79cnw5+HPo9avo5P69JSPHyawQP6dbcJzh+IrA/G5QXo49HEvPF DAJoxlpkvgTIDJdXod/eVZshztdUAC0ihkexIwta7SF6WxUys3IX+g9PlvbEPlQCQw+9QdcTh5T LGcpiLrDC8FfoX1kWXA== X-Received: by 2002:adf:fe84:0:b0:48e:4300:c713 with SMTP id ffacd0b85a97d-48e55a3ef8amr5900103f8f.14.1793122077299; Tue, 27 Oct 2026 10:27:57 -0700 (PDT) X-Received: by 2002:adf:fe84:0:b0:48e:4300:c713 with SMTP id ffacd0b85a97d-48e55a3ef8amr5900068f8f.14.1793122076779; Tue, 27 Oct 2026 10:27:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793122076; cv=none; d=google.com; s=arc-20260327; b=AaROOqagrNOgdncQpwKw3lnPWiqQZotB1t0j9sBXK/AD7sQaxLdn12ibbo+2i5vixc bT7qIqG1Q2e5fVAWy9wxdaA3xdAdatLt4oe16/eKkPTsqLwfREAj3qggbVLk/iAD31bB J2WzONKfr3TmMSa+DZCE8Fu6/24YIBWOE0od0+SDW9sPlkAKMKDouWDKitRrtPRShLlt W/ww5+j/JiA+wj/DsvyZk1udPmS5+pWWonyM9BB65NWx54O5v2aaa1bwUOtHBI1bFZ7Y VySPjGNCwAiEnZSQt/L3g1QqrL/WpnjsMlD8R3KF1zi/bbPtv5VASX73RytOKSl4DfCg siBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=022fMKXvRho5vCd3BZ/ZbEFEmi7Oj2n5DEG4CmXPw6k=; fh=496U6L74gpQuvqOBbA5zrz+GM8420zELyytyetWuBXk=; b=VbIfT+aMBNTasN7tP6tEsUqarYIqtP0SiigukFjb7tmDARYkVZEc8xyHARDZ1gLID1 kBd4R/svaUuA+2g7Nr2vugiN0D0e92FaaFRV3oqFcr6A3mN0bg/md3O5++CrqUeNEwWs 20o8g805mUAaragYlIo54VGYjiImjfrkKFRlVxjY3wicMxMt97v9YedXaC6BCjwfVpo4 /UDmIDyKyjzyHdmswJ2Kh0Dj9TtUpXkt5tOpmr2EhQA1bJxM/RfX0JG1aRnaOpoV95by MbJpWHpNt4Uf/GLyrqNZ5QnnPVy43Ir9OkU3Jr4tI/TpFfVfP+DMAQMRgM4DxcfSLL7Q XmdQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=xdrbxSe8; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@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-48e3ed1df9esi18540297f8f.413.2026.10.27.10.27.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2026 10:27:56 -0700 (PDT) Received-SPF: pass (google.com: domain of khorenko@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=xdrbxSe8; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@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=Message-Id:Content-Type:MIME-Version:Subject:Date :From; bh=022fMKXvRho5vCd3BZ/ZbEFEmi7Oj2n5DEG4CmXPw6k=; b=xdrbxSe8Mq2h8Pz78P/ sjoE2FYJ5fv5Y8QxZegJV4HAxw5X7mhbjN/CwDncA0bWFf1TMfwDUlQDvC1QQ42OA/DpKmB2YSg/H RjIWw1XJr1rl3m9EwiRN0TCWF8eXFyxVp/SH043rcVdh84vLixMpfUdbg1JpsXj3ldtybvOIpzlT3 A/Hh4chfGukSgUTHENNhyyivV+zVeMpOplYUCvgs07SuWagBfDBNtQyC+qf5dRoAPZuXVTHEfh8gI wwiRfGDReEFwlChabfS2mPSXs6a7gpHfgKjfFEY6z1aie7NwufETPAZvqRhwppKDqxshxMw+rCqrK 5ZmZQCs2EtN43Pg==; Received: from ch-demo-asa.virtuozzo.com ([130.117.225.8] helo=f0.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xLku3-000dYJ-1x; Tue, 27 Oct 2026 18:27:46 +0100 From: Konstantin Khorenko Date: Tue, 27 Oct 2026 18:27:51 +0100 MIME-Version: 1.0 Message-Id: <20261027-b4-prep-khorenko-vstor-151678-veth-udp-gro-fwd-v2-2-33d8d5c1f257@virtuozzo.com> References: <20261027-b4-prep-khorenko-vstor-151678-veth-udp-gro-fwd-v2-0-33d8d5c1f257@virtuozzo.com> In-Reply-To: <20261027-b4-prep-khorenko-vstor-151678-veth-udp-gro-fwd-v2-0-33d8d5c1f257@virtuozzo.com> To: Eva Kurchatova X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1666; i=khorenko@virtuozzo.com; h=from:subject:message-id; bh=GOBrqoqk15Mntf4QLmEWpFvqVbrHlH/8U1aj1EYiyAo=; b=owEBbQKS/ZANAwAKAVGWCkf5YVwqAcsmYgBq4N8bN9DWyBzXN5STnfHNBC8+RCCiuKI8uqi2M h9XcKEyrzeJAjMEAAEKAB0WIQRWD23IPcXT0GO9CCxRlgpH+WFcKgUCauDfGwAKCRBRlgpH+WFc Ki8fD/96+uOSq0gOXpxAThdiwkqcKwXyGO+EEugSAFNN46Cz0XwQxI/CzuPqYlPZIorKl2mkYDv AEvzQC3Nsjm6V8mjyQixsZnuA+YzJKsW1kTaUmVZMFaLWikhCFyLytI1Goc8P9zo3jLWdAT0pZO 3YNpjIEW4+RpiCYh3qnGj3Nq96D6+cp47qpGY5ehWZbD/o7e/w+uehGaIC98c4DlOJtDhIfOT4+ HocXJjmzjWttY5Fd/KlUGnR6sScyEI8g4fvLbO9crpAi+0g8bKqPwuQ8qFKxOlhWF4/zN3gZ7Fl W1W+5XEyp27Uli5TgSr+gP2lelvhRg8AH4N9ugENlLJSHZtT0+HaqxVDQxzDt7MceS0rd2MFkF+ R0EuyKDPBla6WHiT/Arcms4dOtyLjm83ZvHCgnf/s9b0srS4ASsI71hg1tCZVqHYHk2dG1eGTJJ AJISCxIm+yBAPZHtWYNDo/ttc7TNw8/KcE2k8xtbqqsHeyPeVdLdF5b3lpthg70rxEYgfKZJSs6 FnI8F8lDBF7vHRRXzjA8UxtENSN8m91GrP1PPweMzfN01V51pv8Hcl6BjDGQ52y2E4eDzCF+lc9 GzfgDqvgYrwam5T3Dy8QWXjuN+8re1fiH38x7vmGaQTkUYZk64w05aM8jVFRZWAZmqqItPLtoYd 6W4h4C1qVQtfo4Q== X-Developer-Key: i=khorenko@virtuozzo.com; a=openpgp; fpr=560F6DC83DC5D3D063BD082C51960A47F9615C2A X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 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 From: Eva Kurchatova 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 Reviewed-by: Konstantin Khorenko --- 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 375273572ecb4..4245522d42014 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.43.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel