From: Kuniyuki Iwashima <kuniyu@amazon.com>
To: <kerneljasonxing@gmail.com>
Cc: <andrii@kernel.org>, <ast@kernel.org>, <bpf@vger.kernel.org>,
<daniel@iogearbox.net>, <davem@davemloft.net>,
<dsahern@kernel.org>, <eddyz87@gmail.com>, <edumazet@google.com>,
<haoluo@google.com>, <horms@kernel.org>,
<john.fastabend@gmail.com>, <jolsa@kernel.org>,
<kpsingh@kernel.org>, <kuba@kernel.org>, <kuniyu@amazon.com>,
<martin.lau@linux.dev>, <ncardwell@google.com>,
<netdev@vger.kernel.org>, <pabeni@redhat.com>, <sdf@fomichev.me>,
<song@kernel.org>, <yonghong.song@linux.dev>
Subject: Re: [PATCH net-next 2/3] bpf: add TCP_BPF_RTO_MAX for bpf_setsockopt
Date: Thu, 13 Feb 2025 11:25:01 +0900 [thread overview]
Message-ID: <20250213022501.76123-1-kuniyu@amazon.com> (raw)
In-Reply-To: <20250213004355.38918-3-kerneljasonxing@gmail.com>
From: Jason Xing <kerneljasonxing@gmail.com>
Date: Thu, 13 Feb 2025 08:43:53 +0800
> Support bpf_setsockopt() to set the maximum value of RTO for
> BPF program.
>
> Signed-off-by: Jason Xing <kerneljasonxing@gmail.com>
> ---
> Documentation/networking/ip-sysctl.rst | 3 ++-
> include/uapi/linux/bpf.h | 2 ++
> net/core/filter.c | 6 ++++++
> tools/include/uapi/linux/bpf.h | 2 ++
> 4 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst
> index 054561f8dcae..78eb0959438a 100644
> --- a/Documentation/networking/ip-sysctl.rst
> +++ b/Documentation/networking/ip-sysctl.rst
> @@ -1241,7 +1241,8 @@ tcp_rto_min_us - INTEGER
>
> tcp_rto_max_ms - INTEGER
> Maximal TCP retransmission timeout (in ms).
> - Note that TCP_RTO_MAX_MS socket option has higher precedence.
> + Note that TCP_BPF_RTO_MAX and TCP_RTO_MAX_MS socket option have the
> + higher precedence for configuring this setting.
>
> When changing tcp_rto_max_ms, it is important to understand
> that tcp_retries2 might need a change.
> diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
> index 2acf9b336371..8ab6ef144217 100644
> --- a/include/uapi/linux/bpf.h
> +++ b/include/uapi/linux/bpf.h
> @@ -2868,6 +2868,7 @@ union bpf_attr {
> * **TCP_NODELAY**, **TCP_MAXSEG**, **TCP_WINDOW_CLAMP**,
> * **TCP_THIN_LINEAR_TIMEOUTS**, **TCP_BPF_DELACK_MAX**,
> * **TCP_BPF_RTO_MIN**, **TCP_BPF_SOCK_OPS_CB_FLAGS**.
> + * **TCP_BPF_RTO_MAX**
> * * **IPPROTO_IP**, which supports *optname* **IP_TOS**.
> * * **IPPROTO_IPV6**, which supports the following *optname*\ s:
> * **IPV6_TCLASS**, **IPV6_AUTOFLOWLABEL**.
> @@ -7091,6 +7092,7 @@ enum {
> TCP_BPF_SYN_IP = 1006, /* Copy the IP[46] and TCP header */
> TCP_BPF_SYN_MAC = 1007, /* Copy the MAC, IP[46], and TCP header */
> TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */
> + TCP_BPF_RTO_MAX = 1009, /* Max delay ack in msecs */
> };
>
> enum {
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 2ec162dd83c4..a21a147e0a86 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -5303,6 +5303,12 @@ static int bpf_sol_tcp_setsockopt(struct sock *sk, int optname,
> return -EINVAL;
> tp->bpf_sock_ops_cb_flags = val;
> break;
> + case TCP_BPF_RTO_MAX:
> + if (val > TCP_RTO_MAX_SEC * MSEC_PER_SEC ||
> + val < TCP_RTO_MAX_MIN_SEC * MSEC_PER_SEC)
> + return -EINVAL;
> + inet_csk(sk)->icsk_rto_max = msecs_to_jiffies(val);
> + break;
> default:
> return -EINVAL;
> }
You need not define TCP_BPF_RTO_MAX because TCP_RTO_MAX is not a
BPF specific option, and you can just reuse do_tcp_setsockopt(),
then bpf_getsockopt() also works.
---8<---
diff --git a/net/core/filter.c b/net/core/filter.c
index 2ec162dd83c4..77732f10097c 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:
if (*optlen != sizeof(int))
return -EINVAL;
break;
---8<---
next prev parent reply other threads:[~2025-02-13 2:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-13 0:43 [PATCH net-next 0/3] bpf: support setting max RTO for bpf_setsockopt Jason Xing
2025-02-13 0:43 ` [PATCH net-next 1/3] tcp: add TCP_RTO_MAX_MIN_SEC definition Jason Xing
2025-02-13 2:19 ` Kuniyuki Iwashima
2025-02-13 0:43 ` [PATCH net-next 2/3] bpf: add TCP_BPF_RTO_MAX for bpf_setsockopt Jason Xing
2025-02-13 2:25 ` Kuniyuki Iwashima [this message]
2025-02-13 2:32 ` Kuniyuki Iwashima
2025-02-13 3:14 ` Jason Xing
2025-02-13 23:41 ` Stanislav Fomichev
2025-02-13 23:57 ` Jason Xing
2025-02-14 2:14 ` Martin KaFai Lau
2025-02-14 3:09 ` Jason Xing
2025-02-14 5:41 ` Martin KaFai Lau
2025-02-14 6:12 ` Jason Xing
2025-02-14 6:40 ` Martin KaFai Lau
2025-02-14 6:56 ` Jason Xing
2025-02-14 23:44 ` Martin KaFai Lau
2025-02-14 23:53 ` Jason Xing
2025-02-15 2:39 ` Martin KaFai Lau
2025-02-15 2:52 ` Jason Xing
2025-02-14 15:48 ` Stanislav Fomichev
2025-02-14 23:21 ` Jason Xing
2025-02-13 0:43 ` [PATCH net-next 3/3] selftests/bpf: add rto max for bpf_setsockopt test Jason Xing
2025-02-13 2:30 ` Kuniyuki Iwashima
2025-02-13 3:13 ` Jason Xing
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250213022501.76123-1-kuniyu@amazon.com \
--to=kuniyu@amazon.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=eddyz87@gmail.com \
--cc=edumazet@google.com \
--cc=haoluo@google.com \
--cc=horms@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kerneljasonxing@gmail.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=martin.lau@linux.dev \
--cc=ncardwell@google.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.