lkml.org 
[lkml]   [2015]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH tip/core/rcu 09/24] rcu: Limit rcu_capacity[] size to RCU_NUM_LVLS items
Date
From: Alexander Gordeev <agordeev@redhat.com>

Number of items in rcu_capacity[] array is defined by macro
MAX_RCU_LVLS. However, that array is never accessed beyond
RCU_NUM_LVLS index. Therefore, we can limit the array to
RCU_NUM_LVLS items and eliminate MAX_RCU_LVLS. As result,
in most cases the memory is conserved.

Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
kernel/rcu/tree.c | 12 ++++++------
kernel/rcu/tree.h | 1 -
2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 2473a60161a3..69c957ea3723 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3968,19 +3968,19 @@ static void __init rcu_init_one(struct rcu_state *rsp,
"rcu_node_0",
"rcu_node_1",
"rcu_node_2",
- "rcu_node_3" }; /* Match MAX_RCU_LVLS */
+ "rcu_node_3" };
static const char * const fqs[] = {
"rcu_node_fqs_0",
"rcu_node_fqs_1",
"rcu_node_fqs_2",
- "rcu_node_fqs_3" }; /* Match MAX_RCU_LVLS */
+ "rcu_node_fqs_3" };
static u8 fl_mask = 0x1;
int cpustride = 1;
int i;
int j;
struct rcu_node *rnp;

- BUILD_BUG_ON(MAX_RCU_LVLS > ARRAY_SIZE(buf)); /* Fix buf[] init! */
+ BUILD_BUG_ON(RCU_NUM_LVLS > ARRAY_SIZE(buf)); /* Fix buf[] init! */

/* Silence gcc 4.8 false positive about array index out of range. */
if (rcu_num_lvls <= 0 || rcu_num_lvls > RCU_NUM_LVLS)
@@ -4052,7 +4052,7 @@ static void __init rcu_init_geometry(void)
{
ulong d;
int i;
- int rcu_capacity[MAX_RCU_LVLS];
+ int rcu_capacity[RCU_NUM_LVLS];

/*
* Initialize any unspecified boot parameters.
@@ -4079,7 +4079,7 @@ static void __init rcu_init_geometry(void)
* with the given number of levels.
*/
rcu_capacity[0] = rcu_fanout_leaf;
- for (i = 1; i < MAX_RCU_LVLS; i++)
+ for (i = 1; i < RCU_NUM_LVLS; i++)
rcu_capacity[i] = rcu_capacity[i - 1] * CONFIG_RCU_FANOUT;

/*
@@ -4092,7 +4092,7 @@ static void __init rcu_init_geometry(void)
* the rcu_node masks. Complain and fall back to the compile-
* time values if these limits are exceeded.
*/
- if (nr_cpu_ids > rcu_capacity[MAX_RCU_LVLS - 1])
+ if (nr_cpu_ids > rcu_capacity[RCU_NUM_LVLS - 1])
panic("rcu_init_geometry: rcu_capacity[] is too small");
else if (rcu_fanout_leaf < CONFIG_RCU_FANOUT_LEAF ||
rcu_fanout_leaf > sizeof(unsigned long) * 8) {
diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
index 7194efd3e1d3..8c0a27861d2f 100644
--- a/kernel/rcu/tree.h
+++ b/kernel/rcu/tree.h
@@ -35,7 +35,6 @@
* In practice, this did work well going from three levels to four.
* Of course, your mileage may vary.
*/
-#define MAX_RCU_LVLS 4
#define RCU_FANOUT_1 (CONFIG_RCU_FANOUT_LEAF)
#define RCU_FANOUT_2 (RCU_FANOUT_1 * CONFIG_RCU_FANOUT)
#define RCU_FANOUT_3 (RCU_FANOUT_2 * CONFIG_RCU_FANOUT)
--
1.8.1.5


\
 
 \ /
  Last update: 2015-05-13 00:41    [W:0.208 / U:0.732 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site