From: zengtao <prime.zeng@huawei.com>
To: <tglx@linutronix.de>, <arnd@arndb.de>, <fweisbec@gmail.com>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH] cputime: Fix timeval/timespec-->cputime conversion
Date: Tue, 2 Feb 2016 11:38:34 +0800 [thread overview]
Message-ID: <1454384314-154784-1-git-send-email-prime.zeng@huawei.com> (raw)
The datatype __kernel_time_t is u32 on 32bit platform,
it will easily get overflow, so force u64 conversion.
Currently the following function will be affected:
1. setitimer()
2. timer_create/timer_settime()
3. sys_clock_nanosleep
And this will occur on MIPS32 and ARM32 with "Full dynticks CPU
time accounting" enabled, which is required for CONFIG_NO_HZ_FULL.
Signed-off-by: zengtao <prime.zeng@huawei.com>
---
include/asm-generic/cputime_nsecs.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/asm-generic/cputime_nsecs.h b/include/asm-generic/cputime_nsecs.h
index 0419485..0f1c6f3 100644
--- a/include/asm-generic/cputime_nsecs.h
+++ b/include/asm-generic/cputime_nsecs.h
@@ -75,7 +75,7 @@ typedef u64 __nocast cputime64_t;
*/
static inline cputime_t timespec_to_cputime(const struct timespec *val)
{
- u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
+ u64 ret = (u64)val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
return (__force cputime_t) ret;
}
static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
@@ -91,7 +91,8 @@ static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
*/
static inline cputime_t timeval_to_cputime(const struct timeval *val)
{
- u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_usec * NSEC_PER_USEC;
+ u64 ret = (u64)val->tv_sec * NSEC_PER_SEC +
+ val->tv_usec * NSEC_PER_USEC;
return (__force cputime_t) ret;
}
static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val)
--
1.9.1
next reply other threads:[~2016-02-02 3:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-02 3:38 zengtao [this message]
2016-02-02 12:53 ` Arnd Bergmann
2016-02-02 14:30 ` [tip:timers/urgent] cputime: Prevent 32bit overflow in time[ val|spec]_to_cputime() tip-bot for zengtao
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=1454384314-154784-1-git-send-email-prime.zeng@huawei.com \
--to=prime.zeng@huawei.com \
--cc=arnd@arndb.de \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®