All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <0x7f454c46@gmail.com>,
	Dmitry Safonov <dima@arista.com>, Adrian Reber <adrian@lisas.de>,
	Andrei Vagin <avagin@openvz.org>,
	Andy Lutomirski <luto@kernel.org>,
	Christian Brauner <christian.brauner@ubuntu.com>,
	Cyrill Gorcunov <gorcunov@openvz.org>,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
	Jeff Dike <jdike@addtoit.com>, Oleg Nesterov <oleg@redhat.com>,
	Pavel Emelyanov <xemul@virtuozzo.com>,
	Shuah Khan <shuah@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	containers@lists.linux-foundation.org, criu@openvz.org,
	linux-api@vger.kernel.org, x86@kernel.org,
	Alexey Dobriyan <adobriyan@gmail.com>
Subject: [RFC 07/20] timens: Shift /proc/uptime
Date: Wed, 19 Sep 2018 21:50:24 +0100	[thread overview]
Message-ID: <20180919205037.9574-8-dima@arista.com> (raw)
In-Reply-To: <20180919205037.9574-1-dima@arista.com>

Respect boottime inside time namespace for /proc/uptime

Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 fs/proc/uptime.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index a4c2791ab70b..4421ec058472 100644
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c
@@ -5,6 +5,7 @@
 #include <linux/sched.h>
 #include <linux/seq_file.h>
 #include <linux/time.h>
+#include <linux/time_namespace.h>
 #include <linux/kernel_stat.h>
 
 static int uptime_proc_show(struct seq_file *m, void *v)
@@ -20,6 +21,8 @@ static int uptime_proc_show(struct seq_file *m, void *v)
 		nsec += (__force u64) kcpustat_cpu(i).cpustat[CPUTIME_IDLE];
 
 	ktime_get_boottime_ts64(&uptime);
