Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1187266

[PATCH tip/core/rcu 06/12] rcu: Limit rcu_state::levelcnt[] to RCU_NUM_LVLS items

Show all headers | View raw

From: Alexander Gordeev <agordeev@redhat.com>

Variable rcu_num_lvls is limited by RCU_NUM_LVLS macro.
In turn, rcu_state::levelcnt[] array is never accessed
beyond rcu_num_lvls. Thus, rcu_state::levelcnt[] is safe
to limit to RCU_NUM_LVLS items.

Since rcu_num_lvls could be changed during boot (as result
of rcutree.rcu_fanout_leaf kernel parameter update) one might
assume a new value could overflow the value of RCU_NUM_LVLS.
However, that is not the case, since leaf-level fanout is only
permitted to increase, resulting in rcu_num_lvls possibly to
decrease.

Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
 kernel/rcu/tree.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
index f1f4784f9107..a6faae53ea8f 100644
--- a/kernel/rcu/tree.h
+++ b/kernel/rcu/tree.h
@@ -443,7 +443,7 @@ do {									\
 struct rcu_state {
 	struct rcu_node node[NUM_RCU_NODES];	/* Hierarchy. */
 	struct rcu_node *level[RCU_NUM_LVLS];	/* Hierarchy levels. */
-	u32 levelcnt[MAX_RCU_LVLS + 1];		/* # nodes in each level. */
+	u32 levelcnt[RCU_NUM_LVLS];		/* # nodes in each level. */
 	u8 levelspread[RCU_NUM_LVLS];		/* kids/node in each level. */
 	u8 flavor_mask;				/* bit in flavor mask. */
 	struct rcu_data __percpu *rda;		/* pointer of percu rcu_data. */
-- 
1.8.1.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH tip/core/rcu 0/12] Tree geometry-initialization  simplifications for 4.3 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
  [PATCH tip/core/rcu 03/12] rcu: Remove superfluous local variable in rcu_init_geometry() "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
  [PATCH tip/core/rcu 08/12] rcu: Remove unnecessary fields from rcu_state structure "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
  [PATCH tip/core/rcu 12/12] rcu: Reset rcu_fanout_leaf if out of bounds "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
  [PATCH tip/core/rcu 11/12] rcu: Shut up bogus gcc array bounds warning "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
  [PATCH tip/core/rcu 10/12] rcu: Simplify arithmetic to calculate number of RCU nodes "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
  [PATCH tip/core/rcu 05/12] rcu: Simplify rcu_init_geometry() capacity arithmetics "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
  [PATCH tip/core/rcu 09/12] rcu: Limit count of static data to the number of RCU levels "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
  [PATCH tip/core/rcu 01/12] rcu: Provide more diagnostics for stalled GP kthread "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
    [PATCH tip/core/rcu 04/12] rcu: Cleanup rcu_init_geometry() code and arithmetics "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
    [PATCH tip/core/rcu 02/12] rcu: Panic if RCU tree can not accommodate all CPUs "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
    [PATCH tip/core/rcu 07/12] rcu: Limit rcu_capacity[] size to RCU_NUM_LVLS items "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200
    [PATCH tip/core/rcu 06/12] rcu: Limit rcu_state::levelcnt[] to RCU_NUM_LVLS items "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-07-18 00:40 +0200

csiph-web