Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

calico fixes #7184

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

calico fixes #7184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion .build/images/Quartz64/quartz64_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=y
CONFIG_BLK_DEV_RAM=n
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_THROTTLING=y
Copy link
Owner

@MichaIng MichaIng Nov 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That one seems to be pretty special, are you sure it is really used? E.g. the RPi kernel does not define it either. Probably it requires hardware support as well.

CONFIG_BOOTTIME_TRACING=y
CONFIG_BPF_JIT=y
CONFIG_BPF_SYSCALL=y
Expand Down Expand Up @@ -89,6 +90,7 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_HUGETLB=y
CONFIG_CGROUP_MISC=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
CONFIG_CHARGER_RK817=y
Expand Down Expand Up @@ -138,6 +140,7 @@ CONFIG_CRYPTO_ECDH=y
CONFIG_CRYPTO_ECHAINIV=y
CONFIG_CRYPTO_GHASH_ARM64_CE=y
CONFIG_CRYPTO_MD4=y
CONFIG_CRYPTO_SEQIV=m
CONFIG_CRYPTO_SHA1_ARM64_CE=y
CONFIG_CRYPTO_SHA2_ARM64_CE=y
CONFIG_CRYPTO_SHA3_ARM64=m
Expand Down Expand Up @@ -311,8 +314,10 @@ CONFIG_IP_MULTICAST=y
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_PNP=y
Expand All @@ -337,6 +342,12 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET_MAX=256
CONFIG_IP_VS=m
CONFIG_IP_VS_PROTO_TCP=y
CONFIG_IP_VS_PROTO_UDP=y
CONFIG_IP_VS_RR=m
CONFIG_IP_VS_NFCT=y
CONFIG_IP_VS_FTP=n
CONFIG_IP_VS_PE_SIP=n
Comment on lines +349 to +350
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you disable those explicitly? They are not defined (not even as "is not set") in our final kernel config, so it would not change something, but RPi and Debian kernels have the modules for those enabled. So, I guess either the lines can be removed, or we add the modules as well.

CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_ISCSI_TCP=m
CONFIG_IXGB=y
Expand Down Expand Up @@ -549,6 +560,7 @@ CONFIG_NET_ACT_MIRRED=m
CONFIG_NET_CLS_ACT=y
CONFIG_NET_CLS_BPF=m
CONFIG_NET_CLS_BASIC=m
CONFIG_NET_CLS_CGROUP=m
CONFIG_NET_CLS_FLOWER=m
CONFIG_NET_DSA=m
CONFIG_NET_SCHED=y
Expand Down Expand Up @@ -662,7 +674,7 @@ CONFIG_NFT_SOCKET=m
CONFIG_NFT_SYNPROXY=m
CONFIG_NFT_TPROXY=m
CONFIG_NFT_TUNNEL=m
CONFIG_NFT_XFRM=m
CONFIG_NFT_XFRM=n
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, this is set in RPi and Debian kernel. So disabling it explicitly, might beak something. If this module must not be loaded in your case, blacklist it via /etc/modprobe.d.

CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_BRIDGE=m
Expand Down Expand Up @@ -1123,3 +1135,16 @@ CONFIG_ZSWAP=y
CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
CONFIG_ZSWAP_DEFAULT_ON=y
CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
CONFIG_RT_GROUP_SCHED=y
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as CONFIG_BLK_DEV_THROTTLING, this group scheduler is not available on RPi or Debian kernel either, so seems to be a very rare use case. Are you sure if is needed for Calico networks?

CONFIG_INET_ESP=m
CONFIG_INET_ESPINTCP=n
CONFIG_INET_ESP_OFFLOAD=n
Comment on lines +1140 to +1141
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both are not defined in our kernel, so it shouldn't be required to explicitly disable them.

CONFIG_XFRM_USER=m
CONFIG_XFRM=y
CONFIG_XFRM_ALGO=m
CONFIG_XFRM_ESP=m
CONFIG_XFRM_INTERFACE=n
CONFIG_XFRM_MIGRATE=n
CONFIG_XFRM_STATISTICS=n
CONFIG_XFRM_SUB_POLICY=n
Comment on lines +1146 to +1149
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, why is it needed to explicitly disable those features? Or is it just that they get implicitly enabled with CONFIG_XFRM=y, and your aim was to enable only the minimal additional feature set?