Commit c618db2a authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

tls: rx: async: hold onto the input skb 



Async crypto currently benefits from the fact that we decrypt
in place. When we allow input and output to be different skbs
we will have to hang onto the input while we move to the next
record. Clone the inputs and keep them on a list.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ececdc5

include/net/tls.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ struct tls_sw_context_rx { 
	atomic_t decrypt_pending;

	/* protect crypto_wait with decrypt_pending*/

	spinlock_t decrypt_compl_lock;

	struct sk_buff_head async_hold;

	struct wait_queue_head wq;

};

net/tls/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ CFLAGS_trace.o := -I$(src) 


obj-$(CONFIG_TLS) += tls.o



tls-y := tls_main.o tls_sw.o tls_proc.o trace.o

tls-y := tls_main.o tls_sw.o tls_proc.o trace.o tls_strp.o



tls-$(CONFIG_TLS_TOE) += tls_toe.o

tls-$(CONFIG_TLS_DEVICE) += tls_device.o tls_device_fallback.o

net/tls/tls.h

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ int tls_sw_fallback_init(struct sock *sk, 
			 struct tls_offload_context_tx *offload_ctx,

			 struct tls_crypto_info *crypto_info);



int tls_strp_msg_hold(struct sock *sk, struct sk_buff *skb,

		      struct sk_buff_head *dst);



static inline struct tls_msg *tls_msg(struct sk_buff *skb)

{

	struct sk_skb_cb *scb = (struct sk_skb_cb *)skb->cb;

net/tls/tls_strp.c

0 → 100644
+17 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



#include <linux/skbuff.h>



#include "tls.h"



int tls_strp_msg_hold(struct sock *sk, struct sk_buff *skb,

		      struct sk_buff_head *dst)

{

	struct sk_buff *clone;



	clone = skb_clone(skb, sk->sk_allocation);

	if (!clone)

		return -ENOMEM;

	__skb_queue_tail(dst, clone);

	return 0;

}

net/tls/tls_sw.c

+17 −9
Original line number Diff line number Diff line
@@ -1535,8 +1535,13 @@ static int tls_decrypt_sg(struct sock *sk, struct iov_iter *out_iov, 
		goto exit_free_pages;



	darg->skb = tls_strp_msg(ctx);

	if (darg->async)

		return 0;



	if (unlikely(darg->async)) {

		err = tls_strp_msg_hold(sk, skb, &ctx->async_hold);

		if (err)

			__skb_queue_tail(&ctx->async_hold, darg->skb);

		return err;

	}



	if (prot->tail_size)

		darg->tail = dctx->tail;
@@ -1998,15 +2003,17 @@ int tls_sw_recvmsg(struct sock *sk, 
		reinit_completion(&ctx->async_wait.completion);

		pending = atomic_read(&ctx->decrypt_pending);

		spin_unlock_bh(&ctx->decrypt_compl_lock);

		if (pending) {

		ret = 0;

		if (pending)

			ret = crypto_wait_req(-EINPROGRESS, &ctx->async_wait);

		__skb_queue_purge(&ctx->async_hold);



		if (ret) {

			if (err >= 0 || err == -EINPROGRESS)

				err = ret;

			decrypted = 0;

			goto end;

		}

		}



		/* Drain records from the rx_list & copy if required */

		if (is_peek || is_kvec)
@@ -2440,6 +2447,7 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx, int tx) 
		crypto_info = &ctx->crypto_recv.info;

		cctx = &ctx->rx;

		skb_queue_head_init(&sw_ctx_rx->rx_list);

		skb_queue_head_init(&sw_ctx_rx->async_hold);

		aead = &sw_ctx_rx->aead_recv;

	}