git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enabling IPv6 support
[linux-2.6.git]
/
kernel
/
rcupdate.c
diff --git
a/kernel/rcupdate.c
b/kernel/rcupdate.c
index
2058f88
..
3554b76
100644
(file)
--- a/
kernel/rcupdate.c
+++ b/
kernel/rcupdate.c
@@
-53,13
+53,13
@@
static struct rcu_ctrlblk rcu_ctrlblk = {
.cur = -300,
.completed = -300,
static struct rcu_ctrlblk rcu_ctrlblk = {
.cur = -300,
.completed = -300,
- .lock =
SPIN_LOCK_UNLOCKED
,
+ .lock =
__SPIN_LOCK_UNLOCKED(&rcu_ctrlblk.lock)
,
.cpumask = CPU_MASK_NONE,
};
static struct rcu_ctrlblk rcu_bh_ctrlblk = {
.cur = -300,
.completed = -300,
.cpumask = CPU_MASK_NONE,
};
static struct rcu_ctrlblk rcu_bh_ctrlblk = {
.cur = -300,
.completed = -300,
- .lock =
SPIN_LOCK_UNLOCKED
,
+ .lock =
__SPIN_LOCK_UNLOCKED(&rcu_bh_ctrlblk.lock)
,
.cpumask = CPU_MASK_NONE,
};
.cpumask = CPU_MASK_NONE,
};
@@
-71,9
+71,6
@@
static DEFINE_PER_CPU(struct tasklet_struct, rcu_tasklet) = {NULL};
static int blimit = 10;
static int qhimark = 10000;
static int qlowmark = 100;
static int blimit = 10;
static int qhimark = 10000;
static int qlowmark = 100;
-#ifdef CONFIG_SMP
-static int rsinterval = 1000;
-#endif
static atomic_t rcu_barrier_cpu_count;
static DEFINE_MUTEX(rcu_barrier_mutex);
static atomic_t rcu_barrier_cpu_count;
static DEFINE_MUTEX(rcu_barrier_mutex);
@@
-86,8
+83,8
@@
static void force_quiescent_state(struct rcu_data *rdp,
int cpu;
cpumask_t cpumask;
set_need_resched();
int cpu;
cpumask_t cpumask;
set_need_resched();
- if (unlikely(
rdp->qlen - rdp->last_rs_qlen > rsinterval
)) {
- r
dp->last_rs_qlen = rdp->qlen
;
+ if (unlikely(
!rcp->signaled
)) {
+ r
cp->signaled = 1
;
/*
* Don't send IPI to itself. With irqs disabled,
* rdp->cpu is the current cpu.
/*
* Don't send IPI to itself. With irqs disabled,
* rdp->cpu is the current cpu.
@@
-182,6
+179,15
@@
long rcu_batches_completed(void)
return rcu_ctrlblk.completed;
}
return rcu_ctrlblk.completed;
}
+/*
+ * Return the number of RCU batches processed thus far. Useful
+ * for debug and statistics.
+ */
+long rcu_batches_completed_bh(void)
+{
+ return rcu_bh_ctrlblk.completed;
+}
+
static void rcu_barrier_callback(struct rcu_head *notused)
{
if (atomic_dec_and_test(&rcu_barrier_cpu_count))
static void rcu_barrier_callback(struct rcu_head *notused)
{
if (atomic_dec_and_test(&rcu_barrier_cpu_count))
@@
-229,15
+235,21
@@
static void rcu_do_batch(struct rcu_data *rdp)
list = rdp->donelist;
while (list) {
list = rdp->donelist;
while (list) {
- next = rdp->donelist = list->next;
+ next = list->next;
+ prefetch(next);
list->func(list);
list = next;
list->func(list);
list = next;
- rdp->qlen--;
if (++count >= rdp->blimit)
break;
}
if (++count >= rdp->blimit)
break;
}
+ rdp->donelist = list;
+
+ local_irq_disable();
+ rdp->qlen -= count;
+ local_irq_enable();
if (rdp->blimit == INT_MAX && rdp->qlen <= qlowmark)
rdp->blimit = blimit;
if (rdp->blimit == INT_MAX && rdp->qlen <= qlowmark)
rdp->blimit = blimit;
+
if (!rdp->donelist)
rdp->donetail = &rdp->donelist;
else
if (!rdp->donelist)
rdp->donetail = &rdp->donelist;
else
@@
-288,6
+300,7
@@
static void rcu_start_batch(struct rcu_ctrlblk *rcp)
smp_mb();
cpus_andnot(rcp->cpumask, cpu_online_map, nohz_cpu_mask);
smp_mb();
cpus_andnot(rcp->cpumask, cpu_online_map, nohz_cpu_mask);
+ rcp->signaled = 0;
}
}
}
}
@@
-539,7
+552,7
@@
static void __devinit rcu_online_cpu(int cpu)
tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL);
}
tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL);
}
-static int rcu_cpu_notify(struct notifier_block *self,
+static int
__cpuinit
rcu_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
@@
-556,7
+569,7
@@
static int rcu_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
return NOTIFY_OK;
}
-static struct notifier_block rcu_nb = {
+static struct notifier_block
__cpuinitdata
rcu_nb = {
.notifier_call = rcu_cpu_notify,
};
.notifier_call = rcu_cpu_notify,
};
@@
-612,22
+625,11
@@
void synchronize_rcu(void)
wait_for_completion(&rcu.completion);
}
wait_for_completion(&rcu.completion);
}
-/*
- * Deprecated, use synchronize_rcu() or synchronize_sched() instead.
- */
-void synchronize_kernel(void)
-{
- synchronize_rcu();
-}
-
module_param(blimit, int, 0);
module_param(qhimark, int, 0);
module_param(qlowmark, int, 0);
module_param(blimit, int, 0);
module_param(qhimark, int, 0);
module_param(qlowmark, int, 0);
-#ifdef CONFIG_SMP
-module_param(rsinterval, int, 0);
-#endif
EXPORT_SYMBOL_GPL(rcu_batches_completed);
EXPORT_SYMBOL_GPL(rcu_batches_completed);
-EXPORT_SYMBOL_GPL_FUTURE(call_rcu); /* WARNING: GPL-only in April 2006. */
-EXPORT_SYMBOL_GPL_FUTURE(call_rcu_bh); /* WARNING: GPL-only in April 2006. */
+EXPORT_SYMBOL_GPL(rcu_batches_completed_bh);
+EXPORT_SYMBOL_GPL(call_rcu);
+EXPORT_SYMBOL_GPL(call_rcu_bh);
EXPORT_SYMBOL_GPL(synchronize_rcu);
EXPORT_SYMBOL_GPL(synchronize_rcu);
-EXPORT_SYMBOL_GPL_FUTURE(synchronize_kernel); /* WARNING: GPL-only in April 2006. */