From 4784f66ec1eff7db1f010b63f0eddaf75bc9c99e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 22 Aug 2025 08:33:25 +0200 Subject: [PATCH] 6.16-stable patches added patches: erofs-do-not-select-tristate-symbols-from-bool-symbols.patch erofs-fix-build-error-with-config_erofs_fs_zip_accel-y.patch --- ...t-tristate-symbols-from-bool-symbols.patch | 110 ++++++++++++++++++ ...ror-with-config_erofs_fs_zip_accel-y.patch | 47 ++++++++ queue-6.16/series | 2 + 3 files changed, 159 insertions(+) create mode 100644 queue-6.16/erofs-do-not-select-tristate-symbols-from-bool-symbols.patch create mode 100644 queue-6.16/erofs-fix-build-error-with-config_erofs_fs_zip_accel-y.patch diff --git a/queue-6.16/erofs-do-not-select-tristate-symbols-from-bool-symbols.patch b/queue-6.16/erofs-do-not-select-tristate-symbols-from-bool-symbols.patch new file mode 100644 index 0000000000..5d79bdcb52 --- /dev/null +++ b/queue-6.16/erofs-do-not-select-tristate-symbols-from-bool-symbols.patch @@ -0,0 +1,110 @@ +From 74da24f0ac9b8aabfb8d7feeba6c32ddff3065e0 Mon Sep 17 00:00:00 2001 +From: Geert Uytterhoeven +Date: Wed, 30 Jul 2025 14:44:49 +0200 +Subject: erofs: Do not select tristate symbols from bool symbols + +From: Geert Uytterhoeven + +commit 74da24f0ac9b8aabfb8d7feeba6c32ddff3065e0 upstream. + +The EROFS filesystem has many configurable options, controlled through +boolean Kconfig symbols. When enabled, these options may need to enable +additional library functionality elsewhere. Currently this is done by +selecting the symbol for the additional functionality. However, if +EROFS_FS itself is modular, and the target symbol is a tristate symbol, +the additional functionality is always forced built-in. + +Selecting tristate symbols from a tristate symbol does keep modular +transitivity. Hence fix this by moving selects of tristate symbols to +the main EROFS_FS symbol. + +Signed-off-by: Geert Uytterhoeven +Reviewed-by: Gao Xiang +Link: https://lore.kernel.org/r/da1b899e511145dd43fd2d398f64b2e03c6a39e7.1753879351.git.geert+renesas@glider.be +Signed-off-by: Gao Xiang +Signed-off-by: Greg Kroah-Hartman +--- + fs/erofs/Kconfig | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/fs/erofs/Kconfig ++++ b/fs/erofs/Kconfig +@@ -3,8 +3,18 @@ + config EROFS_FS + tristate "EROFS filesystem support" + depends on BLOCK ++ select CACHEFILES if EROFS_FS_ONDEMAND + select CRC32 ++ select CRYPTO if EROFS_FS_ZIP_ACCEL ++ select CRYPTO_DEFLATE if EROFS_FS_ZIP_ACCEL + select FS_IOMAP ++ select LZ4_DECOMPRESS if EROFS_FS_ZIP ++ select NETFS_SUPPORT if EROFS_FS_ONDEMAND ++ select XXHASH if EROFS_FS_XATTR ++ select XZ_DEC if EROFS_FS_ZIP_LZMA ++ select XZ_DEC_MICROLZMA if EROFS_FS_ZIP_LZMA ++ select ZLIB_INFLATE if EROFS_FS_ZIP_DEFLATE ++ select ZSTD_DECOMPRESS if EROFS_FS_ZIP_ZSTD + help + EROFS (Enhanced Read-Only File System) is a lightweight read-only + file system with modern designs (e.g. no buffer heads, inline +@@ -38,7 +48,6 @@ config EROFS_FS_DEBUG + config EROFS_FS_XATTR + bool "EROFS extended attributes" + depends on EROFS_FS +- select XXHASH + default y + help + Extended attributes are name:value pairs associated with inodes by +@@ -94,7 +103,6 @@ config EROFS_FS_BACKED_BY_FILE + config EROFS_FS_ZIP + bool "EROFS Data Compression Support" + depends on EROFS_FS +- select LZ4_DECOMPRESS + default y + help + Enable transparent compression support for EROFS file systems. +@@ -104,8 +112,6 @@ config EROFS_FS_ZIP + config EROFS_FS_ZIP_LZMA + bool "EROFS LZMA compressed data support" + depends on EROFS_FS_ZIP +- select XZ_DEC +- select XZ_DEC_MICROLZMA + help + Saying Y here includes support for reading EROFS file systems + containing LZMA compressed data, specifically called microLZMA. It +@@ -117,7 +123,6 @@ config EROFS_FS_ZIP_LZMA + config EROFS_FS_ZIP_DEFLATE + bool "EROFS DEFLATE compressed data support" + depends on EROFS_FS_ZIP +- select ZLIB_INFLATE + help + Saying Y here includes support for reading EROFS file systems + containing DEFLATE compressed data. It gives better compression +@@ -132,7 +137,6 @@ config EROFS_FS_ZIP_DEFLATE + config EROFS_FS_ZIP_ZSTD + bool "EROFS Zstandard compressed data support" + depends on EROFS_FS_ZIP +- select ZSTD_DECOMPRESS + help + Saying Y here includes support for reading EROFS file systems + containing Zstandard compressed data. It gives better compression +@@ -147,8 +151,6 @@ config EROFS_FS_ZIP_ZSTD + config EROFS_FS_ZIP_ACCEL + bool "EROFS hardware decompression support" + depends on EROFS_FS_ZIP +- select CRYPTO +- select CRYPTO_DEFLATE + help + Saying Y here includes hardware accelerator support for reading + EROFS file systems containing compressed data. It gives better +@@ -163,9 +165,7 @@ config EROFS_FS_ZIP_ACCEL + config EROFS_FS_ONDEMAND + bool "EROFS fscache-based on-demand read support (deprecated)" + depends on EROFS_FS +- select NETFS_SUPPORT + select FSCACHE +- select CACHEFILES + select CACHEFILES_ONDEMAND + help + This permits EROFS to use fscache-backed data blobs with on-demand diff --git a/queue-6.16/erofs-fix-build-error-with-config_erofs_fs_zip_accel-y.patch b/queue-6.16/erofs-fix-build-error-with-config_erofs_fs_zip_accel-y.patch new file mode 100644 index 0000000000..775f6154d8 --- /dev/null +++ b/queue-6.16/erofs-fix-build-error-with-config_erofs_fs_zip_accel-y.patch @@ -0,0 +1,47 @@ +From 5e0bf36fd156b8d9b09f8481ee6daa6cdba1b064 Mon Sep 17 00:00:00 2001 +From: "Bo Liu (OpenAnolis)" +Date: Thu, 17 Jul 2025 23:30:39 -0400 +Subject: erofs: fix build error with CONFIG_EROFS_FS_ZIP_ACCEL=y + +From: Bo Liu (OpenAnolis) + +commit 5e0bf36fd156b8d9b09f8481ee6daa6cdba1b064 upstream. + +fix build err: + ld.lld: error: undefined symbol: crypto_req_done + referenced by decompressor_crypto.c + fs/erofs/decompressor_crypto.o:(z_erofs_crypto_decompress) in archive vmlinux.a + referenced by decompressor_crypto.c + fs/erofs/decompressor_crypto.o:(z_erofs_crypto_decompress) in archive vmlinux.a + + ld.lld: error: undefined symbol: crypto_acomp_decompress + referenced by decompressor_crypto.c + fs/erofs/decompressor_crypto.o:(z_erofs_crypto_decompress) in archive vmlinux.a + + ld.lld: error: undefined symbol: crypto_alloc_acomp + referenced by decompressor_crypto.c + fs/erofs/decompressor_crypto.o:(z_erofs_crypto_enable_engine) in archive vmlinux.a + +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202507161032.QholMPtn-lkp@intel.com/ +Fixes: b4a29efc5146 ("erofs: support DEFLATE decompression by using Intel QAT") +Signed-off-by: Bo Liu (OpenAnolis) +Link: https://lore.kernel.org/r/20250718033039.3609-1-liubo03@inspur.com +Reviewed-by: Gao Xiang +Signed-off-by: Gao Xiang +Signed-off-by: Greg Kroah-Hartman +--- + fs/erofs/Kconfig | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/fs/erofs/Kconfig ++++ b/fs/erofs/Kconfig +@@ -147,6 +147,8 @@ config EROFS_FS_ZIP_ZSTD + config EROFS_FS_ZIP_ACCEL + bool "EROFS hardware decompression support" + depends on EROFS_FS_ZIP ++ select CRYPTO ++ select CRYPTO_DEFLATE + help + Saying Y here includes hardware accelerator support for reading + EROFS file systems containing compressed data. It gives better diff --git a/queue-6.16/series b/queue-6.16/series index 88d22180e6..548d860811 100644 --- a/queue-6.16/series +++ b/queue-6.16/series @@ -226,3 +226,5 @@ xfs-return-the-allocated-transaction-from-xfs_trans_alloc_empty.patch xfs-improve-the-comments-in-xfs_select_zone_nowait.patch xfs-fully-decouple-xfs_ibulk-flags-from-xfs_iwalk-flags.patch xfs-remove-unused-label-in-xfs_dax_notify_dev_failure.patch +erofs-fix-build-error-with-config_erofs_fs_zip_accel-y.patch +erofs-do-not-select-tristate-symbols-from-bool-symbols.patch -- 2.47.3