From: Simon Horman <simon.horman@corigine•com>
To: Hannes Reinecke <hare@suse•de>
Cc: Christoph Hellwig <hch@lst•de>, Sagi Grimberg <sagi@grimberg•me>,
Keith Busch <kbusch@kernel•org>,
linux-nvme@lists•infradead.org, Jakub Kicinski <kuba@kernel•org>,
Eric Dumazet <edumazet@google•com>,
Paolo Abeni <pabeni@redhat•com>,
netdev@vger•kernel.org, Boris Pismenny <boris.pismenny@gmail•com>
Subject: Re: [PATCH 6/6] net/tls: implement ->read_sock()
Date: Thu, 20 Jul 2023 19:32:33 +0100 [thread overview]
Message-ID: <ZLl9wUxKrZpgHMxY@corigine.com> (raw)
In-Reply-To: <20230719113836.68859-7-hare@suse.de>
On Wed, Jul 19, 2023 at 01:38:36PM +0200, Hannes Reinecke wrote:
...
Hi Hannes,
> diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
> index d0636ea13009..4829d2cb9a7c 100644
> --- a/net/tls/tls_sw.c
> +++ b/net/tls/tls_sw.c
> @@ -2202,6 +2202,102 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,
> goto splice_read_end;
> }
>
> +int tls_sw_read_sock(struct sock *sk, read_descriptor_t *desc,
> + sk_read_actor_t read_actor)
> +{
> + struct tls_context *tls_ctx = tls_get_ctx(sk);
> + struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
> + struct strp_msg *rxm = NULL;
> + struct tls_msg *tlm;
> + struct sk_buff *skb;
> + struct sk_psock *psock;
> + ssize_t copied = 0;
> + bool bpf_strp_enabled;
> + int err, used;
> +
> + psock = sk_psock_get(sk);
> + err = tls_rx_reader_acquire(sk, ctx, true);
> + if (err < 0)
> + goto psock_put;
skb is uninitialised here,
however, it is used in the psock_put unwind path.
Flagged by gcc-12 [-Wmaybe-uninitialized] and Smatch.
> + bpf_strp_enabled = sk_psock_strp_enabled(psock);
> +
> + /* If crypto failed the connection is broken */
> + err = ctx->async_wait.err;
> + if (err)
> + goto read_sock_end;
Likewise, here.
> +
> + do {
> + if (!skb_queue_empty(&ctx->rx_list)) {
> + skb = __skb_dequeue(&ctx->rx_list);
> + rxm = strp_msg(skb);
> + } else {
> + struct tls_decrypt_arg darg;
> +
> + err = tls_rx_rec_wait(sk, psock, true, true);
> + if (err <= 0)
> + goto read_sock_end;
> +
> + memset(&darg.inargs, 0, sizeof(darg.inargs));
> + darg.zc = !bpf_strp_enabled && ctx->zc_capable;
> +
> + rxm = strp_msg(tls_strp_msg(ctx));
> + tlm = tls_msg(tls_strp_msg(ctx));
> +
> + /* read_sock does not support reading control messages */
> + if (tlm->control != TLS_RECORD_TYPE_DATA) {
> + err = -EINVAL;
> + goto read_sock_requeue;
> + }
> +
> + if (!bpf_strp_enabled)
> + darg.async = ctx->async_capable;
> + else
> + darg.async = false;
> +
> + err = tls_rx_one_record(sk, NULL, &darg);
> + if (err < 0) {
> + tls_err_abort(sk, -EBADMSG);
> + goto read_sock_end;
> + }
> +
> + sk_flush_backlog(sk);
> + skb = darg.skb;
> + rxm = strp_msg(skb);
> +
> + tls_rx_rec_done(ctx);
> + }
> +
> + used = read_actor(desc, skb, rxm->offset, rxm->full_len);
> + if (used <= 0) {
> + if (!copied)
> + err = used;
> + goto read_sock_end;
> + }
> + copied += used;
> + if (used < rxm->full_len) {
> + rxm->offset += used;
> + rxm->full_len -= used;
> + if (!desc->count)
> + goto read_sock_requeue;
> + } else {
> + consume_skb(skb);
> + if (!desc->count)
> + skb = NULL;
> + }
> + } while (skb);
> +
> +read_sock_end:
> + tls_rx_reader_release(sk, ctx);
> +psock_put:
> + if (psock)
> + sk_psock_put(sk, psock);
> + return copied ? : err;
> +
> +read_sock_requeue:
> + __skb_queue_head(&ctx->rx_list, skb);
> + goto read_sock_end;
> +}
> +
> bool tls_sw_sock_is_readable(struct sock *sk)
> {
> struct tls_context *tls_ctx = tls_get_ctx(sk);
next prev parent reply other threads:[~2023-07-20 18:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 11:38 [RESENT PATCHv7 0/6] net/tls: fixes for NVMe-over-TLS Hannes Reinecke
2023-07-19 11:38 ` [PATCH 1/6] net/tls: handle MSG_EOR for tls_sw TX flow Hannes Reinecke
2023-07-19 11:38 ` [PATCH 2/6] net/tls: handle MSG_EOR for tls_device " Hannes Reinecke
2023-07-19 11:38 ` [PATCH 3/6] selftests/net/tls: add test for MSG_EOR Hannes Reinecke
2023-07-19 11:38 ` [PATCH 4/6] net/tls: Use tcp_read_sock() instead of ops->read_sock() Hannes Reinecke
2023-07-19 11:54 ` Sagi Grimberg
2023-07-19 11:38 ` [PATCH 5/6] net/tls: split tls_rx_reader_lock Hannes Reinecke
2023-07-19 11:55 ` Sagi Grimberg
2023-07-19 11:38 ` [PATCH 6/6] net/tls: implement ->read_sock() Hannes Reinecke
2023-07-19 11:55 ` Sagi Grimberg
2023-07-20 18:32 ` Simon Horman [this message]
2023-07-21 6:03 ` Hannes Reinecke
2023-07-21 3:02 ` Jakub Kicinski
2023-07-21 13:53 ` Hannes Reinecke
2023-07-21 14:50 ` Jakub Kicinski
-- strict thread matches above, loose matches on Subject: below --
2023-07-26 19:15 [PATCHv9 0/6] net/tls: fixes for NVMe-over-TLS Hannes Reinecke
2023-07-26 19:15 ` [PATCH 6/6] net/tls: implement ->read_sock() Hannes Reinecke
2023-07-21 14:35 [PATCHv8 0/6] net/tls: fixes for NVMe-over-TLS Hannes Reinecke
2023-07-21 14:35 ` [PATCH 6/6] net/tls: implement ->read_sock() Hannes Reinecke
2023-07-24 12:59 ` Sagi Grimberg
2023-07-24 13:47 ` Hannes Reinecke
[not found] <20230719111944.68544-1-hare@suse.de>
2023-07-19 11:19 ` Hannes Reinecke
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=ZLl9wUxKrZpgHMxY@corigine.com \
--to=simon.horman@corigine$(echo .)com \
--cc=boris.pismenny@gmail$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=hare@suse$(echo .)de \
--cc=hch@lst$(echo .)de \
--cc=kbusch@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-nvme@lists$(echo .)infradead.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=sagi@grimberg$(echo .)me \
/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