calico fixes #7184
calico fixes #7184
Conversation
|
What else should I do to get this merged? |
| @@ -44,6 +44,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 | |||
There was a problem hiding this comment.
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_IP_VS_FTP=n | ||
| CONFIG_IP_VS_PE_SIP=n |
There was a problem hiding this comment.
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.
| @@ -661,7 +673,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 | |||
There was a problem hiding this comment.
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.
| @@ -1122,3 +1134,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 | |||
There was a problem hiding this comment.
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_ESPINTCP=n | ||
| CONFIG_INET_ESP_OFFLOAD=n |
There was a problem hiding this comment.
Both are not defined in our kernel, so it shouldn't be required to explicitly disable them.
| CONFIG_XFRM_INTERFACE=n | ||
| CONFIG_XFRM_MIGRATE=n | ||
| CONFIG_XFRM_STATISTICS=n | ||
| CONFIG_XFRM_SUB_POLICY=n |
There was a problem hiding this comment.
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?
|
Sorry for the long time it took to review it. I added some comments above. Most seems fine. I guess you explicitly disabled some features, which are implicitly enabled with their parent configs? IMO this is not needed. If we enable a parent feature, it is IMO fine to have the kernel enable additional sub features of it, according to its defaults. It might be confusing, if we tailor it too much, a way that users see a kernel module or feature, but not fully functional the way they are used to on plain Debian or other distros. |
|
Basically everything came from getting It was a while ago and I don't remember what magic I used to get the config delta. I think it was menuconfig and the built-in config diff. (Looks like it was 6.10.11.) |
Add more missing configs for Calico. With this config it joins the mesh successfully and seems to be working normally.