net: skbuff: generalize the skb->decrypted bit
Subsystems (5)
Jakub Kicinski
maintainerPATCH 1/1 net: skbuff: generalize the skb->decrypted bit
The ->decrypted bit can be reused for other crypto protocols. Remove the direct dependency on TLS, add helpers to clean up the ifdefs leaking out everywhere.
---
I'm going to post PSP support.. as soon as the test groundwork is in place. I think this stands on its own as a cleanup.
--- include/linux/skbuff.h | 15 ++++++++++++--- include/net/sock.h | 4 +--- net/Kconfig | 3 +++ net/core/sock.c | 5 ++--- net/ipv4/tcp_input.c | 12 +++--------- net/ipv4/tcp_ipv4.c | 4 +--- net/ipv4/tcp_offload.c | 4 +--- net/tls/Kconfig | 1 + 8 files changed, 24 insertions(+), 24 deletions(-)
include/linux/skbuff.h +12 -3
@@ -992,7 +992,7 @@ struct sk_buff {#ifdef CONFIG_NETFILTER_SKIP_EGRESS __u8 nf_skip_egress:1;#endif -#ifdef CONFIG_TLS_DEVICE +#ifdef CONFIG_SKB_DECRYPTED __u8 decrypted:1;#endif __u8 slow_gro:1;
@@ -1615,17 +1615,26 @@ static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from)static inline int skb_cmp_decrypted (const struct sk_buff *skb1,const struct sk_buff *skb2) { -#ifdef CONFIG_TLS_DEVICE +#ifdef CONFIG_SKB_DECRYPTED return skb2->decrypted - skb1->decrypted;#else return 0 ;#endif } +static inline bool skb_is_decrypted (const struct sk_buff *skb) +{ +#ifdef CONFIG_SKB_DECRYPTED +return skb->decrypted; +#else +return false; +#endif +} +static inline void skb_copy_decrypted (struct sk_buff *to,const struct sk_buff *from) { -#ifdef CONFIG_TLS_DEVICE +#ifdef CONFIG_SKB_DECRYPTED to->decrypted = from->decrypted;#endif }
include/net/sock.h +1 -3
@@ -2835,12 +2835,10 @@ static inline struct sk_buff *sk_validate_xmit_skb(struct sk_buff *skb,if (sk &&sk_fullsock (sk) && sk->sk_validate_xmit_skb) { skb = sk->sk_validate_xmit_skb (sk, dev, skb); -#ifdef CONFIG_TLS_DEVICE - }else if (unlikely (skb->decrypted)) { + }else if (unlikely (skb_is_decrypted (skb))) {pr_warn_ratelimited ("unencrypted skb with no associated socket - dropping\n" );kfree_skb (skb); skb =NULL ; -#endif }#endif
net/Kconfig +3 -0
@@ -60,6 +60,9 @@ config NET_XGRESS config NET_REDIRECT bool +config SKB_DECRYPTED + bool + config SKB_EXTENSIONS bool
net/core/sock.c +2 -3
@@ -2526,13 +2526,12 @@ EXPORT_SYMBOL(skb_set_owner_w);static bool can_skb_orphan_partial (const struct sk_buff *skb) { -#ifdef CONFIG_TLS_DEVICE /* Drivers depend on in-order delivery for crypto offload, * partial orphan breaks out-of-order-OK logic. */ -if (skb->decrypted) +if (skb_is_decrypted (skb))return false; -#endif +return (skb->destructor == sock_wfree || (IS_ENABLED (CONFIG_INET ) && skb->destructor == tcp_wfree)); }
net/ipv4/tcp_input.c +3 -9
@@ -4803,10 +4803,8 @@ static bool tcp_try_coalesce(struct sock *sk,if (!mptcp_skb_can_collapse (to, from))return false; -#ifdef CONFIG_TLS_DEVICE -if (from->decrypted != to->decrypted) +if (skb_cmp_decrypted (from, to))return false; -#endif if (!skb_try_coalesce (to, from, fragstolen, &delta))return false;
@@ -5375,9 +5373,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,break ;memcpy (nskb->cb, skb->cb,sizeof (skb->cb)); -#ifdef CONFIG_TLS_DEVICE - nskb->decrypted = skb->decrypted; -#endif +skb_copy_decrypted (nskb, skb);TCP_SKB_CB (nskb)->seq =TCP_SKB_CB (nskb)->end_seq = start;if (list)__skb_queue_before (list, skb, nskb);
@@ -5407,10 +5403,8 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root, !mptcp_skb_can_collapse(nskb, skb) || (TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN))) goto end; -#ifdef CONFIG_TLS_DEVICE -if (skb->decrypted != nskb->decrypted) +if (skb_cmp_decrypted (skb, nskb)) goto end; -#endif } } }
net/ipv4/tcp_ipv4.c +1 -3
@@ -2045,10 +2045,8 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb, TCP_SKB_CB(skb)->tcp_flags) & TCPHDR_ACK) || ((TCP_SKB_CB (tail)->tcp_flags ^TCP_SKB_CB (skb)->tcp_flags) & (TCPHDR_ECE |TCPHDR_CWR )) || -#ifdef CONFIG_TLS_DEVICE - tail->decrypted != skb->decrypted || -#endif !mptcp_skb_can_collapse (tail, skb) || +skb_cmp_decrypted (tail, skb) || thtail->doff != th->doff || memcmp(thtail + 1, th + 1, hdrlen - sizeof(*th))) goto no_coalesce;
net/ipv4/tcp_offload.c +1 -3
@@ -265,9 +265,7 @@ struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb) flush |= (len -1 ) >= mss; flush |= (ntohl (th2->seq) +skb_gro_len (p)) ^ntohl (th->seq); -#ifdef CONFIG_TLS_DEVICE - flush |= p->decrypted ^ skb->decrypted; -#endif + flush |=skb_cmp_decrypted (p, skb);if (flush ||skb_gro_receive (p, skb)) { mss =1 ;
net/tls/Kconfig +1 -0
@@ -20,6 +20,7 @@ config TLS config TLS_DEVICE bool "Transport Layer Security HW offload" depends on TLS + select SKB_DECRYPTED select SOCK_VALIDATE_XMIT select SOCK_RX_QUEUE_MAPPING default n
Signature · 1 line
2.44.0
Quoted 12 lines · Jakub Kicinski
The ->decrypted bit can be reused for other crypto protocols. Remove the direct dependency on TLS, add helpers to clean up the ifdefs leaking out everywhere.
Signed-off-by Jakub Kicinski <[email protected]>---
I'm going to post PSP support.. as soon as the test groundwork is in place. I think this stands on its own as a cleanup.
Quoted 11 lines
--- include/linux/skbuff.h | 15 ++++++++++++--- include/net/sock.h | 4 +--- net/Kconfig | 3 +++ net/core/sock.c | 5 ++--- net/ipv4/tcp_input.c | 12 +++--------- net/ipv4/tcp_ipv4.c | 4 +--- net/ipv4/tcp_offload.c | 4 +--- net/tls/Kconfig | 1 + 8 files changed, 24 insertions(+), 24 deletions(-)
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 10 lines · On Wed, 3 Apr 2024 13:21:39 -0700 you wrote:
The ->decrypted bit can be reused for other crypto protocols. Remove the direct dependency on TLS, add helpers to clean up the ifdefs leaking out everywhere.
Signed-off-by Jakub Kicinski <[email protected]>---
I'm going to post PSP support.. as soon as the test groundwork is in place. I think this stands on its own as a cleanup.[...]
Here is the summary with links:
- [net-next] net: skbuff: generalize the skb->decrypted bit
https://git.kernel.org/netdev/net-next/c/9f06f87fef68
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html