From patchwork Mon Feb 17 03:42:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13977036 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 142691465A1; Mon, 17 Feb 2025 03:43:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739763819; cv=none; b=CAeltrOfPreoarFPhPuBkct4TrKDHLZtG3rfCqDfcoQjcRKVesoEnTA5r4m1Q/0i67+JC5SnCM/yUVxdBvDeyE4r94wBdw94g9II3CU9XS2NGRGWeeEMk+nPS9VgeoiHzApkAh4YlsDfhLIKyTF8/2CfDHbjR3ykRwI7zeOQolY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739763819; c=relaxed/simple; bh=bm3Fy8sl1aN8XdpnW2UjmK0bOKh0X/2BJU26n5vFYFE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OXIl6x91Qbrdnsm8hCgy2O6DQQhkV2A6lMPAd3osO3jAQCZEmKgelhbPb5gd/G7tAAdX7NbhoEcM3R71mV3ULIYy0yJs1eXZNc7Ft1FDSe+hmZ3opIINB2doF3YnWT9EPwF0B3mvAHI56WjnUJy5vGn/X2Rb4H0xzhIqH3fT5ow= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=h5xgITQe; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h5xgITQe" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-220e989edb6so71547925ad.1; Sun, 16 Feb 2025 19:43:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739763817; x=1740368617; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FojXSWZGABebOdYwZgu1ws1LIUxxrDs78QA+roIVn5o=; b=h5xgITQeOV6yjOdq7FqiAt1ciKmWsKt8Pz1/05hxem1OYRPyazC7LOgH5xIsCK2q39 kkbV5Djb5SuvoC5dms5o2KfY81AB0xlFBrS8QLwtJRGclly1VGhIuy+Z/kOISwunpB6l Ovgsbaw7KHS47P3h6FgNuCY/3K6QXAVRoU9tGb3gyOYIDCRccEfsrxvMCT0uWLBOg2Tg IJ9KBVOENvm86YeU+47G4e6uYeyXpcJM97I91P+vDGZPbS6xEuzQfpnipaNGpD44npPl a+01diPSMKEChEDHZ9eGvP7Vk7SJtMaX6ob0pWhBhJYPUcpTUcjZSjVyvjzyE85IQfkM M7hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739763817; x=1740368617; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FojXSWZGABebOdYwZgu1ws1LIUxxrDs78QA+roIVn5o=; b=d982rFMkjcTxoz8NvH5m0wmPBcK9LVbqxqLLHAfKcjqT3bjZ5TkASc4+e19SwU79OA 6gFJm5wf/mPWbv6PqaC7KBgdz+KxqW3E8S43+IJfYBaOSBYXbyANlDEVc6HPq7AZK6Bb XhIpRu0bOtFQMwTHOPXHfDquysxF8MHIUTUFSoP5gNXMnVvu9mtFhS09GVIUsTuk9LCt h5HGFJkE2CbZmIUnL0DA2Oh4D2BOoyGMTD5VdomXPD/IFRXEllIueTXVWIS50hl/nhJO F7C4G43V1UchpV39uzuetJJNHZh/cNoJWkRYA/VICx9Xc/GCQ2QHXWmwXbIril/zr8UW Cabg== X-Forwarded-Encrypted: i=1; AJvYcCWoozXy3KSfDA1SLa5+Dl6PXBhogKak5BP9jZfIG9PvCqy6PCHjeoABZkXNmwk8AD2uKZiDoFY=@vger.kernel.org X-Gm-Message-State: AOJu0Yxkwr0Ffqox2GAsd9f20dhum4IobY0NK3OhAYmSQPm1Jbj+H3a/ oyCQWcrQht4ttseoKRGYx97VxImmkbs58uXE/e4P00468IyFDg33 X-Gm-Gg: ASbGncvzpSIPnPZ1rIRX32MkcwV1huEpiQkHVupFx5Mm0haN29FACjhM11TDro1LGI7 OJdhaEYrZyFAioxmlpVvq4dsaYtmsNnKbaOgbl+euyY798PSo4Toy7f7SE7i7VQRR0UTqBtCSCb +aPHCebgzLHVMd3VOAmbWHpd+xSRffpoiiqdTqfdGMGqJ0La/YMqoRlNzYrb98FKb2sokT981ao sM34E+biW6zg5Np3dJloVJEhqlqu1NrrUzBeNzvYWfCDlBaMt7Goj5Ja43iQBl7X4jOFnZOrsKu 32X1X+s78wF+piWzJY83rhkjiL1IVWxZAZkiuewKZ/ASoQQjfNMhuEowN7HI+84= X-Google-Smtp-Source: AGHT+IGEoYeF0BIeaq9N5q1kx/aHSwvh5ktWu/q92oBWnZaCSwg0+55H6xyi6ObKs++PatW9G+natQ== X-Received: by 2002:a17:902:e5d2:b0:20c:6399:d637 with SMTP id d9443c01a7336-221040a9b2dmr135023935ad.40.1739763817289; Sun, 16 Feb 2025 19:43:37 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536b047sm61966585ad.101.2025.02.16.19.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 19:43:36 -0800 (PST) From: Jason Xing To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, kuniyu@amazon.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, ykolal@fb.com Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v2 1/3] tcp: add TCP_RTO_MAX_MIN_SEC definition Date: Mon, 17 Feb 2025 11:42:43 +0800 Message-Id: <20250217034245.11063-2-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250217034245.11063-1-kerneljasonxing@gmail.com> References: <20250217034245.11063-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Add minimum value definition as the lower bound of RTO MAX set by users. No functional changes here. Reviewed-by: Kuniyuki Iwashima Signed-off-by: Jason Xing --- include/net/tcp.h | 1 + net/ipv4/sysctl_net_ipv4.c | 3 ++- net/ipv4/tcp.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 7fd2d7fa4532..b6bedbe68636 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -143,6 +143,7 @@ static_assert((1 << ATO_BITS) > TCP_DELACK_MAX); #define TCP_DELACK_MIN 4U #define TCP_ATO_MIN 4U #endif +#define TCP_RTO_MAX_MIN_SEC 1 #define TCP_RTO_MAX_SEC 120 #define TCP_RTO_MAX ((unsigned)(TCP_RTO_MAX_SEC * HZ)) #define TCP_RTO_MIN ((unsigned)(HZ / 5)) diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 3a43010d726f..53942c225e0b 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -28,6 +28,7 @@ static int tcp_adv_win_scale_max = 31; static int tcp_app_win_max = 31; static int tcp_min_snd_mss_min = TCP_MIN_SND_MSS; static int tcp_min_snd_mss_max = 65535; +static int tcp_rto_max_min = TCP_RTO_MAX_MIN_SEC * MSEC_PER_SEC; static int tcp_rto_max_max = TCP_RTO_MAX_SEC * MSEC_PER_SEC; static int ip_privileged_port_min; static int ip_privileged_port_max = 65535; @@ -1590,7 +1591,7 @@ static struct ctl_table ipv4_net_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ONE_THOUSAND, + .extra1 = &tcp_rto_max_min, .extra2 = &tcp_rto_max_max, }, }; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 992d5c9b2487..2373ab1a1d47 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3812,7 +3812,8 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname, TCP_RTO_MAX / HZ)); return 0; case TCP_RTO_MAX_MS: - if (val < MSEC_PER_SEC || val > TCP_RTO_MAX_SEC * MSEC_PER_SEC) + if (val < TCP_RTO_MAX_MIN_SEC * MSEC_PER_SEC || + val > TCP_RTO_MAX_SEC * MSEC_PER_SEC) return -EINVAL; WRITE_ONCE(inet_csk(sk)->icsk_rto_max, msecs_to_jiffies(val)); return 0; From patchwork Mon Feb 17 03:42:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13977037 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00C3E1531E9; Mon, 17 Feb 2025 03:43:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739763825; cv=none; b=siN8xcArnijCRpTbzCu8PaUWTO98QcmvBpuC8oHWRqvUMjISrO2JOEE8RIDgO3qoLVw2fWIw64SDwEA3Q1zCq/f/cMIpsp51h/Iru/xzSyU8DA+25aZFsuo58PLMY8YEm7Feug3FbyYEMjm3mcrUh9U392OHoBeJYCqHRogdDgI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739763825; c=relaxed/simple; bh=FBcJp9oqBtHgTXIQ0nluk1qGKr+1altiJ5AKiI+z7pc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QKcZKzgzxC9AGZE9uXnPd+15d3xNtrRkPwhDWFlFH1zQV4Dns0XVN4A/9dP0eINsHysXDfvuUKHceLBJ1qLS9cSWO+KnJ7qZZgCitcA0Ayq8Sv8E7Qx3To39NNK/YUKd3UpjTOEGY5JH0I/kU8NH3/iaYMVgYhVX0jzCK7eWSj4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eEoi77KM; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eEoi77KM" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-220ec47991aso34622045ad.1; Sun, 16 Feb 2025 19:43:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739763823; x=1740368623; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V7PZ/JXec2sS9s17cIhf6J+D/ZmzZ33uHOow6MZzhj8=; b=eEoi77KMo/ck7Z5aWDVk1kM5O51a5vKqtRAv8BrsxA8gMvyAt6iE21+uhUwBfM1LoD YY2Br6KOjWBsX4LF7CIVeuy4GoU+Dc8xAWfBfbMBJmLXJ89STBkOaFGnVucWq3NCggj0 h7eSUUthonpHbI4aFuF0pwpHMmrr3M/wJqtdoLSYTwZK4xfb5b8NHrETIMFP0B2clHVf wngwSp67y2tBCvSN4/mRzps+npzK+tU3s8J0bsxfozb1UQDm25l8jAGNBKZt1BQ2FEG4 RCwLzmoFLqVTQHICuXhEcMmtIhPHZSpZbcQAlPOFk7lph7vugnBG4R+dZ3jwJzwovZHv mDxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739763823; x=1740368623; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V7PZ/JXec2sS9s17cIhf6J+D/ZmzZ33uHOow6MZzhj8=; b=Z6BoWpFCCuC9qIAEPq5HpWWaUV6riVOM7oL249K8xOTogfAnu+nZm+rnkSGlxZ3pRa hfC6kEo8zIfrXY7sXZmbkE45mo9aW6roiRrjoYis9dU+G2xHfwADYIJleNPpM5kgCx9y ZNX+58bNuqS9AHYjuc5K2vYwqA5x9zRGHF0B/gGmOLFLOMT561vAOg6GKn/Shbyzc00Y VdHuCp8n6DlodKIz+YdPJYaEZh3m0gxwXAmyPBwCwpA9BM23B67mg4RKh30wPxZvZ+3R wguzh0hi2vqvr10r41OKL1Pdo9PznsZaVmU37Wi28sweo3vT3KA2nnh3VOfuJ9ZzwUGq hVRw== X-Forwarded-Encrypted: i=1; AJvYcCWKGq0LIsYY22XSrDUYfBcBrNTFE3wLq5UdxHxyA0eCmw6W/6mWokrwOldrjQteq71Hx1ggY+E=@vger.kernel.org X-Gm-Message-State: AOJu0YyZxie6miKpJIbWFAC+0iKoyQNeJQ7/M5LiZ+C3PyPcPSYcxrJw pywDJgdSQXylVNYwJLk2M4GyAvlln0GjMXu0WLh7kF6v2I9wwyEG X-Gm-Gg: ASbGnctj6wBYqlnUG9r5wAJbXa1UOuWaY1FXcACvRez/O7v7z5V0qF+VREd3IGg9Jyw sdwE4IznYvb/OerUSp/TTgMCFpaDoRaqvsWdMsaEFEkboe4kgASGreV5psZVf84skcrCVAoWCyj gy02vb81mERL5oL5NMP/lNwzpDj0mLYn1os8SEkqBmc1VHRH39Y91sZabiSpEj5JjZDh1jBjEvN TmE2HRSlA6j7GnnujP9knrQ/zeRMEniN2pVGJdMxXOoL9BUQXlrn2/KuS7UKjyLaiAAcMZ+nfXG e7uzU3s5+YCK3ILnL9vJW/X3/30UScmrk3L+LMwiq6pr8AoNEp1XYjLvVSIcpyA= X-Google-Smtp-Source: AGHT+IHQRE1vt6lmboosX9eGV6PAYsfEkKNzfQEjyUmNC4Qse6RXjY7eJIZR/zJNXEMmjps0GThNyg== X-Received: by 2002:a17:902:e546:b0:220:d79f:60f1 with SMTP id d9443c01a7336-2210408cdabmr119818205ad.42.1739763823131; Sun, 16 Feb 2025 19:43:43 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536b047sm61966585ad.101.2025.02.16.19.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 19:43:42 -0800 (PST) From: Jason Xing To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, kuniyu@amazon.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, ykolal@fb.com Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v2 2/3] bpf: support TCP_RTO_MAX_MS for bpf_setsockopt Date: Mon, 17 Feb 2025 11:42:44 +0800 Message-Id: <20250217034245.11063-3-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250217034245.11063-1-kerneljasonxing@gmail.com> References: <20250217034245.11063-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Some applications don't want to wait for too long because the time of retransmission increases exponentially and can reach more than 10 seconds, for example. Eric implements the core logic on supporting rto max feature in the stack previously. Based on that, we can support it for BPF use. This patch reuses the same logic of TCP_RTO_MAX_MS in do_tcp_setsockopt() and do_tcp_getsockopt(). BPF program can call bpf_{set/get}sockopt() to set/get the maximum value of RTO. It would be good if a BPF program sets max value of RTO before transmission as we can see in the later patch (selftests). Signed-off-by: Jason Xing Reviewed-by: Kuniyuki Iwashima --- net/core/filter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/core/filter.c b/net/core/filter.c index 2ec162dd83c4..ffec7b4357f9 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5382,6 +5382,7 @@ static int sol_tcp_sockopt(struct sock *sk, int optname, case TCP_USER_TIMEOUT: case TCP_NOTSENT_LOWAT: case TCP_SAVE_SYN: + case TCP_RTO_MAX_MS: if (*optlen != sizeof(int)) return -EINVAL; break; From patchwork Mon Feb 17 03:42:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13977038 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B14C71531E9; Mon, 17 Feb 2025 03:43:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739763831; cv=none; b=H6r3jHIy9YHgM0JL/O9j7kOROhVt1gv13H2qIlbzO4CdQptbtBwlX9ZTjEe3yoLIOPXoSRZmwT/1XKyOYGEMPm07XHPmfGBD71oHi9hR/nG/f3etDsr9CCdIp6hPDoMI7oWYRAPFdk+VdqzKce+MXG42FNLmJvNCIRvYMdxUw4Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739763831; c=relaxed/simple; bh=9QNM3AscLlH25zdbGoqJzoGC3Cbg2xkQ4m6U6PwOPUQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U1yn4tmLJYjT7qUGvo5D5NK0ETXiVsbYafmUnOnJWbTtCCpFAOeZUM+afb+2w1zaVr378Su8FgpQFfKX/HBAohqCpYFQrUQQvnuyicLFQDgpI+FRl+w2Ow1WDd00B/lY3UJ9l7eF8+disw316AvqZkk2IzF06xCVKHg969UCe2k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JRLcduPR; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JRLcduPR" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2fc33aef343so4294649a91.1; Sun, 16 Feb 2025 19:43:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739763829; x=1740368629; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B57NruNT8Me/w38M2LO6Hk9MWp+zWLpI7IL2YwomIyQ=; b=JRLcduPRxMVndTgH4bNxHtVwoD+iwrfIRCMljfkrmD2thgVNbHCtrl0om0TSW6lWfX dYAqzNHMvLprdN00O6z4qGgYx/Wnh3u7ZJ+ewFc/vK/40zgx/SMy1lBR+EIomder+MZP tDYbAUhuo0JCpJHOWljQxFphJosGD4uWnxRbrbVUk32YbIq0pfMCeJlxGuGy3AE9WQR9 KlFuHD8gSNviCx1PtcHdEzwccINEFpWdhIJIca+jrbbChwKc1b1Ij9NvBI3g2xmqC5lT uiGIYU6F5aPv074tV7jY4Bcv/YwCkmkRJ7qu85PilqTTB0xkprd8wXUwZTcOwIGXdRgS aZZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739763829; x=1740368629; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B57NruNT8Me/w38M2LO6Hk9MWp+zWLpI7IL2YwomIyQ=; b=svceCUa/HBpZT5piwIpHhjOB2KclIGTSUjMxQeukUgU65Qho+sBWHWmWasxL0EmtZu VQZuOjRLpBbh9iFWg+j1ZJvvsT8LgUPQIGjluz3OU6FwIgaDaRxR4H2r1jd0Jzi5bYG7 UOjZQBjHfCIem1GT96YxeLcH81gwAy3USy/sKYY60oovu4P/ys042bEqYe/llehAPKcf n4R/GlbQLIVBm5mVaV5Xj6fksF2DE4X/8wWvSeuYKEhoIRDeBMMXwvgko8gkb6dGV9fd xNL7vjCo1t9DWq5ChSAzA2U3Gssb7qzWr/rKfJ4CV3+GJdXIuwjc7je0crQsa465XzdL 1IzQ== X-Forwarded-Encrypted: i=1; AJvYcCV0Ec9DV6RihFbLi0trAKc5VPwtg9sVG4T9S4xAKYsgSq1a6oAlQLdxqweUEhWkfiBecPwSvY0=@vger.kernel.org X-Gm-Message-State: AOJu0Yzq7rMzWx24t5j1EBVX1ceycf7p4I5/OTypw8B3ML4j4NwfYTIs vCCCKBf/OYv/eRfjErDYvUxRZYpv82O/pL+2xbtHHfLAdr6HdSlJ X-Gm-Gg: ASbGncs51Btb2x9gCP6OyNvlYXIjnALcmdgNCHci5Q8/xZ+YOPrc5PwuO9LYyw5x+Vt 3FGAc9tg3Wr8iFeMwACdzCtYBX3W4NviNAkg4BA1BWDVz9IgiLl8up3puGc41hUlEy5NrBL5w9C rjzTfXwnhVCnjvIo6DYy8ZdiYy3J94ckWHPMV0szerZE9aut3QwBfwjuXJn/3cMs9irQg8h6Ya5 sWYpkPcZwDdkopqWmq/9cG5N6zrnH8qWpIevOgMeyX4UQ1cX8Bo3vp1XjgRbg2zEifK/NOR0oH6 NfFjF2giSZeoqz1LouKMDzTE5IqUGU51u3FiFU6eYWSfpyAw7Pn7C2B3L/nxfKc= X-Google-Smtp-Source: AGHT+IEs+22WmmhwfGOFkeqzMbKXOL89TanbzvuylQy7Tc3in0VurD10NCuELWaHJjVAvZxQ5QwYog== X-Received: by 2002:a17:90b:4a0c:b0:2ee:aed6:9ec2 with SMTP id 98e67ed59e1d1-2fc40f10287mr14653472a91.14.1739763828996; Sun, 16 Feb 2025 19:43:48 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536b047sm61966585ad.101.2025.02.16.19.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 19:43:48 -0800 (PST) From: Jason Xing To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, kuniyu@amazon.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, ykolal@fb.com Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v2 3/3] selftests/bpf: add rto max for bpf_setsockopt test Date: Mon, 17 Feb 2025 11:42:45 +0800 Message-Id: <20250217034245.11063-4-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250217034245.11063-1-kerneljasonxing@gmail.com> References: <20250217034245.11063-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Add TCP_RTO_MAX_MS selftests for active and passive flows in various bpf callbacks. Even though the TCP_RTO_MAX_MS can be used in established phase, we highly discourage to do so because it may trigger unexpected behaviour. On the contrary, it's highly recommended that the maximum value of RTO is set before first time of transmission, such as BPF_SOCK_OPS_{PASSIVE|ACTIVE}_ESTABLISHED_CB, Signed-off-by: Jason Xing --- tools/include/uapi/linux/tcp.h | 1 + tools/testing/selftests/bpf/progs/bpf_tracing_net.h | 1 + tools/testing/selftests/bpf/progs/setget_sockopt.c | 1 + 3 files changed, 3 insertions(+) diff --git a/tools/include/uapi/linux/tcp.h b/tools/include/uapi/linux/tcp.h index 13ceeb395eb8..7989e3f34a58 100644 --- a/tools/include/uapi/linux/tcp.h +++ b/tools/include/uapi/linux/tcp.h @@ -128,6 +128,7 @@ enum { #define TCP_CM_INQ TCP_INQ #define TCP_TX_DELAY 37 /* delay outgoing packets by XX usec */ +#define TCP_RTO_MAX_MS 44 /* max rto time in ms */ #define TCP_REPAIR_ON 1 diff --git a/tools/testing/selftests/bpf/progs/bpf_tracing_net.h b/tools/testing/selftests/bpf/progs/bpf_tracing_net.h index 59843b430f76..eb6ed1b7b2ef 100644 --- a/tools/testing/selftests/bpf/progs/bpf_tracing_net.h +++ b/tools/testing/selftests/bpf/progs/bpf_tracing_net.h @@ -49,6 +49,7 @@ #define TCP_SAVED_SYN 28 #define TCP_CA_NAME_MAX 16 #define TCP_NAGLE_OFF 1 +#define TCP_RTO_MAX_MS 44 #define TCP_ECN_OK 1 #define TCP_ECN_QUEUE_CWR 2 diff --git a/tools/testing/selftests/bpf/progs/setget_sockopt.c b/tools/testing/selftests/bpf/progs/setget_sockopt.c index 6dd4318debbf..106fe430f41b 100644 --- a/tools/testing/selftests/bpf/progs/setget_sockopt.c +++ b/tools/testing/selftests/bpf/progs/setget_sockopt.c @@ -61,6 +61,7 @@ static const struct sockopt_test sol_tcp_tests[] = { { .opt = TCP_NOTSENT_LOWAT, .new = 1314, .expected = 1314, }, { .opt = TCP_BPF_SOCK_OPS_CB_FLAGS, .new = BPF_SOCK_OPS_ALL_CB_FLAGS, .expected = BPF_SOCK_OPS_ALL_CB_FLAGS, }, + { .opt = TCP_RTO_MAX_MS, .new = 2000, .expected = 2000, }, { .opt = 0, }, };