[PATCH net] Revert "tls: rx: move counting TlsDecryptErrors for sync"

[PATCH net] Revert "tls: rx: move counting TlsDecryptErrors for sync"

[Gal Pressman]

This reverts commit 284b4d93daee56dff3e10029ddf2e03227f50dbf.
When using TLS device offload and coming from tls_device_reencrypt()
flow, -EBADMSG error in tls_do_decryption() should not be counted
towards the TLSTlsDecryptError counter.

Move the counter increase back to the decrypt_internal() call site in
decrypt_skb_update().
This also fixes an issue where:
	if (n_sgin < 1)
		return -EBADMSG;

Errors in decrypt_internal() were not counted after the cited patch.

Fixes: 284b4d93daee ("tls: rx: move counting TlsDecryptErrors for sync")
Cc: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Gal Pressman <gal@nvidia.com>
---
 net/tls/tls_sw.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 0513f82b8537..e30649f6dde5 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -267,9 +267,6 @@ static int tls_do_decryption(struct sock *sk,
 	}
 	darg->async = false;
 
-	if (ret == -EBADMSG)
-		TLS_INC_STATS(sock_net(sk), LINUX_MIB_TLSDECRYPTERROR);
-
 	return ret;
 }
 
@@ -1579,8 +1576,11 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb,
 	}
 
 	err = decrypt_internal(sk, skb, dest, NULL, darg);
-	if (err < 0)
+	if (err < 0) {
+		if (err == -EBADMSG)
+			TLS_INC_STATS(sock_net(sk), LINUX_MIB_TLSDECRYPTERROR);
 		return err;
+	}
 	if (darg->async)
 		goto decrypt_next;
 
-- 
2.25.1

Re: [PATCH net] Revert "tls: rx: move counting TlsDecryptErrors for sync"

[Jakub Kicinski]

On Tue, 5 Jul 2022 14:08:37 +0300 Gal Pressman wrote:
> This reverts commit 284b4d93daee56dff3e10029ddf2e03227f50dbf.
> When using TLS device offload and coming from tls_device_reencrypt()
> flow, -EBADMSG error in tls_do_decryption() should not be counted
> towards the TLSTlsDecryptError counter.
> 
> Move the counter increase back to the decrypt_internal() call site in
> decrypt_skb_update().
> This also fixes an issue where:
> 	if (n_sgin < 1)
> 		return -EBADMSG;
> 
> Errors in decrypt_internal() were not counted after the cited patch.
> 
> Fixes: 284b4d93daee ("tls: rx: move counting TlsDecryptErrors for sync")
> Cc: Jakub Kicinski <kuba@kernel.org>
> Reviewed-by: Maxim Mikityanskiy <maximmi@nvidia.com>
> Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
> Signed-off-by: Gal Pressman <gal@nvidia.com>

Reviewed-by: Jakub Kicinski <kuba@kernel.org>

Re: [PATCH net] Revert "tls: rx: move counting TlsDecryptErrors for sync"

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

On Tue, 5 Jul 2022 14:08:37 +0300 you wrote:
> This reverts commit 284b4d93daee56dff3e10029ddf2e03227f50dbf.
> When using TLS device offload and coming from tls_device_reencrypt()
> flow, -EBADMSG error in tls_do_decryption() should not be counted
> towards the TLSTlsDecryptError counter.
> 
> Move the counter increase back to the decrypt_internal() call site in
> decrypt_skb_update().
> This also fixes an issue where:
> 	if (n_sgin < 1)
> 		return -EBADMSG;
> 
> [...]

Here is the summary with links:
  - [net] Revert "tls: rx: move counting TlsDecryptErrors for sync"
    https://git.kernel.org/netdev/net/c/a069a9055416

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html