shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

tls: hw: rx: use return value of tls_device_decrypted() to carry status

Browse Source 
[ Upstream commit 71471ca325 ]

Instead of tls_device poking into internals of the message
return 1 from tls_device_decrypted() if the device handled
the decryption.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: f7fa16d49837 ("tls: decrement decrypt_pending if no async completion will be called")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jakub Kicinski
2022-04-07 20:38:23 -07:00
committed by Greg Kroah-Hartman
parent 432d40036f
commit 1abd49fa1f
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/tls/tls_device.c
View File

@@ -936,7 +936,6 @@ int tls_device_decrypted(struct sock *sk, struct tls_context *tls_ctx,
struct sk_buff *skb, struct strp_msg *rxm) struct sk_buff *skb, struct strp_msg *rxm)
{ {
struct tls_offload_context_rx *ctx = tls_offload_ctx_rx(tls_ctx); struct tls_offload_context_rx *ctx = tls_offload_ctx_rx(tls_ctx);
struct tls_msg *tlm = tls_msg(skb);
int is_decrypted = skb->decrypted; int is_decrypted = skb->decrypted;
int is_encrypted = !is_decrypted; int is_encrypted = !is_decrypted;
struct sk_buff *skb_iter; struct sk_buff *skb_iter;
@@ -951,11 +950,9 @@ int tls_device_decrypted(struct sock *sk, struct tls_context *tls_ctx,
tls_ctx->rx.rec_seq, rxm->full_len, tls_ctx->rx.rec_seq, rxm->full_len,
is_encrypted, is_decrypted); is_encrypted, is_decrypted);
tlm->decrypted |= is_decrypted;
if (unlikely(test_bit(TLS_RX_DEV_DEGRADED, &tls_ctx->flags))) { if (unlikely(test_bit(TLS_RX_DEV_DEGRADED, &tls_ctx->flags))) {
if (likely(is_encrypted || is_decrypted)) if (likely(is_encrypted || is_decrypted))
return 0; return is_decrypted;
/* After tls_device_down disables the offload, the next SKB will /* After tls_device_down disables the offload, the next SKB will
* likely have initial fragments decrypted, and final ones not * likely have initial fragments decrypted, and final ones not
@@ -970,7 +967,7 @@ int tls_device_decrypted(struct sock *sk, struct tls_context *tls_ctx,
*/ */
if (is_decrypted) { if (is_decrypted) {
ctx->resync_nh_reset = 1; ctx->resync_nh_reset = 1;
return 0; return is_decrypted;
} }
if (is_encrypted) { if (is_encrypted) {
tls_device_core_ctrl_rx_resync(tls_ctx, ctx, sk, skb); tls_device_core_ctrl_rx_resync(tls_ctx, ctx, sk, skb);

5
net/tls/tls_sw.c
View File

@@ -1571,9 +1571,8 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb,
err = tls_device_decrypted(sk, tls_ctx, skb, rxm); err = tls_device_decrypted(sk, tls_ctx, skb, rxm);
if (err < 0) if (err < 0)
return err; return err;
if (err > 0) {
/* skip SW decryption if NIC handled it already */ tlm->decrypted = 1;
if (tlm->decrypted) {
*zc = false; *zc = false;
goto decrypt_done; goto decrypt_done;
} }