Commit edbed4da authored by Paolo Abeni's avatar Paolo Abeni Committed by Geliang Tang
Browse files

tcp: define initial scaling factor value as a macro 

mainline inclusion
from mainline-v6.7-rc1
commit 849ee75a38b297187c760bb1d23d8f2a7b1fc73e
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=849ee75a38b297187c760bb1d23d8f2a7b1fc73e



--------------------------------

So that other users could access it. Notably MPTCP will use
it in the next patch.

No functional change intended.

Acked-by: default avatarMatthieu Baerts <matttbe@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231023-send-net-next-20231023-2-v1-4-9dc60939d371@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 3404dfb5

include/net/tcp.h

+7 −5
Original line number Diff line number Diff line
@@ -1472,13 +1472,15 @@ static inline int tcp_space_from_win(const struct sock *sk, int win) 
	return __tcp_space_from_win(tcp_sk(sk)->scaling_ratio, win);

}



static inline void tcp_scaling_ratio_init(struct sock *sk)

{

/* Assume a conservative default of 1200 bytes of payload per 4K page.

 * This may be adjusted later in tcp_measure_rcv_mss().

 */

	tcp_sk(sk)->scaling_ratio = (1200 << TCP_RMEM_TO_WIN_SCALE) /

				    SKB_TRUESIZE(4096);

#define TCP_DEFAULT_SCALING_RATIO ((1200 << TCP_RMEM_TO_WIN_SCALE) / \

				   SKB_TRUESIZE(4096))



static inline void tcp_scaling_ratio_init(struct sock *sk)

{

	tcp_sk(sk)->scaling_ratio = TCP_DEFAULT_SCALING_RATIO;

}



/* Note: caller must be prepared to deal with negative returns */