From: Jakub Kicinski <kuba@kernel•org>
To: davem@davemloft•net, pabeni@redhat•com
Cc: netdev@vger•kernel.org, borisp@nvidia•com,
john.fastabend@gmail•com, daniel@iogearbox•net,
vfedorenko@novek•ru, Jakub Kicinski <kuba@kernel•org>
Subject: [PATCH net-next 01/10] tls: rx: jump to a more appropriate label
Date: Thu, 7 Apr 2022 20:38:14 -0700 [thread overview]
Message-ID: <20220408033823.965896-2-kuba@kernel.org> (raw)
In-Reply-To: <20220408033823.965896-1-kuba@kernel.org>
'recv_end:' checks num_async and decrypted, and is then followed
by the 'end' label. Since we know that decrypted and num_async
are 0 at the start we can jump to 'end'.
Move the init of decrypted and num_async to let the compiler
catch if I'm wrong.
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
net/tls/tls_sw.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 0024a692f0f8..3b3fe455d680 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1760,6 +1760,7 @@ int tls_sw_recvmsg(struct sock *sk,
struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
struct tls_prot_info *prot = &tls_ctx->prot_info;
struct sk_psock *psock;
+ int num_async, pending;
unsigned char control = 0;
ssize_t decrypted = 0;
struct strp_msg *rxm;
@@ -1772,8 +1773,6 @@ int tls_sw_recvmsg(struct sock *sk,
bool is_kvec = iov_iter_is_kvec(&msg->msg_iter);
bool is_peek = flags & MSG_PEEK;
bool bpf_strp_enabled;
- int num_async = 0;
- int pending;
flags |= nonblock;
@@ -1795,12 +1794,14 @@ int tls_sw_recvmsg(struct sock *sk,
}
if (len <= copied)
- goto recv_end;
+ goto end;
target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
len = len - copied;
timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
+ decrypted = 0;
+ num_async = 0;
while (len && (decrypted + copied < target || ctx->recv_pkt)) {
bool retain_skb = false;
bool zc = false;
--
2.34.1
next prev parent reply other threads:[~2022-04-08 3:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-08 3:38 [PATCH net-next 00/10] tls: rx: random refactoring part 1 Jakub Kicinski
2022-04-08 3:38 ` Jakub Kicinski [this message]
2022-04-08 3:38 ` [PATCH net-next 02/10] tls: rx: drop pointless else after goto Jakub Kicinski
2022-04-08 3:38 ` [PATCH net-next 03/10] tls: rx: don't store the record type in socket context Jakub Kicinski
2022-04-08 3:38 ` [PATCH net-next 04/10] tls: rx: don't store the decryption status " Jakub Kicinski
2022-04-08 3:38 ` [PATCH net-next 05/10] tls: rx: init decrypted status in tls_read_size() Jakub Kicinski
2022-04-08 3:38 ` [PATCH net-next 06/10] tls: rx: use a define for tag length Jakub Kicinski
2022-04-08 3:38 ` [PATCH net-next 07/10] tls: rx: replace 'back' with 'offset' Jakub Kicinski
2022-04-08 3:38 ` [PATCH net-next 08/10] tls: rx: don't issue wake ups when data is decrypted Jakub Kicinski
2022-04-08 3:38 ` [PATCH net-next 09/10] tls: rx: refactor decrypt_skb_update() Jakub Kicinski
2022-04-08 3:38 ` [PATCH net-next 10/10] tls: hw: rx: use return value of tls_device_decrypted() to carry status Jakub Kicinski
2022-04-08 11:10 ` [PATCH net-next 00/10] tls: rx: random refactoring part 1 patchwork-bot+netdevbpf
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=20220408033823.965896-2-kuba@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=borisp@nvidia$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=john.fastabend@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=vfedorenko@novek$(echo .)ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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