From patchwork Tue Aug 13 23:25:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Peixoto X-Patchwork-Id: 1972140 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 4Wk6vk0ccDz1yXl for ; Wed, 14 Aug 2024 09:26:09 +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 1se0tq-000131-Aq; Tue, 13 Aug 2024 23:25:58 +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 1se0to-00012l-3h for kernel-team@lists.ubuntu.com; Tue, 13 Aug 2024 23:25:56 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (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 926A33F322 for ; Tue, 13 Aug 2024 23:25:55 +0000 (UTC) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-70d1df50db2so275028b3a.0 for ; Tue, 13 Aug 2024 16:25:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723591553; x=1724196353; 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=wo3Qe25/3fbFSaz3ne3oKQUBtRdS3NbabKx+7TPONGY=; b=kQEVvd8ucsFUknQ+zPymo/REwwzMZAFoWi/y4TnENuj4HX+4subICI/FM4mKxQ3aN7 BFpUV3TuCx2PWMNNeOzrnFdb7Ig+jkGgYvpqSBNw4c3ueTCJIeebj9pHrC5L2Uk1+WBF 4XCYX8om+mRigQQL6bakQ68M+Eeb44glpqvmQJf0EubshKHsPR+6jIWg19IDVLotiSPE D/kOm7Xq1A0INo49Q0it+QLF70/zktCbcgxyjuSdqUf5KpA3u4+abae5J2iwKZPMDef6 jwy9YVIqhuYeuzt1wDe+J3ClcEgXsImlp8IciPTcAh/EKjBVZ+9uGoTvKBvdtsPO3rM6 ITAQ== X-Gm-Message-State: AOJu0YzmSRx1Ry6tadMrWDdiN4IMPfHtbEECxavcFxAUZtxtgijWAvSr 9E/kj8Fx6HX38KH7YCNCB0wsrxlsy/NQ641dXbs3DztkzUSU/CoDNxMCC6dYcJVTKfsRpVwzBZH 68UrKo9La2NMfSweE2G+cg16MbZPsHbScZZzfBmpPH23LyBK2u/ZTa58WSHlaE+TrkaRdEmaIae jZAg9SlFMSDQ== X-Received: by 2002:a05:6a00:b87:b0:70d:2a1b:422c with SMTP id d2e1a72fcca58-7126a45f2c0mr402261b3a.7.1723591553163; Tue, 13 Aug 2024 16:25:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEN19dfCjEbMHNE+5kyzCaFLhoAc/SSpJN0mwR8RTnYxBXqzq084zmVU7Ii/6WEpBBmtJTT2A== X-Received: by 2002:a05:6a00:b87:b0:70d:2a1b:422c with SMTP id d2e1a72fcca58-7126a45f2c0mr402242b3a.7.1723591552757; Tue, 13 Aug 2024 16:25:52 -0700 (PDT) Received: from canonical.com ([2804:1b3:a700:3d2c:2581:40a7:e5dc:ac36]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-710e5ab56fbsm6237651b3a.200.2024.08.13.16.25.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 16:25:51 -0700 (PDT) From: Vinicius Peixoto To: kernel-team@lists.ubuntu.com Subject: [SRU][noble:linux-gcp][PATCH 0/2] Backport sysctl_tcp_rto_min_us Date: Tue, 13 Aug 2024 20:25:38 -0300 Message-ID: <20240813232540.408387-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 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 + net/ipv4/sysctl_net_ipv4.c | 8 ++++++++ net/ipv4/tcp.c | 4 +++- net/ipv4/tcp_ipv4.c | 1 + net/ipv4/tcp_output.c | 11 ++--------- 6 files changed, 28 insertions(+), 10 deletions(-)