mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 09:16:29 +00:00
Convert slow net subsystems to modules on 4.14.
In setup_net() there are a few particularly slow subsystems that contribute more than 140ms of time to the new net namespace creation path. The docker daemon doesn't depend on these, and won't modprobe them into the kernel. Convert these to modules to reduce the amount of time it takes for docker to start a container. This change takes an additional ~120 ms of time off container start time. Signed-off-by: Krister Johansen <krister.johansen@oracle.com>
This commit is contained in:
parent
fac99683a7
commit
1095c2721d
@ -921,7 +921,7 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=y
|
||||
CONFIG_NETFILTER_XT_MATCH_HL=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPVS=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPVS=m
|
||||
CONFIG_NETFILTER_XT_MATCH_L2TP=y
|
||||
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
|
||||
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
|
||||
@ -963,7 +963,7 @@ CONFIG_IP_SET_HASH_NET=y
|
||||
CONFIG_IP_SET_HASH_NETPORT=y
|
||||
CONFIG_IP_SET_HASH_NETIFACE=y
|
||||
CONFIG_IP_SET_LIST_SET=y
|
||||
CONFIG_IP_VS=y
|
||||
CONFIG_IP_VS=m
|
||||
CONFIG_IP_VS_IPV6=y
|
||||
CONFIG_IP_VS_DEBUG=y
|
||||
CONFIG_IP_VS_TAB_BITS=12
|
||||
@ -981,18 +981,18 @@ CONFIG_IP_VS_PROTO_SCTP=y
|
||||
#
|
||||
# IPVS scheduler
|
||||
#
|
||||
CONFIG_IP_VS_RR=y
|
||||
CONFIG_IP_VS_WRR=y
|
||||
CONFIG_IP_VS_LC=y
|
||||
CONFIG_IP_VS_WLC=y
|
||||
CONFIG_IP_VS_FO=y
|
||||
CONFIG_IP_VS_OVF=y
|
||||
CONFIG_IP_VS_LBLC=y
|
||||
CONFIG_IP_VS_LBLCR=y
|
||||
CONFIG_IP_VS_DH=y
|
||||
CONFIG_IP_VS_SH=y
|
||||
CONFIG_IP_VS_SED=y
|
||||
CONFIG_IP_VS_NQ=y
|
||||
CONFIG_IP_VS_RR=m
|
||||
CONFIG_IP_VS_WRR=m
|
||||
CONFIG_IP_VS_LC=m
|
||||
CONFIG_IP_VS_WLC=m
|
||||
CONFIG_IP_VS_FO=m
|
||||
CONFIG_IP_VS_OVF=m
|
||||
CONFIG_IP_VS_LBLC=m
|
||||
CONFIG_IP_VS_LBLCR=m
|
||||
CONFIG_IP_VS_DH=m
|
||||
CONFIG_IP_VS_SH=m
|
||||
CONFIG_IP_VS_SED=m
|
||||
CONFIG_IP_VS_NQ=m
|
||||
|
||||
#
|
||||
# IPVS SH scheduler
|
||||
@ -1002,9 +1002,9 @@ CONFIG_IP_VS_SH_TAB_BITS=8
|
||||
#
|
||||
# IPVS application helper
|
||||
#
|
||||
CONFIG_IP_VS_FTP=y
|
||||
CONFIG_IP_VS_FTP=m
|
||||
CONFIG_IP_VS_NFCT=y
|
||||
CONFIG_IP_VS_PE_SIP=y
|
||||
CONFIG_IP_VS_PE_SIP=m
|
||||
|
||||
#
|
||||
# IP: Netfilter Configuration
|
||||
@ -1044,7 +1044,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
|
||||
CONFIG_IP_NF_TARGET_NETMAP=y
|
||||
CONFIG_IP_NF_TARGET_REDIRECT=y
|
||||
CONFIG_IP_NF_MANGLE=y
|
||||
CONFIG_IP_NF_TARGET_CLUSTERIP=y
|
||||
CONFIG_IP_NF_TARGET_CLUSTERIP=m
|
||||
CONFIG_IP_NF_TARGET_ECN=y
|
||||
CONFIG_IP_NF_TARGET_TTL=y
|
||||
CONFIG_IP_NF_RAW=y
|
||||
@ -1096,27 +1096,27 @@ CONFIG_NF_TABLES_BRIDGE=y
|
||||
CONFIG_NFT_BRIDGE_META=y
|
||||
CONFIG_NFT_BRIDGE_REJECT=y
|
||||
CONFIG_NF_LOG_BRIDGE=y
|
||||
CONFIG_BRIDGE_NF_EBTABLES=y
|
||||
CONFIG_BRIDGE_EBT_BROUTE=y
|
||||
CONFIG_BRIDGE_EBT_T_FILTER=y
|
||||
CONFIG_BRIDGE_EBT_T_NAT=y
|
||||
CONFIG_BRIDGE_EBT_802_3=y
|
||||
CONFIG_BRIDGE_EBT_AMONG=y
|
||||
CONFIG_BRIDGE_EBT_ARP=y
|
||||
CONFIG_BRIDGE_EBT_IP=y
|
||||
CONFIG_BRIDGE_EBT_IP6=y
|
||||
CONFIG_BRIDGE_EBT_LIMIT=y
|
||||
CONFIG_BRIDGE_EBT_MARK=y
|
||||
CONFIG_BRIDGE_EBT_PKTTYPE=y
|
||||
CONFIG_BRIDGE_EBT_STP=y
|
||||
CONFIG_BRIDGE_EBT_VLAN=y
|
||||
CONFIG_BRIDGE_EBT_ARPREPLY=y
|
||||
CONFIG_BRIDGE_EBT_DNAT=y
|
||||
CONFIG_BRIDGE_EBT_MARK_T=y
|
||||
CONFIG_BRIDGE_EBT_REDIRECT=y
|
||||
CONFIG_BRIDGE_EBT_SNAT=y
|
||||
CONFIG_BRIDGE_EBT_LOG=y
|
||||
CONFIG_BRIDGE_EBT_NFLOG=y
|
||||
CONFIG_BRIDGE_NF_EBTABLES=m
|
||||
CONFIG_BRIDGE_EBT_BROUTE=m
|
||||
CONFIG_BRIDGE_EBT_T_FILTER=m
|
||||
CONFIG_BRIDGE_EBT_T_NAT=m
|
||||
CONFIG_BRIDGE_EBT_802_3=m
|
||||
CONFIG_BRIDGE_EBT_AMONG=m
|
||||
CONFIG_BRIDGE_EBT_ARP=m
|
||||
CONFIG_BRIDGE_EBT_IP=m
|
||||
CONFIG_BRIDGE_EBT_IP6=m
|
||||
CONFIG_BRIDGE_EBT_LIMIT=m
|
||||
CONFIG_BRIDGE_EBT_MARK=m
|
||||
CONFIG_BRIDGE_EBT_PKTTYPE=m
|
||||
CONFIG_BRIDGE_EBT_STP=m
|
||||
CONFIG_BRIDGE_EBT_VLAN=m
|
||||
CONFIG_BRIDGE_EBT_ARPREPLY=m
|
||||
CONFIG_BRIDGE_EBT_DNAT=m
|
||||
CONFIG_BRIDGE_EBT_MARK_T=m
|
||||
CONFIG_BRIDGE_EBT_REDIRECT=m
|
||||
CONFIG_BRIDGE_EBT_SNAT=m
|
||||
CONFIG_BRIDGE_EBT_LOG=m
|
||||
CONFIG_BRIDGE_EBT_NFLOG=m
|
||||
# CONFIG_IP_DCCP is not set
|
||||
CONFIG_IP_SCTP=m
|
||||
# CONFIG_NET_SCTPPROBE is not set
|
||||
|
@ -859,7 +859,7 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=y
|
||||
CONFIG_NETFILTER_XT_MATCH_HL=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPVS=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPVS=m
|
||||
CONFIG_NETFILTER_XT_MATCH_L2TP=y
|
||||
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
|
||||
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
|
||||
@ -901,7 +901,7 @@ CONFIG_IP_SET_HASH_NET=y
|
||||
CONFIG_IP_SET_HASH_NETPORT=y
|
||||
CONFIG_IP_SET_HASH_NETIFACE=y
|
||||
CONFIG_IP_SET_LIST_SET=y
|
||||
CONFIG_IP_VS=y
|
||||
CONFIG_IP_VS=m
|
||||
CONFIG_IP_VS_IPV6=y
|
||||
CONFIG_IP_VS_DEBUG=y
|
||||
CONFIG_IP_VS_TAB_BITS=12
|
||||
@ -919,18 +919,18 @@ CONFIG_IP_VS_PROTO_SCTP=y
|
||||
#
|
||||
# IPVS scheduler
|
||||
#
|
||||
CONFIG_IP_VS_RR=y
|
||||
CONFIG_IP_VS_WRR=y
|
||||
CONFIG_IP_VS_LC=y
|
||||
CONFIG_IP_VS_WLC=y
|
||||
CONFIG_IP_VS_FO=y
|
||||
CONFIG_IP_VS_OVF=y
|
||||
CONFIG_IP_VS_LBLC=y
|
||||
CONFIG_IP_VS_LBLCR=y
|
||||
CONFIG_IP_VS_DH=y
|
||||
CONFIG_IP_VS_SH=y
|
||||
CONFIG_IP_VS_SED=y
|
||||
CONFIG_IP_VS_NQ=y
|
||||
CONFIG_IP_VS_RR=m
|
||||
CONFIG_IP_VS_WRR=m
|
||||
CONFIG_IP_VS_LC=m
|
||||
CONFIG_IP_VS_WLC=m
|
||||
CONFIG_IP_VS_FO=m
|
||||
CONFIG_IP_VS_OVF=m
|
||||
CONFIG_IP_VS_LBLC=m
|
||||
CONFIG_IP_VS_LBLCR=m
|
||||
CONFIG_IP_VS_DH=m
|
||||
CONFIG_IP_VS_SH=m
|
||||
CONFIG_IP_VS_SED=m
|
||||
CONFIG_IP_VS_NQ=m
|
||||
|
||||
#
|
||||
# IPVS SH scheduler
|
||||
@ -940,7 +940,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
|
||||
#
|
||||
# IPVS application helper
|
||||
#
|
||||
CONFIG_IP_VS_FTP=y
|
||||
CONFIG_IP_VS_FTP=m
|
||||
CONFIG_IP_VS_NFCT=y
|
||||
# CONFIG_IP_VS_PE_SIP is not set
|
||||
|
||||
@ -982,7 +982,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
|
||||
CONFIG_IP_NF_TARGET_NETMAP=y
|
||||
CONFIG_IP_NF_TARGET_REDIRECT=y
|
||||
CONFIG_IP_NF_MANGLE=y
|
||||
CONFIG_IP_NF_TARGET_CLUSTERIP=y
|
||||
CONFIG_IP_NF_TARGET_CLUSTERIP=m
|
||||
CONFIG_IP_NF_TARGET_ECN=y
|
||||
CONFIG_IP_NF_TARGET_TTL=y
|
||||
CONFIG_IP_NF_RAW=y
|
||||
@ -1034,27 +1034,27 @@ CONFIG_NF_TABLES_BRIDGE=y
|
||||
CONFIG_NFT_BRIDGE_META=y
|
||||
CONFIG_NFT_BRIDGE_REJECT=y
|
||||
CONFIG_NF_LOG_BRIDGE=y
|
||||
CONFIG_BRIDGE_NF_EBTABLES=y
|
||||
CONFIG_BRIDGE_EBT_BROUTE=y
|
||||
CONFIG_BRIDGE_EBT_T_FILTER=y
|
||||
CONFIG_BRIDGE_EBT_T_NAT=y
|
||||
CONFIG_BRIDGE_EBT_802_3=y
|
||||
CONFIG_BRIDGE_EBT_AMONG=y
|
||||
CONFIG_BRIDGE_EBT_ARP=y
|
||||
CONFIG_BRIDGE_EBT_IP=y
|
||||
CONFIG_BRIDGE_EBT_IP6=y
|
||||
CONFIG_BRIDGE_EBT_LIMIT=y
|
||||
CONFIG_BRIDGE_EBT_MARK=y
|
||||
CONFIG_BRIDGE_EBT_PKTTYPE=y
|
||||
CONFIG_BRIDGE_EBT_STP=y
|
||||
CONFIG_BRIDGE_EBT_VLAN=y
|
||||
CONFIG_BRIDGE_EBT_ARPREPLY=y
|
||||
CONFIG_BRIDGE_EBT_DNAT=y
|
||||
CONFIG_BRIDGE_EBT_MARK_T=y
|
||||
CONFIG_BRIDGE_EBT_REDIRECT=y
|
||||
CONFIG_BRIDGE_EBT_SNAT=y
|
||||
CONFIG_BRIDGE_EBT_LOG=y
|
||||
CONFIG_BRIDGE_EBT_NFLOG=y
|
||||
CONFIG_BRIDGE_NF_EBTABLES=m
|
||||
CONFIG_BRIDGE_EBT_BROUTE=m
|
||||
CONFIG_BRIDGE_EBT_T_FILTER=m
|
||||
CONFIG_BRIDGE_EBT_T_NAT=m
|
||||
CONFIG_BRIDGE_EBT_802_3=m
|
||||
CONFIG_BRIDGE_EBT_AMONG=m
|
||||
CONFIG_BRIDGE_EBT_ARP=m
|
||||
CONFIG_BRIDGE_EBT_IP=m
|
||||
CONFIG_BRIDGE_EBT_IP6=m
|
||||
CONFIG_BRIDGE_EBT_LIMIT=m
|
||||
CONFIG_BRIDGE_EBT_MARK=m
|
||||
CONFIG_BRIDGE_EBT_PKTTYPE=m
|
||||
CONFIG_BRIDGE_EBT_STP=m
|
||||
CONFIG_BRIDGE_EBT_VLAN=m
|
||||
CONFIG_BRIDGE_EBT_ARPREPLY=m
|
||||
CONFIG_BRIDGE_EBT_DNAT=m
|
||||
CONFIG_BRIDGE_EBT_MARK_T=m
|
||||
CONFIG_BRIDGE_EBT_REDIRECT=m
|
||||
CONFIG_BRIDGE_EBT_SNAT=m
|
||||
CONFIG_BRIDGE_EBT_LOG=m
|
||||
CONFIG_BRIDGE_EBT_NFLOG=m
|
||||
# CONFIG_IP_DCCP is not set
|
||||
CONFIG_IP_SCTP=m
|
||||
# CONFIG_NET_SCTPPROBE is not set
|
||||
|
@ -1080,7 +1080,7 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=y
|
||||
CONFIG_NETFILTER_XT_MATCH_HL=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPVS=y
|
||||
CONFIG_NETFILTER_XT_MATCH_IPVS=m
|
||||
CONFIG_NETFILTER_XT_MATCH_L2TP=y
|
||||
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
|
||||
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
|
||||
@ -1122,7 +1122,7 @@ CONFIG_IP_SET_HASH_NET=y
|
||||
CONFIG_IP_SET_HASH_NETPORT=y
|
||||
CONFIG_IP_SET_HASH_NETIFACE=y
|
||||
CONFIG_IP_SET_LIST_SET=y
|
||||
CONFIG_IP_VS=y
|
||||
CONFIG_IP_VS=m
|
||||
CONFIG_IP_VS_IPV6=y
|
||||
CONFIG_IP_VS_DEBUG=y
|
||||
CONFIG_IP_VS_TAB_BITS=12
|
||||
@ -1140,18 +1140,18 @@ CONFIG_IP_VS_PROTO_SCTP=y
|
||||
#
|
||||
# IPVS scheduler
|
||||
#
|
||||
CONFIG_IP_VS_RR=y
|
||||
CONFIG_IP_VS_WRR=y
|
||||
CONFIG_IP_VS_LC=y
|
||||
CONFIG_IP_VS_WLC=y
|
||||
CONFIG_IP_VS_FO=y
|
||||
CONFIG_IP_VS_OVF=y
|
||||
CONFIG_IP_VS_LBLC=y
|
||||
CONFIG_IP_VS_LBLCR=y
|
||||
CONFIG_IP_VS_DH=y
|
||||
CONFIG_IP_VS_SH=y
|
||||
CONFIG_IP_VS_SED=y
|
||||
CONFIG_IP_VS_NQ=y
|
||||
CONFIG_IP_VS_RR=m
|
||||
CONFIG_IP_VS_WRR=m
|
||||
CONFIG_IP_VS_LC=m
|
||||
CONFIG_IP_VS_WLC=m
|
||||
CONFIG_IP_VS_FO=m
|
||||
CONFIG_IP_VS_OVF=m
|
||||
CONFIG_IP_VS_LBLC=m
|
||||
CONFIG_IP_VS_LBLCR=m
|
||||
CONFIG_IP_VS_DH=m
|
||||
CONFIG_IP_VS_SH=m
|
||||
CONFIG_IP_VS_SED=m
|
||||
CONFIG_IP_VS_NQ=m
|
||||
|
||||
#
|
||||
# IPVS SH scheduler
|
||||
@ -1161,7 +1161,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
|
||||
#
|
||||
# IPVS application helper
|
||||
#
|
||||
CONFIG_IP_VS_FTP=y
|
||||
CONFIG_IP_VS_FTP=m
|
||||
CONFIG_IP_VS_NFCT=y
|
||||
# CONFIG_IP_VS_PE_SIP is not set
|
||||
|
||||
@ -1203,7 +1203,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
|
||||
CONFIG_IP_NF_TARGET_NETMAP=y
|
||||
CONFIG_IP_NF_TARGET_REDIRECT=y
|
||||
CONFIG_IP_NF_MANGLE=y
|
||||
CONFIG_IP_NF_TARGET_CLUSTERIP=y
|
||||
CONFIG_IP_NF_TARGET_CLUSTERIP=m
|
||||
CONFIG_IP_NF_TARGET_ECN=y
|
||||
CONFIG_IP_NF_TARGET_TTL=y
|
||||
CONFIG_IP_NF_RAW=y
|
||||
@ -1255,27 +1255,27 @@ CONFIG_NF_TABLES_BRIDGE=y
|
||||
CONFIG_NFT_BRIDGE_META=y
|
||||
CONFIG_NFT_BRIDGE_REJECT=y
|
||||
CONFIG_NF_LOG_BRIDGE=y
|
||||
CONFIG_BRIDGE_NF_EBTABLES=y
|
||||
CONFIG_BRIDGE_EBT_BROUTE=y
|
||||
CONFIG_BRIDGE_EBT_T_FILTER=y
|
||||
CONFIG_BRIDGE_EBT_T_NAT=y
|
||||
CONFIG_BRIDGE_EBT_802_3=y
|
||||
CONFIG_BRIDGE_EBT_AMONG=y
|
||||
CONFIG_BRIDGE_EBT_ARP=y
|
||||
CONFIG_BRIDGE_EBT_IP=y
|
||||
CONFIG_BRIDGE_EBT_IP6=y
|
||||
CONFIG_BRIDGE_EBT_LIMIT=y
|
||||
CONFIG_BRIDGE_EBT_MARK=y
|
||||
CONFIG_BRIDGE_EBT_PKTTYPE=y
|
||||
CONFIG_BRIDGE_EBT_STP=y
|
||||
CONFIG_BRIDGE_EBT_VLAN=y
|
||||
CONFIG_BRIDGE_EBT_ARPREPLY=y
|
||||
CONFIG_BRIDGE_EBT_DNAT=y
|
||||
CONFIG_BRIDGE_EBT_MARK_T=y
|
||||
CONFIG_BRIDGE_EBT_REDIRECT=y
|
||||
CONFIG_BRIDGE_EBT_SNAT=y
|
||||
CONFIG_BRIDGE_EBT_LOG=y
|
||||
CONFIG_BRIDGE_EBT_NFLOG=y
|
||||
CONFIG_BRIDGE_NF_EBTABLES=m
|
||||
CONFIG_BRIDGE_EBT_BROUTE=m
|
||||
CONFIG_BRIDGE_EBT_T_FILTER=m
|
||||
CONFIG_BRIDGE_EBT_T_NAT=m
|
||||
CONFIG_BRIDGE_EBT_802_3=m
|
||||
CONFIG_BRIDGE_EBT_AMONG=m
|
||||
CONFIG_BRIDGE_EBT_ARP=m
|
||||
CONFIG_BRIDGE_EBT_IP=m
|
||||
CONFIG_BRIDGE_EBT_IP6=m
|
||||
CONFIG_BRIDGE_EBT_LIMIT=m
|
||||
CONFIG_BRIDGE_EBT_MARK=m
|
||||
CONFIG_BRIDGE_EBT_PKTTYPE=m
|
||||
CONFIG_BRIDGE_EBT_STP=m
|
||||
CONFIG_BRIDGE_EBT_VLAN=m
|
||||
CONFIG_BRIDGE_EBT_ARPREPLY=m
|
||||
CONFIG_BRIDGE_EBT_DNAT=m
|
||||
CONFIG_BRIDGE_EBT_MARK_T=m
|
||||
CONFIG_BRIDGE_EBT_REDIRECT=m
|
||||
CONFIG_BRIDGE_EBT_SNAT=m
|
||||
CONFIG_BRIDGE_EBT_LOG=m
|
||||
CONFIG_BRIDGE_EBT_NFLOG=m
|
||||
# CONFIG_IP_DCCP is not set
|
||||
CONFIG_IP_SCTP=m
|
||||
# CONFIG_NET_SCTPPROBE is not set
|
||||
|
Loading…
Reference in New Issue
Block a user