From: Greg Kroah-Hartman Date: Tue, 7 Jun 2022 09:57:04 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.10.121~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff87d3434fec7f2ee4f958fb7dcb8445aadc22f4;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: ext4-only-allow-test_dummy_encryption-when-supported.patch mips-ip27-remove-incorrect-cpu_has_fpu-override.patch mips-ip30-remove-incorrect-cpu_has_fpu-override.patch --- diff --git a/queue-5.10/ext4-only-allow-test_dummy_encryption-when-supported.patch b/queue-5.10/ext4-only-allow-test_dummy_encryption-when-supported.patch new file mode 100644 index 00000000000..5d8a2534594 --- /dev/null +++ b/queue-5.10/ext4-only-allow-test_dummy_encryption-when-supported.patch @@ -0,0 +1,108 @@ +From 5f41fdaea63ddf96d921ab36b2af4a90ccdb5744 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Thu, 19 May 2022 13:44:37 -0700 +Subject: ext4: only allow test_dummy_encryption when supported + +From: Eric Biggers + +commit 5f41fdaea63ddf96d921ab36b2af4a90ccdb5744 upstream. + +Make the test_dummy_encryption mount option require that the encrypt +feature flag be already enabled on the filesystem, rather than +automatically enabling it. Practically, this means that "-O encrypt" +will need to be included in MKFS_OPTIONS when running xfstests with the +test_dummy_encryption mount option. (ext4/053 also needs an update.) + +Moreover, as long as the preconditions for test_dummy_encryption are +being tightened anyway, take the opportunity to start rejecting it when +!CONFIG_FS_ENCRYPTION rather than ignoring it. + +The motivation for requiring the encrypt feature flag is that: + +- Having the filesystem auto-enable feature flags is problematic, as it + bypasses the usual sanity checks. The specific issue which came up + recently is that in kernel versions where ext4 supports casefold but + not encrypt+casefold (v5.1 through v5.10), the kernel will happily add + the encrypt flag to a filesystem that has the casefold flag, making it + unmountable -- but only for subsequent mounts, not the initial one. + This confused the casefold support detection in xfstests, causing + generic/556 to fail rather than be skipped. + +- The xfstests-bld test runners (kvm-xfstests et al.) already use the + required mkfs flag, so they will not be affected by this change. Only + users of test_dummy_encryption alone will be affected. But, this + option has always been for testing only, so it should be fine to + require that the few users of this option update their test scripts. + +- f2fs already requires it (for its equivalent feature flag). + +Signed-off-by: Eric Biggers +Reviewed-by: Gabriel Krisman Bertazi +Link: https://lore.kernel.org/r/20220519204437.61645-1-ebiggers@kernel.org +Signed-off-by: Theodore Ts'o +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ext4/ext4.h | 6 ------ + fs/ext4/super.c | 18 ++++++++++-------- + 2 files changed, 10 insertions(+), 14 deletions(-) + +--- a/fs/ext4/ext4.h ++++ b/fs/ext4/ext4.h +@@ -1419,12 +1419,6 @@ struct ext4_super_block { + + #ifdef __KERNEL__ + +-#ifdef CONFIG_FS_ENCRYPTION +-#define DUMMY_ENCRYPTION_ENABLED(sbi) ((sbi)->s_dummy_enc_policy.policy != NULL) +-#else +-#define DUMMY_ENCRYPTION_ENABLED(sbi) (0) +-#endif +- + /* Number of quota types we support */ + #define EXT4_MAXQUOTAS 3 + +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -2084,6 +2084,12 @@ static int ext4_set_test_dummy_encryptio + struct ext4_sb_info *sbi = EXT4_SB(sb); + int err; + ++ if (!ext4_has_feature_encrypt(sb)) { ++ ext4_msg(sb, KERN_WARNING, ++ "test_dummy_encryption requires encrypt feature"); ++ return -1; ++ } ++ + /* + * This mount option is just for testing, and it's not worthwhile to + * implement the extra complexity (e.g. RCU protection) that would be +@@ -2111,11 +2117,13 @@ static int ext4_set_test_dummy_encryptio + return -1; + } + ext4_msg(sb, KERN_WARNING, "Test dummy encryption mode enabled"); ++ return 1; + #else + ext4_msg(sb, KERN_WARNING, +- "Test dummy encryption mount option ignored"); ++ "test_dummy_encryption option not supported"); ++ return -1; ++ + #endif +- return 1; + } + + static int handle_mount_opt(struct super_block *sb, char *opt, int token, +@@ -4929,12 +4937,6 @@ no_journal: + goto failed_mount_wq; + } + +- if (DUMMY_ENCRYPTION_ENABLED(sbi) && !sb_rdonly(sb) && +- !ext4_has_feature_encrypt(sb)) { +- ext4_set_feature_encrypt(sb); +- ext4_commit_super(sb, 1); +- } +- + /* + * Get the # of file system overhead blocks from the + * superblock if present. diff --git a/queue-5.10/mips-ip27-remove-incorrect-cpu_has_fpu-override.patch b/queue-5.10/mips-ip27-remove-incorrect-cpu_has_fpu-override.patch new file mode 100644 index 00000000000..e3fedf619c3 --- /dev/null +++ b/queue-5.10/mips-ip27-remove-incorrect-cpu_has_fpu-override.patch @@ -0,0 +1,39 @@ +From 424c3781dd1cb401857585331eaaa425a13f2429 Mon Sep 17 00:00:00 2001 +From: "Maciej W. Rozycki" +Date: Sun, 1 May 2022 23:14:16 +0100 +Subject: MIPS: IP27: Remove incorrect `cpu_has_fpu' override + +From: Maciej W. Rozycki + +commit 424c3781dd1cb401857585331eaaa425a13f2429 upstream. + +Remove unsupported forcing of `cpu_has_fpu' to 1, which makes the `nofpu' +kernel parameter non-functional, and also causes a link error: + +ld: arch/mips/kernel/traps.o: in function `trap_init': +./arch/mips/include/asm/msa.h:(.init.text+0x348): undefined reference to `handle_fpe' +ld: ./arch/mips/include/asm/msa.h:(.init.text+0x354): undefined reference to `handle_fpe' +ld: ./arch/mips/include/asm/msa.h:(.init.text+0x360): undefined reference to `handle_fpe' + +where the CONFIG_MIPS_FP_SUPPORT configuration option has been disabled. + +Signed-off-by: Maciej W. Rozycki +Reported-by: Stephen Zhang +Fixes: 0ebb2f4159af ("MIPS: IP27: Update/restructure CPU overrides") +Cc: stable@vger.kernel.org # v4.2+ +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h | 1 - + 1 file changed, 1 deletion(-) + +--- a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h ++++ b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h +@@ -26,7 +26,6 @@ + #define cpu_has_3k_cache 0 + #define cpu_has_4k_cache 1 + #define cpu_has_tx39_cache 0 +-#define cpu_has_fpu 1 + #define cpu_has_nofpuex 0 + #define cpu_has_32fpr 1 + #define cpu_has_counter 1 diff --git a/queue-5.10/mips-ip30-remove-incorrect-cpu_has_fpu-override.patch b/queue-5.10/mips-ip30-remove-incorrect-cpu_has_fpu-override.patch new file mode 100644 index 00000000000..977cce16357 --- /dev/null +++ b/queue-5.10/mips-ip30-remove-incorrect-cpu_has_fpu-override.patch @@ -0,0 +1,39 @@ +From f44b3e74c33fe04defeff24ebcae98c3bcc5b285 Mon Sep 17 00:00:00 2001 +From: "Maciej W. Rozycki" +Date: Sun, 1 May 2022 23:14:22 +0100 +Subject: MIPS: IP30: Remove incorrect `cpu_has_fpu' override + +From: Maciej W. Rozycki + +commit f44b3e74c33fe04defeff24ebcae98c3bcc5b285 upstream. + +Remove unsupported forcing of `cpu_has_fpu' to 1, which makes the `nofpu' +kernel parameter non-functional, and also causes a link error: + +ld: arch/mips/kernel/traps.o: in function `trap_init': +./arch/mips/include/asm/msa.h:(.init.text+0x348): undefined reference to `handle_fpe' +ld: ./arch/mips/include/asm/msa.h:(.init.text+0x354): undefined reference to `handle_fpe' +ld: ./arch/mips/include/asm/msa.h:(.init.text+0x360): undefined reference to `handle_fpe' + +where the CONFIG_MIPS_FP_SUPPORT configuration option has been disabled. + +Signed-off-by: Maciej W. Rozycki +Reported-by: Stephen Zhang +Fixes: 7505576d1c1a ("MIPS: add support for SGI Octane (IP30)") +Cc: stable@vger.kernel.org # v5.5+ +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h | 1 - + 1 file changed, 1 deletion(-) + +--- a/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h ++++ b/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h +@@ -29,7 +29,6 @@ + #define cpu_has_3k_cache 0 + #define cpu_has_4k_cache 1 + #define cpu_has_tx39_cache 0 +-#define cpu_has_fpu 1 + #define cpu_has_nofpuex 0 + #define cpu_has_32fpr 1 + #define cpu_has_counter 1 diff --git a/queue-5.10/series b/queue-5.10/series index b67a32040f4..a7b4a014923 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -446,3 +446,6 @@ bfq-make-sure-bfqg-for-which-we-are-queueing-requests-is-online.patch block-fix-bio_clone_blkg_association-to-associate-with-proper-blkcg_gq.patch revert-random-use-static-branch-for-crng_ready.patch rdma-rxe-generate-a-completion-for-unsupported-invalid-opcode.patch +mips-ip27-remove-incorrect-cpu_has_fpu-override.patch +mips-ip30-remove-incorrect-cpu_has_fpu-override.patch +ext4-only-allow-test_dummy_encryption-when-supported.patch