Attachment 291063 Details for Bug 427998 – git 677517771b7b6efaf8617e70f655b16f3cafcc9b backported to 2.6.9-67.EL

[patch] git 677517771b7b6efaf8617e70f655b16f3cafcc9b backported to 2.6.9-67.EL

git-677517771b7b6efaf8617e70f655b16f3cafcc9b (text/plain), 2.75 KB, created by Ian Campbell on 2008-01-08 16:21:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Campbell

Created: 2008-01-08 16:21:19 UTC

Size: 2.75 KB

patch

obsolete

>commit 677517771b7b6efaf8617e70f655b16f3cafcc9b
>Author: Oleg Nesterov <oleg@tv-sign.ru>
>Date:   Sun Jan 8 22:19:16 2006 +0300
>
>    [PATCH] rcu: uninline __rcu_pending()
>    
>    __rcu_pending() is rather fat and called twice from rcu_pending().
>    
>    rcu_pending() has multiple callers, and not that small too.
>    
>    This patch uninlines both of them.
>    
>    Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
>    Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
>    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
>
>diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
>index 51747cd..a1d26cb 100644
>--- a/include/linux/rcupdate.h
>+++ b/include/linux/rcupdate.h
>@@ -125,36 +125,7 @@ static inline void rcu_bh_qsctr_inc(int cpu)
> 	rdp->passed_quiesc = 1;
> }
> 
>-static inline int __rcu_pending(struct rcu_ctrlblk *rcp,
>-						struct rcu_data *rdp)
>-{
>-	/* This cpu has pending rcu entries and the grace period
>-	 * for them has completed.
>-	 */
>-	if (rdp->curlist && !rcu_batch_before(rcp->completed, rdp->batch))
>-		return 1;
>-
>-	/* This cpu has no pending entries, but there are new entries */
>-	if (!rdp->curlist && rdp->nxtlist)
>-		return 1;
>-
>-	/* This cpu has finished callbacks to invoke */
>-	if (rdp->donelist)
>-		return 1;
>-
>-	/* The rcu core waits for a quiescent state from the cpu */
>-	if (rdp->quiescbatch != rcp->cur || rdp->qs_pending)
>-		return 1;
>-
>-	/* nothing to do */
>-	return 0;
>-}
>-
>-static inline int rcu_pending(int cpu)
>-{
>-	return __rcu_pending(&rcu_ctrlblk, &per_cpu(rcu_data, cpu)) ||
>-		__rcu_pending(&rcu_bh_ctrlblk, &per_cpu(rcu_bh_data, cpu));
>-}
>+extern int rcu_pending(int cpu);
> 
> /**
>  * rcu_read_lock - mark the beginning of an RCU read-side critical section.
>diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
>index 30b0bba..ccc45d4 100644
>--- a/kernel/rcupdate.c
>+++ b/kernel/rcupdate.c
>@@ -429,6 +429,36 @@ static void rcu_process_callbacks(unsigned long unused)
> 				&__get_cpu_var(rcu_bh_data));
> }
> 
>+static int __rcu_pending(struct rcu_ctrlblk *rcp, struct rcu_data *rdp)
>+{
>+	/* This cpu has pending rcu entries and the grace period
>+	 * for them has completed.
>+	 */
>+	if (rdp->curlist && !rcu_batch_before(rcp->completed, rdp->batch))
>+		return 1;
>+
>+	/* This cpu has no pending entries, but there are new entries */
>+	if (!rdp->curlist && rdp->nxtlist)
>+		return 1;
>+
>+	/* This cpu has finished callbacks to invoke */
>+	if (rdp->donelist)
>+		return 1;
>+
>+	/* The rcu core waits for a quiescent state from the cpu */
>+	if (rdp->quiescbatch != rcp->cur || rdp->qs_pending)
>+		return 1;
>+
>+	/* nothing to do */
>+	return 0;
>+}
>+
>+int rcu_pending(int cpu)
>+{
>+	return __rcu_pending(&rcu_ctrlblk, &per_cpu(rcu_data, cpu)) ||
>+		__rcu_pending(&rcu_bh_ctrlblk, &per_cpu(rcu_bh_data, cpu));
>+}
>+
> void rcu_check_callbacks(int cpu, int user)
> {
> 	if (user ||

Actions: View | Diff

Attachments on bug 427998: 291063 | 291064 | 291065 | 291066