Commit 6d93a197 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'time-namespace-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux 

Pull time namespace updates from Christian Brauner:
 "When time namespaces were introduced we missed to virtualize the
  'btime' field in /proc/stat. This confuses tasks which are in another
  time namespace with a virtualized boottime which is common in some
  container workloads. This contains Michael's series to fix 'btime'
  which Thomas asked me to take through my tree.

  To fix 'btime' virtualization we simply subtract the offset of the
  time namespace's boottime from btime before printing the stats. Note
  that since start_boottime of processes are seconds since boottime and
  the boottime stamp is now shifted according to the time namespace's
  offset, the offset of the time namespace also needs to be applied
  before the process stats are given to userspace. This avoids that
  processes shown by tools such as 'ps' appear as time travelers in the
  corresponding time namespace.

  Selftests are included to verify that btime virtualization in
  /proc/stat works as expected"

* tag 'time-namespace-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
  namespace: make timens_on_fork() return nothing
  selftests/timens: added selftest for /proc/stat btime
  fs/proc: apply the time namespace offset to /proc/stat btime
  timens: additional helper functions for boottime offset handling
parents 0ca2ce81 5c62634f

fs/proc/array.c

+4 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <linux/types.h>

#include <linux/errno.h>

#include <linux/time.h>

#include <linux/time_namespace.h>

#include <linux/kernel.h>

#include <linux/kernel_stat.h>

#include <linux/tty.h>
@@ -533,8 +534,9 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, 
	priority = task_prio(task);

	nice = task_nice(task);



	/* convert nsec -> ticks */

	start_time = nsec_to_clock_t(task->start_boottime);

	/* apply timens offset for boottime and convert nsec -> ticks */

	start_time =

		nsec_to_clock_t(timens_add_boottime_ns(task->start_boottime));



	seq_put_decimal_ull(m, "", pid_nr_ns(pid, ns));

	seq_puts(m, " (");

fs/proc/stat.c

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/time.h>

#include <linux/time_namespace.h>

#include <linux/irqnr.h>

#include <linux/sched/cputime.h>

#include <linux/tick.h>
@@ -118,6 +119,8 @@ static int show_stat(struct seq_file *p, void *v) 
		irq = softirq = steal = 0;

	guest = guest_nice = 0;

	getboottime64(&boottime);

	/* shift boot timestamp according to the timens offset */

	timens_sub_boottime(&boottime);



	for_each_possible_cpu(i) {

		struct kernel_cpustat kcpustat;

include/linux/time_namespace.h

+25 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct time_namespace *copy_time_ns(unsigned long flags, 
				    struct user_namespace *user_ns,

				    struct time_namespace *old_ns);

void free_time_ns(struct kref *kref);

int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk);

void timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk);

struct vdso_data *arch_get_vdso_data(void *vvar_page);



static inline void put_time_ns(struct time_namespace *ns)
@@ -77,6 +77,20 @@ static inline void timens_add_boottime(struct timespec64 *ts) 
	*ts = timespec64_add(*ts, ns_offsets->boottime);

}



static inline u64 timens_add_boottime_ns(u64 nsec)

{

	struct timens_offsets *ns_offsets = &current->nsproxy->time_ns->offsets;



	return nsec + timespec64_to_ns(&ns_offsets->boottime);

}



static inline void timens_sub_boottime(struct timespec64 *ts)

{

	struct timens_offsets *ns_offsets = &current->nsproxy->time_ns->offsets;



	*ts = timespec64_sub(*ts, ns_offsets->boottime);

}



ktime_t do_timens_ktime_to_host(clockid_t clockid, ktime_t tim,

				struct timens_offsets *offsets);
@@ -122,14 +136,22 @@ struct time_namespace *copy_time_ns(unsigned long flags, 
	return old_ns;

}



static inline int timens_on_fork(struct nsproxy *nsproxy,

static inline void timens_on_fork(struct nsproxy *nsproxy,

				 struct task_struct *tsk)

{

	return 0;

	return;

}



static inline void timens_add_monotonic(struct timespec64 *ts) { }

static inline void timens_add_boottime(struct timespec64 *ts) { }



static inline u64 timens_add_boottime_ns(u64 nsec)

{

	return nsec;

}



static inline void timens_sub_boottime(struct timespec64 *ts) { }



static inline ktime_t timens_ktime_to_host(clockid_t clockid, ktime_t tim)

{

	return tim;

kernel/nsproxy.c

+1 −6
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk) 
	struct nsproxy *old_ns = tsk->nsproxy;

	struct user_namespace *user_ns = task_cred_xxx(tsk, user_ns);

	struct nsproxy *new_ns;

	int ret;



	if (likely(!(flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |

			      CLONE_NEWPID | CLONE_NEWNET |
@@ -180,11 +179,7 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk) 
	if (IS_ERR(new_ns))

		return  PTR_ERR(new_ns);



	ret = timens_on_fork(new_ns, tsk);

	if (ret) {

		free_nsproxy(new_ns);

		return ret;

	}

	timens_on_fork(new_ns, tsk);



	tsk->nsproxy = new_ns;

	return 0;

kernel/time/namespace.c

+2 −4
Original line number Diff line number Diff line
@@ -308,22 +308,20 @@ static int timens_install(struct nsset *nsset, struct ns_common *new) 
	return 0;

}



int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk)

void timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk)

{

	struct ns_common *nsc = &nsproxy->time_ns_for_children->ns;

	struct time_namespace *ns = to_time_ns(nsc);



	/* create_new_namespaces() already incremented the ref counter */

	if (nsproxy->time_ns == nsproxy->time_ns_for_children)

		return 0;

		return;



	get_time_ns(ns);

	put_time_ns(nsproxy->time_ns);

	nsproxy->time_ns = ns;



	timens_commit(tsk, ns);



	return 0;

}



static struct user_namespace *timens_owner(struct ns_common *ns)

CRA Git | Maintained and supported by SUSTech CRA and CCSE