From patchwork Wed Aug 14 15:09:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Peixoto X-Patchwork-Id: 1972455 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 4WkWrD0mTkz1yXl for ; Thu, 15 Aug 2024 01:09:32 +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 1seFcq-0005vx-S8; Wed, 14 Aug 2024 15:09:24 +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 1seFcp-0005ts-0J for kernel-team@lists.ubuntu.com; Wed, 14 Aug 2024 15:09:23 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 ADD5D3F162 for ; Wed, 14 Aug 2024 15:09:22 +0000 (UTC) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1fc6f3ac7beso55940745ad.1 for ; Wed, 14 Aug 2024 08:09:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723648160; x=1724252960; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lMzilBTcAYGYl6EK1V9n1jHGdsOVkI5WV9R5YCViOv0=; b=UidIbBxs90E2iLIZXl0/u6I5LAwQcd+SWgh/QdAcWydFijdXU/1G/5nPTBKBY6lCEK e9IfbKsd49ZsiIvo5T8x8/vbWxfgLuyAtFHEjF/OtxHL7lsDN6mVaNLcYBw1kJKO/rz4 XaJQ8rbnKMBwX6Vvb870HI1S4xDsnn+bLjlCH/hK8UQiCZbplysaSfkWg/YXoai27yVA vw9waXwHnKDnQHmGaNgfl0829KMIqtSuWLI5b74qOYGRQtNJ3NTP3SoVs0TIjgyyidAc KgS3n0V9SikivZVIfPfG0LNQyXJHpnRBdOQsRXTYDJvpttPr8IHILFibni6NsCjIqmvf vngg== X-Gm-Message-State: AOJu0YxQvXYarn0qE1mAebTCFYz66Uj8Uz2pR7oOsO5dR7yfBYAAFCVh ApWqWUr0X4rPUzhzZy6MeStbQyMLyTIWkP9CU9gXM/L90WVs/r12r7jfmookkEz6wsQ0F4B9XVI rHzsOWQg+mfWCkzdILlerFZOdreE2P3XXJo1jNUi88J5GYRqXq7sQ5wnuRZmdNMMc2IQ0q+zO0e WyyfFPaG8vKw== X-Received: by 2002:a17:902:db04:b0:200:798f:ec4b with SMTP id d9443c01a7336-201d63acf43mr37249285ad.20.1723648160235; Wed, 14 Aug 2024 08:09:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2u04jqA6tGx1DHdt9Hh4dvwmslgnX7zIG5IPG95jU4i/Aau/Lsw8yunX/HIEh/YbD6TTg9Q== X-Received: by 2002:a17:902:db04:b0:200:798f:ec4b with SMTP id d9443c01a7336-201d63acf43mr37248945ad.20.1723648159777; Wed, 14 Aug 2024 08:09:19 -0700 (PDT) Received: from canonical.com ([2804:1b3:a700:3d2c:3248:f628:658d:3fd4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201cd14e084sm30631315ad.110.2024.08.14.08.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 08:09:19 -0700 (PDT) From: Vinicius Peixoto To: kernel-team@lists.ubuntu.com Subject: [SRU][noble:linux-gcp][PATCH v2 0/2] Backport sysctl_tcp_rto_min_us Date: Wed, 14 Aug 2024 12:09:14 -0300 Message-ID: <20240814150916.476249-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 512bd0f9f926a05c724a9fd72bc4e14213845e01 tcp: derive delack_max with tcp_rto_min helper [Fix] Noble: * Backported due to context conflicts Jammy: * Clean cherry-pick for pre-req commit bbf80d713fe7 ("tcp: derive delack_max from rto_min") * Fixed 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 v1 -> v2: - Fix wrong commit hash in the [Impact] section of the cover letter - Fix typo in the [Fix] section of the cover letter - Add a BugLink entry to all commits - Fix commit hashes in the "cherry-picked from ..." sections of the patches 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(-) Acked-by: Magali Lemes Acked-by: Kevin Becker