The taskstats interface uses microsecond granularity for the user and system time values. The conversion from cputime to the taskstats values uses the cputime_to_msecs primitive which effectively limits the granularity to milliseconds. Add the cputime_to_usecs primitive for architectures that have better, more precise CPU time values. Remove cputime_to_msecs primitive because there are no more users left. Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com> Cc: Luck Tony <tony.luck@intel.com> Cc: Shailabh Nagar <nagar1234@in.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Shailabh Nagar <nagar@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			154 lines
		
	
	
	
		
			4.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			154 lines
		
	
	
	
		
			4.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * tsacct.c - System accounting over taskstats interface
 | 
						|
 *
 | 
						|
 * Copyright (C) Jay Lan,	<jlan@sgi.com>
 | 
						|
 *
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation; either version 2 of the License, or
 | 
						|
 * (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/sched.h>
 | 
						|
#include <linux/tsacct_kern.h>
 | 
						|
#include <linux/acct.h>
 | 
						|
#include <linux/jiffies.h>
 | 
						|
#include <linux/mm.h>
 | 
						|
 | 
						|
/*
 | 
						|
 * fill in basic accounting fields
 | 
						|
 */
 | 
						|
void bacct_add_tsk(struct taskstats *stats, struct task_struct *tsk)
 | 
						|
{
 | 
						|
	const struct cred *tcred;
 | 
						|
	struct timespec uptime, ts;
 | 
						|
	u64 ac_etime;
 | 
						|
 | 
						|
	BUILD_BUG_ON(TS_COMM_LEN < TASK_COMM_LEN);
 | 
						|
 | 
						|
	/* calculate task elapsed time in timespec */
 | 
						|
	do_posix_clock_monotonic_gettime(&uptime);
 | 
						|
	ts = timespec_sub(uptime, tsk->start_time);
 | 
						|
	/* rebase elapsed time to usec (should never be negative) */
 | 
						|
	ac_etime = timespec_to_ns(&ts);
 | 
						|
	do_div(ac_etime, NSEC_PER_USEC);
 | 
						|
	stats->ac_etime = ac_etime;
 | 
						|
	stats->ac_btime = get_seconds() - ts.tv_sec;
 | 
						|
	if (thread_group_leader(tsk)) {
 | 
						|
		stats->ac_exitcode = tsk->exit_code;
 | 
						|
		if (tsk->flags & PF_FORKNOEXEC)
 | 
						|
			stats->ac_flag |= AFORK;
 | 
						|
	}
 | 
						|
	if (tsk->flags & PF_SUPERPRIV)
 | 
						|
		stats->ac_flag |= ASU;
 | 
						|
	if (tsk->flags & PF_DUMPCORE)
 | 
						|
		stats->ac_flag |= ACORE;
 | 
						|
	if (tsk->flags & PF_SIGNALED)
 | 
						|
		stats->ac_flag |= AXSIG;
 | 
						|
	stats->ac_nice	 = task_nice(tsk);
 | 
						|
	stats->ac_sched	 = tsk->policy;
 | 
						|
	stats->ac_pid	 = tsk->pid;
 | 
						|
	rcu_read_lock();
 | 
						|
	tcred = __task_cred(tsk);
 | 
						|
	stats->ac_uid	 = tcred->uid;
 | 
						|
	stats->ac_gid	 = tcred->gid;
 | 
						|
	stats->ac_ppid	 = pid_alive(tsk) ?
 | 
						|
				rcu_dereference(tsk->real_parent)->tgid : 0;
 | 
						|
	rcu_read_unlock();
 | 
						|
	stats->ac_utime = cputime_to_usecs(tsk->utime);
 | 
						|
	stats->ac_stime = cputime_to_usecs(tsk->stime);
 | 
						|
	stats->ac_utimescaled = cputime_to_usecs(tsk->utimescaled);
 | 
						|
	stats->ac_stimescaled = cputime_to_usecs(tsk->stimescaled);
 | 
						|
	stats->ac_minflt = tsk->min_flt;
 | 
						|
	stats->ac_majflt = tsk->maj_flt;
 | 
						|
 | 
						|
	strncpy(stats->ac_comm, tsk->comm, sizeof(stats->ac_comm));
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
#ifdef CONFIG_TASK_XACCT
 | 
						|
 | 
						|
#define KB 1024
 | 
						|
#define MB (1024*KB)
 | 
						|
/*
 | 
						|
 * fill in extended accounting fields
 | 
						|
 */
 | 
						|
void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
 | 
						|
{
 | 
						|
	struct mm_struct *mm;
 | 
						|
 | 
						|
	/* convert pages-usec to Mbyte-usec */
 | 
						|
	stats->coremem = p->acct_rss_mem1 * PAGE_SIZE / MB;
 | 
						|
	stats->virtmem = p->acct_vm_mem1 * PAGE_SIZE / MB;
 | 
						|
	mm = get_task_mm(p);
 | 
						|
	if (mm) {
 | 
						|
		/* adjust to KB unit */
 | 
						|
		stats->hiwater_rss   = get_mm_hiwater_rss(mm) * PAGE_SIZE / KB;
 | 
						|
		stats->hiwater_vm    = get_mm_hiwater_vm(mm)  * PAGE_SIZE / KB;
 | 
						|
		mmput(mm);
 | 
						|
	}
 | 
						|
	stats->read_char	= p->ioac.rchar;
 | 
						|
	stats->write_char	= p->ioac.wchar;
 | 
						|
	stats->read_syscalls	= p->ioac.syscr;
 | 
						|
	stats->write_syscalls	= p->ioac.syscw;
 | 
						|
#ifdef CONFIG_TASK_IO_ACCOUNTING
 | 
						|
	stats->read_bytes	= p->ioac.read_bytes;
 | 
						|
	stats->write_bytes	= p->ioac.write_bytes;
 | 
						|
	stats->cancelled_write_bytes = p->ioac.cancelled_write_bytes;
 | 
						|
#else
 | 
						|
	stats->read_bytes	= 0;
 | 
						|
	stats->write_bytes	= 0;
 | 
						|
	stats->cancelled_write_bytes = 0;
 | 
						|
#endif
 | 
						|
}
 | 
						|
#undef KB
 | 
						|
#undef MB
 | 
						|
 | 
						|
/**
 | 
						|
 * acct_update_integrals - update mm integral fields in task_struct
 | 
						|
 * @tsk: task_struct for accounting
 | 
						|
 */
 | 
						|
void acct_update_integrals(struct task_struct *tsk)
 | 
						|
{
 | 
						|
	if (likely(tsk->mm)) {
 | 
						|
		cputime_t time, dtime;
 | 
						|
		struct timeval value;
 | 
						|
		unsigned long flags;
 | 
						|
		u64 delta;
 | 
						|
 | 
						|
		local_irq_save(flags);
 | 
						|
		time = tsk->stime + tsk->utime;
 | 
						|
		dtime = cputime_sub(time, tsk->acct_timexpd);
 | 
						|
		jiffies_to_timeval(cputime_to_jiffies(dtime), &value);
 | 
						|
		delta = value.tv_sec;
 | 
						|
		delta = delta * USEC_PER_SEC + value.tv_usec;
 | 
						|
 | 
						|
		if (delta == 0)
 | 
						|
			goto out;
 | 
						|
		tsk->acct_timexpd = time;
 | 
						|
		tsk->acct_rss_mem1 += delta * get_mm_rss(tsk->mm);
 | 
						|
		tsk->acct_vm_mem1 += delta * tsk->mm->total_vm;
 | 
						|
	out:
 | 
						|
		local_irq_restore(flags);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
/**
 | 
						|
 * acct_clear_integrals - clear the mm integral fields in task_struct
 | 
						|
 * @tsk: task_struct whose accounting fields are cleared
 | 
						|
 */
 | 
						|
void acct_clear_integrals(struct task_struct *tsk)
 | 
						|
{
 | 
						|
	tsk->acct_timexpd = 0;
 | 
						|
	tsk->acct_rss_mem1 = 0;
 | 
						|
	tsk->acct_vm_mem1 = 0;
 | 
						|
}
 | 
						|
#endif
 |