From: Jason Xing <kerneljasonxing@gmail.com>
To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, dsahern@kernel.org,
willemdebruijn.kernel@gmail.com, willemb@google.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
Cc: bpf@vger.kernel.org, netdev@vger.kernel.org,
Jason Xing <kernelxing@tencent.com>
Subject: [PATCH net-next v2 02/12] net-timestamp: open gate for bpf_setsockopt
Date: Sat, 12 Oct 2024 12:06:41 +0800 [thread overview]
Message-ID: <20241012040651.95616-3-kerneljasonxing@gmail.com> (raw)
In-Reply-To: <20241012040651.95616-1-kerneljasonxing@gmail.com>
From: Jason Xing <kernelxing@tencent.com>
For now, we support bpf_setsockopt only TX timestamps flags. Users
can use something like this in bpf program to turn on the feature:
flags = SOF_TIMESTAMPING_TX_SCHED;
bpf_setsockopt(skops, SOL_SOCKET, SO_TIMESTAMPING, &flags, sizeof(flags));
Later, I will support each Tx flags one by one based on this.
Signed-off-by: Jason Xing <kernelxing@tencent.com>
---
include/net/sock.h | 2 ++
net/core/filter.c | 27 +++++++++++++++++++++++++++
net/core/sock.c | 35 ++++++++++++++++++++++++-----------
3 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 8cf278c957b3..66ecd78f1dfe 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2890,6 +2890,8 @@ void sock_def_readable(struct sock *sk);
int sock_bindtoindex(struct sock *sk, int ifindex, bool lock_sk);
void sock_set_timestamp(struct sock *sk, int optname, bool valbool);
+int sock_get_timestamping(struct so_timestamping *timestamping,
+ sockptr_t optval, unsigned int optlen);
int sock_set_timestamping(struct sock *sk, int optname,
struct so_timestamping timestamping);
diff --git a/net/core/filter.c b/net/core/filter.c
index bd0d08bf76bb..996426095bd9 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -5204,10 +5204,30 @@ static const struct bpf_func_proto bpf_get_socket_uid_proto = {
.arg1_type = ARG_PTR_TO_CTX,
};
+static int bpf_sock_set_timestamping(struct sock *sk,
+ struct so_timestamping *timestamping)
+{
+ u32 flags = timestamping->flags;
+
+ if (flags & ~SOF_TIMESTAMPING_MASK)
+ return -EINVAL;
+
+ if (!(flags & (SOF_TIMESTAMPING_TX_SCHED | SOF_TIMESTAMPING_TX_SOFTWARE |
+ SOF_TIMESTAMPING_TX_ACK)))
+ return -EINVAL;
+
+ WRITE_ONCE(sk->sk_tsflags[BPFPROG_TS_REQUESTOR], flags);
+
+ return 0;
+}
+
static int sol_socket_sockopt(struct sock *sk, int optname,
char *optval, int *optlen,
bool getopt)
{
+ struct so_timestamping ts;
+ int ret = 0;
+
switch (optname) {
case SO_REUSEADDR:
case SO_SNDBUF:
@@ -5225,6 +5245,13 @@ static int sol_socket_sockopt(struct sock *sk, int optname,
break;
case SO_BINDTODEVICE:
break;
+ case SO_TIMESTAMPING_NEW:
+ case SO_TIMESTAMPING_OLD:
+ ret = sock_get_timestamping(&ts, KERNEL_SOCKPTR(optval),
+ *optlen);
+ if (!ret)
+ ret = bpf_sock_set_timestamping(sk, &ts);
+ return ret;
default:
return -EINVAL;
}
diff --git a/net/core/sock.c b/net/core/sock.c
index 52c8c5a5ba27..a6e0d51a5f72 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -894,6 +894,27 @@ static int sock_timestamping_bind_phc(struct sock *sk, int phc_index)
return 0;
}
+int sock_get_timestamping(struct so_timestamping *timestamping,
+ sockptr_t optval, unsigned int optlen)
+{
+ int val;
+
+ if (copy_from_sockptr(&val, optval, sizeof(val)))
+ return -EFAULT;
+
+ if (optlen == sizeof(*timestamping)) {
+ if (copy_from_sockptr(timestamping, optval,
+ sizeof(*timestamping))) {
+ return -EFAULT;
+ }
+ } else {
+ memset(timestamping, 0, sizeof(*timestamping));
+ timestamping->flags = val;
+ }
+
+ return 0;
+}
+
int sock_set_timestamping(struct sock *sk, int optname,
struct so_timestamping timestamping)
{
@@ -1402,17 +1423,9 @@ int sk_setsockopt(struct sock *sk, int level, int optname,
case SO_TIMESTAMPING_NEW:
case SO_TIMESTAMPING_OLD:
- if (optlen == sizeof(timestamping)) {
- if (copy_from_sockptr(×tamping, optval,
- sizeof(timestamping))) {
- ret = -EFAULT;
- break;
- }
- } else {
- memset(×tamping, 0, sizeof(timestamping));
- timestamping.flags = val;
- }
- ret = sock_set_timestamping(sk, optname, timestamping);
+ ret = sock_get_timestamping(×tamping, optval, optlen);
+ if (!ret)
+ ret = sock_set_timestamping(sk, optname, timestamping);
break;
case SO_RCVLOWAT:
--
2.37.3
next prev parent reply other threads:[~2024-10-12 4:07 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-12 4:06 [PATCH net-next v2 00/12] net-timestamp: bpf extension to equip applications transparently Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 01/12] net-timestamp: introduce socket tsflag requestors Jason Xing
2024-10-15 1:30 ` Willem de Bruijn
2024-10-15 1:50 ` Jason Xing
2024-10-12 4:06 ` Jason Xing [this message]
2024-10-15 1:34 ` [PATCH net-next v2 02/12] net-timestamp: open gate for bpf_setsockopt Willem de Bruijn
2024-10-15 2:05 ` Jason Xing
2024-10-15 21:32 ` Martin KaFai Lau
2024-10-15 21:55 ` Willem de Bruijn
2024-10-22 13:22 ` Jason Xing
2024-10-23 0:06 ` Willem de Bruijn
2024-10-23 3:49 ` Jason Xing
2024-10-16 0:45 ` Jason Xing
2024-10-15 23:54 ` Martin KaFai Lau
2024-10-16 0:49 ` Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 03/12] net-timestamp: reorganize in skb_tstamp_tx_output() Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 04/12] net-timestamp: add static key to control the whole bpf extension Jason Xing
2024-10-15 1:36 ` Willem de Bruijn
2024-10-15 2:25 ` Jason Xing
2024-10-16 0:09 ` Martin KaFai Lau
2024-10-16 1:04 ` Jason Xing
2024-10-16 1:32 ` Jason Xing
2024-10-16 6:13 ` Martin KaFai Lau
2024-10-16 6:30 ` Jason Xing
2024-10-16 7:01 ` Martin KaFai Lau
2024-10-16 7:54 ` Jason Xing
2024-10-16 8:31 ` Martin KaFai Lau
2024-10-16 10:36 ` Jason Xing
2024-10-17 0:48 ` Martin KaFai Lau
2024-10-17 2:28 ` Jason Xing
2024-10-17 20:43 ` Martin KaFai Lau
2024-10-18 2:52 ` Jason Xing
2024-10-18 3:05 ` Jason Xing
2024-10-16 6:31 ` Martin KaFai Lau
2024-10-16 6:45 ` Jason Xing
2024-10-16 13:13 ` Willem de Bruijn
2024-10-16 13:22 ` Jason Xing
2024-10-20 21:51 ` Willem de Bruijn
2024-10-21 3:21 ` Jason Xing
2024-10-21 14:49 ` Willem de Bruijn
2024-10-21 15:05 ` Jason Xing
2024-10-22 0:53 ` Martin KaFai Lau
2024-10-22 2:30 ` Jason Xing
2024-10-23 0:17 ` Willem de Bruijn
2024-10-23 2:31 ` Willem de Bruijn
2024-10-12 4:06 ` [PATCH net-next v2 05/12] net-timestamp: add bpf infrastructure to allow exposing timestamp later Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 06/12] net-timestamp: introduce TS_SCHED_OPT_CB to generate dev xmit timestamp Jason Xing
2024-10-16 1:01 ` Martin KaFai Lau
2024-10-16 1:24 ` Jason Xing
2024-10-16 5:35 ` Martin KaFai Lau
2024-10-16 6:08 ` Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 07/12] net-timestamp: introduce TS_SW_OPT_CB to generate driver timestamp Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 08/12] net-timestamp: introduce TS_ACK_OPT_CB to generate tcp acked timestamp Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 09/12] net-timestamp: add tx OPT_ID_TCP support for bpf case Jason Xing
2024-10-15 1:38 ` Willem de Bruijn
2024-10-15 2:25 ` Jason Xing
2024-10-15 2:38 ` Willem de Bruijn
2024-10-15 2:59 ` Jason Xing
2024-10-15 8:40 ` kernel test robot
2024-10-15 9:36 ` Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 10/12] net-timestamp: make bpf for tx timestamp work Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 11/12] net-timestamp: add bpf framework for rx timestamps Jason Xing
2024-10-15 1:44 ` Willem de Bruijn
2024-10-15 2:18 ` Jason Xing
2024-10-12 4:06 ` [PATCH net-next v2 12/12] net-timestamp: add bpf support for rx software/hardware timestamp Jason Xing
2024-10-12 17:48 ` [PATCH net-next v2 00/12] net-timestamp: bpf extension to equip applications transparently Willem de Bruijn
2024-10-13 3:28 ` Jason Xing
2024-10-13 3:43 ` Jason Xing
2024-10-13 6:05 ` Jason Xing
2024-10-15 1:28 ` Willem de Bruijn
2024-10-15 2:52 ` Jason Xing
2024-10-15 2:59 ` Willem de Bruijn
2024-10-15 3:02 ` 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=20241012040651.95616-3-kerneljasonxing@gmail.com \
--to=kerneljasonxing@gmail.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=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kernelxing@tencent.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=martin.lau@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
--cc=song@kernel.org \
--cc=willemb@google.com \
--cc=willemdebruijn.kernel@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).