Unverified Commit b861615c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3732 tcp_comp: implement tcp compression 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lu Wei <luwei32@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OMZVSDVMDCB3P3TZXKPNAC3TILZPKPMA/ 
 
https://gitee.com/openeuler/kernel/issues/I8T5DG 
 
Link:https://gitee.com/openeuler/kernel/pulls/3732

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 2804c510 c31dcf6c

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -1246,6 +1246,7 @@ CONFIG_DEFAULT_CUBIC=y 
# CONFIG_DEFAULT_RENO is not set

CONFIG_DEFAULT_TCP_CONG="cubic"

CONFIG_TCP_MD5SIG=y

CONFIG_TCP_COMP=y

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -1263,6 +1263,7 @@ CONFIG_DEFAULT_CUBIC=y 
# CONFIG_DEFAULT_RENO is not set

CONFIG_DEFAULT_TCP_CONG="cubic"

CONFIG_TCP_MD5SIG=y

CONFIG_TCP_COMP=y

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

include/linux/tcp.h

+7 −1
Original line number Diff line number Diff line
@@ -123,7 +123,10 @@ struct tcp_options_received { 
		snd_wscale : 4,	/* Window scaling received from sender	*/

		rcv_wscale : 4;	/* Window scaling to send to receiver	*/

	u8	saw_unknown:1,	/* Received unknown option		*/

		unused:7;

#if IS_ENABLED(CONFIG_TCP_COMP)

		comp_ok:1,	/* COMP seen on SYN packet		*/

#endif

		unused:6;

	u8	num_sacks;	/* Number of SACK blocks		*/

	u16	user_mss;	/* mss requested by user in ioctl	*/

	u16	mss_clamp;	/* Maximal mss, negotiated at connection setup */
@@ -136,6 +139,9 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt) 
#if IS_ENABLED(CONFIG_SMC)

	rx_opt->smc_ok = 0;

#endif

#if IS_ENABLED(CONFIG_TCP_COMP)

	rx_opt->comp_ok = 0;

#endif

}



/* This is the max number of SACKS that we'll generate and process. It's safe

include/net/inet_sock.h

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ struct inet_request_sock { 
				ecn_ok	   : 1,

				acked	   : 1,

				no_srccheck: 1,

#if IS_ENABLED(CONFIG_TCP_COMP)

				comp_ok	   : 1,

#endif

				smc_ok	   : 1;

	u32                     ir_mark;

	union {

include/net/sock.h

+1 −0
Original line number Diff line number Diff line
@@ -959,6 +959,7 @@ enum sock_flags { 
	SOCK_XDP, /* XDP is attached */

	SOCK_TSTAMP_NEW, /* Indicates 64 bit timestamps always */

	SOCK_RCVMARK, /* Receive SO_MARK  ancillary data with packet */

	SOCK_COMP,

};



#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE))