From: Justin M. Forbes jforbes@fedoraproject.org

Fix up SQUASHFS decompression configs

The 6.2 merge window changed the way that squashfs decompression threading worked. It now allows the number of threads to be set as mount options if all options are compiled. Until a decicion is made on this functionality, this MR factors in the new options and gives us a built kernel config similar to what has been supported in previous releases. We select CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU as the only option. If a different config is desired, I am happy to change this, but our current defaults were not working as it forced a config mismatch, and I did not want the state to get lost.

Signed-off-by: Justin M. Forbes jforbes@fedoraproject.org

diff --git a/redhat/configs/ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT b/redhat/configs/ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT @@ -0,0 +1 @@ +# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set diff --git a/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI @@ -0,0 +1 @@ +# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set diff --git a/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU @@ -0,0 +1 @@ +CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y diff --git a/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE @@ -0,0 +1 @@ +# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT +++ /dev/null @@ -1,15 +0,0 @@ -# Symbol: SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n] -# Type : bool -# Defined at fs/squashfs/Kconfig:69 -# Prompt: Select the parallel decompression mode during mount -# Depends on: MISC_FILESYSTEMS [=y] && SQUASHFS [=m] -# Location: -# -> File systems -# -> Miscellaneous filesystems (MISC_FILESYSTEMS [=y]) -# -> SquashFS 4.0 - Squashed file system support (SQUASHFS [=m]) -# -> Select the parallel decompression mode during mount (SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n]) -# Selects: SQUASHFS_DECOMP_SINGLE [=y] && SQUASHFS_DECOMP_MULTI [=n] && SQUASHFS_DECOMP_MULTI_PERCPU [=n] && SQUASHFS_MOUNT_DECOMP_THREADS [=n] -# -# -# -# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI +++ /dev/null @@ -1,17 +0,0 @@ -# Symbol: SQUASHFS_COMPILE_DECOMP_MULTI [=n] -# Type : bool -# Defined at fs/squashfs/Kconfig:101 -# Prompt: Use multiple decompressors for parallel I/O -# Depends on: <choice> -# Location: -# -> File systems -# -> Miscellaneous filesystems (MISC_FILESYSTEMS [=y]) -# -> SquashFS 4.0 - Squashed file system support (SQUASHFS [=m]) -# -> Select the parallel decompression mode during mount (SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n]) -# -> Select decompression parallel mode at compile time (<choice> [=y]) -# -> Use multiple decompressors for parallel I/O (SQUASHFS_COMPILE_DECOMP_MULTI [=n]) -# Selects: SQUASHFS_DECOMP_MULTI [=n] -# -# -# -# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU +++ /dev/null @@ -1,17 +0,0 @@ -# Symbol: SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU [=n] -# Type : bool -# Defined at fs/squashfs/Kconfig:116 -# Prompt: Use percpu multiple decompressors for parallel I/O -# Depends on: <choice> -# Location: -# -> File systems -# -> Miscellaneous filesystems (MISC_FILESYSTEMS [=y]) -# -> SquashFS 4.0 - Squashed file system support (SQUASHFS [=m]) -# -> Select the parallel decompression mode during mount (SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n]) -# -> Select decompression parallel mode at compile time (<choice> [=y]) -# -> Use percpu multiple decompressors for parallel I/O (SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU [=n]) -# Selects: SQUASHFS_DECOMP_MULTI_PERCPU [=n] -# -# -# -# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE +++ /dev/null @@ -1,17 +0,0 @@ -# Symbol: SQUASHFS_COMPILE_DECOMP_SINGLE [=y] -# Type : bool -# Defined at fs/squashfs/Kconfig:93 -# Prompt: Single threaded compression -# Depends on: <choice> -# Location: -# -> File systems -# -> Miscellaneous filesystems (MISC_FILESYSTEMS [=y]) -# -> SquashFS 4.0 - Squashed file system support (SQUASHFS [=m]) -# -> Select the parallel decompression mode during mount (SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n]) -# -> Select decompression parallel mode at compile time (<choice> [=y]) -# -> Single threaded compression (SQUASHFS_COMPILE_DECOMP_SINGLE [=y]) -# Selects: SQUASHFS_DECOMP_SINGLE [=y] -# -# -# -CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_DECOMP_SINGLE b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_DECOMP_SINGLE deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_DECOMP_SINGLE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SQUASHFS_DECOMP_SINGLE=y

-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2277