From 65cb59a0fff241ad2870cae55b21303f83c7e1a2 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 16 Jun 2025 21:03:41 +0200 Subject: [PATCH 1/2] Revert "configs: 6.1: add zram support" This reverts commit 8813b397cff37e92a06b7fccd4a748c5f0bc98e6. This actually adds ramdisk support, not zram support. My brain short circuited. Change-type: patch Signed-off-by: Alex Gonzalez --- config/6.1/microvm-kernel-aarch64-6.1.config | 4 +--- config/6.1/microvm-kernel-x86_64-6.1.config | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/config/6.1/microvm-kernel-aarch64-6.1.config b/config/6.1/microvm-kernel-aarch64-6.1.config index 9f892cf..ddbba1a 100644 --- a/config/6.1/microvm-kernel-aarch64-6.1.config +++ b/config/6.1/microvm-kernel-aarch64-6.1.config @@ -1510,9 +1510,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_VIRTIO_BLK=y diff --git a/config/6.1/microvm-kernel-x86_64-6.1.config b/config/6.1/microvm-kernel-x86_64-6.1.config index 92e3473..e1141a7 100644 --- a/config/6.1/microvm-kernel-x86_64-6.1.config +++ b/config/6.1/microvm-kernel-x86_64-6.1.config @@ -1546,9 +1546,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_VIRTIO_BLK=y From 65a61ad96a7f435c2e6eeca642741dfef5e803e1 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 16 Jun 2025 21:37:50 +0200 Subject: [PATCH 2/2] configs: 6.1: add zram support This is required to run some new tests on the OS automation suite.git gui Change-type: minor Signed-off-by: Alex Gonzalez --- config/6.1/microvm-kernel-aarch64-6.1.config | 13 +++++++++++-- config/6.1/microvm-kernel-x86_64-6.1.config | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/config/6.1/microvm-kernel-aarch64-6.1.config b/config/6.1/microvm-kernel-aarch64-6.1.config index ddbba1a..6247f66 100644 --- a/config/6.1/microvm-kernel-aarch64-6.1.config +++ b/config/6.1/microvm-kernel-aarch64-6.1.config @@ -818,6 +818,8 @@ CONFIG_COREDUMP=y # CONFIG_SWAP=y # CONFIG_ZSWAP is not set +CONFIG_ZSMALLOC=y +# CONFIG_ZSMALLOC_STAT is not set # # SLAB allocator options @@ -1505,7 +1507,13 @@ CONFIG_OF_NUMA=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set -# CONFIG_ZRAM is not set +CONFIG_ZRAM=y +# CONFIG_ZRAM_DEF_COMP_LZORLE is not set +CONFIG_ZRAM_DEF_COMP_ZSTD=y +# CONFIG_ZRAM_DEF_COMP_LZO is not set +CONFIG_ZRAM_DEF_COMP="zstd" +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set @@ -2812,7 +2820,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=y # end of Compression # @@ -2947,6 +2955,7 @@ CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_DECOMPRESS=y CONFIG_ZSTD_COMMON=y +CONFIG_ZSTD_COMPRESS=y CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y diff --git a/config/6.1/microvm-kernel-x86_64-6.1.config b/config/6.1/microvm-kernel-x86_64-6.1.config index e1141a7..d578d6f 100644 --- a/config/6.1/microvm-kernel-x86_64-6.1.config +++ b/config/6.1/microvm-kernel-x86_64-6.1.config @@ -874,6 +874,8 @@ CONFIG_COREDUMP=y # CONFIG_SWAP=y # CONFIG_ZSWAP is not set +CONFIG_ZSMALLOC=y +# CONFIG_ZSMALLOC_STAT is not set # # SLAB allocator options @@ -1541,7 +1543,13 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_FD is not set -# CONFIG_ZRAM is not set +CONFIG_ZRAM=y +# CONFIG_ZRAM_DEF_COMP_LZORLE is not set +CONFIG_ZRAM_DEF_COMP_ZSTD=y +# CONFIG_ZRAM_DEF_COMP_LZO is not set +CONFIG_ZRAM_DEF_COMP="zstd" +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set @@ -2766,7 +2774,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=y # end of Compression # @@ -2913,6 +2921,7 @@ CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_DECOMPRESS=y CONFIG_ZSTD_COMMON=y +CONFIG_ZSTD_COMPRESS=y CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y