From 66a8eaf828398afe30954486357b73b321ad16e9 Mon Sep 17 00:00:00 2001 From: aaronk6 Date: Thu, 10 Apr 2025 21:31:06 +0200 Subject: [PATCH 1/6] coreos-modules: Add CONFIG_VIRTIO_FS=m --- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index 841c800754..29913acab7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -999,6 +999,7 @@ CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRT_DRIVERS=y CONFIG_VLAN_8021Q=m From 8519210e0be848a983b7fdf30cda7223178a59c8 Mon Sep 17 00:00:00 2001 From: aaronk6 Date: Sat, 12 Apr 2025 21:38:58 +0200 Subject: [PATCH 2/6] coreos-modules: Add CONFIG_FUSE_DAX=m and CONFIG_ZONE_DEVICE=m --- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index 29913acab7..a9ceedcfc2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -208,6 +208,7 @@ CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y CONFIG_FS_ENCRYPTION=y CONFIG_FUSE_FS=m +CONFIG_FUSE_DAX=m CONFIG_FUSION=y CONFIG_FUSION_CTL=m CONFIG_FUSION_LOGGING=y @@ -1036,5 +1037,6 @@ CONFIG_XFS_QUOTA=y # CONFIG_XZ_DEC_POWERPC is not set # CONFIG_XZ_DEC_SPARC is not set CONFIG_ZISOFS=y +CONFIG_ZONE_DEVICE=m CONFIG_ZRAM=m CONFIG_ZSMALLOC=m From dba9b9a3331e1f7984a52be0bce145e359467cce Mon Sep 17 00:00:00 2001 From: aaronk6 Date: Sun, 13 Apr 2025 16:21:16 +0200 Subject: [PATCH 3/6] coreos-modules: Fix CONFIG_FUSE_DAX and CONFIG_ZONE_DEVICE (y instead of m) --- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index a9ceedcfc2..a6eaa72ef2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -208,7 +208,7 @@ CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y CONFIG_FS_ENCRYPTION=y CONFIG_FUSE_FS=m -CONFIG_FUSE_DAX=m +CONFIG_FUSE_DAX=y CONFIG_FUSION=y CONFIG_FUSION_CTL=m CONFIG_FUSION_LOGGING=y @@ -1037,6 +1037,6 @@ CONFIG_XFS_QUOTA=y # CONFIG_XZ_DEC_POWERPC is not set # CONFIG_XZ_DEC_SPARC is not set CONFIG_ZISOFS=y -CONFIG_ZONE_DEVICE=m +CONFIG_ZONE_DEVICE=y CONFIG_ZRAM=m CONFIG_ZSMALLOC=m From 31db25c53e62a025493c3f32714ba49640d1c17a Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 15 Apr 2025 11:37:38 +0200 Subject: [PATCH 4/6] coreos-modules: Add CONFIG_FS_DAX=y This is a dependency of CONFIG_FUSE_DAX=y. Signed-off-by: Jeremi Piotrowski --- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index a6eaa72ef2..1e0e7dd17f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -206,6 +206,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y +CONFIG_FS_DAX=y CONFIG_FS_ENCRYPTION=y CONFIG_FUSE_FS=m CONFIG_FUSE_DAX=y From 330ebdc579275e42c160df12cfcc027c41a2a1d5 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 15 Apr 2025 14:22:49 +0200 Subject: [PATCH 5/6] coreos-modules: Move MEMORY_HOT{PLUG,REMOVE} to common Dependency of ZONE_DEVICE. Signed-off-by: Jeremi Piotrowski --- .../sys-kernel/coreos-modules/files/amd64_defconfig-6.6 | 2 -- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 index 1d171bc519..af07e1a4fe 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 @@ -79,8 +79,6 @@ CONFIG_KVM=m CONFIG_KVM_AMD=m CONFIG_KVM_INTEL=m CONFIG_MEMORY_FAILURE=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTREMOVE=y CONFIG_MEM_SOFT_DIRTY=y CONFIG_MMC_SDHCI_ACPI=m # CONFIG_MOUSE_PS2_LIFEBOOK is not set diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index 1e0e7dd17f..bb489aafe2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -460,6 +460,8 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_SAS=m CONFIG_MEMCG=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTREMOVE=y CONFIG_MEMTEST=y CONFIG_MICROSOFT_MANA=m CONFIG_MINIX_SUBPARTITION=y From 49c8b51b722c00810d78b1328f405ffa2852fb2d Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 25 Apr 2025 17:13:11 +0200 Subject: [PATCH 6/6] changelog: Add entry for virtiofs Signed-off-by: Jeremi Piotrowski --- changelog/changes/2025-04-25-virtiofs.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/changes/2025-04-25-virtiofs.md diff --git a/changelog/changes/2025-04-25-virtiofs.md b/changelog/changes/2025-04-25-virtiofs.md new file mode 100644 index 0000000000..a1737c69af --- /dev/null +++ b/changelog/changes/2025-04-25-virtiofs.md @@ -0,0 +1 @@ +- Enabled virtiofs and fuse-dax modules in the kernel for advaned Qemu usecases. Thank you @aaronk6! ([Flatcar#2825](https://github.com/flatcar/scripts/pull/2825))