+	timens_clock_from_host(CLOCK_BOOTTIME, &uptime);
+
 	idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
 	idle.tv_nsec = rem;
 	seq_printf(m, "%lu.%02lu %lu.%02lu\n",
-- 
2.13.6


  parent reply	other threads:[~2018-09-19 20:52 UTC|newest]

Thread overview: 164+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-19 20:50 [RFC 00/20] ns: Introduce Time Namespace Dmitry Safonov
2018-09-19 20:50 ` Dmitry Safonov
2018-09-19 20:50 ` Dmitry Safonov
2018-09-19 20:50 ` dima
2018-09-19 20:50 ` [RFC 01/20] " Dmitry Safonov
2018-09-28 18:20   ` Laurent Vivier
2018-09-19 20:50 ` [RFC 02/20] timens: Add timens_offsets Dmitry Safonov
2018-09-20 18:45   ` Cyrill Gorcunov
2018-09-20 22:14     ` Cyrill Gorcunov
2018-09-19 20:50 ` [RFC 03/20] timens: Introduce CLOCK_MONOTONIC offsets Dmitry Safonov
2018-09-19 20:50 ` [RFC 04/20] timens: Introduce CLOCK_BOOTTIME offset Dmitry Safonov
2018-09-30  3:18   ` [LKP] [timens] 3cc8de9dcb: RIP:posix_get_boottime kernel test robot
2018-09-30  3:18     ` kernel test robot
2018-09-30  3:18     ` [LKP] " kernel test robot
2018-09-19 20:50 ` [RFC 05/20] timerfd/timens: Take into account ns clock offsets Dmitry Safonov
2018-09-19 20:50 ` [RFC 06/20] kernel: Take into account timens clock offsets in clock_nanosleep Dmitry Safonov
2018-09-19 20:50 ` Dmitry Safonov [this message]
2018-09-19 20:50 ` [RFC 08/20] x86/vdso: Restrict splitting vvar vma Dmitry Safonov
2018-09-19 20:50 ` [RFC 09/20] x86/vdso/timens: Add offsets page in vvar Dmitry Safonov
2018-09-19 20:50 ` [RFC 10/20] x86/vdso: Use set_normalized_timespec() to avoid 32 bit overflow Dmitry Safonov
2018-09-19 20:50 ` [RFC 11/20] x86/vdso: Purge timens page on setns()/unshare()/clone() Dmitry Safonov
2018-09-19 20:50 ` [RFC 12/20] x86/vdso: Look for vvar vma to purge timens page Dmitry Safonov
2018-09-19 20:50 ` [RFC 13/20] posix-timers/timens: Take into account clock offsets Dmitry Safonov
2018-09-30  3:11   ` [LKP] [posix] 25217c6e39: BUG:KASAN:null-ptr-deref_in_c kernel test robot
2018-09-30  3:11     ` kernel test robot
2018-09-30  3:11     ` [LKP] " kernel test robot
2018-09-19 20:50 ` [RFC 14/20] timens: Add align for timens_offsets Dmitry Safonov
2018-09-19 20:50 ` [RFC 15/20] timens: Optimize zero-offsets Dmitry Safonov
2018-09-19 20:50 ` [RFC 16/20] selftest: Add Time Namespace test for supported clocks Dmitry Safonov
2018-09-19 20:50   ` Dmitry Safonov
2018-09-19 20:50   ` dima
2018-09-24 21:36   ` Shuah Khan
2018-09-24 21:36     ` Shuah Khan
2018-09-24 21:36     ` shuah
2018-09-19 20:50 ` [RFC 17/20] selftest/timens: Add test for timerfd Dmitry Safonov
2018-09-19 20:50   ` Dmitry Safonov
2018-09-19 20:50   ` dima
2018-09-19 20:50 ` [RFC 18/20] selftest/timens: Add test for clock_nanosleep Dmitry Safonov
2018-09-19 20:50   ` Dmitry Safonov
2018-09-19 20:50   ` dima
2018-09-19 20:50 ` [RFC 19/20] timens/selftest: Add procfs selftest Dmitry Safonov
2018-09-19 20:50   ` Dmitry Safonov
2018-09-19 20:50   ` dima
2018-09-19 20:50 ` [RFC 20/20] timens/selftest: Add timer offsets test Dmitry Safonov
2018-09-19 20:50   ` Dmitry Safonov
2018-09-19 20:50   ` dima
2018-09-21 12:27 ` [RFC 00/20] ns: Introduce Time Namespace Eric W. Biederman
2018-09-21 12:27   ` Eric W. Biederman
2018-09-21 12:27   ` ebiederm
2018-09-24 20:51   ` Andrey Vagin
2018-09-24 20:51     ` Andrey Vagin
2018-09-24 20:51     ` Andrey Vagin
2018-09-24 20:51     ` avagin
2018-09-24 22:02     ` Eric W. Biederman
2018-09-24 22:02       ` Eric W. Biederman
2018-09-24 22:02       ` Eric W. Biederman
2018-09-24 22:02       ` ebiederm
2018-09-25  1:42       ` Andrey Vagin
2018-09-25  1:42         ` Andrey Vagin
2018-09-25  1:42         ` Andrey Vagin
2018-09-25  1:42         ` avagin
2018-09-26 17:36         ` Eric W. Biederman
2018-09-26 17:36           ` Eric W. Biederman
2018-09-26 17:36           ` Eric W. Biederman
2018-09-26 17:36           ` ebiederm
2018-09-26 17:59           ` Dmitry Safonov
2018-09-26 17:59             ` Dmitry Safonov
2018-09-26 17:59             ` Dmitry Safonov
2018-09-26 17:59             ` 0x7f454c46
2018-09-27 21:30           ` Thomas Gleixner
2018-09-27 21:30             ` Thomas Gleixner
2018-09-27 21:30             ` Thomas Gleixner
2018-09-27 21:30             ` tglx
2018-09-27 21:41             ` Thomas Gleixner
2018-09-27 21:41               ` Thomas Gleixner
2018-09-27 21:41               ` Thomas Gleixner
2018-09-27 21:41               ` tglx
2018-10-01 23:20               ` Andrey Vagin
2018-10-01 23:20                 ` Andrey Vagin
2018-10-01 23:20                 ` Andrey Vagin
2018-10-01 23:20                 ` avagin
2018-10-02  6:15                 ` Thomas Gleixner
2018-10-02  6:15                   ` Thomas Gleixner
2018-10-02  6:15                   ` Thomas Gleixner
2018-10-02  6:15                   ` tglx
2018-10-02 21:05                   ` Dmitry Safonov
2018-10-02 21:05                     ` Dmitry Safonov
2018-10-02 21:05                     ` 0x7f454c46
2018-10-02 21:26                     ` Thomas Gleixner
2018-10-02 21:26                       ` Thomas Gleixner
2018-10-02 21:26                       ` tglx
2018-09-28 17:03             ` Eric W. Biederman
2018-09-28 17:03               ` Eric W. Biederman
2018-09-28 17:03               ` Eric W. Biederman
2018-09-28 17:03               ` ebiederm
2018-09-28 19:32               ` Thomas Gleixner
2018-09-28 19:32                 ` Thomas Gleixner
2018-09-28 19:32                 ` Thomas Gleixner
2018-09-28 19:32                 ` tglx
2018-10-01  9:05                 ` Eric W. Biederman
2018-10-01  9:05                   ` Eric W. Biederman
2018-10-01  9:05                   ` Eric W. Biederman
2018-10-01  9:05                   ` ebiederm
2018-10-01  9:15                 ` Setting monotonic time? Eric W. Biederman
2018-10-01  9:15                   ` Eric W. Biederman
2018-10-01  9:15                   ` Eric W. Biederman
2018-10-01  9:15                   ` ebiederm
2018-10-01 18:52                   ` Thomas Gleixner
2018-10-01 18:52                     ` Thomas Gleixner
2018-10-01 18:52                     ` Thomas Gleixner
2018-10-01 18:52                     ` tglx
2018-10-02 20:00                     ` Arnd Bergmann
2018-10-02 20:00                       ` Arnd Bergmann
2018-10-02 20:00                       ` arnd
2018-10-02 20:06                       ` Thomas Gleixner
2018-10-02 20:06                         ` Thomas Gleixner
2018-10-02 20:06                         ` tglx
2018-10-03  4:50                         ` Eric W. Biederman
2018-10-03  4:50                           ` Eric W. Biederman
2018-10-03  4:50                           ` ebiederm
2018-10-03  5:25                           ` Thomas Gleixner
2018-10-03  5:25                             ` Thomas Gleixner
2018-10-03  5:25                             ` tglx
2018-10-03  6:14                             ` Eric W. Biederman
2018-10-03  6:14                               ` Eric W. Biederman
2018-10-03  6:14                               ` ebiederm
2018-10-03  7:02                               ` Arnd Bergmann
2018-10-03  7:02                                 ` Arnd Bergmann
2018-10-03  7:02                                 ` arnd
2018-10-03  6:14                             ` Thomas Gleixner
2018-10-03  6:14                               ` Thomas Gleixner
2018-10-03  6:14                               ` tglx
2018-10-01 20:51                   ` Andrey Vagin
2018-10-01 20:51                     ` Andrey Vagin
2018-10-01 20:51                     ` Andrey Vagin
2018-10-01 20:51                     ` avagin
2018-10-02  6:16                     ` Thomas Gleixner
2018-10-02  6:16                       ` Thomas Gleixner
2018-10-02  6:16                       ` Thomas Gleixner
2018-10-02  6:16                       ` tglx
2018-10-21  1:41               ` [RFC 00/20] ns: Introduce Time Namespace Andrei Vagin
2018-10-21  1:41                 ` Andrei Vagin
2018-10-21  1:41                 ` Andrei Vagin
2018-10-21  1:41                 ` avagin
2018-10-21  3:54                 ` Andrei Vagin
2018-10-21  3:54                   ` Andrei Vagin
2018-10-21  3:54                   ` Andrei Vagin
2018-10-21  3:54                   ` avagin
2018-10-29 20:33                 ` Thomas Gleixner
2018-10-29 20:33                   ` Thomas Gleixner
2018-10-29 20:33                   ` Thomas Gleixner
2018-10-29 20:33                   ` tglx
2018-10-29 21:21                   ` Eric W. Biederman
2018-10-29 21:21                     ` Eric W. Biederman
2018-10-29 21:21                     ` Eric W. Biederman
2018-10-29 21:21                     ` ebiederm
2018-10-29 21:36                     ` Thomas Gleixner
2018-10-29 21:36                       ` Thomas Gleixner
2018-10-29 21:36                       ` Thomas Gleixner
2018-10-29 21:36                       ` tglx
2018-10-31 16:26                   ` Andrei Vagin
2018-10-31 16:26                     ` Andrei Vagin
2018-10-31 16:26                     ` Andrei Vagin
2018-10-31 16:26                     ` avagin

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=20180919205037.9574-8-dima@arista.com \
    --to=dima@arista.com \
    --cc=0x7f454c46@gmail.com \
    --cc=adobriyan@gmail.com \
    --cc=adrian@lisas.de \
    --cc=avagin@openvz.org \
    --cc=christian.brauner@ubuntu.com \
    --cc=containers@lists.linux-foundation.org \
    --cc=criu@openvz.org \
    --cc=ebiederm@xmission.com \
    --cc=gorcunov@openvz.org \
    --cc=hpa@zytor.com \
    --cc=jdike@addtoit.com \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@redhat.com \
    --cc=oleg@redhat.com \
    --cc=shuah@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    --cc=xemul@virtuozzo.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.