From patchwork Tue Aug 13 23:26:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Peixoto X-Patchwork-Id: 1972146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wk6wS2P9mz1yXl for ; Wed, 14 Aug 2024 09:26:48 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1se0uZ-0001ey-2R; Tue, 13 Aug 2024 23:26:43 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1se0uX-0001cQ-88 for kernel-team@lists.ubuntu.com; Tue, 13 Aug 2024 23:26:41 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id C21833F322 for ; Tue, 13 Aug 2024 23:26:40 +0000 (UTC) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-2cb600e1169so6277760a91.1 for ; Tue, 13 Aug 2024 16:26:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723591599; x=1724196399; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=G7Bj0OJPXYtZpaCAVtiBrVPy2HMpWLRnApUnv0TEDAg=; b=f8g1cq31c51a6IJ+43eLh+BEYfkF//jf00k/qAYwBB7JhJipvqX+oWhY346GsJOsA+ y3ANg1gVV73bv6grzQzDt/BH3AywJUSdUf6D0m9cBab/bhCEFBjOdvSbgGFip2SXZ8ZG zyuLwf9BjMBxa+qWfliAceXZVtSHoQ9zGamwZI4uzGi0ZHWsIzqxayUnZTKiK4l5Prl0 lJ8CmpNiU4jjiAg5pt+dTVYr/hon8//cZHqY0MkPYq0wRqgrywFWpvtFXMqDgQ9js8kC F4f5kC8zfzxL7xp/KWEmsiJiWnt7pzjyxQp+NFkfDChiy32DkuUq0clWm14xe/rAUVzy ua5w== X-Gm-Message-State: AOJu0YzKumWuuQT5wRm0+XXIGXLwdEd5NbKZhXPZaXMvfs/G/YDWMYq8 xCAoKtKhzuappNtmmD0rEqHstsf5DkhfKErb/qh0qk1Bqlo43MUX1TOljln+EesXomDQAXLQD9J 4TtOabpvkuWWHm13rsWhZ9Eg5ty3BuXvNSvKr+l6OaDSoZmPOUdyiGRJJvfwcRWcnw2qdW0ISNN a+hmvDmX8Cow== X-Received: by 2002:a17:90b:1116:b0:2cf:db0e:89f6 with SMTP id 98e67ed59e1d1-2d3aab87f58mr1223497a91.41.1723591598880; Tue, 13 Aug 2024 16:26:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFx5fLn+1PT6xNAH7KWHx4vIY5fEV6kihq7Q28UpOiCmA9jI47dzJdQ0HaptJE/oK/XnrWJlg== X-Received: by 2002:a17:90b:1116:b0:2cf:db0e:89f6 with SMTP id 98e67ed59e1d1-2d3aab87f58mr1223479a91.41.1723591598471; Tue, 13 Aug 2024 16:26:38 -0700 (PDT) Received: from canonical.com ([2804:1b3:a700:3d2c:2581:40a7:e5dc:ac36]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d3ac8306a6sm147507a91.52.2024.08.13.16.26.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 16:26:37 -0700 (PDT) From: Vinicius Peixoto To: kernel-team@lists.ubuntu.com Subject: [SRU][jammy:linux-gcp][PATCH 0/3] Backport sysctl_tcp_rto_min_us Date: Tue, 13 Aug 2024 20:26:25 -0300 Message-ID: <20240813232628.408515-1-vinicius.peixoto@canonical.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2076950 [Impact] Google has requested backports for the following upstream patches: f086edef71be7174a16c1ed67ac65a085cda28b1 tcp: add sysctl_tcp_rto_min_us 5258da376f3c51332f917087361caf4c76e9e84f tcp: derive delack_max with tcp_rto_min helper [Fix] Noble: * Backported due to context conflicts Jammy: * Clean cherry-pick for pre-req commit f086edef71be * Fixed context the same context conflicts as Noble, plus a few others due to other missing commits that add unrelated TCP sysctls [Test plan] * Build and boot tested * Tested if the new sysctl was added: $ sysctl net.ipv4.tcp_rto_min_us net.ipv4.tcp_rto_min_us = 200000 $ sysctl -w net.ipv4.tcp_rto_min_us=50000 net.ipv4.tcp_rto_min_us = 50000 * Ran the kernel selftests in tools/testing/selftests/net to ensure basic network functionality wasn't compromised [Where problems could occur] Since this this adds new networking functionality, any problems here would impact networking on affected systems. [Other info] #SF 00392021 Eric Dumazet (1): tcp: derive delack_max from rto_min Kevin Yang (2): tcp: derive delack_max with tcp_rto_min helper tcp: add sysctl_tcp_rto_min_us Documentation/networking/ip-sysctl.rst | 13 +++++++++++++ include/net/netns/ipv4.h | 1 + include/net/tcp.h | 2 ++ net/ipv4/sysctl_net_ipv4.c | 8 ++++++++ net/ipv4/tcp.c | 7 +++++-- net/ipv4/tcp_ipv4.c | 2 ++ net/ipv4/tcp_output.c | 9 ++++++++- 7 files changed, 39 insertions(+), 3 deletions(-)