From: Dmitry Safonov <dima@arista.com>
To: Eric Dumazet <edumazet@google.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
David Ahern <dsahern@kernel.org>, Shuah Khan <shuah@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Dmitry Safonov <dima@arista.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org,
linux-trace-kernel@vger.kernel.org,
Dmitry Safonov <0x7f454c46@gmail.com>
Subject: [PATCH net-next 01/10] net/tcp: Use static_branch_tcp_{md5,ao} to drop ifdefs
Date: Sat, 24 Feb 2024 09:04:09 +0000 [thread overview]
Message-ID: <20240224-tcp-ao-tracepoints-v1-1-15f31b7f30a7@arista.com> (raw)
In-Reply-To: <20240224-tcp-ao-tracepoints-v1-0-15f31b7f30a7@arista.com>
It's possible to clean-up some ifdefs by hiding that
tcp_{md5,ao}_needed static branch is defined and compiled only
under related configs, since commit 4c8530dc7d7d ("net/tcp: Only produce
AO/MD5 logs if there are any keys").
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
include/net/tcp.h | 14 ++++----------
net/ipv4/tcp_ipv4.c | 8 ++------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 33bf92dff0af..c1fff9207e2d 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -2369,21 +2369,15 @@ static inline void tcp_get_current_key(const struct sock *sk,
static inline bool tcp_key_is_md5(const struct tcp_key *key)
{
-#ifdef CONFIG_TCP_MD5SIG
- if (static_branch_unlikely(&tcp_md5_needed.key) &&
- key->type == TCP_KEY_MD5)
- return true;
-#endif
+ if (static_branch_tcp_md5())
+ return key->type == TCP_KEY_MD5;
return false;
}
static inline bool tcp_key_is_ao(const struct tcp_key *key)
{
-#ifdef CONFIG_TCP_AO
- if (static_branch_unlikely(&tcp_ao_needed.key) &&
- key->type == TCP_KEY_AO)
- return true;
-#endif
+ if (static_branch_tcp_ao())
+ return key->type == TCP_KEY_AO;
return false;
}
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 0c50c5a32b84..56dfae81c671 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1050,12 +1050,10 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
#else
if (0) {
#endif
-#ifdef CONFIG_TCP_MD5SIG
- } else if (static_branch_unlikely(&tcp_md5_needed.key)) {
+ } else if (static_branch_tcp_md5()) {
key.md5_key = tcp_twsk_md5_key(tcptw);
if (key.md5_key)
key.type = TCP_KEY_MD5;
-#endif
}
tcp_v4_send_ack(sk, skb,
@@ -1124,8 +1122,7 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
#else
if (0) {
#endif
-#ifdef CONFIG_TCP_MD5SIG
- } else if (static_branch_unlikely(&tcp_md5_needed.key)) {
+ } else if (static_branch_tcp_md5()) {
const union tcp_md5_addr *addr;
int l3index;
@@ -1134,7 +1131,6 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
key.md5_key = tcp_md5_do_lookup(sk, l3index, addr, AF_INET);
if (key.md5_key)
key.type = TCP_KEY_MD5;
-#endif
}
/* RFC 7323 2.3
--
2.43.0
next prev parent reply other threads:[~2024-02-24 9:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-24 9:04 [PATCH net-next 00/10] net/tcp: TCP-AO and TCP-MD5 tracepoints Dmitry Safonov
2024-02-24 9:04 ` Dmitry Safonov [this message]
2024-02-24 9:04 ` [PATCH net-next 02/10] net/tcp: Add a helper tcp_ao_hdr_maclen() Dmitry Safonov
2024-02-24 9:04 ` [PATCH net-next 03/10] net/tcp: Move tcp_inbound_hash() from headers Dmitry Safonov
2024-02-24 9:30 ` Eric Dumazet
2024-02-24 9:40 ` Dmitry Safonov
2024-02-26 20:41 ` Simon Horman
2024-02-26 23:51 ` Dmitry Safonov
2024-02-24 9:04 ` [PATCH net-next 04/10] net/tcp: Add tcp-md5 and tcp-ao tracepoints Dmitry Safonov
2024-02-24 9:04 ` [PATCH net-next 05/10] net/tcp: Remove tcp_hash_fail() Dmitry Safonov
2024-02-24 9:04 ` [PATCH net-next 06/10] selftests/net: Clean-up double assignment Dmitry Safonov
2024-02-24 9:04 ` [PATCH net-next 07/10] selftests/net: Provide test_snprintf() helper Dmitry Safonov
2024-02-24 9:04 ` [PATCH net-next 08/10] selftests/net: Be consistnat in kconfig checks Dmitry Safonov
2024-02-24 9:04 ` [PATCH net-next 09/10] selftests/net: Don't forget to close nsfd after switch_save_ns() Dmitry Safonov
2024-02-24 9:04 ` [PATCH net-next 10/10] selftest/net: Add trace events matching to tcp_ao Dmitry Safonov
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=20240224-tcp-ao-tracepoints-v1-1-15f31b7f30a7@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rostedt@goodmis.org \
--cc=shuah@kernel.org \
/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).