| Message ID | 20220309014705.1265861-3-liupeng256@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bdd015f7b71b92c2e4ecabac689642cc72553e04 |
| Delegated to: | Brendan Higgins |
| Headers | show |
| Series | kunit: fix a UAF bug and do some optimization | expand |
On Wed, 9 Mar 2022 at 02:29, 'Peng Liu' via kasan-dev <kasan-dev@googlegroups.com> 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. > > Signed-off-by: Peng Liu <liupeng256@huawei.com> Does this need a: Fixes: 5f3e06208920 ("kunit: test: add support for test abort") ? > --- > 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 */ Why not just "300 * HZ" ? > } > > 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 kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20220309014705.1265861-3-liupeng256%40huawei.com.
Thank you for your advice. On 2022/3/9 14:03, Marco Elver wrote: > On Wed, 9 Mar 2022 at 02:29, 'Peng Liu' via kasan-dev > <kasan-dev@googlegroups.com> 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. >> >> Signed-off-by: Peng Liu <liupeng256@huawei.com> > Does this need a: > > Fixes: 5f3e06208920 ("kunit: test: add support for test abort") > > ? Yes, I will add this description. >> --- >> 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 */ > Why not just "300 * HZ" ? Because I have seen patch df3c30f6e904 ("staging: lustre: replace direct HZ access with kernel APIs"). Here, both "msecs_to_jiffies(MSEC_PER_SEC)" and "300 * HZ" is ok for me. >> } >> >> 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 kasan-dev+unsubscribe@googlegroups.com. >> To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20220309014705.1265861-3-liupeng256%40huawei.com. > .
On Wed, 9 Mar 2022 at 07:32, liupeng (DM) <liupeng256@huawei.com> wrote: > > Thank you for your advice. > > On 2022/3/9 14:03, Marco Elver wrote: > > On Wed, 9 Mar 2022 at 02:29, 'Peng Liu' via kasan-dev > > <kasan-dev@googlegroups.com> 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. > >> > >> Signed-off-by: Peng Liu <liupeng256@huawei.com> > > Does this need a: > > > > Fixes: 5f3e06208920 ("kunit: test: add support for test abort") > > > > ? > > Yes, I will add this description. > > >> --- > >> 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 */ > > Why not just "300 * HZ" ? > > Because I have seen patch > > df3c30f6e904 ("staging: lustre: replace direct HZ access with kernel APIs"). > > Here, both "msecs_to_jiffies(MSEC_PER_SEC)" and "300 * HZ" is ok for me. I see - let's keep as-is and use msecs_to_jiffies(). Thanks, -- Marco
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)
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. Signed-off-by: Peng Liu <liupeng256@huawei.com> --- lib/kunit/try-catch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)