Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5822a454 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

sched/wait: Move bit_wait_table[] and related functionality from sched/core.c to sched/wait_bit.c 



The key hashed waitqueue data structures and their initialization
was done in the main scheduler file for no good reason, move them
to sched/wait_bit.c instead.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5dd43ce2

include/linux/wait_bit.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ int out_of_line_wait_on_bit_timeout(void *word, int, wait_bit_action_f *action, 
int out_of_line_wait_on_bit_lock(void *word, int, wait_bit_action_f *action, unsigned int mode);

int out_of_line_wait_on_atomic_t(atomic_t *p, int (*)(atomic_t *), unsigned int mode);

struct wait_queue_head *bit_waitqueue(void *word, int bit);

extern void __init wait_bit_init(void);



int wake_bit_function(struct wait_queue_entry *wq_entry, unsigned mode, int sync, void *key);

kernel/sched/core.c

+2 −16
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <uapi/linux/sched/types.h>

#include <linux/sched/loadavg.h>

#include <linux/sched/hotplug.h>

#include <linux/wait_bit.h>

#include <linux/cpuset.h>

#include <linux/delayacct.h>

#include <linux/init_task.h>
@@ -6026,28 +6027,13 @@ static struct kmem_cache *task_group_cache __read_mostly; 
DECLARE_PER_CPU(cpumask_var_t, load_balance_mask);

DECLARE_PER_CPU(cpumask_var_t, select_idle_mask);



#define WAIT_TABLE_BITS 8

#define WAIT_TABLE_SIZE (1 << WAIT_TABLE_BITS)

static wait_queue_head_t bit_wait_table[WAIT_TABLE_SIZE] __cacheline_aligned;



wait_queue_head_t *bit_waitqueue(void *word, int bit)

{

	const int shift = BITS_PER_LONG == 32 ? 5 : 6;

	unsigned long val = (unsigned long)word << shift | bit;



	return bit_wait_table + hash_long(val, WAIT_TABLE_BITS);

}

EXPORT_SYMBOL(bit_waitqueue);



void __init sched_init(void)

{

	int i, j;

	unsigned long alloc_size = 0, ptr;



	sched_clock_init();



	for (i = 0; i < WAIT_TABLE_SIZE; i++)

		init_waitqueue_head(bit_wait_table + i);

	wait_bit_init();



#ifdef CONFIG_FAIR_GROUP_SCHED

	alloc_size += 2 * nr_cpu_ids * sizeof(void **);

kernel/sched/wait_bit.c

+23 −0
Original line number Diff line number Diff line
@@ -4,6 +4,21 @@ 
#include <linux/wait_bit.h>

#include <linux/sched/signal.h>

#include <linux/sched/debug.h>

#include <linux/hash.h>



#define WAIT_TABLE_BITS 8

#define WAIT_TABLE_SIZE (1 << WAIT_TABLE_BITS)



static wait_queue_head_t bit_wait_table[WAIT_TABLE_SIZE] __cacheline_aligned;



wait_queue_head_t *bit_waitqueue(void *word, int bit)

{

	const int shift = BITS_PER_LONG == 32 ? 5 : 6;

	unsigned long val = (unsigned long)word << shift | bit;



	return bit_wait_table + hash_long(val, WAIT_TABLE_BITS);

}

EXPORT_SYMBOL(bit_waitqueue);



int wake_bit_function(struct wait_queue_entry *wq_entry, unsigned mode, int sync, void *arg)

{
@@ -261,3 +276,11 @@ __sched int bit_wait_io_timeout(struct wait_bit_key *word, int mode) 
	return 0;

}

EXPORT_SYMBOL_GPL(bit_wait_io_timeout);



void __init wait_bit_init(void)

{

	int i;



	for (i = 0; i < WAIT_TABLE_SIZE; i++)

		init_waitqueue_head(bit_wait_table + i);

}