Skip to content

Commit c212d2c

Browse files
Dave Watsondavem330
Dave Watson
authored andcommitted
net/tls: Don't recursively call push_record during tls_write_space callbacks
It is reported that in some cases, write_space may be called in do_tcp_sendpages, such that we recursively invoke do_tcp_sendpages again: [ 660.468802] ? do_tcp_sendpages+0x8d/0x580 [ 660.468826] ? tls_push_sg+0x74/0x130 [tls] [ 660.468852] ? tls_push_record+0x24a/0x390 [tls] [ 660.468880] ? tls_write_space+0x6a/0x80 [tls] ... tls_push_sg already does a loop over all sending sg's, so ignore any tls_write_space notifications until we are done sending. We then have to call the previous write_space to wake up poll() waiters after we are done with the send loop. Reported-by: Andre Tomt <andre@tomt.net> Signed-off-by: Dave Watson <davejwatson@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent edd7ceb commit c212d2c

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

include/net/tls.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ struct tls_context {
148148
struct scatterlist *partially_sent_record;
149149
u16 partially_sent_offset;
150150
unsigned long flags;
151+
bool in_tcp_sendpages;
151152

152153
u16 pending_open_record_frags;
153154
int (*push_pending_record)(struct sock *sk, int flags);

net/tls/tls_main.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ int tls_push_sg(struct sock *sk,
114114
size = sg->length - offset;
115115
offset += sg->offset;
116116

117+
ctx->in_tcp_sendpages = true;
117118
while (1) {
118119
if (sg_is_last(sg))
119120
sendpage_flags = flags;
@@ -148,6 +149,8 @@ int tls_push_sg(struct sock *sk,
148149
}
149150

150151
clear_bit(TLS_PENDING_CLOSED_RECORD, &ctx->flags);
152+
ctx->in_tcp_sendpages = false;
153+
ctx->sk_write_space(sk);
151154

152155
return 0;
153156
}
@@ -217,6 +220,10 @@ static void tls_write_space(struct sock *sk)
217220
{
218221
struct tls_context *ctx = tls_get_ctx(sk);
219222

223+
/* We are already sending pages, ignore notification */
224+
if (ctx->in_tcp_sendpages)
225+
return;
226+
220227
if (!sk->sk_write_pending && tls_is_pending_closed_record(ctx)) {
221228
gfp_t sk_allocation = sk->sk_allocation;
222229
int rc;

0 commit comments

Comments
 (0)