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

Commit e6280603 authored by Paolo Abeni's avatar Paolo Abeni Committed by Greg Kroah-Hartman
Browse files

tcp: factor out __tcp_close() helper 



[ Upstream commit 77c3c95637526f1e4330cc9a4b2065f668c2c4fe ]

unlocked version of protocol level close, will be used by
MPTCP to allow decouple orphaning and subflow level close.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Stable-dep-of: e14cadfd80d7 ("tcp: add annotations around sk->sk_shutdown accesses")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7e120db7

include/net/tcp.h

+1 −0
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ void tcp_update_metrics(struct sock *sk); 
void tcp_init_metrics(struct sock *sk);

void tcp_metrics_init(void);

bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst);

void __tcp_close(struct sock *sk, long timeout);

void tcp_close(struct sock *sk, long timeout);

void tcp_init_sock(struct sock *sk);

void tcp_init_transfer(struct sock *sk, int bpf_op);

net/ipv4/tcp.c

+7 −2
Original line number Diff line number Diff line
@@ -2338,13 +2338,12 @@ bool tcp_check_oom(struct sock *sk, int shift) 
	return too_many_orphans || out_of_socket_memory;

}



void tcp_close(struct sock *sk, long timeout)

void __tcp_close(struct sock *sk, long timeout)

{

	struct sk_buff *skb;

	int data_was_unread = 0;

	int state;



	lock_sock(sk);

	sk->sk_shutdown = SHUTDOWN_MASK;



	if (sk->sk_state == TCP_LISTEN) {
@@ -2505,6 +2504,12 @@ void tcp_close(struct sock *sk, long timeout) 
out:

	bh_unlock_sock(sk);

	local_bh_enable();

}



void tcp_close(struct sock *sk, long timeout)

{

	lock_sock(sk);

	__tcp_close(sk, timeout);

	release_sock(sk);

	sock_put(sk);

}