linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Peng Liu <liupeng256@huawei.com>
To: <brendanhiggins@google.com>, <glider@google.com>,
	<elver@google.com>, <dvyukov@google.com>,
	<akpm@linux-foundation.org>, <linux-kselftest@vger.kernel.org>,
	<kunit-dev@googlegroups.com>, <linux-kernel@vger.kernel.org>,
	<kasan-dev@googlegroups.com>, <linux-mm@kvack.org>
Cc: <wangkefeng.wang@huawei.com>, <liupeng256@huawei.com>
Subject: [PATCH 2/3] kunit: make kunit_test_timeout compatible with comment
Date: Wed, 9 Mar 2022 01:47:04 +0000	[thread overview]
Message-ID: <20220309014705.1265861-3-liupeng256@huawei.com> (raw)
In-Reply-To: <20220309014705.1265861-1-liupeng256@huawei.com>

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(-)

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



  parent reply	other threads:[~2022-03-09  1:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-09  1:47 [PATCH 0/3] kunit: fix a UAF bug and do some optimization Peng Liu
2022-03-09  1:47 ` [PATCH 1/3] kunit: fix UAF when run kfence test case test_gfpzero Peng Liu
2022-03-09  1:47 ` Peng Liu [this message]
2022-03-09  6:03   ` [PATCH 2/3] kunit: make kunit_test_timeout compatible with comment Marco Elver
2022-03-09  6:31     ` liupeng (DM)
2022-03-09  6:37       ` Marco Elver
2022-03-09  1:47 ` [PATCH 3/3] kfence: test: try to avoid test_gfpzero trigger rcu_stall Peng Liu
2022-03-09 21:39   ` Shuah Khan
2022-03-09  6:12 ` [PATCH 0/3] kunit: fix a UAF bug and do some optimization Marco Elver
2022-03-09  6:39   ` liupeng (DM)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220309014705.1265861-3-liupeng256@huawei.com \
    --to=liupeng256@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=brendanhiggins@google.com \
    --cc=dvyukov@google.com \
    --cc=elver@google.com \
    --cc=glider@google.com \
    --cc=kasan-dev@googlegroups.com \
    --cc=kunit-dev@googlegroups.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=wangkefeng.wang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox