Commit 4f084ca7 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

locking/spinlock: Split the lock types header, and move the raw types into... 


locking/spinlock: Split the lock types header, and move the raw types into <linux/spinlock_types_raw.h>

Move raw_spinlock into its own file. Prepare for RT 'sleeping spinlocks', to
avoid header recursion, as RT locks require rtmutex.h, which in turn requires
the raw spinlock types.

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210815211303.371269088@linutronix.de
parent e17ba59b

include/linux/rwlock_types.h

+4 −0
Original line number Diff line number Diff line 
#ifndef __LINUX_RWLOCK_TYPES_H

#define __LINUX_RWLOCK_TYPES_H



#if !defined(__LINUX_SPINLOCK_TYPES_H)

# error "Do not include directly, include spinlock_types.h"

#endif



/*

 * include/linux/rwlock_types.h - generic rwlock type definitions

 *				  and initializers

include/linux/spinlock.h

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
 *  asm/spinlock_types.h: contains the arch_spinlock_t/arch_rwlock_t and the

 *                        initializers

 *

 *  linux/spinlock_types_raw:

 *			  The raw types and initializers

 *  linux/spinlock_types.h:

 *                        defines the generic type and initializers

 *
@@ -31,6 +33,8 @@ 
 *                        contains the generic, simplified UP spinlock type.

 *                        (which is an empty structure on non-debug builds)

 *

 *  linux/spinlock_types_raw:

 *			  The raw RT types and initializers

 *  linux/spinlock_types.h:

 *                        defines the generic type and initializers

 *

include/linux/spinlock_types.h

+1 −58
Original line number Diff line number Diff line
@@ -9,64 +9,7 @@ 
 * Released under the General Public License (GPL).

 */



#if defined(CONFIG_SMP)

# include <asm/spinlock_types.h>

#else

# include <linux/spinlock_types_up.h>

#endif



#include <linux/lockdep_types.h>



typedef struct raw_spinlock {

	arch_spinlock_t raw_lock;

#ifdef CONFIG_DEBUG_SPINLOCK

	unsigned int magic, owner_cpu;

	void *owner;

#endif

#ifdef CONFIG_DEBUG_LOCK_ALLOC

	struct lockdep_map dep_map;

#endif

} raw_spinlock_t;



#define SPINLOCK_MAGIC		0xdead4ead



#define SPINLOCK_OWNER_INIT	((void *)-1L)



#ifdef CONFIG_DEBUG_LOCK_ALLOC

# define RAW_SPIN_DEP_MAP_INIT(lockname)		\

	.dep_map = {					\

		.name = #lockname,			\

		.wait_type_inner = LD_WAIT_SPIN,	\

	}

# define SPIN_DEP_MAP_INIT(lockname)			\

	.dep_map = {					\

		.name = #lockname,			\

		.wait_type_inner = LD_WAIT_CONFIG,	\

	}

#else

# define RAW_SPIN_DEP_MAP_INIT(lockname)

# define SPIN_DEP_MAP_INIT(lockname)

#endif



#ifdef CONFIG_DEBUG_SPINLOCK

# define SPIN_DEBUG_INIT(lockname)		\

	.magic = SPINLOCK_MAGIC,		\

	.owner_cpu = -1,			\

	.owner = SPINLOCK_OWNER_INIT,

#else

# define SPIN_DEBUG_INIT(lockname)

#endif



#define __RAW_SPIN_LOCK_INITIALIZER(lockname)	\

	{					\

	.raw_lock = __ARCH_SPIN_LOCK_UNLOCKED,	\

	SPIN_DEBUG_INIT(lockname)		\

	RAW_SPIN_DEP_MAP_INIT(lockname) }



#define __RAW_SPIN_LOCK_UNLOCKED(lockname)	\

	(raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)



#define DEFINE_RAW_SPINLOCK(x)	raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)

#include <linux/spinlock_types_raw.h>



typedef struct spinlock {

	union {

include/linux/spinlock_types_raw.h

0 → 100644
+65 −0
Original line number Diff line number Diff line 
#ifndef __LINUX_SPINLOCK_TYPES_RAW_H

#define __LINUX_SPINLOCK_TYPES_RAW_H



#include <linux/types.h>



#if defined(CONFIG_SMP)

# include <asm/spinlock_types.h>

#else

# include <linux/spinlock_types_up.h>

#endif



#include <linux/lockdep_types.h>



typedef struct raw_spinlock {

	arch_spinlock_t raw_lock;

#ifdef CONFIG_DEBUG_SPINLOCK

	unsigned int magic, owner_cpu;

	void *owner;

#endif

#ifdef CONFIG_DEBUG_LOCK_ALLOC

	struct lockdep_map dep_map;

#endif

} raw_spinlock_t;



#define SPINLOCK_MAGIC		0xdead4ead



#define SPINLOCK_OWNER_INIT	((void *)-1L)



#ifdef CONFIG_DEBUG_LOCK_ALLOC

# define RAW_SPIN_DEP_MAP_INIT(lockname)		\

	.dep_map = {					\

		.name = #lockname,			\

		.wait_type_inner = LD_WAIT_SPIN,	\

	}

# define SPIN_DEP_MAP_INIT(lockname)			\

	.dep_map = {					\

		.name = #lockname,			\

		.wait_type_inner = LD_WAIT_CONFIG,	\

	}

#else

# define RAW_SPIN_DEP_MAP_INIT(lockname)

# define SPIN_DEP_MAP_INIT(lockname)

#endif



#ifdef CONFIG_DEBUG_SPINLOCK

# define SPIN_DEBUG_INIT(lockname)		\

	.magic = SPINLOCK_MAGIC,		\

	.owner_cpu = -1,			\

	.owner = SPINLOCK_OWNER_INIT,

#else

# define SPIN_DEBUG_INIT(lockname)

#endif



#define __RAW_SPIN_LOCK_INITIALIZER(lockname)	\

{						\

	.raw_lock = __ARCH_SPIN_LOCK_UNLOCKED,	\

	SPIN_DEBUG_INIT(lockname)		\

	RAW_SPIN_DEP_MAP_INIT(lockname) }



#define __RAW_SPIN_LOCK_UNLOCKED(lockname)	\

	(raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)



#define DEFINE_RAW_SPINLOCK(x)  raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)



#endif /* __LINUX_SPINLOCK_TYPES_RAW_H */