kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

strparser: Add __strp_unpause and use it in ktls.

Browse source 
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: Doron Roberts-Kedes <doronrk@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Doron Roberts-Kedes 2018-06-06 09:33:28 -07:00 committed by David S. Miller
parent fb1967a69f
commit 7170e6045a
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/strparser.h
View file

@ -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)

13
net/strparser/strparser.c
View file

@ -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;

2
net/tls/tls_sw.c
View file

@ -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;
}