From 05878a8df4fd3f4372fbcf06dc6cbe2368ee8e88 Mon Sep 17 00:00:00 2001 From: virant Date: Fri, 23 Oct 2026 20:56:25 +0200 Subject: [PATCH 1/2] fix(config): give arm64 the SmoothRouter netfilter and PPPoE path The released arm64 kernel had no NF_TABLES_INET, NF_NAT, NF_FLOW_TABLE, PPP or PPPOE. The profile asked for NFT_NAT, NFT_MASQ, NFT_FIB_INET and NFT_FLOW_OFFLOAD, but their parents have no default and were unset in the arm64 seed, so olddefconfig silently dropped them. amd64 only worked because its seed already carried the parents. Set the parents explicitly in the shared profile, add PPPoE, the qdiscs SQM needs and the netdev LED trigger, and regenerate the arm64 seed against the patched 7.2.10 tree. scripts/check-router-config.sh asserts the router symbols on both seeds (make check-router-config, run in CI) and on the resolved .config of every build. The amd64 seed is unchanged: regenerating it with Debian's gcc 14 would churn compiler-dependent options unrelated to this fix. --- .github/workflows/release.yml | 3 + Makefile | 6 +- configs/7.2.10/smooth-arm64.config | 89 +++++++++++++++++++++++------- configs/smooth-arm64.config | 89 +++++++++++++++++++++++------- docs/kernel-config.md | 4 ++ recipes/build-kernel.sh | 35 ++++++++++++ scripts/check-router-config.sh | 41 ++++++++++++++ 7 files changed, 228 insertions(+), 39 deletions(-) create mode 100755 scripts/check-router-config.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f75b40..68d907d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -101,6 +101,9 @@ jobs: - name: Check ROCm kernel config run: make check-rocm-config + - name: Check router kernel config + run: make check-router-config + - name: Seed build.env run: cp examples/smooth.env build.env diff --git a/Makefile b/Makefile index 93a029a..cf73f6f 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ NOBARA_PATCHSET ?= nobara-picks POST_NOBARA_PATCHSET ?= post-nobara-$(KERNEL_VERSION) OUT_DIR ?= $(CURDIR)/out -.PHONY: help kernel kernel-all kernel-config-update kernel-config-update-all check-rocm-config check-zfs-dkms zfs clean show +.PHONY: help kernel kernel-all kernel-config-update kernel-config-update-all check-rocm-config check-router-config check-zfs-dkms zfs clean show help: @echo "smoothkernel — Smooth* shared kernel build harness" @@ -34,6 +34,7 @@ help: @echo " kernel-config-update Refresh configs/ against the patched kernel tree" @echo " kernel-config-update-all Refresh configs/ for ARCHES='$(ARCHES)'" @echo " check-rocm-config Assert amd64 SmoothKernel keeps ROCm/KFD symbols enabled" + @echo " check-router-config Assert every arch keeps the SmoothRouter netfilter/PPPoE symbols" @echo " zfs Build OpenZFS .debs (zfs-dkms + libs + utils)" @echo " check-zfs-dkms Rebuild packaged ZFS against the built kernel (native)" @echo " clean Remove build trees + out/" @@ -91,6 +92,9 @@ kernel-config-update-all: check-rocm-config: @$(CURDIR)/scripts/check-rocm-config.sh +check-router-config: + @$(CURDIR)/scripts/check-router-config.sh + check-zfs-dkms: @$(CURDIR)/recipes/check-zfs-dkms.sh diff --git a/configs/7.2.10/smooth-arm64.config b/configs/7.2.10/smooth-arm64.config index 14606e9..4b6c75e 100644 --- a/configs/7.2.10/smooth-arm64.config +++ b/configs/7.2.10/smooth-arm64.config @@ -2,26 +2,28 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 7.2.10 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-linux-gcc (GCC) 14.2.0" +CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Debian 14.2.0-19) 14.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24400 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24400 CONFIG_LLD_VERSION=0 CONFIG_RUSTC_VERSION=0 CONFIG_RUSTC_LLVM_VERSION=0 CONFIG_RUSTC_LLVM_MAJOR_VERSION=0 +CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_ASSUME=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_CC_OPT_INLINE_MEMSET="-finline-stringops=memset" CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y -CONFIG_PAHOLE_VERSION=132 +CONFIG_PAHOLE_VERSION=130 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -898,6 +900,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y +CONFIG_RELR=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_ARCH_HAS_CC_PLATFORM=y CONFIG_HAVE_PREEMPT_DYNAMIC=y @@ -1163,6 +1166,7 @@ CONFIG_NET=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y CONFIG_NET_XGRESS=y +CONFIG_NET_REDIRECT=y CONFIG_SKB_EXTENSIONS=y CONFIG_NET_DEVMEM=y CONFIG_NET_CRC32C=y @@ -1275,7 +1279,7 @@ CONFIG_NETFILTER_BPF_LINK=y # CONFIG_NETFILTER_NETLINK_OSF is not set CONFIG_NF_CONNTRACK=m CONFIG_NF_LOG_SYSLOG=m -# CONFIG_NF_CONNTRACK_MARK is not set +CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_ZONES is not set # CONFIG_NF_CONNTRACK_PROCFS is not set CONFIG_NF_CONNTRACK_EVENTS=y @@ -1294,26 +1298,42 @@ CONFIG_NF_CT_PROTO_SCTP=y # CONFIG_NF_CONNTRACK_SIP is not set # CONFIG_NF_CONNTRACK_TFTP is not set # CONFIG_NF_CT_NETLINK is not set -# CONFIG_NF_NAT is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_REDIRECT=y +CONFIG_NF_NAT_MASQUERADE=y CONFIG_NF_TABLES=m -# CONFIG_NF_TABLES_INET is not set -# CONFIG_NF_TABLES_NETDEV is not set +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_NETDEV=y # CONFIG_NFT_NUMGEN is not set CONFIG_NFT_CT=m # CONFIG_NFT_EXTHDR_DCCP is not set +CONFIG_NFT_FLOW_OFFLOAD=m # CONFIG_NFT_CONNLIMIT is not set CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m # CONFIG_NFT_TUNNEL is not set # CONFIG_NFT_QUOTA is not set CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m # CONFIG_NFT_COMPAT is not set # CONFIG_NFT_HASH is not set +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m # CONFIG_NFT_SOCKET is not set # CONFIG_NFT_OSF is not set # CONFIG_NFT_TPROXY is not set # CONFIG_NFT_SYNPROXY is not set -# CONFIG_NF_FLOW_TABLE is not set +# CONFIG_NF_DUP_NETDEV is not set +# CONFIG_NFT_DUP_NETDEV is not set +# CONFIG_NFT_FWD_NETDEV is not set +# CONFIG_NFT_FIB_NETDEV is not set +# CONFIG_NFT_REJECT_NETDEV is not set +CONFIG_NF_FLOW_TABLE_INET=m +CONFIG_NF_FLOW_TABLE=m +# CONFIG_NF_FLOW_TABLE_PROCFS is not set CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XTABLES_COMPAT is not set # CONFIG_NETFILTER_XTABLES_LEGACY is not set @@ -1335,9 +1355,13 @@ CONFIG_NETFILTER_XT_MARK=m # CONFIG_NETFILTER_XT_TARGET_LED is not set CONFIG_NETFILTER_XT_TARGET_LOG=m # CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_NAT is not set +# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set +# CONFIG_NETFILTER_XT_TARGET_MASQUERADE is not set # CONFIG_NETFILTER_XT_TARGET_TEE is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set @@ -1445,12 +1469,15 @@ CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_NF_DEFRAG_IPV4=m # CONFIG_NF_SOCKET_IPV4 is not set # CONFIG_NF_TPROXY_IPV4 is not set -# CONFIG_NF_TABLES_IPV4 is not set +CONFIG_NF_TABLES_IPV4=y +CONFIG_NFT_REJECT_IPV4=m +# CONFIG_NFT_DUP_IPV4 is not set +CONFIG_NFT_FIB_IPV4=m # CONFIG_NF_TABLES_ARP is not set # CONFIG_NF_DUP_IPV4 is not set # CONFIG_NF_LOG_ARP is not set # CONFIG_NF_LOG_IPV4 is not set -# CONFIG_NF_REJECT_IPV4 is not set +CONFIG_NF_REJECT_IPV4=m CONFIG_IP_NF_IPTABLES=m # CONFIG_IP_NF_MATCH_AH is not set # CONFIG_IP_NF_MATCH_ECN is not set @@ -1463,9 +1490,12 @@ CONFIG_IP_NF_IPTABLES=m # # CONFIG_NF_SOCKET_IPV6 is not set # CONFIG_NF_TPROXY_IPV6 is not set -# CONFIG_NF_TABLES_IPV6 is not set +CONFIG_NF_TABLES_IPV6=y +CONFIG_NFT_REJECT_IPV6=m +# CONFIG_NFT_DUP_IPV6 is not set +CONFIG_NFT_FIB_IPV6=m # CONFIG_NF_DUP_IPV6 is not set -# CONFIG_NF_REJECT_IPV6 is not set +CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_AH is not set @@ -1541,7 +1571,7 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -# CONFIG_NET_SCH_HTB is not set +CONFIG_NET_SCH_HTB=m # CONFIG_NET_SCH_HFSC is not set # CONFIG_NET_SCH_PRIO is not set # CONFIG_NET_SCH_MULTIQ is not set @@ -1562,8 +1592,8 @@ CONFIG_NET_SCH_MQPRIO=m # CONFIG_NET_SCH_CHOKE is not set # CONFIG_NET_SCH_QFQ is not set # CONFIG_NET_SCH_CODEL is not set -# CONFIG_NET_SCH_FQ_CODEL is not set -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_FQ=y # CONFIG_NET_SCH_HHF is not set # CONFIG_NET_SCH_PIE is not set @@ -1573,6 +1603,7 @@ CONFIG_NET_SCH_INGRESS=m # CONFIG_NET_SCH_DUALPI2 is not set CONFIG_NET_SCH_DEFAULT=y CONFIG_DEFAULT_FQ=y +# CONFIG_DEFAULT_FQ_CODEL is not set # CONFIG_DEFAULT_PFIFO_FAST is not set CONFIG_DEFAULT_NET_SCH="fq" @@ -1604,9 +1635,12 @@ CONFIG_NET_ACT_MIRRED=m # CONFIG_NET_ACT_MPLS is not set # CONFIG_NET_ACT_VLAN is not set # CONFIG_NET_ACT_BPF is not set +# CONFIG_NET_ACT_CONNMARK is not set +# CONFIG_NET_ACT_CTINFO is not set # CONFIG_NET_ACT_SKBMOD is not set # CONFIG_NET_ACT_IFE is not set # CONFIG_NET_ACT_TUNNEL_KEY is not set +# CONFIG_NET_ACT_CT is not set CONFIG_NET_ACT_GATE=m # CONFIG_NET_TC_SKB_EXT is not set CONFIG_NET_SCH_FIFO=y @@ -2562,7 +2596,7 @@ CONFIG_WIREGUARD=m # CONFIG_OVPN is not set # CONFIG_EQUALIZER is not set # CONFIG_NET_FC is not set -# CONFIG_IFB is not set +CONFIG_IFB=m # CONFIG_NET_TEAM is not set CONFIG_MACVLAN=m CONFIG_MACVTAP=m @@ -2778,6 +2812,7 @@ CONFIG_I40E=m # CONFIG_ICE is not set # CONFIG_FM10K is not set CONFIG_IGC=m +CONFIG_IGC_LEDS=y # CONFIG_IDPF is not set # CONFIG_JME is not set CONFIG_NET_VENDOR_ADI=y @@ -2880,6 +2915,7 @@ CONFIG_NET_VENDOR_REALTEK=y # CONFIG_8139CP is not set # CONFIG_8139TOO is not set CONFIG_R8169=m +CONFIG_R8169_LEDS=y # CONFIG_RTASE is not set CONFIG_NET_VENDOR_RENESAS=y CONFIG_SH_ETH=y @@ -3149,8 +3185,23 @@ CONFIG_PCS_LYNX=y CONFIG_PCS_RZN1_MIIC=m # end of PCS device drivers -# CONFIG_PPP is not set +CONFIG_PPP=m +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPP_MULTILINK is not set +CONFIG_PPPOX=m +CONFIG_PPPOE=m +# CONFIG_PPPOE_HASH_BITS_1 is not set +# CONFIG_PPPOE_HASH_BITS_2 is not set +CONFIG_PPPOE_HASH_BITS_4=y +# CONFIG_PPPOE_HASH_BITS_8 is not set +CONFIG_PPPOE_HASH_BITS=4 +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set # CONFIG_SLIP is not set +CONFIG_SLHC=m CONFIG_USB_NET_DRIVERS=y # CONFIG_USB_CATC is not set # CONFIG_USB_KAWETH is not set @@ -8160,7 +8211,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # CONFIG_LEDS_TRIGGER_TRANSIENT is not set # CONFIG_LEDS_TRIGGER_CAMERA is not set CONFIG_LEDS_TRIGGER_PANIC=y -# CONFIG_LEDS_TRIGGER_NETDEV is not set +CONFIG_LEDS_TRIGGER_NETDEV=m # CONFIG_LEDS_TRIGGER_PATTERN is not set # CONFIG_LEDS_TRIGGER_TTY is not set # CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set diff --git a/configs/smooth-arm64.config b/configs/smooth-arm64.config index 14606e9..4b6c75e 100644 --- a/configs/smooth-arm64.config +++ b/configs/smooth-arm64.config @@ -2,26 +2,28 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 7.2.10 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-linux-gcc (GCC) 14.2.0" +CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Debian 14.2.0-19) 14.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24400 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24400 CONFIG_LLD_VERSION=0 CONFIG_RUSTC_VERSION=0 CONFIG_RUSTC_LLVM_VERSION=0 CONFIG_RUSTC_LLVM_MAJOR_VERSION=0 +CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_ASSUME=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_CC_OPT_INLINE_MEMSET="-finline-stringops=memset" CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y -CONFIG_PAHOLE_VERSION=132 +CONFIG_PAHOLE_VERSION=130 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -898,6 +900,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y +CONFIG_RELR=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_ARCH_HAS_CC_PLATFORM=y CONFIG_HAVE_PREEMPT_DYNAMIC=y @@ -1163,6 +1166,7 @@ CONFIG_NET=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y CONFIG_NET_XGRESS=y +CONFIG_NET_REDIRECT=y CONFIG_SKB_EXTENSIONS=y CONFIG_NET_DEVMEM=y CONFIG_NET_CRC32C=y @@ -1275,7 +1279,7 @@ CONFIG_NETFILTER_BPF_LINK=y # CONFIG_NETFILTER_NETLINK_OSF is not set CONFIG_NF_CONNTRACK=m CONFIG_NF_LOG_SYSLOG=m -# CONFIG_NF_CONNTRACK_MARK is not set +CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_ZONES is not set # CONFIG_NF_CONNTRACK_PROCFS is not set CONFIG_NF_CONNTRACK_EVENTS=y @@ -1294,26 +1298,42 @@ CONFIG_NF_CT_PROTO_SCTP=y # CONFIG_NF_CONNTRACK_SIP is not set # CONFIG_NF_CONNTRACK_TFTP is not set # CONFIG_NF_CT_NETLINK is not set -# CONFIG_NF_NAT is not set +CONFIG_NF_NAT=m +CONFIG_NF_NAT_REDIRECT=y +CONFIG_NF_NAT_MASQUERADE=y CONFIG_NF_TABLES=m -# CONFIG_NF_TABLES_INET is not set -# CONFIG_NF_TABLES_NETDEV is not set +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_NETDEV=y # CONFIG_NFT_NUMGEN is not set CONFIG_NFT_CT=m # CONFIG_NFT_EXTHDR_DCCP is not set +CONFIG_NFT_FLOW_OFFLOAD=m # CONFIG_NFT_CONNLIMIT is not set CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m # CONFIG_NFT_TUNNEL is not set # CONFIG_NFT_QUOTA is not set CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m # CONFIG_NFT_COMPAT is not set # CONFIG_NFT_HASH is not set +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m # CONFIG_NFT_SOCKET is not set # CONFIG_NFT_OSF is not set # CONFIG_NFT_TPROXY is not set # CONFIG_NFT_SYNPROXY is not set -# CONFIG_NF_FLOW_TABLE is not set +# CONFIG_NF_DUP_NETDEV is not set +# CONFIG_NFT_DUP_NETDEV is not set +# CONFIG_NFT_FWD_NETDEV is not set +# CONFIG_NFT_FIB_NETDEV is not set +# CONFIG_NFT_REJECT_NETDEV is not set +CONFIG_NF_FLOW_TABLE_INET=m +CONFIG_NF_FLOW_TABLE=m +# CONFIG_NF_FLOW_TABLE_PROCFS is not set CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XTABLES_COMPAT is not set # CONFIG_NETFILTER_XTABLES_LEGACY is not set @@ -1335,9 +1355,13 @@ CONFIG_NETFILTER_XT_MARK=m # CONFIG_NETFILTER_XT_TARGET_LED is not set CONFIG_NETFILTER_XT_TARGET_LOG=m # CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_NAT is not set +# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set +# CONFIG_NETFILTER_XT_TARGET_MASQUERADE is not set # CONFIG_NETFILTER_XT_TARGET_TEE is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set @@ -1445,12 +1469,15 @@ CONFIG_IP_VS_MH_TAB_INDEX=12 CONFIG_NF_DEFRAG_IPV4=m # CONFIG_NF_SOCKET_IPV4 is not set # CONFIG_NF_TPROXY_IPV4 is not set -# CONFIG_NF_TABLES_IPV4 is not set +CONFIG_NF_TABLES_IPV4=y +CONFIG_NFT_REJECT_IPV4=m +# CONFIG_NFT_DUP_IPV4 is not set +CONFIG_NFT_FIB_IPV4=m # CONFIG_NF_TABLES_ARP is not set # CONFIG_NF_DUP_IPV4 is not set # CONFIG_NF_LOG_ARP is not set # CONFIG_NF_LOG_IPV4 is not set -# CONFIG_NF_REJECT_IPV4 is not set +CONFIG_NF_REJECT_IPV4=m CONFIG_IP_NF_IPTABLES=m # CONFIG_IP_NF_MATCH_AH is not set # CONFIG_IP_NF_MATCH_ECN is not set @@ -1463,9 +1490,12 @@ CONFIG_IP_NF_IPTABLES=m # # CONFIG_NF_SOCKET_IPV6 is not set # CONFIG_NF_TPROXY_IPV6 is not set -# CONFIG_NF_TABLES_IPV6 is not set +CONFIG_NF_TABLES_IPV6=y +CONFIG_NFT_REJECT_IPV6=m +# CONFIG_NFT_DUP_IPV6 is not set +CONFIG_NFT_FIB_IPV6=m # CONFIG_NF_DUP_IPV6 is not set -# CONFIG_NF_REJECT_IPV6 is not set +CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_IP6_NF_IPTABLES=m # CONFIG_IP6_NF_MATCH_AH is not set @@ -1541,7 +1571,7 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -# CONFIG_NET_SCH_HTB is not set +CONFIG_NET_SCH_HTB=m # CONFIG_NET_SCH_HFSC is not set # CONFIG_NET_SCH_PRIO is not set # CONFIG_NET_SCH_MULTIQ is not set @@ -1562,8 +1592,8 @@ CONFIG_NET_SCH_MQPRIO=m # CONFIG_NET_SCH_CHOKE is not set # CONFIG_NET_SCH_QFQ is not set # CONFIG_NET_SCH_CODEL is not set -# CONFIG_NET_SCH_FQ_CODEL is not set -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_FQ=y # CONFIG_NET_SCH_HHF is not set # CONFIG_NET_SCH_PIE is not set @@ -1573,6 +1603,7 @@ CONFIG_NET_SCH_INGRESS=m # CONFIG_NET_SCH_DUALPI2 is not set CONFIG_NET_SCH_DEFAULT=y CONFIG_DEFAULT_FQ=y +# CONFIG_DEFAULT_FQ_CODEL is not set # CONFIG_DEFAULT_PFIFO_FAST is not set CONFIG_DEFAULT_NET_SCH="fq" @@ -1604,9 +1635,12 @@ CONFIG_NET_ACT_MIRRED=m # CONFIG_NET_ACT_MPLS is not set # CONFIG_NET_ACT_VLAN is not set # CONFIG_NET_ACT_BPF is not set +# CONFIG_NET_ACT_CONNMARK is not set +# CONFIG_NET_ACT_CTINFO is not set # CONFIG_NET_ACT_SKBMOD is not set # CONFIG_NET_ACT_IFE is not set # CONFIG_NET_ACT_TUNNEL_KEY is not set +# CONFIG_NET_ACT_CT is not set CONFIG_NET_ACT_GATE=m # CONFIG_NET_TC_SKB_EXT is not set CONFIG_NET_SCH_FIFO=y @@ -2562,7 +2596,7 @@ CONFIG_WIREGUARD=m # CONFIG_OVPN is not set # CONFIG_EQUALIZER is not set # CONFIG_NET_FC is not set -# CONFIG_IFB is not set +CONFIG_IFB=m # CONFIG_NET_TEAM is not set CONFIG_MACVLAN=m CONFIG_MACVTAP=m @@ -2778,6 +2812,7 @@ CONFIG_I40E=m # CONFIG_ICE is not set # CONFIG_FM10K is not set CONFIG_IGC=m +CONFIG_IGC_LEDS=y # CONFIG_IDPF is not set # CONFIG_JME is not set CONFIG_NET_VENDOR_ADI=y @@ -2880,6 +2915,7 @@ CONFIG_NET_VENDOR_REALTEK=y # CONFIG_8139CP is not set # CONFIG_8139TOO is not set CONFIG_R8169=m +CONFIG_R8169_LEDS=y # CONFIG_RTASE is not set CONFIG_NET_VENDOR_RENESAS=y CONFIG_SH_ETH=y @@ -3149,8 +3185,23 @@ CONFIG_PCS_LYNX=y CONFIG_PCS_RZN1_MIIC=m # end of PCS device drivers -# CONFIG_PPP is not set +CONFIG_PPP=m +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPP_MULTILINK is not set +CONFIG_PPPOX=m +CONFIG_PPPOE=m +# CONFIG_PPPOE_HASH_BITS_1 is not set +# CONFIG_PPPOE_HASH_BITS_2 is not set +CONFIG_PPPOE_HASH_BITS_4=y +# CONFIG_PPPOE_HASH_BITS_8 is not set +CONFIG_PPPOE_HASH_BITS=4 +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set # CONFIG_SLIP is not set +CONFIG_SLHC=m CONFIG_USB_NET_DRIVERS=y # CONFIG_USB_CATC is not set # CONFIG_USB_KAWETH is not set @@ -8160,7 +8211,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # CONFIG_LEDS_TRIGGER_TRANSIENT is not set # CONFIG_LEDS_TRIGGER_CAMERA is not set CONFIG_LEDS_TRIGGER_PANIC=y -# CONFIG_LEDS_TRIGGER_NETDEV is not set +CONFIG_LEDS_TRIGGER_NETDEV=m # CONFIG_LEDS_TRIGGER_PATTERN is not set # CONFIG_LEDS_TRIGGER_TTY is not set # CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set diff --git a/docs/kernel-config.md b/docs/kernel-config.md index d8e5667..b18ab34 100644 --- a/docs/kernel-config.md +++ b/docs/kernel-config.md @@ -140,6 +140,10 @@ When a kernel bump introduces new config symbols (common on major bumps): 2. Review the resulting diff. Sometimes a new option defaults to `y` and bloats the image; sometimes to `n` and disables something we want. Check the diff manually. 3. Run `make check-rocm-config` before review sign-off; it guards the amd64 `amdgpu`/HSA symbols that SmoothNAS ROCm plugins need for `/dev/kfd`. + `make check-router-config` guards, for every arch, the netfilter (inet + tables, NAT, flowtable) and PPPoE symbols SmoothRouter needs. The build + also runs it against the resolved `.config`, since `olddefconfig` drops a + symbol whose parents are unset even when the profile asks for it. 4. Commit the updated `configs/smooth-.config` and `configs//smooth-.config` files as part of the kernel-bump PR. ## Out-of-tree modules diff --git a/recipes/build-kernel.sh b/recipes/build-kernel.sh index 4a23177..fd3b4a7 100755 --- a/recipes/build-kernel.sh +++ b/recipes/build-kernel.sh @@ -338,20 +338,49 @@ apply_smoothkernel_profile() { --module NFS_FS \ --module NFSD \ --module CIFS + # Router netfilter path (SmoothRouter). The NFT_* expressions below depend + # on parents that have no default — NF_TABLES_INET, NF_NAT, NF_FLOW_TABLE — + # so they are set explicitly; otherwise olddefconfig silently drops the + # children on a seed that lacks the parents (the arm64 seed did, shipping + # a kernel with no NAT, no inet tables and no flowtable). + # scripts/check-router-config.sh asserts the result for every arch. scripts/config --enable NETFILTER \ + --enable NETFILTER_ADVANCED \ + --module NF_CONNTRACK \ + --enable NF_CONNTRACK_MARK \ + --module NF_NAT \ --module NF_TABLES \ + --enable NF_TABLES_INET \ + --enable NF_TABLES_IPV4 \ + --enable NF_TABLES_IPV6 \ + --enable NF_TABLES_NETDEV \ --module NFT_CT \ --module NFT_MASQ \ --module NFT_NAT \ --module NFT_REJECT \ + --module NFT_REJECT_INET \ --module NFT_LOG \ --module NFT_LIMIT \ --module NFT_COUNTER \ --module NFT_FIB \ --module NFT_FIB_INET \ + --module NFT_FIB_IPV4 \ + --module NFT_FIB_IPV6 \ --module NFT_REDIR \ + --module NF_FLOW_TABLE \ + --module NF_FLOW_TABLE_INET \ --module NFT_FLOW_OFFLOAD \ --module WIREGUARD + scripts/config --module PPP \ + --module PPPOX \ + --module PPPOE \ + --module PPP_ASYNC \ + --module VLAN_8021Q \ + --module BRIDGE \ + --module IFB \ + --module NET_SCH_CAKE \ + --module NET_SCH_HTB \ + --module LEDS_TRIGGER_NETDEV scripts/config --module BLK_DEV_NVME \ --module ATA \ --module SATA_AHCI \ @@ -363,6 +392,7 @@ apply_smoothkernel_profile() { --module IXGBE \ --module I40E \ --module R8169 \ + --enable R8169_LEDS \ --module ATLANTIC \ --module MLX4_EN \ --module MLX5_CORE \ @@ -497,6 +527,11 @@ fi apply_smoothkernel_profile +# Assert the resolved config, not just the seed: olddefconfig drops any +# symbol whose dependencies are unmet, and that is how a kernel without NAT +# shipped for arm64. +"$ROOT/scripts/check-router-config.sh" .config + if [[ "$MODE" == "update-config" ]]; then echo "==> writing refreshed configs" mkdir -p "$VERSIONED_CONFIG_DIR" diff --git a/scripts/check-router-config.sh b/scripts/check-router-config.sh new file mode 100755 index 0000000..f90cd84 --- /dev/null +++ b/scripts/check-router-config.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +set -euo pipefail + +root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" + +# Checks every config given, or both canonical seeds by default. SmoothRouter +# runs on amd64 and arm64, so the netfilter path must not depend on the arch. +if [[ $# -eq 0 ]]; then + set -- "$root/configs/smooth-amd64.config" "$root/configs/smooth-arm64.config" +fi + +failed=0 +for cfg in "$@"; do + require_config() { + local symbol="$1" + local value + value="$(sed -n "s/^CONFIG_${symbol}=//p" "$cfg")" + if [[ "$value" != y && "$value" != m ]]; then + echo "ERROR: $cfg must enable CONFIG_${symbol} (y or m) for SmoothRouter" >&2 + failed=1 + fi + } + + # routerd's generated ruleset: inet filter table, NAT/masquerade, + # port-forward redirects, rpfilter (fib), rejects and the flowtable. + for symbol in NF_TABLES NF_TABLES_INET NF_TABLES_IPV4 NF_TABLES_IPV6 \ + NF_CONNTRACK NF_NAT NFT_CT NFT_NAT NFT_MASQ NFT_REDIR \ + NFT_FIB_INET NFT_REJECT_INET \ + NF_FLOW_TABLE NF_FLOW_TABLE_INET NFT_FLOW_OFFLOAD; do + require_config "$symbol" + done + # WAN links and tunnels. + for symbol in PPP PPPOE VLAN_8021Q BRIDGE WIREGUARD TUN; do + require_config "$symbol" + done +done + +if [[ $failed -ne 0 ]]; then + exit 1 +fi +echo "Router kernel config OK: $*" From c6779b09bf7238d75405f426ae4ed2771b891f9b Mon Sep 17 00:00:00 2001 From: virant Date: Sat, 24 Oct 2026 00:32:12 +0200 Subject: [PATCH 2/2] fix(config): arm64 dummy links and conntrack procfs for routerd's tests Running SmoothRouter's kernel tests on the arm64 kernel found two more amd64-only symbols: DUMMY (the ruleset tests' interfaces) and NF_CONNTRACK_PROCFS (how the flow-offload test sees offloaded flows). Without the latter the test could not observe the flowtable at all. Add both to the profile and to check-router-config.sh; regenerate the arm64 seed. --- configs/7.2.10/smooth-arm64.config | 4 ++-- configs/smooth-arm64.config | 4 ++-- recipes/build-kernel.sh | 4 +++- scripts/check-router-config.sh | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/configs/7.2.10/smooth-arm64.config b/configs/7.2.10/smooth-arm64.config index 4b6c75e..568e407 100644 --- a/configs/7.2.10/smooth-arm64.config +++ b/configs/7.2.10/smooth-arm64.config @@ -1281,7 +1281,7 @@ CONFIG_NF_CONNTRACK=m CONFIG_NF_LOG_SYSLOG=m CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_ZONES is not set -# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y # CONFIG_NF_CONNTRACK_TIMEOUT is not set # CONFIG_NF_CONNTRACK_TIMESTAMP is not set @@ -2590,7 +2590,7 @@ CONFIG_NETDEVICES=y CONFIG_MII=y CONFIG_NET_CORE=y # CONFIG_BONDING is not set -# CONFIG_DUMMY is not set +CONFIG_DUMMY=m CONFIG_WIREGUARD=m # CONFIG_WIREGUARD_DEBUG is not set # CONFIG_OVPN is not set diff --git a/configs/smooth-arm64.config b/configs/smooth-arm64.config index 4b6c75e..568e407 100644 --- a/configs/smooth-arm64.config +++ b/configs/smooth-arm64.config @@ -1281,7 +1281,7 @@ CONFIG_NF_CONNTRACK=m CONFIG_NF_LOG_SYSLOG=m CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_ZONES is not set -# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y # CONFIG_NF_CONNTRACK_TIMEOUT is not set # CONFIG_NF_CONNTRACK_TIMESTAMP is not set @@ -2590,7 +2590,7 @@ CONFIG_NETDEVICES=y CONFIG_MII=y CONFIG_NET_CORE=y # CONFIG_BONDING is not set -# CONFIG_DUMMY is not set +CONFIG_DUMMY=m CONFIG_WIREGUARD=m # CONFIG_WIREGUARD_DEBUG is not set # CONFIG_OVPN is not set diff --git a/recipes/build-kernel.sh b/recipes/build-kernel.sh index fd3b4a7..15e5f10 100755 --- a/recipes/build-kernel.sh +++ b/recipes/build-kernel.sh @@ -348,6 +348,7 @@ apply_smoothkernel_profile() { --enable NETFILTER_ADVANCED \ --module NF_CONNTRACK \ --enable NF_CONNTRACK_MARK \ + --enable NF_CONNTRACK_PROCFS \ --module NF_NAT \ --module NF_TABLES \ --enable NF_TABLES_INET \ @@ -380,7 +381,8 @@ apply_smoothkernel_profile() { --module IFB \ --module NET_SCH_CAKE \ --module NET_SCH_HTB \ - --module LEDS_TRIGGER_NETDEV + --module LEDS_TRIGGER_NETDEV \ + --module DUMMY scripts/config --module BLK_DEV_NVME \ --module ATA \ --module SATA_AHCI \ diff --git a/scripts/check-router-config.sh b/scripts/check-router-config.sh index f90cd84..101e6ee 100755 --- a/scripts/check-router-config.sh +++ b/scripts/check-router-config.sh @@ -33,6 +33,11 @@ for cfg in "$@"; do for symbol in PPP PPPOE VLAN_8021Q BRIDGE WIREGUARD TUN; do require_config "$symbol" done + # routerd's kernel tests (go test -tags kerneltest): dummy links for the + # ruleset permutations, /proc/net/nf_conntrack to see offloaded flows. + for symbol in DUMMY NF_CONNTRACK_PROCFS; do + require_config "$symbol" + done done if [[ $failed -ne 0 ]]; then