2009-04-14 18:17:50

by Jiri Pirko

Subject: [PATCH] rculist: use list_entry_rcu in places where it's appropriate

Use previously introduced list_entry_rcu instead of list_entry + rcu_dereference
combination.

Jirka

Signed-off-by: Jiri Pirko <[email protected]>
---
include/linux/sched.h | 8 +++++---
ipc/sem.c | 4 ++--
security/integrity/ima/ima_fs.c | 4 ++--
security/smack/smackfs.c | 8 ++++----
4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index b4c38bc..886df41 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -77,6 +77,7 @@ struct sched_param {
#include <linux/proportions.h>
#include <linux/seccomp.h>
#include <linux/rcupdate.h>
+#include <linux/rculist.h>
#include <linux/rtmutex.h>

#include <linux/time.h>
@@ -2010,7 +2011,8 @@ static inline unsigned long wait_task_inactive(struct task_struct *p,
}
#endif

-#define next_task(p) list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks)
+#define next_task(p) \
+ list_entry_rcu((p)->tasks.next, struct task_struct, tasks)

#define for_each_process(p) \
for (p = &init_task ; (p = next_task(p)) != &init_task ; )
@@ -2049,8 +2051,8 @@ int same_thread_group(struct task_struct *p1, struct task_struct *p2)

static inline struct task_struct *next_thread(const struct task_struct *p)
{
- return list_entry(rcu_dereference(p->thread_group.next),
- struct task_struct, thread_group);
+ return list_entry_rcu(p->thread_group.next,
+ struct task_struct, thread_group);
}

static inline int thread_group_empty(struct task_struct *p)
diff --git a/ipc/sem.c b/ipc/sem.c
index 16a2189..87c2b64 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1290,8 +1290,8 @@ void exit_sem(struct task_struct *tsk)
int i;

rcu_read_lock();
- un = list_entry(rcu_dereference(ulp->list_proc.next),
- struct sem_undo, list_proc);
+ un = list_entry_rcu(ulp->list_proc.next,
+ struct sem_undo, list_proc);
if (&un->list_proc == &ulp->list_proc)
semid = -1;
else
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index ffbe259..510186f 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -84,8 +84,8 @@ static void *ima_measurements_next(struct seq_file *m, void *v, loff_t *pos)
* against concurrent list-extension
*/
rcu_read_lock();
- qe = list_entry(rcu_dereference(qe->later.next),
- struct ima_queue_entry, later);
+ qe = list_entry_rcu(qe->later.next,
+ struct ima_queue_entry, later);
rcu_read_unlock();
(*pos)++;

diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index e03a7e1..11d2cb1 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -734,8 +734,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new)
return;
}

- m = list_entry(rcu_dereference(smk_netlbladdr_list.next),
- struct smk_netlbladdr, list);
+ m = list_entry_rcu(smk_netlbladdr_list.next,
+ struct smk_netlbladdr, list);

