Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7170e604 authored by Doron Roberts-Kedes's avatar Doron Roberts-Kedes Committed by David S. Miller
Browse files

strparser: Add __strp_unpause and use it in ktls. 



strp_unpause queues strp_work in order to parse any messages that
arrived while the strparser was paused. However, the process invoking
strp_unpause could eagerly parse a buffered message itself if it held
the sock lock.

__strp_unpause is an alternative to strp_pause that avoids the scheduling
overhead that results when a receiving thread unpauses the strparser
and waits for the next message to be delivered by the workqueue thread.

This patch more than doubled the IOPS achieved in a benchmark of NBD
traffic encrypted using ktls.

Signed-off-by: default avatarDoron Roberts-Kedes <doronrk@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb1967a6

include/net/strparser.h

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ static inline void strp_pause(struct strparser *strp) 


/* May be called without holding lock for attached socket */

void strp_unpause(struct strparser *strp);

/* Must be called with process lock held (lock_sock) */

void __strp_unpause(struct strparser *strp);



static inline void save_strp_stats(struct strparser *strp,

				   struct strp_aggr_stats *agg_stats)

net/strparser/strparser.c

+13 −0
Original line number Diff line number Diff line
@@ -512,6 +512,19 @@ int strp_init(struct strparser *strp, struct sock *sk, 
}

EXPORT_SYMBOL_GPL(strp_init);



/* Sock process lock held (lock_sock) */

void __strp_unpause(struct strparser *strp)

{

	strp->paused = 0;



	if (strp->need_bytes) {

		if (strp_peek_len(strp) < strp->need_bytes)

			return;

	}

	strp_read_sock(strp);

}

EXPORT_SYMBOL_GPL(__strp_unpause);



void strp_unpause(struct strparser *strp)

{

	strp->paused = 0;

net/tls/tls_sw.c

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ static bool tls_sw_advance_skb(struct sock *sk, struct sk_buff *skb, 
	/* Finished with message */

	ctx->recv_pkt = NULL;

	kfree_skb(skb);

	strp_unpause(&ctx->strp);

	__strp_unpause(&ctx->strp);



	return true;

}