Commit 679f9858 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Paul E. McKenney

rcu: Cleanup rcu_init_geometry() code and arithmetics

This update simplifies rcu_init_geometry() code flow
and makes calculation of the total number of rcu_node
structures more easy to read.

The update relies on the fact num_rcu_lvl[] is never
accessed beyond rcu_num_lvls index by the rest of the
code. Therefore, there is no need initialize the whole
num_rcu_lvl[].

Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 372b0ec2
...@@ -4082,7 +4082,6 @@ static void __init rcu_init_geometry(void) ...@@ -4082,7 +4082,6 @@ static void __init rcu_init_geometry(void)
{ {
ulong d; ulong d;
int i; int i;
int j;
int rcu_capacity[MAX_RCU_LVLS + 1]; int rcu_capacity[MAX_RCU_LVLS + 1];
/* /*
...@@ -4135,24 +4134,21 @@ static void __init rcu_init_geometry(void) ...@@ -4135,24 +4134,21 @@ static void __init rcu_init_geometry(void)
if (nr_cpu_ids > rcu_capacity[MAX_RCU_LVLS]) if (nr_cpu_ids > rcu_capacity[MAX_RCU_LVLS])
panic("rcu_init_geometry: rcu_capacity[] is too small"); panic("rcu_init_geometry: rcu_capacity[] is too small");
/* Calculate the number of levels in the tree. */
for (i = 1; nr_cpu_ids > rcu_capacity[i]; i++) {
}
rcu_num_lvls = i;
/* Calculate the number of rcu_nodes at each level of the tree. */ /* Calculate the number of rcu_nodes at each level of the tree. */
for (i = 1; i <= MAX_RCU_LVLS; i++) for (i = 0; i < rcu_num_lvls; i++) {
if (nr_cpu_ids <= rcu_capacity[i]) { int cap = rcu_capacity[rcu_num_lvls - i];
for (j = 0; j <= i; j++) { num_rcu_lvl[i] = DIV_ROUND_UP(nr_cpu_ids, cap);
int cap = rcu_capacity[i - j]; }
num_rcu_lvl[j] = DIV_ROUND_UP(nr_cpu_ids, cap);
}
rcu_num_lvls = i;
for (j = i + 1; j <= MAX_RCU_LVLS; j++)
num_rcu_lvl[j] = 0;
break;
}
/* Calculate the total number of rcu_node structures. */ /* Calculate the total number of rcu_node structures. */
rcu_num_nodes = 0; rcu_num_nodes = 0;
for (i = 0; i <= MAX_RCU_LVLS; i++) for (i = 0; i < rcu_num_lvls; i++)
rcu_num_nodes += num_rcu_lvl[i]; rcu_num_nodes += num_rcu_lvl[i];
rcu_num_nodes -= nr_cpu_ids;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment