net/tls: don't pay attention to sk_write_pending when pushing partial records (02b1fa07) · Commits · 戴 / test

sk_write_pending being not zero does not guarantee that partial record will be pushed. If the thread waiting for memory times out the pending record may get stuck. In case of tls_device there is no path where parial record is set and writer present in the first place. Partial record is set only in tls_push_sg() and tls_push_sg() will return an error immediately. All tls_device callers of tls_push_sg() will return (and not wait for memory) if it failed. Fixes: ("net/tls: Add support for async encryption of records for performance") Signed-off-by:

Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by:

Simon Horman <simon.horman@netronome.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/tls/tls_device.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -623,9 +623,11 @@ static int tls_device_push_pending_record(struct sock *sk, int flags)

		void tls_device_write_space(struct sock sk, struct tls_context ctx)
		{
		if (!sk->sk_write_pending && tls_is_partially_sent_record(ctx)) {
		if (tls_is_partially_sent_record(ctx)) {
		gfp_t sk_allocation = sk->sk_allocation;

		WARN_ON_ONCE(sk->sk_write_pending);

		sk->sk_allocation = GFP_ATOMIC;
		tls_push_partial_record(sk, ctx,
		MSG_DONTWAIT \| MSG_NOSIGNAL \|

net/tls/tls_sw.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -2180,13 +2180,10 @@ void tls_sw_write_space(struct sock sk, struct tls_context ctx)
		struct tls_sw_context_tx *tx_ctx = tls_sw_ctx_tx(ctx);

		/* Schedule the transmission if tx list is ready */
		if (is_tx_ready(tx_ctx) && !sk->sk_write_pending) {
		/* Schedule the transmission */
		if (!test_and_set_bit(BIT_TX_SCHEDULED,
		&tx_ctx->tx_bitmask))
		if (is_tx_ready(tx_ctx) &&
		!test_and_set_bit(BIT_TX_SCHEDULED, &tx_ctx->tx_bitmask))
		schedule_delayed_work(&tx_ctx->tx_work.work, 0);
		}
		}

		void tls_sw_strparser_arm(struct sock sk, struct tls_context tls_ctx)
		{

Admin message