NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/tls: split tls_rx_reader_lock

Browse source 
[ Upstream commit f9ae3204fb45d0749befc1cdff50f691c7461e5a ]

Split tls_rx_reader_{lock,unlock} into an 'acquire/release' and
the actual locking part.
With that we can use the tls_rx_reader_lock in situations where
the socket is already locked.

Suggested-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20230726191556.41714-6-hare@suse.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 419ce133ab92 ("tcp: allow again tcp_disconnect() when threads are waiting")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hannes Reinecke 2023-07-26 21:15:55 +02:00 • committed by Greg Kroah-Hartman
parent 76f96854aa
commit 9dc02f41d5
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
net/tls/tls_sw.c
View file

@ -1851,13 +1851,10 @@ tls_read_flush_backlog(struct sock *sk, struct tls_prot_info *prot,
return sk_flush_backlog(sk); return sk_flush_backlog(sk);
} }
static int tls_rx_reader_lock(struct sock *sk, struct tls_sw_context_rx *ctx, static int tls_rx_reader_acquire(struct sock *sk, struct tls_sw_context_rx *ctx,
bool nonblock) bool nonblock)
{ {
long timeo; long timeo;
int err;
lock_sock(sk);
timeo = sock_rcvtimeo(sk, nonblock); timeo = sock_rcvtimeo(sk, nonblock);
@ -1871,26 +1868,30 @@ static int tls_rx_reader_lock(struct sock *sk, struct tls_sw_context_rx *ctx,
!READ_ONCE(ctx->reader_present), &wait); !READ_ONCE(ctx->reader_present), &wait);
remove_wait_queue(&ctx->wq, &wait); remove_wait_queue(&ctx->wq, &wait);
if (timeo <= 0) { if (timeo <= 0)
err = -EAGAIN; return -EAGAIN;
goto err_unlock; if (signal_pending(current))
} return sock_intr_errno(timeo);
if (signal_pending(current)) {
err = sock_intr_errno(timeo);
goto err_unlock;
}
} }
WRITE_ONCE(ctx->reader_present, 1); WRITE_ONCE(ctx->reader_present, 1);
return 0; return 0;
}
err_unlock: static int tls_rx_reader_lock(struct sock *sk, struct tls_sw_context_rx *ctx,
release_sock(sk); bool nonblock)
{
int err;
lock_sock(sk);
err = tls_rx_reader_acquire(sk, ctx, nonblock);
if (err)
release_sock(sk);
return err; return err;
} }
static void tls_rx_reader_unlock(struct sock *sk, struct tls_sw_context_rx *ctx) static void tls_rx_reader_release(struct sock *sk, struct tls_sw_context_rx *ctx)
{ {
if (unlikely(ctx->reader_contended)) { if (unlikely(ctx->reader_contended)) {
if (wq_has_sleeper(&ctx->wq)) if (wq_has_sleeper(&ctx->wq))
@ -1902,6 +1903,11 @@ static void tls_rx_reader_unlock(struct sock *sk, struct tls_sw_context_rx *ctx)
} }
WRITE_ONCE(ctx->reader_present, 0); WRITE_ONCE(ctx->reader_present, 0);
}
static void tls_rx_reader_unlock(struct sock *sk, struct tls_sw_context_rx *ctx)
{
tls_rx_reader_release(sk, ctx);
release_sock(sk); release_sock(sk);
} }