2022-03-09 08:35:36

by Peng Liu

[permalink] [raw]
Subject: [PATCH v2 2/3] 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.

Fixes: 5f3e06208920 ("kunit: test: add support for test abort")
Signed-off-by: Peng Liu <[email protected]>
---
lib/kunit/try-catch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
index 6b3d4db94077..f7825991d576 100644
--- a/lib/kunit/try-catch.c
+++ b/lib/kunit/try-catch.c
@@ -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)
--
2.18.0.huawei.25


2022-03-09 10:54:36

by Marco Elver

[permalink] [raw]
Subject: Re: [PATCH v2 2/3] kunit: make kunit_test_timeout compatible with comment

On Wed, 9 Mar 2022 at 09:19, 'Peng Liu' via kasan-dev
<[email protected]> wrote:
>
> 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.
>
> Fixes: 5f3e06208920 ("kunit: test: add support for test abort")
> Signed-off-by: Peng Liu <[email protected]>

Reviewed-by: Marco Elver <[email protected]>

+Cc more KUnit folks.

> ---
> lib/kunit/try-catch.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
> index 6b3d4db94077..f7825991d576 100644
> --- a/lib/kunit/try-catch.c
> +++ b/lib/kunit/try-catch.c
> @@ -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)
> --
> 2.18.0.huawei.25
>
> --
> You received this message because you are subscribed to the Google Groups "kasan-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20220309083753.1561921-3-liupeng256%40huawei.com.

2022-03-09 14:58:09

by Daniel Latypov

[permalink] [raw]
Subject: Re: [PATCH v2 2/3] kunit: make kunit_test_timeout compatible with comment

On Wed, Mar 9, 2022 at 2:19 AM 'Peng Liu' via KUnit Development
<[email protected]> wrote:
>
> 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.
>
> Fixes: 5f3e06208920 ("kunit: test: add support for test abort")
> Signed-off-by: Peng Liu <[email protected]>

Reviewed-by: Daniel Latypov <[email protected]>

Thanks for catching this!

> ---
> lib/kunit/try-catch.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
> index 6b3d4db94077..f7825991d576 100644
> --- a/lib/kunit/try-catch.c
> +++ b/lib/kunit/try-catch.c
> @@ -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)
> --
> 2.18.0.huawei.25
>
> --
> You received this message because you are subscribed to the Google Groups "KUnit Development" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/20220309083753.1561921-3-liupeng256%40huawei.com.

2022-03-10 10:35:41

by Brendan Higgins

[permalink] [raw]
Subject: Re: [PATCH v2 2/3] kunit: make kunit_test_timeout compatible with comment

On Wed, Mar 9, 2022 at 3:19 AM 'Peng Liu' via KUnit Development
<[email protected]> wrote:
>
> 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.
>
> Fixes: 5f3e06208920 ("kunit: test: add support for test abort")
> Signed-off-by: Peng Liu <[email protected]>

Reviewed-by: Brendan Higgins <[email protected]>