* [PATCH net-next 1/5] tcp: bpf: support bpf_getsockopt for TCP_BPF_RTO_MIN
2025-03-09 12:29 [PATCH net-next 0/5] tcp: add some RTO MIN and DELACK MAX Jason Xing
@ 2025-03-09 12:30 ` Jason Xing
2025-03-09 12:30 ` [PATCH net-next 2/5] tcp: bpf: support bpf_getsockopt for TCP_BPF_DELACK_MAX Jason Xing
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Jason Xing @ 2025-03-09 12:30 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, dsahern, ast, daniel, andrii,
martin.lau, eddyz87, song, yonghong.song, john.fastabend, kpsingh,
sdf, haoluo, jolsa, horms, kuniyu, ncardwell
Cc: bpf, netdev, Jason Xing
Support bpf_getsockopt if application tries to know what the RTO MIN
of this socket is.
Signed-off-by: Jason Xing <kerneljasonxing@gmail.com>
---
net/core/filter.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/net/core/filter.c b/net/core/filter.c
index a0867c5b32b3..31aef259e104 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -5415,6 +5415,17 @@ static int sol_tcp_sockopt(struct sock *sk, int optname,
if (*optlen < 1)
return -EINVAL;
break;
+ case TCP_BPF_RTO_MIN:
+ if (*optlen != sizeof(int))
+ return -EINVAL;
+ if (getopt) {
+ int rto_min = inet_csk(sk)->icsk_rto_min;
+ int rto_min_us = jiffies_to_usecs(rto_min);
+
+ memcpy(optval, &rto_min_us, *optlen);
+ return 0;
+ }
+ return bpf_sol_tcp_setsockopt(sk, optname, optval, *optlen);
case TCP_BPF_SOCK_OPS_CB_FLAGS:
if (*optlen != sizeof(int))
return -EINVAL;
--
2.43.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH net-next 2/5] tcp: bpf: support bpf_getsockopt for TCP_BPF_DELACK_MAX
2025-03-09 12:29 [PATCH net-next 0/5] tcp: add some RTO MIN and DELACK MAX Jason Xing
2025-03-09 12:30 ` [PATCH net-next 1/5] tcp: bpf: support bpf_getsockopt for TCP_BPF_RTO_MIN Jason Xing
@ 2025-03-09 12:30 ` Jason Xing
2025-03-11 1:21 ` Martin KaFai Lau
2025-03-09 12:30 ` [PATCH net-next 3/5] tcp: support TCP_RTO_MIN_US for set/getsockopt use Jason Xing
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Jason Xing @ 2025-03-09 12:30 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, dsahern, ast, daniel, andrii,
martin.lau, eddyz87, song, yonghong.song, john.fastabend, kpsingh,
sdf, haoluo, jolsa, horms, kuniyu, ncardwell
Cc: bpf, netdev, Jason Xing
Support bpf_getsockopt if application tries to know what the delayed ack
max time is.
Signed-off-by: Jason Xing <kerneljasonxing@gmail.com>
---
net/core/filter.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/net/core/filter.c b/net/core/filter.c
index 31aef259e104..5564917e0c6d 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -5415,6 +5415,17 @@ static int sol_tcp_sockopt(struct sock *sk, int optname,
if (*optlen < 1)
return -EINVAL;
break;
+ case TCP_BPF_DELACK_MAX:
+ if (*optlen != sizeof(int))
+ return -EINVAL;
+ if (getopt) {
+ int delack_max = inet_csk(sk)->icsk_delack_max;
+ int delack_max_us = jiffies_to_usecs(delack_max);
+
+ memcpy(optval, &delack_max_us, *optlen);
+ return 0;
+ }
+ return bpf_sol_tcp_setsockopt(sk, optname, optval, *optlen);
case TCP_BPF_RTO_MIN:
if (*optlen != sizeof(int))
return -EINVAL;
--
2.43.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH net-next 2/5] tcp: bpf: support bpf_getsockopt for TCP_BPF_DELACK_MAX
2025-03-09 12:30 ` [PATCH net-next 2/5] tcp: bpf: support bpf_getsockopt for TCP_BPF_DELACK_MAX Jason Xing
@ 2025-03-11 1:21 ` Martin KaFai Lau
2025-03-11 4:50 ` Jason Xing
0 siblings, 1 reply; 8+ messages in thread
From: Martin KaFai Lau @ 2025-03-11 1:21 UTC (permalink / raw)
To: Jason Xing
Cc: davem, edumazet, kuba, pabeni, dsahern, ast, daniel, andrii,
eddyz87, song, yonghong.song, john.fastabend, kpsingh, sdf,
haoluo, jolsa, horms, kuniyu, ncardwell, bpf, netdev
On 3/9/25 5:30 AM, Jason Xing wrote:
> Support bpf_getsockopt if application tries to know what the delayed ack
> max time is.
>
> Signed-off-by: Jason Xing <kerneljasonxing@gmail.com>
> ---
> net/core/filter.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 31aef259e104..5564917e0c6d 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -5415,6 +5415,17 @@ static int sol_tcp_sockopt(struct sock *sk, int optname,
> if (*optlen < 1)
> return -EINVAL;
> break;
> + case TCP_BPF_DELACK_MAX:
> + if (*optlen != sizeof(int))
> + return -EINVAL;
> + if (getopt) {
> + int delack_max = inet_csk(sk)->icsk_delack_max;
> + int delack_max_us = jiffies_to_usecs(delack_max);
> +
> + memcpy(optval, &delack_max_us, *optlen);
> + return 0;
> + }
> + return bpf_sol_tcp_setsockopt(sk, optname, optval, *optlen);
There are three TCP_BPF_* specific optnames supported by bpf_getsockopt now.
Please take this chance to create a bpf_sol_tcp_getsockopt and refactor the
existing bpf_getsockopt(TCP_BPF_SOCK_OPS_CB_FLAGS) support into it also. The new
bpf_sol_tcp_getsockopt can reject the TCP_BPF_IW and TCP_BPF_SNDCWND_CLAMP.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next 2/5] tcp: bpf: support bpf_getsockopt for TCP_BPF_DELACK_MAX
2025-03-11 1:21 ` Martin KaFai Lau
@ 2025-03-11 4:50 ` Jason Xing
0 siblings, 0 replies; 8+ messages in thread
From: Jason Xing @ 2025-03-11 4:50 UTC (permalink / raw)
To: Martin KaFai Lau
Cc: davem, edumazet, kuba, pabeni, dsahern, ast, daniel, andrii,
eddyz87, song, yonghong.song, john.fastabend, kpsingh, sdf,
haoluo, jolsa, horms, kuniyu, ncardwell, bpf, netdev
On Tue, Mar 11, 2025 at 2:21 AM Martin KaFai Lau <martin.lau@linux.dev> wrote:
>
> On 3/9/25 5:30 AM, Jason Xing wrote:
> > Support bpf_getsockopt if application tries to know what the delayed ack
> > max time is.
> >
> > Signed-off-by: Jason Xing <kerneljasonxing@gmail.com>
> > ---
> > net/core/filter.c | 11 +++++++++++
> > 1 file changed, 11 insertions(+)
> >
> > diff --git a/net/core/filter.c b/net/core/filter.c
> > index 31aef259e104..5564917e0c6d 100644
> > --- a/net/core/filter.c
> > +++ b/net/core/filter.c
> > @@ -5415,6 +5415,17 @@ static int sol_tcp_sockopt(struct sock *sk, int optname,
> > if (*optlen < 1)
> > return -EINVAL;
> > break;
> > + case TCP_BPF_DELACK_MAX:
> > + if (*optlen != sizeof(int))
> > + return -EINVAL;
> > + if (getopt) {
> > + int delack_max = inet_csk(sk)->icsk_delack_max;
> > + int delack_max_us = jiffies_to_usecs(delack_max);
> > +
> > + memcpy(optval, &delack_max_us, *optlen);
> > + return 0;
> > + }
> > + return bpf_sol_tcp_setsockopt(sk, optname, optval, *optlen);
>
> There are three TCP_BPF_* specific optnames supported by bpf_getsockopt now.
> Please take this chance to create a bpf_sol_tcp_getsockopt and refactor the
> existing bpf_getsockopt(TCP_BPF_SOCK_OPS_CB_FLAGS) support into it also. The new
> bpf_sol_tcp_getsockopt can reject the TCP_BPF_IW and TCP_BPF_SNDCWND_CLAMP.
>
Will do it. BTW, it seems then I'm supposed to target bpf-next net branch?
Thanks,
Jason
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH net-next 3/5] tcp: support TCP_RTO_MIN_US for set/getsockopt use
2025-03-09 12:29 [PATCH net-next 0/5] tcp: add some RTO MIN and DELACK MAX Jason Xing
2025-03-09 12:30 ` [PATCH net-next 1/5] tcp: bpf: support bpf_getsockopt for TCP_BPF_RTO_MIN Jason Xing
2025-03-09 12:30 ` [PATCH net-next 2/5] tcp: bpf: support bpf_getsockopt for TCP_BPF_DELACK_MAX Jason Xing
@ 2025-03-09 12:30 ` Jason Xing
2025-03-09 12:30 ` [PATCH net-next 4/5] tcp: support TCP_DELACK_MAX_US " Jason Xing
2025-03-09 12:30 ` [PATCH net-next 5/5] selftests: add bpf_set/getsockopt() for TCP_BPF_DELACK_MAX and TCP_BPF_RTO_MIN Jason Xing
4 siblings, 0 replies; 8+ messages in thread
From: Jason Xing @ 2025-03-09 12:30 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, dsahern, ast, daniel, andrii,
martin.lau, eddyz87, song, yonghong.song, john.fastabend, kpsingh,
sdf, haoluo, jolsa, horms, kuniyu, ncardwell
Cc: bpf, netdev, Jason Xing
Support adjusting RTO MIN for socket level in non BPF case.
Signed-off-by: Jason Xing <kerneljasonxing@gmail.com>
---
Documentation/networking/ip-sysctl.rst | 4 ++--
include/net/tcp.h | 2 +-
include/uapi/linux/tcp.h | 1 +
net/ipv4/tcp.c | 16 +++++++++++++++-
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst
index 054561f8dcae..56eabcff0ed0 100644
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -1229,8 +1229,8 @@ tcp_pingpong_thresh - INTEGER
tcp_rto_min_us - INTEGER
Minimal TCP retransmission timeout (in microseconds). Note that the
rto_min route option has the highest precedence for configuring this
- setting, followed by the TCP_BPF_RTO_MIN socket option, followed by
- this tcp_rto_min_us sysctl.
+ setting, followed by the TCP_BPF_RTO_MIN and TCP_RTO_MIN_US socket
+ options, followed by this tcp_rto_min_us sysctl.
The recommended practice is to use a value less or equal to 200000
microseconds.
diff --git a/include/net/tcp.h b/include/net/tcp.h
index a9bc959fb102..b5873ac43483 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -806,7 +806,7 @@ u32 tcp_delack_max(const struct sock *sk);
static inline u32 tcp_rto_min(const struct sock *sk)
{
const struct dst_entry *dst = __sk_dst_get(sk);
- u32 rto_min = inet_csk(sk)->icsk_rto_min;
+ u32 rto_min = READ_ONCE(inet_csk(sk)->icsk_rto_min);
if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN);
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 32a27b4a5020..b2476cf7058e 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -137,6 +137,7 @@ enum {
#define TCP_IS_MPTCP 43 /* Is MPTCP being used? */
#define TCP_RTO_MAX_MS 44 /* max rto time in ms */
+#define TCP_RTO_MIN_US 45 /* min rto time in us */
#define TCP_REPAIR_ON 1
#define TCP_REPAIR_OFF 0
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index eb5a60c7a9cc..cec944a83c2d 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3352,7 +3352,7 @@ int tcp_disconnect(struct sock *sk, int flags)
icsk->icsk_probes_out = 0;
icsk->icsk_probes_tstamp = 0;
icsk->icsk_rto = TCP_TIMEOUT_INIT;
- icsk->icsk_rto_min = TCP_RTO_MIN;
+ WRITE_ONCE(icsk->icsk_rto_min, TCP_RTO_MIN);
icsk->icsk_delack_max = TCP_DELACK_MAX;
tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
tcp_snd_cwnd_set(tp, TCP_INIT_CWND);
@@ -3833,6 +3833,14 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
return -EINVAL;
WRITE_ONCE(inet_csk(sk)->icsk_rto_max, msecs_to_jiffies(val));
return 0;
+ case TCP_RTO_MIN_US: {
+ int rto_min = usecs_to_jiffies(val);
+
+ if (rto_min > TCP_RTO_MIN || rto_min < TCP_TIMEOUT_MIN)
+ return -EINVAL;
+ WRITE_ONCE(inet_csk(sk)->icsk_rto_min, rto_min);
+ return 0;
+ }
}
sockopt_lock_sock(sk);
@@ -4672,6 +4680,12 @@ int do_tcp_getsockopt(struct sock *sk, int level,
case TCP_RTO_MAX_MS:
val = jiffies_to_msecs(tcp_rto_max(sk));
break;
+ case TCP_RTO_MIN_US: {
+ int rto_min = READ_ONCE(inet_csk(sk)->icsk_rto_min);
+
+ val = jiffies_to_usecs(rto_min);
+ break;
+ }
default:
return -ENOPROTOOPT;
}
--
2.43.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH net-next 4/5] tcp: support TCP_DELACK_MAX_US for set/getsockopt use
2025-03-09 12:29 [PATCH net-next 0/5] tcp: add some RTO MIN and DELACK MAX Jason Xing
` (2 preceding siblings ...)
2025-03-09 12:30 ` [PATCH net-next 3/5] tcp: support TCP_RTO_MIN_US for set/getsockopt use Jason Xing
@ 2025-03-09 12:30 ` Jason Xing
2025-03-09 12:30 ` [PATCH net-next 5/5] selftests: add bpf_set/getsockopt() for TCP_BPF_DELACK_MAX and TCP_BPF_RTO_MIN Jason Xing
4 siblings, 0 replies; 8+ messages in thread
From: Jason Xing @ 2025-03-09 12:30 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, dsahern, ast, daniel, andrii,
martin.lau, eddyz87, song, yonghong.song, john.fastabend, kpsingh,
sdf, haoluo, jolsa, horms, kuniyu, ncardwell
Cc: bpf, netdev, Jason Xing
Support adjusting delayed ack max for socket level in non BPF case.
Signed-off-by: Jason Xing <kerneljasonxing@gmail.com>
---
include/uapi/linux/tcp.h | 1 +
net/ipv4/tcp.c | 16 +++++++++++++++-
net/ipv4/tcp_output.c | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index b2476cf7058e..2377e22f2c4b 100644
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -138,6 +138,7 @@ enum {
#define TCP_IS_MPTCP 43 /* Is MPTCP being used? */
#define TCP_RTO_MAX_MS 44 /* max rto time in ms */
#define TCP_RTO_MIN_US 45 /* min rto time in us */
+#define TCP_DELACK_MAX_US 46 /* max delayed ack time in us */
#define TCP_REPAIR_ON 1
#define TCP_REPAIR_OFF 0
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index cec944a83c2d..100135117cf2 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3353,7 +3353,7 @@ int tcp_disconnect(struct sock *sk, int flags)
icsk->icsk_probes_tstamp = 0;
icsk->icsk_rto = TCP_TIMEOUT_INIT;
WRITE_ONCE(icsk->icsk_rto_min, TCP_RTO_MIN);
- icsk->icsk_delack_max = TCP_DELACK_MAX;
+ WRITE_ONCE(icsk->icsk_delack_max, TCP_DELACK_MAX);
tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
tcp_snd_cwnd_set(tp, TCP_INIT_CWND);
tp->snd_cwnd_cnt = 0;
@@ -3841,6 +3841,14 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
WRITE_ONCE(inet_csk(sk)->icsk_rto_min, rto_min);
return 0;
}
+ case TCP_DELACK_MAX_US: {
+ int delack_max = usecs_to_jiffies(val);
+
+ if (delack_max > TCP_DELACK_MAX || delack_max < TCP_TIMEOUT_MIN)
+ return -EINVAL;
+ WRITE_ONCE(inet_csk(sk)->icsk_delack_max, delack_max);
+ return 0;
+ }
}
sockopt_lock_sock(sk);
@@ -4686,6 +4694,12 @@ int do_tcp_getsockopt(struct sock *sk, int level,
val = jiffies_to_usecs(rto_min);
break;
}
+ case TCP_DELACK_MAX_US: {
+ int delack_max = READ_ONCE(inet_csk(sk)->icsk_delack_max);
+
+ val = jiffies_to_usecs(delack_max);
+ break;
+ }
default:
return -ENOPROTOOPT;
}
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 24e56bf96747..65aa26d65987 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -4179,7 +4179,7 @@ u32 tcp_delack_max(const struct sock *sk)
{
u32 delack_from_rto_min = max(tcp_rto_min(sk), 2) - 1;
- return min(inet_csk(sk)->icsk_delack_max, delack_from_rto_min);
+ return min(READ_ONCE(inet_csk(sk)->icsk_delack_max), delack_from_rto_min);
}
/* Send out a delayed ack, the caller does the policy checking
--
2.43.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH net-next 5/5] selftests: add bpf_set/getsockopt() for TCP_BPF_DELACK_MAX and TCP_BPF_RTO_MIN
2025-03-09 12:29 [PATCH net-next 0/5] tcp: add some RTO MIN and DELACK MAX Jason Xing
` (3 preceding siblings ...)
2025-03-09 12:30 ` [PATCH net-next 4/5] tcp: support TCP_DELACK_MAX_US " Jason Xing
@ 2025-03-09 12:30 ` Jason Xing
4 siblings, 0 replies; 8+ messages in thread
From: Jason Xing @ 2025-03-09 12:30 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, dsahern, ast, daniel, andrii,
martin.lau, eddyz87, song, yonghong.song, john.fastabend, kpsingh,
sdf, haoluo, jolsa, horms, kuniyu, ncardwell
Cc: bpf, netdev, Jason Xing
Add selftests for TCP_BPF_DELACK_MAX and TCP_BPF_RTO_MIN BPF socket
cases.
Signed-off-by: Jason Xing <kerneljasonxing@gmail.com>
---
tools/testing/selftests/bpf/progs/setget_sockopt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/testing/selftests/bpf/progs/setget_sockopt.c b/tools/testing/selftests/bpf/progs/setget_sockopt.c
index 106fe430f41b..7a18a2d089bb 100644
--- a/tools/testing/selftests/bpf/progs/setget_sockopt.c
+++ b/tools/testing/selftests/bpf/progs/setget_sockopt.c
@@ -61,6 +61,8 @@ 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_BPF_DELACK_MAX, .new = 10000, .expected = 10000, },
+ { .opt = TCP_BPF_RTO_MIN, .new = 2000, .expected = 2000, },
{ .opt = TCP_RTO_MAX_MS, .new = 2000, .expected = 2000, },
{ .opt = 0, },
};
--
2.43.5
^ permalink raw reply related [flat|nested] 8+ messages in thread