sched: Factor out nr_iowait and nr_iowait_cpu (145d952a) · Commits · 戴 / test

kernel/sched/core.c

+20 −21

Original line number	Diff line number	Diff line
		@@ -2875,6 +2875,25 @@ unsigned long long nr_context_switches(void)
		return sum;
		}

		/*
		* Consumers of these two interfaces, like for example the cpuidle menu
		* governor, are using nonsensical data. Preferring shallow idle state selection
		* for a CPU that has IO-wait which might not even end up running the task when
		* it does become runnable.
		*/

		unsigned long nr_iowait_cpu(int cpu)
		{
		return atomic_read(&cpu_rq(cpu)->nr_iowait);
		}

		void get_iowait_load(unsigned long nr_waiters, unsigned long load)
		{
		struct rq *rq = this_rq();
		*nr_waiters = atomic_read(&rq->nr_iowait);
		*load = rq->load.weight;
		}

		/*
		* IO-wait accounting, and how its mostly bollocks (on SMP).
		*
		@@ -2910,31 +2929,11 @@ unsigned long nr_iowait(void)
		unsigned long i, sum = 0;

		for_each_possible_cpu(i)
		sum += atomic_read(&cpu_rq(i)->nr_iowait);
		sum += nr_iowait_cpu(i);

		return sum;
		}

		/*
		* Consumers of these two interfaces, like for example the cpuidle menu
		* governor, are using nonsensical data. Preferring shallow idle state selection
		* for a CPU that has IO-wait which might not even end up running the task when
		* it does become runnable.
		*/

		unsigned long nr_iowait_cpu(int cpu)
		{
		struct rq *this = cpu_rq(cpu);
		return atomic_read(&this->nr_iowait);
		}

		void get_iowait_load(unsigned long nr_waiters, unsigned long load)
		{
		struct rq *rq = this_rq();
		*nr_waiters = atomic_read(&rq->nr_iowait);
		*load = rq->load.weight;
		}

		#ifdef CONFIG_SMP

		/*