wake_q: rename WAKE_Q to DEFINE_WAKE_Q
Subsystems (2)
Waiman Long
reviewerPATCH 1/1 wake_q: rename WAKE_Q to DEFINE_WAKE_Q
Currently the wake_q data structure is defined by the WAKE_Q() macro. This macro, however, looks like a function doing something as "wake" is a verb. Even checkpatch.pl was confused as it reported warnings like
WARNING: Missing a blank line after declarations #548: FILE: kernel/futex.c:3665:
+ int ret;
+ WAKE_Q(wake_q);
This patch renames the WAKE_Q() macro to DEFINE_WAKE_Q() which clarifies what the macro is doing and eliminates the checkpatch.pl warnings.
--- include/linux/sched.h | 2 +- ipc/mqueue.c | 4 ++-- ipc/msg.c | 8 ++++---- kernel/futex.c | 8 ++++---- kernel/locking/mutex.c | 2 +- kernel/locking/rtmutex.c | 2 +- kernel/locking/rwsem-xadd.c | 10 +++++----- 7 files changed, 18 insertions(+), 18 deletions(-)
include/linux/sched.h +1 -1
@@ -1009,7 +1009,7 @@ struct wake_q_head {#define WAKE_Q_TAIL ((struct wake_q_node *) 0x01) -#define WAKE_Q (name) \ +#define DEFINE_WAKE_Q (name) \ struct wake_q_head name = { WAKE_Q_TAIL, &name.first } extern void wake_q_add(struct wake_q_head *head,
ipc/mqueue.c +2 -2
@@ -967,7 +967,7 @@ static inline void pipelined_receive(struct wake_q_head *wake_q,struct timespec ts;struct posix_msg_tree_node *new_leaf =NULL ;int ret =0 ; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (u_abs_timeout) {int res =prepare_timeout (u_abs_timeout, &expires, &ts);
@@ -1151,7 +1151,7 @@ static inline void pipelined_receive(struct wake_q_head *wake_q, msg_ptr = wait.msg; } }else { -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); msg_ptr =msg_get (info);
ipc/msg.c +4 -4
@@ -235,7 +235,7 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) {struct msg_msg *msg, *t; struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm); -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);expunge_all (msq, -EIDRM , &wake_q);ss_wakeup (msq, &wake_q, true);
@@ -397,7 +397,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, goto out_up;case IPC_SET : { -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (msqid64.msg_qbytes > ns->msg_ctlmnb && !capable (CAP_SYS_RESOURCE )) {
@@ -634,7 +634,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,struct msg_msg *msg;int err;struct ipc_namespace *ns; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); ns = current->nsproxy->ipc_ns;
@@ -850,7 +850,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgflstruct msg_queue *msq;struct ipc_namespace *ns;struct msg_msg *msg, *copy =NULL ; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); ns = current->nsproxy->ipc_ns;
kernel/futex.c +4 -4
@@ -1298,7 +1298,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,struct task_struct *new_owner;struct futex_pi_state *pi_state = this->pi_state;u32 uninitialized_var (curval ), newval; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);bool deboost;int ret =0 ;
@@ -1415,7 +1415,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,struct futex_q *this, *next;union futex_key key =FUTEX_KEY_INIT ;int ret; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (!bitset)return -EINVAL ;
@@ -1469,7 +1469,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,struct futex_hash_bucket *hb1, *hb2;struct futex_q *this, *next;int ret, op_ret; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); retry: ret =get_futex_key (uaddr1, flags &FLAGS_SHARED , &key1,VERIFY_READ );
@@ -1708,7 +1708,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,struct futex_pi_state *pi_state =NULL ;struct futex_hash_bucket *hb1, *hb2;struct futex_q *this, *next; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (requeue_pi) {/*
kernel/locking/mutex.c +1 -1
@@ -719,7 +719,7 @@ void __sched ww_mutex_unlock(struct ww_mutex *lock) __mutex_unlock_common_slowpath(struct mutex *lock, int nested) {unsigned long flags; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);/* * As a performance measurement, release the lock before doing other
kernel/locking/rtmutex.c +1 -1
@@ -1382,7 +1382,7 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,bool (*slowfn)(struct rt_mutex *lock, struct wake_q_head *wqh)) { -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (likely (rt_mutex_cmpxchg_release (lock, current,NULL ))) {rt_mutex_deadlock_account_unlock (current);
kernel/locking/rwsem-xadd.c +5 -5
@@ -225,7 +225,7 @@ struct rw_semaphore __sched *rwsem_down_read_failed(struct rw_semaphore *sem)long count, adjustment = -RWSEM_ACTIVE_READ_BIAS ;struct rwsem_waiter waiter;struct task_struct *tsk = current; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); waiter.task = tsk; waiter.type =RWSEM_WAITING_FOR_READ ;
@@ -461,7 +461,7 @@ static inline bool rwsem_has_spinner(struct rw_semaphore *sem)bool waiting = true;/* any queued threads before us */ struct rwsem_waiter waiter;struct rw_semaphore *ret = sem; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);/* undo write bias from down_write operation, stop active locking */ count =atomic_long_sub_return (RWSEM_ACTIVE_WRITE_BIAS , &sem->count);
@@ -495,7 +495,7 @@ static inline bool rwsem_has_spinner(struct rw_semaphore *sem)* wake any read locks that were queued ahead of us. */ if (count >RWSEM_WAITING_BIAS ) { -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);__rwsem_mark_wake (sem,RWSEM_WAKE_READERS , &wake_q);/*
@@ -571,7 +571,7 @@ static inline bool rwsem_has_spinner(struct rw_semaphore *sem)struct rw_semaphore *rwsem_wake (struct rw_semaphore *sem) {unsigned long flags; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);/* * If a spinner is present, it is not necessary to do the wakeup.
@@ -625,7 +625,7 @@ struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem)struct rw_semaphore *rwsem_downgrade_wake (struct rw_semaphore *sem) {unsigned long flags; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);raw_spin_lock_irqsave (&sem->wait_lock, flags);
Signature · 1 line
1.8.3.1
Quoted 11 lines · Waiman Long
Currently the
wake_qdata structure is defined by theWAKE_Q()macro. This macro, however, looks like a function doing something as "wake" is a verb. Even checkpatch.pl was confused as it reported warnings likeWARNING: Missing a blank line after declarations
#548: FILE:kernel/futex.c:3665:
+ int ret;
+WAKE_Q(wake_q);This patch renames the
WAKE_Q()macro toDEFINE_WAKE_Q()which clarifies what the macro is doing and eliminates the checkpatch.pl warnings.
No objection from me. Ack.
tip-bot for Waiman Long
merge bot[tip:locking/core] sched/wake_q: Rename WAKE_Q to DEFINE_WAKE_Q
In reply to Waiman Longsched/wake_q: Rename WAKE_Q to DEFINE_WAKE_Q
Commit-ID: 194a6b5b9cb6b91a5f7d86984165a3bc55188599 Gitweb: http://git.kernel.org/tip/194a6b5b9cb6b91a5f7d86984165a3bc55188599 Author: Waiman Long <[email protected]> AuthorDate: Thu, 17 Nov 2016 11:46:38 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 21 Nov 2016 10:29:01 +0100
sched/wake_q: Rename WAKE_Q to DEFINE_WAKE_Q
Currently the wake_q data structure is defined by the WAKE_Q() macro. This macro, however, looks like a function doing something as "wake" is a verb. Even checkpatch.pl was confused as it reported warnings like
WARNING: Missing a blank line after declarations #548: FILE: kernel/futex.c:3665:
+ int ret;
+ WAKE_Q(wake_q);
This patch renames the WAKE_Q() macro to DEFINE_WAKE_Q() which clarifies what the macro is doing and eliminates the checkpatch.pl warnings.
--- include/linux/sched.h | 4 ++-- ipc/mqueue.c | 4 ++-- ipc/msg.c | 8 ++++---- kernel/futex.c | 8 ++++---- kernel/locking/mutex.c | 2 +- kernel/locking/rtmutex.c | 2 +- kernel/locking/rwsem-xadd.c | 10 +++++----- 7 files changed, 19 insertions(+), 19 deletions(-)
include/linux/sched.h +2 -2
@@ -989,7 +989,7 @@ enum cpu_idle_type {* already in a wake queue, the wakeup will happen soon and the second * waker can just skip it. * -* The WAKE_Q macro declares and initializes the list head. +* The DEFINE_WAKE_Q macro declares and initializes the list head. * wake_up_q() does NOT reinitialize the list; it's expected to be * called near the end of a function, where the fact that the queue is * not used again will be easy to see by inspection.
@@ -1009,7 +1009,7 @@ struct wake_q_head {#define WAKE_Q_TAIL ((struct wake_q_node *) 0x01) -#define WAKE_Q (name) \ +#define DEFINE_WAKE_Q (name) \ struct wake_q_head name = { WAKE_Q_TAIL, &name.first } extern void wake_q_add(struct wake_q_head *head,
ipc/mqueue.c +2 -2
@@ -967,7 +967,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,struct timespec ts;struct posix_msg_tree_node *new_leaf =NULL ;int ret =0 ; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (u_abs_timeout) {int res =prepare_timeout (u_abs_timeout, &expires, &ts);
@@ -1151,7 +1151,7 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, msg_ptr = wait.msg; } }else { -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); msg_ptr =msg_get (info);
ipc/msg.c +4 -4
@@ -235,7 +235,7 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) {struct msg_msg *msg, *t; struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm); -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);expunge_all (msq, -EIDRM , &wake_q);ss_wakeup (msq, &wake_q, true);
@@ -397,7 +397,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, goto out_up;case IPC_SET : { -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (msqid64.msg_qbytes > ns->msg_ctlmnb && !capable (CAP_SYS_RESOURCE )) {
@@ -634,7 +634,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,struct msg_msg *msg;int err;struct ipc_namespace *ns; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); ns = current->nsproxy->ipc_ns;
@@ -850,7 +850,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgflstruct msg_queue *msq;struct ipc_namespace *ns;struct msg_msg *msg, *copy =NULL ; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); ns = current->nsproxy->ipc_ns;
kernel/futex.c +4 -4
@@ -1298,7 +1298,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,struct task_struct *new_owner;struct futex_pi_state *pi_state = this->pi_state;u32 uninitialized_var (curval ), newval; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);bool deboost;int ret =0 ;
@@ -1415,7 +1415,7 @@ futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset)struct futex_q *this, *next;union futex_key key =FUTEX_KEY_INIT ;int ret; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (!bitset)return -EINVAL ;
@@ -1469,7 +1469,7 @@ futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2,struct futex_hash_bucket *hb1, *hb2;struct futex_q *this, *next;int ret, op_ret; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); retry: ret =get_futex_key (uaddr1, flags &FLAGS_SHARED , &key1,VERIFY_READ );
@@ -1708,7 +1708,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,struct futex_pi_state *pi_state =NULL ;struct futex_hash_bucket *hb1, *hb2;struct futex_q *this, *next; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (requeue_pi) {/*
kernel/locking/mutex.c +1 -1
@@ -840,7 +840,7 @@ static noinline void __sched __mutex_unlock_slowpath(struct mutex *lock, unsigne {struct task_struct *next =NULL ;unsigned long owner, flags; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);mutex_release (&lock->dep_map,1 , ip);
kernel/locking/rtmutex.c +1 -1
@@ -1382,7 +1382,7 @@ rt_mutex_fastunlock(struct rt_mutex *lock,bool (*slowfn)(struct rt_mutex *lock, struct wake_q_head *wqh)) { -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);if (likely (rt_mutex_cmpxchg_release (lock, current,NULL ))) {rt_mutex_deadlock_account_unlock (current);
kernel/locking/rwsem-xadd.c +5 -5
@@ -225,7 +225,7 @@ struct rw_semaphore __sched *rwsem_down_read_failed(struct rw_semaphore *sem)long count, adjustment = -RWSEM_ACTIVE_READ_BIAS ;struct rwsem_waiter waiter;struct task_struct *tsk = current; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q); waiter.task = tsk; waiter.type =RWSEM_WAITING_FOR_READ ;
@@ -461,7 +461,7 @@ __rwsem_down_write_failed_common(struct rw_semaphore *sem, int state)bool waiting = true;/* any queued threads before us */ struct rwsem_waiter waiter;struct rw_semaphore *ret = sem; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);/* undo write bias from down_write operation, stop active locking */ count =atomic_long_sub_return (RWSEM_ACTIVE_WRITE_BIAS , &sem->count);
@@ -495,7 +495,7 @@ __rwsem_down_write_failed_common(struct rw_semaphore *sem, int state)* wake any read locks that were queued ahead of us. */ if (count >RWSEM_WAITING_BIAS ) { -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);__rwsem_mark_wake (sem,RWSEM_WAKE_READERS , &wake_q);/*
@@ -571,7 +571,7 @@ __visiblestruct rw_semaphore *rwsem_wake (struct rw_semaphore *sem) {unsigned long flags; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);/* * If a spinner is present, it is not necessary to do the wakeup.
@@ -625,7 +625,7 @@ __visiblestruct rw_semaphore *rwsem_downgrade_wake (struct rw_semaphore *sem) {unsigned long flags; -WAKE_Q (wake_q); +DEFINE_WAKE_Q (wake_q);raw_spin_lock_irqsave (&sem->wait_lock, flags);