Merge branch 'next' into feat/image-stream-kernel

Author: kvinwang

os/mkosi/components/kernel/kernel.config

@@ -80,6 +80,34 @@ CONFIG_SWIOTLB_DYNAMIC=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 
+# Let khugepaged collapse read-only file mappings -- in practice program and
+# library text -- into huge pages, for regions marked MADV_HUGEPAGE (or every
+# eligible region with THP "always"). Otherwise large-code workloads (torch's
+# shared libraries, say) run their text from 4 KiB pages and pay the
+# two-dimensional (guest + EPT) page walk on every iTLB miss.
+#
+# Kept in step with meta-dstack's dstack.cfg.
+CONFIG_READ_ONLY_THP_FOR_FS=y
+
+# Multi-Gen LRU, built in but off by default: a workload under memory pressure
+# turns it on at runtime with "echo y > /sys/kernel/mm/lru_gen/enabled".
+#
+# Kept in step with meta-dstack's dstack.cfg.
+CONFIG_LRU_GEN=y
+
+# BBR congestion control, built in so a container can select it through its own
+# network namespace (sysctl net.ipv4.tcp_congestion_control=bbr) without a
+# module load it has no privilege for. The default stays cubic.
+#
+# Kept in step with meta-dstack's dstack.cfg.
+CONFIG_TCP_CONG_BBR=y
+
+# Initialise struct pages for most of memory in parallel kthreads after SMP
+# bring-up instead of on the boot CPU. A 512 GiB guest has 128M of them.
+#
+# Kept in step with meta-dstack's dstack.cfg.
+CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
+
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_CORE=y
 CONFIG_NET_VENDOR_GOOGLE=y

os/mkosi/parity.json

@@ -118,6 +118,10 @@
     "CONFIG_SWIOTLB_DYNAMIC=y",
     "CONFIG_TRANSPARENT_HUGEPAGE=y",
     "CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y",
+    "CONFIG_READ_ONLY_THP_FOR_FS=y",
+    "CONFIG_LRU_GEN=y",
+    "CONFIG_TCP_CONG_BBR=y",
+    "CONFIG_DEFERRED_STRUCT_PAGE_INIT=y",
     "CONFIG_INTEL_TDX_GUEST=y",
     "CONFIG_TDX_GUEST_DRIVER=y",
     "CONFIG_AMD_MEM_ENCRYPT=y",

os/yocto/layers/meta-dstack/recipes-kernel/linux/files/dstack.cfg

@@ -46,6 +46,34 @@ CONFIG_SWIOTLB_DYNAMIC=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 
+# Let khugepaged collapse read-only file mappings -- in practice program and
+# library text -- into huge pages, for regions marked MADV_HUGEPAGE (or every
+# eligible region with THP "always"). Otherwise large-code workloads (torch's
+# shared libraries, say) run their text from 4 KiB pages and pay the
+# two-dimensional (guest + EPT) page walk on every iTLB miss.
+#
+# Kept in step with os/mkosi/components/kernel/kernel.config.
+CONFIG_READ_ONLY_THP_FOR_FS=y
+
+# Multi-Gen LRU, built in but off by default: a workload under memory pressure
+# turns it on at runtime with "echo y > /sys/kernel/mm/lru_gen/enabled".
+#
+# Kept in step with os/mkosi/components/kernel/kernel.config.
+CONFIG_LRU_GEN=y
+
+# BBR congestion control, built in so a container can select it through its own
+# network namespace (sysctl net.ipv4.tcp_congestion_control=bbr) without a
+# module load it has no privilege for. The default stays cubic.
+#
+# Kept in step with os/mkosi/components/kernel/kernel.config.
+CONFIG_TCP_CONG_BBR=y
+
+# Initialise struct pages for most of memory in parallel kthreads after SMP
+# bring-up instead of on the boot CPU. A 512 GiB guest has 128M of them.
+#
+# Kept in step with os/mkosi/components/kernel/kernel.config.
+CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
+
 # Network NIC drivers. GCP C3/modern instances use gVNIC (the Google gve
 # driver); older/virtio instances use virtio-net. Without gve, a C3 CVM gets
 # no NIC -> no DHCP -> no network. Build both in.