sched: Clean up and harmonize the coding style of the scheduler code base (97fb7a0a) · Commits · 戴 / test

kernel/sched/autogroup.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -168,18 +168,19 @@ autogroup_move_group(struct task_struct p, struct autogroup ag)
		autogroup_kref_put(prev);
		}

		/* Allocates GFP_KERNEL, cannot be called under any spinlock */
		/* Allocates GFP_KERNEL, cannot be called under any spinlock: */
		void sched_autogroup_create_attach(struct task_struct *p)
		{
		struct autogroup *ag = autogroup_create();

		autogroup_move_group(p, ag);
		/* drop extra reference added by autogroup_create() */

		/* Drop extra reference added by autogroup_create(): */
		autogroup_kref_put(ag);
		}
		EXPORT_SYMBOL(sched_autogroup_create_attach);

		/* Cannot be called under siglock. Currently has no users */
		/* Cannot be called under siglock. Currently has no users: */
		void sched_autogroup_detach(struct task_struct *p)
		{
		autogroup_move_group(p, &autogroup_default);
		@@ -202,7 +203,6 @@ static int __init setup_autogroup(char *str)

		return 1;
		}

		__setup("noautogroup", setup_autogroup);

		#ifdef CONFIG_PROC_FS
		@@ -224,7 +224,7 @@ int proc_sched_autogroup_set_nice(struct task_struct *p, int nice)
		if (nice < 0 && !can_nice(current, nice))
		return -EPERM;

		/* this is a heavy operation taking global locks.. */
		/* This is a heavy operation, taking global locks.. */
		if (!capable(CAP_SYS_ADMIN) && time_before(jiffies, next))
		return -EAGAIN;

		@@ -267,4 +267,4 @@ int autogroup_path(struct task_group tg, char buf, int buflen)

		return snprintf(buf, buflen, "%s-%ld", "/autogroup", tg->autogroup->id);
		}
		#endif /* CONFIG_SCHED_DEBUG */
		#endif

kernel/sched/autogroup.h

+3 −5

Original line number	Diff line number	Diff line
		@@ -7,9 +7,9 @@

		struct autogroup {
		/*
		* reference doesn't mean how many thread attach to this
		* autogroup now. It just stands for the number of task
		* could use this autogroup.
		* Reference doesn't mean how many threads attach to this
		* autogroup now. It just stands for the number of tasks
		* which could use this autogroup.
		*/
		struct kref kref;
		struct task_group *tg;
		@@ -56,11 +56,9 @@ autogroup_task_group(struct task_struct p, struct task_group tg)
		return tg;
		}

		#ifdef CONFIG_SCHED_DEBUG
		static inline int autogroup_path(struct task_group tg, char buf, int buflen)
		{
		return 0;
		}
		#endif

		#endif /* CONFIG_SCHED_AUTOGROUP */

kernel/sched/clock.c

+11 −11

Original line number	Diff line number	Diff line
		/*
		* sched_clock for unstable cpu clocks
		* sched_clock() for unstable CPU clocks
		*
		* Copyright (C) 2008 Red Hat, Inc., Peter Zijlstra
		*
		@@ -11,7 +11,7 @@
		* Guillaume Chazarain <guichaz@gmail.com>
		*
		*
		* What:
		* What this file implements:
		*
		* cpu_clock(i) provides a fast (execution time) high resolution
		* clock with bounded drift between CPUs. The value of cpu_clock(i)
		@@ -26,11 +26,11 @@
		* at 0 on boot (but people really shouldn't rely on that).
		*
		* cpu_clock(i) -- can be used from any context, including NMI.
		* local_clock() -- is cpu_clock() on the current cpu.
		* local_clock() -- is cpu_clock() on the current CPU.
		*
		* sched_clock_cpu(i)
		*
		* How:
		* How it is implemented:
		*
		* The implementation either uses sched_clock() when
		* !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK, which means in that case the
		@@ -302,21 +302,21 @@ again:
		* cmpxchg64 below only protects one readout.
		*
		* We must reread via sched_clock_local() in the retry case on
		* 32bit as an NMI could use sched_clock_local() via the
		* 32-bit kernels as an NMI could use sched_clock_local() via the
		* tracer and hit between the readout of
		* the low32bit and the high 32bit portion.
		* the low 32-bit and the high 32-bit portion.
		*/
		this_clock = sched_clock_local(my_scd);
		/*
		* We must enforce atomic readout on 32bit, otherwise the
		* update on the remote cpu can hit inbetween the readout of
		* the low32bit and the high 32bit portion.
		* We must enforce atomic readout on 32-bit, otherwise the
		* update on the remote CPU can hit inbetween the readout of
		* the low 32-bit and the high 32-bit portion.
		*/
		remote_clock = cmpxchg64(&scd->clock, 0, 0);
		#else
		/*
		* On 64bit the read of [my]scd->clock is atomic versus the
		* update, so we can avoid the above 32bit dance.
		* On 64-bit kernels the read of [my]scd->clock is atomic versus the
		* update, so we can avoid the above 32-bit dance.
		*/
		sched_clock_local(my_scd);
		again:

