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

sched/isolation: Move housekeeping related code to its own file 



The housekeeping code is currently tied to the NOHZ code. As we are
planning to make housekeeping independent from it, start with moving
the relevant code to its own file.

Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Wanpeng Li <kernellwp@gmail.com>
Link: http://lkml.kernel.org/r/1509072159-31808-2-git-send-email-frederic@kernel.org


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

drivers/net/ethernet/tile/tilegx.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <linux/tcp.h>

#include <linux/net_tstamp.h>

#include <linux/ptp_clock_kernel.h>

#include <linux/tick.h>

#include <linux/sched/isolation.h>



#include <asm/checksum.h>

#include <asm/homecache.h>

include/linux/sched/isolation.h

0 → 100644
+56 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_SCHED_ISOLATION_H

#define _LINUX_SCHED_ISOLATION_H



#include <linux/cpumask.h>

#include <linux/init.h>

#include <linux/tick.h>



#ifdef CONFIG_NO_HZ_FULL

extern cpumask_var_t housekeeping_mask;



static inline int housekeeping_any_cpu(void)

{

	return cpumask_any_and(housekeeping_mask, cpu_online_mask);

}



extern void __init housekeeping_init(void);



#else



static inline int housekeeping_any_cpu(void)

{

	return smp_processor_id();

}



static inline void housekeeping_init(void) { }

#endif /* CONFIG_NO_HZ_FULL */





static inline const struct cpumask *housekeeping_cpumask(void)

{

#ifdef CONFIG_NO_HZ_FULL

	if (tick_nohz_full_enabled())

		return housekeeping_mask;

#endif

	return cpu_possible_mask;

}



static inline bool is_housekeeping_cpu(int cpu)

{

#ifdef CONFIG_NO_HZ_FULL

	if (tick_nohz_full_enabled())

		return cpumask_test_cpu(cpu, housekeeping_mask);

#endif

	return true;

}



static inline void housekeeping_affine(struct task_struct *t)

{

#ifdef CONFIG_NO_HZ_FULL

	if (tick_nohz_full_enabled())

		set_cpus_allowed_ptr(t, housekeeping_mask);



#endif

}



#endif /* _LINUX_SCHED_ISOLATION_H */

include/linux/tick.h

+0 −37
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ static inline u64 get_cpu_iowait_time_us(int cpu, u64 *unused) { return -1; } 
#ifdef CONFIG_NO_HZ_FULL

extern bool tick_nohz_full_running;

extern cpumask_var_t tick_nohz_full_mask;

extern cpumask_var_t housekeeping_mask;



static inline bool tick_nohz_full_enabled(void)

{
@@ -161,11 +160,6 @@ static inline void tick_nohz_full_add_cpus_to(struct cpumask *mask) 
		cpumask_or(mask, mask, tick_nohz_full_mask);

}



static inline int housekeeping_any_cpu(void)

{

	return cpumask_any_and(housekeeping_mask, cpu_online_mask);

}



extern void tick_nohz_dep_set(enum tick_dep_bits bit);

extern void tick_nohz_dep_clear(enum tick_dep_bits bit);

extern void tick_nohz_dep_set_cpu(int cpu, enum tick_dep_bits bit);
@@ -235,10 +229,6 @@ static inline void tick_dep_clear_signal(struct signal_struct *signal, 
extern void tick_nohz_full_kick_cpu(int cpu);

extern void __tick_nohz_task_switch(void);

#else

static inline int housekeeping_any_cpu(void)

{

	return smp_processor_id();

}

static inline bool tick_nohz_full_enabled(void) { return false; }

static inline bool tick_nohz_full_cpu(int cpu) { return false; }

static inline void tick_nohz_full_add_cpus_to(struct cpumask *mask) { }
@@ -260,33 +250,6 @@ static inline void tick_nohz_full_kick_cpu(int cpu) { } 
static inline void __tick_nohz_task_switch(void) { }

#endif



static inline const struct cpumask *housekeeping_cpumask(void)

{

#ifdef CONFIG_NO_HZ_FULL

	if (tick_nohz_full_enabled())

		return housekeeping_mask;

#endif

	return cpu_possible_mask;

}



static inline bool is_housekeeping_cpu(int cpu)

{

#ifdef CONFIG_NO_HZ_FULL

	if (tick_nohz_full_enabled())

		return cpumask_test_cpu(cpu, housekeeping_mask);

#endif

	return true;

}



static inline void housekeeping_affine(struct task_struct *t)

{

#ifdef CONFIG_NO_HZ_FULL

	if (tick_nohz_full_enabled())

		set_cpus_allowed_ptr(t, housekeeping_mask);



#endif

}



static inline void tick_nohz_task_switch(void)

{

	if (tick_nohz_full_enabled())

init/main.c

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/cgroup.h>

#include <linux/efi.h>

#include <linux/tick.h>

#include <linux/sched/isolation.h>

#include <linux/interrupt.h>

#include <linux/taskstats_kern.h>

#include <linux/delayacct.h>
@@ -606,6 +607,7 @@ asmlinkage __visible void __init start_kernel(void) 
	early_irq_init();

	init_IRQ();

	tick_init();

	housekeeping_init();

	rcu_init_nohz();

	init_timers();

	hrtimers_init();

kernel/rcu/tree_plugin.h

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

#include <linux/sched/debug.h>

#include <linux/smpboot.h>

#include <linux/sched/isolation.h>

#include <uapi/linux/sched/types.h>

#include "../time/tick-internal.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE