summaryrefslogtreecommitdiffstats
path: root/arch/um/Kconfig
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2019-12-13 10:01:28 +0100
committerRichard Weinberger <richard@nod.at>2020-01-19 22:42:06 +0100
commitd65197ad52494bed3b5e64708281b8295f76c391 (patch)
tree6b62b3fc956ae45c2bcc417f3bebe92dcef5a2a3 /arch/um/Kconfig
parentRevert "um: Enable CONFIG_CONSTRUCTORS" (diff)
downloadlinux-d65197ad52494bed3b5e64708281b8295f76c391.tar.xz
linux-d65197ad52494bed3b5e64708281b8295f76c391.zip
um: Fix time-travel=inf-cpu with xor/raid6
Today, I erroneously built a time-travel configuration with btrfs enabled, and noticed it cannot boot in time-travel=inf-cpu mode, both xor and raid6 speed measurement gets stuck. For xor, work around it by picking the first algorithm if inf-cpu mode is enabled. For raid6, I didn't find such a workaround, so disallow enabling time-travel mode if RAID6_PQ_BENCHMARK is enabled. With this, and RAID6_PQ_BENCHMARK disabled, I can boot a kernel that has btrfs enabled in time-travel=inf-cpu mode. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/Kconfig')
-rw-r--r--arch/um/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 6f0edd0c0220..0917f8443c28 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -189,6 +189,8 @@ config SECCOMP
config UML_TIME_TRAVEL_SUPPORT
bool
prompt "Support time-travel mode (e.g. for test execution)"
+ # inf-cpu mode is incompatible with the benchmarking
+ depends on !RAID6_PQ_BENCHMARK
help
Enable this option to support time travel inside the UML instance.