kernel/sched/core.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ struct rq task_rq_lock(struct task_struct p, struct rq_flags *rf)
		* [L] ->on_rq
		* RELEASE (rq->lock)
		*
		* If we observe the old cpu in task_rq_lock, the acquire of
		* If we observe the old CPU in task_rq_lock, the acquire of
		* the old rq->lock will fully serialize against the stores.
		*
		* If we observe the new CPU in task_rq_lock, the acquire will
		@@ -1457,7 +1457,7 @@ EXPORT_SYMBOL_GPL(kick_process);
		*
		* - cpu_active must be a subset of cpu_online
		*
		* - on cpu-up we allow per-cpu kthreads on the online && !active cpu,
		* - on CPU-up we allow per-CPU kthreads on the online && !active CPU,
		* see __set_cpus_allowed_ptr(). At this point the newly online
		* CPU isn't yet part of the sched domains, and balancing will not
		* see it.
		@@ -3037,7 +3037,7 @@ unsigned long long task_sched_runtime(struct task_struct *p)

		#if defined(CONFIG_64BIT) && defined(CONFIG_SMP)
		/*
		* 64-bit doesn't need locks to atomically read a 64bit value.
		* 64-bit doesn't need locks to atomically read a 64-bit value.
		* So we have a optimization chance when the task's delta_exec is 0.
		* Reading ->on_cpu is racy, but this is ok.
		*

kernel/sched/cpuacct.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		* (balbir@in.ibm.com).
		*/

		/* Time spent by the tasks of the cpu accounting group executing in ... */
		/* Time spent by the tasks of the CPU accounting group executing in ... */
		enum cpuacct_stat_index {
		CPUACCT_STAT_USER, /* ... user mode */
		CPUACCT_STAT_SYSTEM, /* ... kernel mode */
		@@ -35,10 +35,10 @@ struct cpuacct_usage {
		u64 usages[CPUACCT_STAT_NSTATS];
		};

		/* track cpu usage of a group of tasks and its child groups */
		/* track CPU usage of a group of tasks and its child groups */
		struct cpuacct {
		struct cgroup_subsys_state css;
		/* cpuusage holds pointer to a u64-type object on every cpu */
		/* cpuusage holds pointer to a u64-type object on every CPU */
		struct cpuacct_usage __percpu *cpuusage;
		struct kernel_cpustat __percpu *cpustat;
		};
		@@ -48,7 +48,7 @@ static inline struct cpuacct css_ca(struct cgroup_subsys_state css)
		return css ? container_of(css, struct cpuacct, css) : NULL;
		}

		/* return cpu accounting group to which this task belongs */
		/* Return CPU accounting group to which this task belongs */
		static inline struct cpuacct task_ca(struct task_struct tsk)
		{
		return css_ca(task_css(tsk, cpuacct_cgrp_id));
		@@ -65,7 +65,7 @@ static struct cpuacct root_cpuacct = {
		.cpuusage = &root_cpuacct_cpuusage,
		};

		/* create a new cpu accounting group */
		/* Create a new CPU accounting group */
		static struct cgroup_subsys_state *
		cpuacct_css_alloc(struct cgroup_subsys_state *parent_css)
		{
		@@ -96,7 +96,7 @@ out:
		return ERR_PTR(-ENOMEM);
		}

		/* destroy an existing cpu accounting group */
		/* Destroy an existing CPU accounting group */
		static void cpuacct_css_free(struct cgroup_subsys_state *css)
		{
		struct cpuacct *ca = css_ca(css);
		@@ -162,7 +162,7 @@ static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val)
		#endif
		}

		/* return total cpu usage (in nanoseconds) of a group */
		/* Return total CPU usage (in nanoseconds) of a group */
		static u64 __cpuusage_read(struct cgroup_subsys_state *css,
		enum cpuacct_stat_index index)
		{

Admin message