locking/percpu-rwsem: Add DEFINE_PERCPU_RWSEM(), use it to initialize cgroup_threadgroup_rwsem
Subsystems (2)
PATCH 1/1 locking/percpu-rwsem: Add DEFINE_PERCPU_RWSEM(), use it to initialize cgroup_threadgroup_rwsem
Turn DEFINE_STATIC_PERCPU_RWSEM() into __DEFINE_PERCPU_RWSEM() with the additional "is_static" argument to introduce DEFINE_PERCPU_RWSEM().
Change cgroup.c to use DEFINE_PERCPU_RWSEM(cgroup_threadgroup_rwsem).
--- include/linux/percpu-rwsem.h | 8 ++++++-- kernel/cgroup/cgroup.c | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-)
include/linux/percpu-rwsem.h +6 -2
@@ -17,14 +17,18 @@ struct percpu_rw_semaphore {int readers_block; }; -#define DEFINE_STATIC_PERCPU_RWSEM (name) \ +#define __DEFINE_PERCPU_RWSEM (name, is_static) \ static DEFINE_PER_CPU(unsigned int, __percpu_rwsem_rc_##name); \ -static struct percpu_rw_semaphore name = { \ +is_static struct percpu_rw_semaphore name = { \ .rss = __RCU_SYNC_INITIALIZER(name.rss), \ .read_count = &__percpu_rwsem_rc_##name, \ .rw_sem = __RWSEM_INITIALIZER(name.rw_sem), \ .writer = __RCUWAIT_INITIALIZER(name.writer), \ } +#define DEFINE_PERCPU_RWSEM(name) \ + __DEFINE_PERCPU_RWSEM(name, /* not static */) +#define DEFINE_STATIC_PERCPU_RWSEM (name) \ + __DEFINE_PERCPU_RWSEM(name, static)extern int __percpu_down_read (struct percpu_rw_semaphore *,int );extern void __percpu_up_read (struct percpu_rw_semaphore *);
kernel/cgroup/cgroup.c +1 -2
@@ -101,7 +101,7 @@ static DEFINE_SPINLOCK(cgroup_idr_lock);*/ static DEFINE_SPINLOCK (cgroup_file_kn_lock); -struct percpu_rw_semaphore cgroup_threadgroup_rwsem; +DEFINE_PERCPU_RWSEM (cgroup_threadgroup_rwsem);#define cgroup_assert_mutex_or_rcu_locked () \ RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \
@@ -5432,7 +5432,6 @@ int __init cgroup_init(void)int ssid;BUILD_BUG_ON (CGROUP_SUBSYS_COUNT >16 ); -BUG_ON (percpu_init_rwsem (&cgroup_threadgroup_rwsem));BUG_ON (cgroup_init_cftypes (NULL , cgroup_base_files));BUG_ON (cgroup_init_cftypes (NULL , cgroup1_base_files));
Signature · 1 line
2.5.0
Quoted 23 lines · Oleg Nesterov
Turn
DEFINE_STATIC_PERCPU_RWSEM()into__DEFINE_PERCPU_RWSEM()with the additional "is_static" argument to introduceDEFINE_PERCPU_RWSEM().Change
cgroup.cto useDEFINE_PERCPU_RWSEM(cgroup_threadgroup_rwsem).Signed-off-by Oleg Nesterov <[email protected]>--- include/linux/percpu-rwsem.h | 8 ++++++-- kernel/cgroup/cgroup.c | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-)include/linux/percpu-rwsem.h +1
-2@@ -17,14 +17,18 @@ struct percpu_rw_semaphore {int readers_block; }; -#define DEFINE_STATIC_PERCPU_RWSEM (name) \ +#define __DEFINE_PERCPU_RWSEM (name, is_static) \ static DEFINE_PER_CPU(unsigned int, __percpu_rwsem_rc_##name); \ -static struct percpu_rw_semaphore name = { \
include/linux/percpu-rwsem.h struct percpu_rw_semaphore { · line 31
Quoted 10 lines
include/linux/percpu-rwsem.h +5
-0+is_static struct percpu_rw_semaphore name = { \ .rss =__RCU_SYNC_INITIALIZER (name.rss), \ .read_count = &__percpu_rwsem_rc_##name, \ .rw_sem =__RWSEM_INITIALIZER (name.rw_sem), \ .writer =__RCUWAIT_INITIALIZER (name.writer), \ } +#define DEFINE_PERCPU_RWSEM(name) \ + __DEFINE_PERCPU_RWSEM(name, /* not static */) +#define DEFINE_STATIC_PERCPU_RWSEM (name) \ + __DEFINE_PERCPU_RWSEM(name, static)
Which tree is this against? It doesn't apply to tip:master nor latest -git.
Thanks,
Ingo
Quoted 17 lines · Ingo Molnar
Quoted 5 lines
include/linux/percpu-rwsem.h +1
-2-#define DEFINE_STATIC_PERCPU_RWSEM (name) \ +#define __DEFINE_PERCPU_RWSEM (name, is_static) \ static DEFINE_PER_CPU(unsigned int, __percpu_rwsem_rc_##name); \ -static struct percpu_rw_semaphore name = { \include/linux/percpu-rwsem.h struct percpu_rw_semaphore { · line 31
Quoted 10 lines
include/linux/percpu-rwsem.h +5
-0+is_static struct percpu_rw_semaphore name = { \ .rss =__RCU_SYNC_INITIALIZER (name.rss), \ .read_count = &__percpu_rwsem_rc_##name, \ .rw_sem =__RWSEM_INITIALIZER (name.rw_sem), \ .writer =__RCUWAIT_INITIALIZER (name.writer), \ } +#define DEFINE_PERCPU_RWSEM(name) \ + __DEFINE_PERCPU_RWSEM(name, /* not static */) +#define DEFINE_STATIC_PERCPU_RWSEM (name) \ + __DEFINE_PERCPU_RWSEM(name, static)Which tree is this against? It doesn't apply to tip:master nor latest
OOPS, sorry Ingo!
I forgot that the change above depends on another cleanup I sent to Paul,
[PATCH] rcu/sync: kill rcu_sync_type/gp_type https://lore.kernel.org/lkml/[email protected]/
which does
- .rss = __RCU_SYNC_INITIALIZER(name.rss, RCU_SCHED_SYNC), \ + .rss = __RCU_SYNC_INITIALIZER(name.rss), \
so lets forget it for now, or may be Paul can take this patch too.
Sorry,
Oleg.
Ingo Molnar
Reviewed-byQuoted 26 lines · Oleg Nesterov
Quoted 17 lines · Ingo Molnar
Quoted 5 lines
include/linux/percpu-rwsem.h +1
-2-#define DEFINE_STATIC_PERCPU_RWSEM (name) \ +#define __DEFINE_PERCPU_RWSEM (name, is_static) \ static DEFINE_PER_CPU(unsigned int, __percpu_rwsem_rc_##name); \ -static struct percpu_rw_semaphore name = { \include/linux/percpu-rwsem.h struct percpu_rw_semaphore { · line 31
Quoted 10 lines
include/linux/percpu-rwsem.h +5
-0+is_static struct percpu_rw_semaphore name = { \ .rss =__RCU_SYNC_INITIALIZER (name.rss), \ .read_count = &__percpu_rwsem_rc_##name, \ .rw_sem =__RWSEM_INITIALIZER (name.rw_sem), \ .writer =__RCUWAIT_INITIALIZER (name.writer), \ } +#define DEFINE_PERCPU_RWSEM(name) \ + __DEFINE_PERCPU_RWSEM(name, /* not static */) +#define DEFINE_STATIC_PERCPU_RWSEM (name) \ + __DEFINE_PERCPU_RWSEM(name, static)Which tree is this against? It doesn't apply to tip:master nor latest
OOPS, sorry Ingo!
I forgot that the change above depends on another cleanup I sent to Paul,
[PATCH] rcu/sync: kill rcu_sync_type/gp_type https://lore.kernel.org/lkml/[email protected]/
Quoted 6 lines
which does
- .rss = __RCU_SYNC_INITIALIZER(name.rss, RCU_SCHED_SYNC), \ + .rss = __RCU_SYNC_INITIALIZER(name.rss), \so lets forget it for now, or may be Paul can take this patch too.
No problem, and both rwsem patches you sent seem fine to me:
Thanks,
Ingo
Paul E. McKenney
AppliedQuoted 31 lines · Ingo Molnar
Quoted 28 lines · Oleg Nesterov
Quoted 17 lines · Ingo Molnar
Quoted 5 lines
include/linux/percpu-rwsem.h +1
-2-#define DEFINE_STATIC_PERCPU_RWSEM (name) \ +#define __DEFINE_PERCPU_RWSEM (name, is_static) \ static DEFINE_PER_CPU(unsigned int, __percpu_rwsem_rc_##name); \ -static struct percpu_rw_semaphore name = { \include/linux/percpu-rwsem.h struct percpu_rw_semaphore { · line 31
Quoted 10 lines
include/linux/percpu-rwsem.h +5
-0+is_static struct percpu_rw_semaphore name = { \ .rss =__RCU_SYNC_INITIALIZER (name.rss), \ .read_count = &__percpu_rwsem_rc_##name, \ .rw_sem =__RWSEM_INITIALIZER (name.rw_sem), \ .writer =__RCUWAIT_INITIALIZER (name.writer), \ } +#define DEFINE_PERCPU_RWSEM(name) \ + __DEFINE_PERCPU_RWSEM(name, /* not static */) +#define DEFINE_STATIC_PERCPU_RWSEM (name) \ + __DEFINE_PERCPU_RWSEM(name, static)Which tree is this against? It doesn't apply to tip:master nor latest
OOPS, sorry Ingo!
I forgot that the change above depends on another cleanup I sent to Paul,
[PATCH] rcu/sync: kill rcu_sync_type/gp_type https://lore.kernel.org/lkml/[email protected]/which does
Quoted 8 lines
Quoted 4 lines
- .rss = __RCU_SYNC_INITIALIZER(name.rss, RCU_SCHED_SYNC), \ + .rss = __RCU_SYNC_INITIALIZER(name.rss), \so lets forget it for now, or may be Paul can take this patch too.
No problem, and both rwsem patches you sent seem fine to me:
Reviewed-by Ingo Molnar <[email protected]>
I queued patches with Ingo's reviewed-by. Thank you both!
Thanx, Paul