From: Arnd Bergmann <arnd@arndb.de>
To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
Thomas Gleixner <tglx@linutronix.de>,
Richard Fontana <rfontana@redhat.com>
Subject: [PATCH v2 07/24] tsacct: add 64-bit btime field
Date: Fri, 13 Dec 2019 21:52:12 +0100 [thread overview]
Message-ID: <20191213205221.3787308-4-arnd@arndb.de> (raw)
In-Reply-To: <20191213204936.3643476-1-arnd@arndb.de>
As there is only a 32-bit ac_btime field in taskstat and
we should handle dates after the overflow, add a new field
with the same information but 64-bit width that can hold
a full time64_t.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
include/uapi/linux/taskstats.h | 5 ++++-
kernel/tsacct.c | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/taskstats.h b/include/uapi/linux/taskstats.h
index 7d3ea366e93b..ccbd08709321 100644
--- a/include/uapi/linux/taskstats.h
+++ b/include/uapi/linux/taskstats.h
@@ -34,7 +34,7 @@
*/
-#define TASKSTATS_VERSION 9
+#define TASKSTATS_VERSION 10
#define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN
* in linux/sched.h */
@@ -169,6 +169,9 @@ struct taskstats {
/* Delay waiting for thrashing page */
__u64 thrashing_count;
__u64 thrashing_delay_total;
+
+ /* v10: 64-bit btime to avoid overflow */
+ __u64 ac_btime64; /* 64-bit begin time */
};
diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index ab12616ee6fb..257ffb993ea2 100644
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
@@ -36,6 +36,7 @@ void bacct_add_tsk(struct user_namespace *user_ns,
/* Convert to seconds for btime (note y2106 limit) */
btime = ktime_get_real_seconds() - div_u64(delta, USEC_PER_SEC);
stats->ac_btime = clamp_t(time64_t, btime, 0, U32_MAX);
+ stats->ac_btime64 = btime;
if (thread_group_leader(tsk)) {
stats->ac_exitcode = tsk->exit_code;
--
2.20.0
next prev parent reply other threads:[~2019-12-13 20:53 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 20:49 [PATCH v2 00/24] drivers, fs: y2038 updates Arnd Bergmann
2019-12-13 20:49 ` [PATCH v2 01/24] Input: input_event: fix struct padding on sparc64 Arnd Bergmann
2019-12-13 22:08 ` Dmitry Torokhov
2019-12-13 20:49 ` [PATCH v2 02/24] fat: use prandom_u32() for i_generation Arnd Bergmann
2019-12-13 20:49 ` [PATCH v2 03/24] dlm: use SO_SNDTIMEO_NEW instead of SO_SNDTIMEO_OLD Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 04/24] xtensa: ISS: avoid struct timeval Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 05/24] um: ubd: use 64-bit time_t where possible Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 06/24] acct: stop using get_seconds() Arnd Bergmann
2019-12-13 20:52 ` Arnd Bergmann [this message]
2019-12-13 20:52 ` [PATCH v2 08/24] packet: clarify timestamp overflow Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 09/24] quota: avoid time_t in v1_disk_dqblk definition Arnd Bergmann
2019-12-16 13:14 ` Jan Kara
2019-12-13 20:53 ` [PATCH v2 10/24] hostfs: pass 64-bit timestamps to/from user space Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 11/24] hfs/hfsplus: use 64-bit inode timestamps Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 12/24] drm/msm: avoid using 'timespec' Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 13/24] drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC Arnd Bergmann
2020-01-08 1:16 ` [Y2038] " Ben Hutchings
2020-01-17 15:47 ` Guido Günther
2020-01-20 17:47 ` Lucas Stach
2020-01-20 18:47 ` Arnd Bergmann
2020-01-21 10:21 ` Lucas Stach
2020-01-21 11:46 ` Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 14/24] drm/etnaviv: avoid deprecated timespec Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 15/24] sunrpc: convert to time64_t for expiry Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 16/24] nfs: use time64_t internally Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 17/24] nfs: fix timstamp debug prints Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 18/24] nfs: fscache: use timespec64 in inode auxdata Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 19/24] xfs: rename compat_time_t to old_time32_t Arnd Bergmann
2019-12-13 21:18 ` Darrick J. Wong
2019-12-16 16:31 ` Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 20/24] xfs: disallow broken ioctls without compat-32-bit-time Arnd Bergmann
2019-12-13 21:05 ` Darrick J. Wong
2019-12-16 16:45 ` Arnd Bergmann
2019-12-16 16:52 ` Darrick J. Wong
2019-12-17 15:06 ` Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 21/24] xfs: quota: move to time64_t interfaces Arnd Bergmann
2019-12-13 21:17 ` Darrick J. Wong
2019-12-16 16:52 ` Arnd Bergmann
2019-12-17 15:02 ` Arnd Bergmann
2019-12-17 22:15 ` Darrick J. Wong
2019-12-18 16:44 ` Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 22/24] y2038: remove obsolete jiffies conversion functions Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 23/24] y2038: rename itimerval to __kernel_old_itimerval Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 24/24] y2038: sparc: remove use of struct timex Arnd Bergmann
2019-12-14 1:37 ` Julian Calaby
2019-12-14 14:44 ` [Y2038] " Arnd Bergmann
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=20191213205221.3787308-4-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=rfontana@redhat.com \
--cc=tglx@linutronix.de \
--cc=y2038@lists.linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).