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 03/12] net-timestamp: reorganize in skb_tstamp_tx_output()
Date: Sat, 12 Oct 2024 12:06:42 +0800 [thread overview]
Message-ID: <20241012040651.95616-4-kerneljasonxing@gmail.com> (raw)
In-Reply-To: <20241012040651.95616-1-kerneljasonxing@gmail.com>
From: Jason Xing <kernelxing@tencent.com>
It's a prep for bpf print function later. This patch only put the
original generating logic into one function. No functional changes.
Signed-off-by: Jason Xing <kernelxing@tencent.com>
---
My thought is keeping each patch small helps people to review.
---
net/core/skbuff.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index ab0a59f1e14d..f36eb9daa31a 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -5540,18 +5540,15 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
}
EXPORT_SYMBOL_GPL(skb_complete_tx_timestamp);
-void __skb_tstamp_tx(struct sk_buff *orig_skb,
- const struct sk_buff *ack_skb,
- struct skb_shared_hwtstamps *hwtstamps,
- struct sock *sk, int tstype)
+static void skb_tstamp_tx_output(struct sk_buff *orig_skb,
+ const struct sk_buff *ack_skb,
+ struct skb_shared_hwtstamps *hwtstamps,
+ struct sock *sk, int tstype)
{
struct sk_buff *skb;
bool tsonly, opt_stats = false;
u32 tsflags;
- if (!sk)
- return;
-
tsflags = READ_ONCE(sk->sk_tsflags[SOCKETOPT_TS_REQUESTOR]);
if (!hwtstamps && !(tsflags & SOF_TIMESTAMPING_OPT_TX_SWHW) &&
skb_shinfo(orig_skb)->tx_flags & SKBTX_IN_PROGRESS)
@@ -5595,6 +5592,17 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb,
__skb_complete_tx_timestamp(skb, sk, tstype, opt_stats);
}
+
+void __skb_tstamp_tx(struct sk_buff *orig_skb,
+ const struct sk_buff *ack_skb,
+ struct skb_shared_hwtstamps *hwtstamps,
+ struct sock *sk, int tstype)
+{
+ if (!sk)
+ return;
+
+ skb_tstamp_tx_output(orig_skb, ack_skb, hwtstamps, sk, tstype);
+}
EXPORT_SYMBOL_GPL(__skb_tstamp_tx);
void skb_tstamp_tx(struct sk_buff *orig_skb,
--
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 ` [PATCH net-next v2 02/12] net-timestamp: open gate for bpf_setsockopt Jason Xing
2024-10-15 1:34 ` 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 ` Jason Xing [this message]
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-4-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).