Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fb1327e authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

sched/cputime: Convert kcpustat to nsecs 



Kernel CPU stats are stored in cputime_t which is an architecture
defined type, and hence a bit opaque and requiring accessors and mutators
for any operation.

Converting them to nsecs simplifies the code and is one step toward
the removal of cputime_t in the core code.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1485832191-26889-4-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ba03ce82

arch/s390/appldata/appldata_os.c

+8 −8
Original line number Diff line number Diff line
@@ -113,21 +113,21 @@ static void appldata_get_os_data(void *data) 
	j = 0;

	for_each_online_cpu(i) {

		os_data->os_cpu[j].per_cpu_user =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_USER]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_USER]);

		os_data->os_cpu[j].per_cpu_nice =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_NICE]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_NICE]);

		os_data->os_cpu[j].per_cpu_system =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]);

		os_data->os_cpu[j].per_cpu_idle =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IDLE]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IDLE]);

		os_data->os_cpu[j].per_cpu_irq =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IRQ]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IRQ]);

		os_data->os_cpu[j].per_cpu_softirq =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ]);

		os_data->os_cpu[j].per_cpu_iowait =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IOWAIT]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IOWAIT]);

		os_data->os_cpu[j].per_cpu_steal =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_STEAL]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_STEAL]);

		os_data->os_cpu[j].cpu_id = i;

		j++;

	}

drivers/cpufreq/cpufreq.c

+3 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) 
	u64 cur_wall_time;

	u64 busy_time;



	cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());

	cur_wall_time = jiffies64_to_nsecs(get_jiffies_64());



	busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];
@@ -143,9 +143,9 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) 


	idle_time = cur_wall_time - busy_time;

	if (wall)

		*wall = cputime_to_usecs(cur_wall_time);

		*wall = div_u64(cur_wall_time, NSEC_PER_USEC);



	return cputime_to_usecs(idle_time);

	return div_u64(idle_time, NSEC_PER_USEC);

}



u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy)

drivers/cpufreq/cpufreq_governor.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ unsigned int dbs_update(struct cpufreq_policy *policy) 
		if (ignore_nice) {

			u64 cur_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];



			idle_time += cputime_to_usecs(cur_nice - j_cdbs->prev_cpu_nice);

			idle_time += div_u64(cur_nice - j_cdbs->prev_cpu_nice, NSEC_PER_USEC);

			j_cdbs->prev_cpu_nice = cur_nice;

		}

drivers/cpufreq/cpufreq_stats.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/cpufreq.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/cputime.h>



static DEFINE_SPINLOCK(cpufreq_stats_lock);

drivers/macintosh/rack-meter.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static inline cputime64_t get_cpu_idle_time(unsigned int cpu) 
	if (rackmeter_ignore_nice)

		retval += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];



	return retval;

	return nsecs_to_cputime64(retval);

}



static void rackmeter_setup_i2s(struct rackmeter *rm)