Merge branch 'sched-core-for-linus' of... (99e97b86) · Commits · 戴 / test

Documentation/scheduler/sched-rt-group.txt

+19 −1

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		CONTENTS
		========

		0. WARNING
		1. Overview
		1.1 The problem
		1.2 The solution
		@@ -14,6 +15,23 @@ CONTENTS
		3. Future plans


		0. WARNING
		==========

		Fiddling with these settings can result in an unstable system, the knobs are
		root only and assumes root knows what he is doing.

		Most notable:

		* very small values in sched_rt_period_us can result in an unstable
		system when the period is smaller than either the available hrtimer
		resolution, or the time it takes to handle the budget refresh itself.

		* very small values in sched_rt_runtime_us can result in an unstable
		system when the runtime is so small the system has difficulty making
		forward progress (NOTE: the migration thread and kstopmachine both
		are real-time processes).

		1. Overview
		===========

		@@ -169,7 +187,7 @@ get their allocated time.

		Implementing SCHED_EDF might take a while to complete. Priority Inheritance is
		the biggest challenge as the current linux PI infrastructure is geared towards
		the limited static priority levels 0-139. With deadline scheduling you need to
		the limited static priority levels 0-99. With deadline scheduling you need to
		do deadline inheritance (since priority is inversely proportional to the
		deadline delta (deadline - now).

Documentation/trace/ftrace.txt

+12 −3

Original line number	Diff line number	Diff line
		@@ -518,9 +518,18 @@ priority with zero (0) being the highest priority and the nice
		values starting at 100 (nice -20). Below is a quick chart to map
		the kernel priority to user land priorities.

		Kernel priority: 0 to 99 ==> user RT priority 99 to 0
		Kernel priority: 100 to 139 ==> user nice -20 to 19
		Kernel priority: 140 ==> idle task priority
		Kernel Space User Space
		===============================================================
		0(high) to 98(low) user RT priority 99(high) to 1(low)
		with SCHED_RR or SCHED_FIFO
		---------------------------------------------------------------
		99 sched_priority is not used in scheduling
		decisions(it must be specified as 0)
		---------------------------------------------------------------
		100(high) to 139(low) user nice -20(high) to 19(low)
		---------------------------------------------------------------
		140 idle task priority
		---------------------------------------------------------------

		The task states are:

arch/x86/include/asm/topology.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,8 @@ struct pci_bus;
		void x86_pci_root_bus_res_quirks(struct pci_bus *b);

		#ifdef CONFIG_SMP
		#define mc_capable() (cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids)
		#define mc_capable() ((boot_cpu_data.x86_max_cores > 1) && \
		(cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids))
		#define smt_capable() (smp_num_siblings > 1)
		#endif

fs/proc/loadavg.c

+6 −12

Original line number	Diff line number	Diff line
		@@ -12,20 +12,14 @@

		static int loadavg_proc_show(struct seq_file m, void v)
		{
		int a, b, c;
		unsigned long seq;
		unsigned long avnrun[3];

		do {
		seq = read_seqbegin(&xtime_lock);
		a = avenrun[0] + (FIXED_1/200);
		b = avenrun[1] + (FIXED_1/200);
		c = avenrun[2] + (FIXED_1/200);
		} while (read_seqretry(&xtime_lock, seq));
		get_avenrun(avnrun, FIXED_1/200, 0);

		seq_printf(m, "%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
		LOAD_INT(a), LOAD_FRAC(a),
		LOAD_INT(b), LOAD_FRAC(b),
		LOAD_INT(c), LOAD_FRAC(c),
		seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n",
		LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]),
		LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]),
		LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]),
		nr_running(), nr_threads,
		task_active_pid_ns(current)->last_pid);
		return 0;

include/linux/sched.h

+24 −4

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ struct fs_struct;
		* 11 bit fractions.
		*/
		extern unsigned long avenrun[]; /* Load averages */
		extern void get_avenrun(unsigned long *loads, unsigned long offset, int shift);

		#define FSHIFT 11 /* nr of bits of precision */
		#define FIXED_1 (1<<FSHIFT) /* 1.0 as fixed-point */
		@@ -135,8 +136,8 @@ DECLARE_PER_CPU(unsigned long, process_counts);
		extern int nr_processes(void);
		extern unsigned long nr_running(void);
		extern unsigned long nr_uninterruptible(void);
		extern unsigned long nr_active(void);
		extern unsigned long nr_iowait(void);
		extern void calc_global_load(void);

		extern unsigned long get_parent_ip(unsigned long addr);

		@@ -838,7 +839,17 @@ struct sched_group {
		*/
		u32 reciprocal_cpu_power;

		unsigned long cpumask[];
		/*
		* The CPUs this group covers.
		*
		* NOTE: this field is variable length. (Allocated dynamically
		* by attaching extra space to the end of the structure,
		* depending on how many CPUs the kernel has booted up with)
		*
		* It is also be embedded into static data structures at build
		* time. (See 'struct static_sched_group' in kernel/sched.c)
		*/
		unsigned long cpumask[0];
		};

		static inline struct cpumask sched_group_cpus(struct sched_group sg)
		@@ -924,8 +935,17 @@ struct sched_domain {
		char *name;
		#endif

		/* span of all CPUs in this domain */
		unsigned long span[];
		/*
		* Span of all CPUs in this domain.
		*
		* NOTE: this field is variable length. (Allocated dynamically
		* by attaching extra space to the end of the structure,
		* depending on how many CPUs the kernel has booted up with)
		*
		* It is also be embedded into static data structures at build
		* time. (See 'struct static_sched_domain' in kernel/sched.c)
		*/
		unsigned long span[0];
		};

		static inline struct cpumask sched_domain_span(struct sched_domain sd)

Admin message