2020-03-03 15:45:11

by Cyril Hrubis

Subject: [PATCH] sys/sysinfo: Respect boottime inside time namespace

The sysinfo() syscall includes uptime in seconds this makes it
consistent with the /proc/uptime inside of a time namespace.

Signed-off-by: Cyril Hrubis <[email protected]>
---
kernel/sys.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/kernel/sys.c b/kernel/sys.c
index f9bc5c303e3f..d325f3ab624a 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
#include <linux/user_namespace.h>
+#include <linux/time_namespace.h>
#include <linux/binfmts.h>

#include <linux/sched.h>
@@ -2546,6 +2547,7 @@ static int do_sysinfo(struct sysinfo *info)
memset(info, 0, sizeof(struct sysinfo));

ktime_get_boottime_ts64(&tp);
+ timens_add_boottime(&tp);
info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);

get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);
--
2.24.1

2020-03-03 16:42:28

by Dmitry Safonov

Subject: Re: [PATCH] sys/sysinfo: Respect boottime inside time namespace

On 3/3/20 3:06 PM, Cyril Hrubis wrote:
> The sysinfo() syscall includes uptime in seconds this makes it
> consistent with the /proc/uptime inside of a time namespace.
>
> Signed-off-by: Cyril Hrubis <[email protected]>

Reviewed-by: Dmitry Safonov <[email protected]>

> ---
> kernel/sys.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/kernel/sys.c b/kernel/sys.c
> index f9bc5c303e3f..d325f3ab624a 100644
> --- a/kernel/sys.c
> +++ b/kernel/sys.c
> @@ -47,6 +47,7 @@
> #include <linux/syscalls.h>
> #include <linux/kprobes.h>
> #include <linux/user_namespace.h>
> +#include <linux/time_namespace.h>
> #include <linux/binfmts.h>
>
> #include <linux/sched.h>
> @@ -2546,6 +2547,7 @@ static int do_sysinfo(struct sysinfo *info)
> memset(info, 0, sizeof(struct sysinfo));
>
> ktime_get_boottime_ts64(&tp);
> + timens_add_boottime(&tp);
> info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
>
> get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);
>

Thanks for noticing,
Dmitry

2020-03-03 21:39:36

by tip-bot2 for Alexey Makhalov

Subject: [tip: timers/urgent] sys/sysinfo: Respect boottime inside time namespace

The following commit has been merged into the timers/urgent branch of tip:

Commit-ID: ecc421e05bab97cf3ff4fe456ade47ef84dba8c2
Gitweb: https://git.kernel.org/tip/ecc421e05bab97cf3ff4fe456ade47ef84dba8c2
Author: Cyril Hrubis <[email protected]>
AuthorDate: Tue, 03 Mar 2020 16:06:38 +01:00
Committer: Thomas Gleixner <[email protected]>
CommitterDate: Tue, 03 Mar 2020 19:34:32 +01:00

sys/sysinfo: Respect boottime inside time namespace

The sysinfo() syscall includes uptime in seconds but has no correction for
time namespaces which makes it inconsistent with the /proc/uptime inside of
a time namespace.

Add the missing time namespace adjustment call.

Signed-off-by: Cyril Hrubis <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Dmitry Safonov <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]

---
kernel/sys.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/kernel/sys.c b/kernel/sys.c
index f9bc5c3..d325f3a 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
#include <linux/user_namespace.h>
+#include <linux/time_namespace.h>
#include <linux/binfmts.h>

#include <linux/sched.h>
@@ -2546,6 +2547,7 @@ static int do_sysinfo(struct sysinfo *info)
memset(info, 0, sizeof(struct sysinfo));

ktime_get_boottime_ts64(&tp);
+ timens_add_boottime(&tp);
info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);

get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);