Commit 1685e177 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

tcp: move tcp_stream_memory_free() to tcp.c 



Moving tcp_stream_memory_free() to tcp.c allows the compiler
to (auto)inline it from tcp_poll() and tcp_sendmsg_locked()
for better performance.

$ scripts/bloat-o-meter -t vmlinux.old vmlinux.new
add/remove: 0/0 grow/shrink: 2/0 up/down: 118/0 (118)
Function                                     old     new   delta
tcp_poll                                     840     923     +83
tcp_sendmsg_locked                          4217    4252     +35
Total: Before=22573095, After=22573213, chg +0.00%

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarNeal Cardwell <ncardwell@google.com>
Link: https://patch.msgid.link/20260122090228.1678207-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 339e7f59

net/ipv4/tcp.c

+13 −0
Original line number Diff line number Diff line
@@ -517,6 +517,19 @@ static void tcp_tx_timestamp(struct sock *sk, struct sockcm_cookie *sockc) 
		bpf_skops_tx_timestamping(sk, skb, BPF_SOCK_OPS_TSTAMP_SENDMSG_CB);

}



/* @wake is one when sk_stream_write_space() calls us.

 * This sends EPOLLOUT only if notsent_bytes is half the limit.

 * This mimics the strategy used in sock_def_write_space().

 */

bool tcp_stream_memory_free(const struct sock *sk, int wake)

{

	const struct tcp_sock *tp = tcp_sk(sk);

	u32 notsent_bytes = READ_ONCE(tp->write_seq) - READ_ONCE(tp->snd_nxt);



	return (notsent_bytes << wake) < tcp_notsent_lowat(tp);

}

EXPORT_SYMBOL(tcp_stream_memory_free);



static bool tcp_stream_is_readable(struct sock *sk, int target)

{

	if (tcp_epollin_ready(sk, target))

net/ipv4/tcp_ipv4.c

+0 −14
Original line number Diff line number Diff line
@@ -3418,20 +3418,6 @@ void tcp4_proc_exit(void) 
}

#endif /* CONFIG_PROC_FS */



/* @wake is one when sk_stream_write_space() calls us.

 * This sends EPOLLOUT only if notsent_bytes is half the limit.

 * This mimics the strategy used in sock_def_write_space().

 */

bool tcp_stream_memory_free(const struct sock *sk, int wake)

{

	const struct tcp_sock *tp = tcp_sk(sk);

	u32 notsent_bytes = READ_ONCE(tp->write_seq) -

			    READ_ONCE(tp->snd_nxt);



	return (notsent_bytes << wake) < tcp_notsent_lowat(tp);

}

EXPORT_SYMBOL(tcp_stream_memory_free);



struct proto tcp_prot = {

	.name			= "TCP",

	.owner			= THIS_MODULE,