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

From: Dmitry Safonov
Date: Tue Mar 03 2020 - 11:41:05 EST


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 <chrubis@xxxxxxx>

Reviewed-by: Dmitry Safonov <dima@xxxxxxxxxx>

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