Commit bdd015f7 authored by Peng Liu's avatar Peng Liu Committed by Linus Torvalds
Browse files

kunit: make kunit_test_timeout compatible with comment 

In function kunit_test_timeout, it is declared "300 * MSEC_PER_SEC"
represent 5min.  However, it is wrong when dealing with arm64 whose
default HZ = 250, or some other situations.  Use msecs_to_jiffies to fix
this, and kunit_test_timeout will work as desired.

Link: https://lkml.kernel.org/r/20220309083753.1561921-3-liupeng256@huawei.com


Fixes: 5f3e0620 ("kunit: test: add support for test abort")
Signed-off-by: default avatarPeng Liu <liupeng256@huawei.com>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Reviewed-by: default avatarDaniel Latypov <dlatypov@google.com>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Tested-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Wang Kefeng <wangkefeng.wang@huawei.com>
Cc: David Gow <davidgow@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent adf50545

lib/kunit/try-catch.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static unsigned long kunit_test_timeout(void) 
	 * If tests timeout due to exceeding sysctl_hung_task_timeout_secs,

	 * the task will be killed and an oops generated.

	 */

	return 300 * MSEC_PER_SEC; /* 5 min */

	return 300 * msecs_to_jiffies(MSEC_PER_SEC); /* 5 min */

}



void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)