Commit b41bbb33 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/eevdf' into sched/core 



Pick up the EEVDF work into the main branch - it's looking good so far.

 Conflicts:
	kernel/sched/features.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 88c56cfe d07f09a1

include/linux/rbtree_augmented.h

+26 −0
Original line number Diff line number Diff line
@@ -60,6 +60,32 @@ rb_insert_augmented_cached(struct rb_node *node, 
	rb_insert_augmented(node, &root->rb_root, augment);

}



static __always_inline struct rb_node *

rb_add_augmented_cached(struct rb_node *node, struct rb_root_cached *tree,

			bool (*less)(struct rb_node *, const struct rb_node *),

			const struct rb_augment_callbacks *augment)

{

	struct rb_node **link = &tree->rb_root.rb_node;

	struct rb_node *parent = NULL;

	bool leftmost = true;



	while (*link) {

		parent = *link;

		if (less(node, parent)) {

			link = &parent->rb_left;

		} else {

			link = &parent->rb_right;

			leftmost = false;

		}

	}



	rb_link_node(node, parent, link);

	augment->propagate(parent, NULL); /* suboptimal */

	rb_insert_augmented_cached(node, tree, leftmost, augment);



	return leftmost ? node : NULL;

}



/*

 * Template for declaring augmented rbtree callbacks (generic case)

 *

include/linux/sched.h

+6 −1
Original line number Diff line number Diff line
@@ -549,13 +549,18 @@ struct sched_entity { 
	/* For load-balancing: */

	struct load_weight		load;

	struct rb_node			run_node;

	u64				deadline;

	u64				min_deadline;



	struct list_head		group_node;

	unsigned int			on_rq;



	u64				exec_start;

	u64				sum_exec_runtime;

	u64				vruntime;

	u64				prev_sum_exec_runtime;

	u64				vruntime;

	s64				vlag;

	u64				slice;



	u64				nr_migrations;

kernel/sched/core.c

+2 −0
Original line number Diff line number Diff line
@@ -4527,6 +4527,8 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) 
	p->se.prev_sum_exec_runtime	= 0;

	p->se.nr_migrations		= 0;

	p->se.vruntime			= 0;

	p->se.vlag			= 0;

	p->se.slice			= sysctl_sched_base_slice;

	INIT_LIST_HEAD(&p->se.group_node);



#ifdef CONFIG_FAIR_GROUP_SCHED

kernel/sched/debug.c

+22 −26
Original line number Diff line number Diff line
@@ -347,10 +347,7 @@ static __init int sched_init_debug(void) 
	debugfs_create_file("preempt", 0644, debugfs_sched, NULL, &sched_dynamic_fops);

#endif



	debugfs_create_u32("latency_ns", 0644, debugfs_sched, &sysctl_sched_latency);

	debugfs_create_u32("min_granularity_ns", 0644, debugfs_sched, &sysctl_sched_min_granularity);

	debugfs_create_u32("idle_min_granularity_ns", 0644, debugfs_sched, &sysctl_sched_idle_min_granularity);

	debugfs_create_u32("wakeup_granularity_ns", 0644, debugfs_sched, &sysctl_sched_wakeup_granularity);

	debugfs_create_u32("base_slice_ns", 0644, debugfs_sched, &sysctl_sched_base_slice);



	debugfs_create_u32("latency_warn_ms", 0644, debugfs_sched, &sysctl_resched_latency_warn_ms);

	debugfs_create_u32("latency_warn_once", 0644, debugfs_sched, &sysctl_resched_latency_warn_once);
@@ -582,9 +579,13 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p) 
	else

		SEQ_printf(m, " %c", task_state_to_char(p));



	SEQ_printf(m, " %15s %5d %9Ld.%06ld %9Ld %5d ",

	SEQ_printf(m, "%15s %5d %9Ld.%06ld %c %9Ld.%06ld %9Ld.%06ld %9Ld.%06ld %9Ld %5d ",

		p->comm, task_pid_nr(p),

		SPLIT_NS(p->se.vruntime),

		entity_eligible(cfs_rq_of(&p->se), &p->se) ? 'E' : 'N',

		SPLIT_NS(p->se.deadline),

		SPLIT_NS(p->se.slice),

		SPLIT_NS(p->se.sum_exec_runtime),

		(long long)(p->nvcsw + p->nivcsw),

		p->prio);
@@ -627,10 +628,9 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu) 


void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)

{

	s64 MIN_vruntime = -1, min_vruntime, max_vruntime = -1,

		spread, rq0_min_vruntime, spread0;

	s64 left_vruntime = -1, min_vruntime, right_vruntime = -1, spread;

	struct sched_entity *last, *first;

	struct rq *rq = cpu_rq(cpu);

	struct sched_entity *last;

	unsigned long flags;



#ifdef CONFIG_FAIR_GROUP_SCHED
@@ -644,26 +644,25 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) 
			SPLIT_NS(cfs_rq->exec_clock));



	raw_spin_rq_lock_irqsave(rq, flags);

	if (rb_first_cached(&cfs_rq->tasks_timeline))

		MIN_vruntime = (__pick_first_entity(cfs_rq))->vruntime;

	first = __pick_first_entity(cfs_rq);

	if (first)

		left_vruntime = first->vruntime;

	last = __pick_last_entity(cfs_rq);

	if (last)

		max_vruntime = last->vruntime;

		right_vruntime = last->vruntime;

	min_vruntime = cfs_rq->min_vruntime;

	rq0_min_vruntime = cpu_rq(0)->cfs.min_vruntime;

	raw_spin_rq_unlock_irqrestore(rq, flags);

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "MIN_vruntime",

			SPLIT_NS(MIN_vruntime));



	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "left_vruntime",

			SPLIT_NS(left_vruntime));

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "min_vruntime",

			SPLIT_NS(min_vruntime));

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "max_vruntime",

			SPLIT_NS(max_vruntime));

	spread = max_vruntime - MIN_vruntime;

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "spread",

			SPLIT_NS(spread));

	spread0 = min_vruntime - rq0_min_vruntime;

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "spread0",

			SPLIT_NS(spread0));

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "avg_vruntime",

			SPLIT_NS(avg_vruntime(cfs_rq)));

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "right_vruntime",

			SPLIT_NS(right_vruntime));

	spread = right_vruntime - left_vruntime;

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "spread", SPLIT_NS(spread));

	SEQ_printf(m, "  .%-30s: %d\n", "nr_spread_over",

			cfs_rq->nr_spread_over);

	SEQ_printf(m, "  .%-30s: %d\n", "nr_running", cfs_rq->nr_running);
@@ -864,10 +863,7 @@ static void sched_debug_header(struct seq_file *m) 
	SEQ_printf(m, "  .%-40s: %Ld\n", #x, (long long)(x))

#define PN(x) \

	SEQ_printf(m, "  .%-40s: %Ld.%06ld\n", #x, SPLIT_NS(x))

	PN(sysctl_sched_latency);

	PN(sysctl_sched_min_granularity);

	PN(sysctl_sched_idle_min_granularity);

	PN(sysctl_sched_wakeup_granularity);

	PN(sysctl_sched_base_slice);

	P(sysctl_sched_child_runs_first);

	P(sysctl_sched_features);

#undef PN

kernel/sched/fair.c

+494 −597

File changed.

Preview size limit exceeded, changes collapsed.