/* the comparison '>' is a bit hacky, but works */
if (new->smk_mask.s_addr > m->smk_mask.s_addr) {
@@ -748,8 +748,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new)
list_add_rcu(&new->list, &m->list);
return;
}
- m_next = list_entry(rcu_dereference(m->list.next),
- struct smk_netlbladdr, list);
+ m_next = list_entry_rcu(m->list.next,
+ struct smk_netlbladdr, list);
if (new->smk_mask.s_addr > m_next->smk_mask.s_addr) {
list_add_rcu(&new->list, &m->list);
return;
--
1.6.0.6

2009-04-15 00:14:47

by Paul E. McKenney

Subject: Re: [PATCH] rculist: use list_entry_rcu in places where it's appropriate

On Tue, Apr 14, 2009 at 08:17:16PM +0200, Jiri Pirko wrote:
> Use previously introduced list_entry_rcu instead of list_entry + rcu_dereference
> combination.
>
> Jirka

Looks good!

Reviewed-by: Paul E. McKenney <[email protected]>

> Signed-off-by: Jiri Pirko <[email protected]>
> ---
> include/linux/sched.h | 8 +++++---
> ipc/sem.c | 4 ++--
> security/integrity/ima/ima_fs.c | 4 ++--
> security/smack/smackfs.c | 8 ++++----
> 4 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index b4c38bc..886df41 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -77,6 +77,7 @@ struct sched_param {
> #include <linux/proportions.h>
> #include <linux/seccomp.h>
> #include <linux/rcupdate.h>
> +#include <linux/rculist.h>
> #include <linux/rtmutex.h>
>
> #include <linux/time.h>
> @@ -2010,7 +2011,8 @@ static inline unsigned long wait_task_inactive(struct task_struct *p,
> }
> #endif
>
> -#define next_task(p) list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks)
> +#define next_task(p) \
> + list_entry_rcu((p)->tasks.next, struct task_struct, tasks)
>
> #define for_each_process(p) \
> for (p = &init_task ; (p = next_task(p)) != &init_task ; )
> @@ -2049,8 +2051,8 @@ int same_thread_group(struct task_struct *p1, struct task_struct *p2)
>
> static inline struct task_struct *next_thread(const struct task_struct *p)
> {
> - return list_entry(rcu_dereference(p->thread_group.next),
> - struct task_struct, thread_group);
> + return list_entry_rcu(p->thread_group.next,
> + struct task_struct, thread_group);
> }
>
> static inline int thread_group_empty(struct task_struct *p)
> diff --git a/ipc/sem.c b/ipc/sem.c
> index 16a2189..87c2b64 100644
> --- a/ipc/sem.c
> +++ b/ipc/sem.c
> @@ -1290,8 +1290,8 @@ void exit_sem(struct task_struct *tsk)
> int i;
>
> rcu_read_lock();
> - un = list_entry(rcu_dereference(ulp->list_proc.next),
> - struct sem_undo, list_proc);
> + un = list_entry_rcu(ulp->list_proc.next,
> + struct sem_undo, list_proc);
> if (&un->list_proc == &ulp->list_proc)
> semid = -1;
> else
> diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
> index ffbe259..510186f 100644
> --- a/security/integrity/ima/ima_fs.c
> +++ b/security/integrity/ima/ima_fs.c
> @@ -84,8 +84,8 @@ static void *ima_measurements_next(struct seq_file *m, void *v, loff_t *pos)
> * against concurrent list-extension
> */
> rcu_read_lock();
> - qe = list_entry(rcu_dereference(qe->later.next),
> - struct ima_queue_entry, later);
> + qe = list_entry_rcu(qe->later.next,
> + struct ima_queue_entry, later);
> rcu_read_unlock();
> (*pos)++;
>
> diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
> index e03a7e1..11d2cb1 100644
> --- a/security/smack/smackfs.c
> +++ b/security/smack/smackfs.c
> @@ -734,8 +734,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new)
> return;
> }
>
> - m = list_entry(rcu_dereference(smk_netlbladdr_list.next),
> - struct smk_netlbladdr, list);
> + m = list_entry_rcu(smk_netlbladdr_list.next,
> + struct smk_netlbladdr, list);
>
> /* the comparison '>' is a bit hacky, but works */
> if (new->smk_mask.s_addr > m->smk_mask.s_addr) {
> @@ -748,8 +748,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new)
> list_add_rcu(&new->list, &m->list);
> return;
> }
> - m_next = list_entry(rcu_dereference(m->list.next),
> - struct smk_netlbladdr, list);
> + m_next = list_entry_rcu(m->list.next,
> + struct smk_netlbladdr, list);
> if (new->smk_mask.s_addr > m_next->smk_mask.s_addr) {
> list_add_rcu(&new->list, &m->list);
> return;
> --
> 1.6.0.6
>

2009-04-15 10:14:42

by Jiri Pirko

Subject: [tip:core/rcu] rculist: use list_entry_rcu in places where it's appropriate

Commit-ID: 05725f7eb4b8acb147c5fc7b91397b1f6bcab00d
Gitweb: http://git.kernel.org/tip/05725f7eb4b8acb147c5fc7b91397b1f6bcab00d
Author: Jiri Pirko <[email protected]>
AuthorDate: Tue, 14 Apr 2009 20:17:16 +0200
Committer: Ingo Molnar <[email protected]>
CommitDate: Wed, 15 Apr 2009 12:05:25 +0200

rculist: use list_entry_rcu in places where it's appropriate

Use previously introduced list_entry_rcu instead of an open-coded
list_entry + rcu_dereference combination.

Signed-off-by: Jiri Pirko <[email protected]>
Reviewed-by: Paul E. McKenney <[email protected]>
Cc: [email protected]
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>


---
include/linux/sched.h | 8 +++++---
ipc/sem.c | 4 ++--
security/integrity/ima/ima_fs.c | 4 ++--
security/smack/smackfs.c | 8 ++++----
4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index b4c38bc..886df41 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -77,6 +77,7 @@ struct sched_param {
#include <linux/proportions.h>
#include <linux/seccomp.h>
#include <linux/rcupdate.h>
+#include <linux/rculist.h>
#include <linux/rtmutex.h>

#include <linux/time.h>
@@ -2010,7 +2011,8 @@ static inline unsigned long wait_task_inactive(struct task_struct *p,
}
#endif

-#define next_task(p) list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks)
+#define next_task(p) \
+ list_entry_rcu((p)->tasks.next, struct task_struct, tasks)

#define for_each_process(p) \
for (p = &init_task ; (p = next_task(p)) != &init_task ; )
@@ -2049,8 +2051,8 @@ int same_thread_group(struct task_struct *p1, struct task_struct *p2)

static inline struct task_struct *next_thread(const struct task_struct *p)
{
- return list_entry(rcu_dereference(p->thread_group.next),
- struct task_struct, thread_group);
+ return list_entry_rcu(p->thread_group.next,
+ struct task_struct, thread_group);
}

static inline int thread_group_empty(struct task_struct *p)
diff --git a/ipc/sem.c b/ipc/sem.c
index 16a2189..87c2b64 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1290,8 +1290,8 @@ void exit_sem(struct task_struct *tsk)
int i;

rcu_read_lock();
- un = list_entry(rcu_dereference(ulp->list_proc.next),
- struct sem_undo, list_proc);
+ un = list_entry_rcu(ulp->list_proc.next,
+ struct sem_undo, list_proc);
if (&un->list_proc == &ulp->list_proc)
semid = -1;
else
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index ffbe259..510186f 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -84,8 +84,8 @@ static void *ima_measurements_next(struct seq_file *m, void *v, loff_t *pos)
* against concurrent list-extension
*/
rcu_read_lock();
- qe = list_entry(rcu_dereference(qe->later.next),
- struct ima_queue_entry, later);
+ qe = list_entry_rcu(qe->later.next,
+ struct ima_queue_entry, later);
rcu_read_unlock();
(*pos)++;

diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index e03a7e1..11d2cb1 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -734,8 +734,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new)
return;
}

- m = list_entry(rcu_dereference(smk_netlbladdr_list.next),
- struct smk_netlbladdr, list);
+ m = list_entry_rcu(smk_netlbladdr_list.next,
+ struct smk_netlbladdr, list);

/* the comparison '>' is a bit hacky, but works */
if (new->smk_mask.s_addr > m->smk_mask.s_addr) {
@@ -748,8 +748,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new)
list_add_rcu(&new->list, &m->list);
return;
}
- m_next = list_entry(rcu_dereference(m->list.next),
- struct smk_netlbladdr, list);
+ m_next = list_entry_rcu(m->list.next,
+ struct smk_netlbladdr, list);
if (new->smk_mask.s_addr > m_next->smk_mask.s_addr) {
list_add_rcu(&new->list, &m->list);
return;