From 67fa83f7c86a86913ab9cd5a13b4bebd8d2ebb43 Mon Sep 17 00:00:00 2001 From: Dmitry Safonov Date: Mon, 23 Oct 2023 20:22:12 +0100 Subject: net/tcp: Add static_key for TCP-AO Similarly to TCP-MD5, add a static key to TCP-AO that is patched out when there are no keys on a machine and dynamically enabled with the first setsockopt(TCP_AO) adds a key on any socket. The static key is as well dynamically disabled later when the socket is destructed. The lifetime of enabled static key here is the same as ao_info: it is enabled on allocation, passed over from full socket to twsk and destructed when ao_info is scheduled for destruction. Signed-off-by: Dmitry Safonov Acked-by: David Ahern Signed-off-by: David S. Miller --- include/net/tcp.h | 24 ++++++++++++++++-------- include/net/tcp_ao.h | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/net/tcp.h b/include/net/tcp.h index 54226d85feb8..e3617c433cf1 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -2288,14 +2288,18 @@ static inline void tcp_get_current_key(const struct sock *sk, #if defined(CONFIG_TCP_AO) || defined(CONFIG_TCP_MD5SIG) const struct tcp_sock *tp = tcp_sk(sk); #endif -#ifdef CONFIG_TCP_AO - struct tcp_ao_info *ao; - ao = rcu_dereference_protected(tp->ao_info, lockdep_sock_is_held(sk)); - if (ao) { - out->ao_key = READ_ONCE(ao->current_key); - out->type = TCP_KEY_AO; - return; +#ifdef CONFIG_TCP_AO + if (static_branch_unlikely(&tcp_ao_needed.key)) { + struct tcp_ao_info *ao; + + ao = rcu_dereference_protected(tp->ao_info, + lockdep_sock_is_held(sk)); + if (ao) { + out->ao_key = READ_ONCE(ao->current_key); + out->type = TCP_KEY_AO; + return; + } } #endif #ifdef CONFIG_TCP_MD5SIG @@ -2324,7 +2328,8 @@ static inline bool tcp_key_is_md5(const struct tcp_key *key) static inline bool tcp_key_is_ao(const struct tcp_key *key) { #ifdef CONFIG_TCP_AO - if (key->type == TCP_KEY_AO) + if (static_branch_unlikely(&tcp_ao_needed.key) && + key->type == TCP_KEY_AO) return true; #endif return false; @@ -2718,6 +2723,9 @@ static inline bool tcp_ao_required(struct sock *sk, const void *saddr, struct tcp_ao_info *ao_info; struct tcp_ao_key *ao_key; + if (!static_branch_unlikely(&tcp_ao_needed.key)) + return false; + ao_info = rcu_dereference_check(tcp_sk(sk)->ao_info, lockdep_sock_is_held(sk)); if (!ao_info) diff --git a/include/net/tcp_ao.h b/include/net/tcp_ao.h index 061c358a3c8a..a38408072ea8 100644 --- a/include/net/tcp_ao.h +++ b/include/net/tcp_ao.h @@ -151,6 +151,8 @@ do { \ #ifdef CONFIG_TCP_AO /* TCP-AO structures and functions */ +#include +extern struct static_key_false_deferred tcp_ao_needed; struct tcp4_ao_context { __be32 saddr; -- cgit v1.2.3 cbcfacd8fe932fb6&follow=1'>python/flamegraph.py (unfollow)
AgeCommit message (Expand)AuthorFilesLines
2021-12-20remoteproc: rcar_rproc: Remove trailing semicolonJulien Massot1-1/+1
2021-12-20remoteproc: rcar_rproc: Fix pm_runtime_get_sync error checkJulien Massot1-1/+1
2021-12-13remoteproc: qcom: pas: Add SM6350 CDSP supportLuca Weiss1-0/+18
2021-12-13remoteproc: qcom: pas: Add SM6350 ADSP supportLuca Weiss1-0/+18
2021-12-13remoteproc: qcom: pas: Add SM6350 MPSS supportLuca Weiss1-0/+1
2021-12-13dt-bindings: remoteproc: qcom: pas: Add SM6350 adsp, cdsp & mpssLuca Weiss1-0/+28
2021-12-13remoteproc: qcom: pas: Add missing power-domain "mxc" for CDSPSibi Sankar1-0/+1
2021-12-13remoteproc: imx_rproc: correct firmware reloadPeng Fan1-3/+5
2021-12-13remoteproc: qcom: pil_info: Don't memcpy_toio more than is providedStephen Boyd1-1/+1
2021-12-13remoteproc: Add Renesas rcar driverJulien Massot3-0/+236