Skip to contentSkip to conversation

RCU commits for 3.9

GIT PULL Paul E. McKenney 5 participants 12 messages Feb 4, 2013 – Feb 7, 2013

lore
Share & tools
lore
#0 lore raw

Hello, Ingo,

The major features of this series are:

1. Changes to rcutorture and to RCU documentation. Posted to LKML at

	https://lkml.org/lkml/2013/1/26/188.

2. Enhancements to uniprocessor handling in tiny RCU. Posted to LKML

	at https://lkml.org/lkml/2013/1/27/2.

3. Tag RCU callbacks with grace-period number to simplify callback

	advancement.  Posted to LKML at https://lkml.org/lkml/2013/1/26/203.

4. Miscellaneous fixes. Posted to LKML at

	https://lkml.org/lkml/2013/1/26/204.

All of these commits have been subject to -next testing.

These changes are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/next

--------------------->

Cody P Schafer (1):
rcu: Correct 'optimized' to 'optimize' in header comment

Dave Hansen (1):
rcu: Consolidate debugging Kconfig options

Frederic Weisbecker (1):
context_tracking: Add comments on interface and internals

Josh Triplett (1):
rcu: Make rcu_is_cpu_rrupt_from_idle helper functions static

Li Zhong (2):
rcu: Use new nesting value for rcu_dyntick trace in rcu_eqs_enter_common
rcu: Remove unused code originally used for context tracking

Paul E. McKenney (11):
tracing: Export trace_clock_local()
rcu: Reduce rcutorture tracing
rcu: Fix blimit type for trace_rcu_batch_start()
rcu: Silence compiler array out-of-bounds false positive
rcu: Tag callback lists with corresponding grace-period number
rcu: Trace callback acceleration
rcu: Remove obsolete Kconfig option from comment
rcu: Provide RCU CPU stall warnings for tiny RCU
rcu: Allow TREE_PREEMPT_RCU on UP systems
rcu: Make rcutorture's shuffler task shuffle recently added tasks
Merge branches 'doctorture.2013.01.29a', 'fixes.2013.01.26a', 'tagcb.2013.01.24a' and 'tiny.2013.01.29b' into HEAD

Richard Braun (1):
Documentation: Memory barrier semantics of atomic_xchg()

Sasha Levin (1):
rcutorture: Don't compare ptr with 0

 Documentation/atomic_ops.txt      |    2 +
 Documentation/memory-barriers.txt |    1 +
 include/linux/rcupdate.h          |   15 ++-
 include/trace/events/rcu.h        |   31 +++--
 init/Kconfig                      |   12 ++-
 kernel/context_tracking.c         |   75 +++++++++--
 kernel/rcu.h                      |    7 +
 kernel/rcupdate.c                 |   60 ++++++++-
 kernel/rcutiny.c                  |    8 +-
 kernel/rcutiny_plugin.h           |   56 ++++++++
 kernel/rcutorture.c               |   57 +++++++--
 kernel/rcutree.c                  |  260 ++++++++++++++++++++++++++-----------
 kernel/rcutree.h                  |   11 +--
 kernel/trace/trace_clock.c        |    1 +
 lib/Kconfig.debug                 |  117 +++++++++--------
 15 files changed, 528 insertions(+), 185 deletions(-)
#1 lore raw
Quoted 58 lines · Paul E. McKenney

Hello, Ingo,

The major features of this series are:

1. Changes to rcutorture and to RCU documentation. Posted to LKML at

	https://lkml.org/lkml/2013/1/26/188.

2. Enhancements to uniprocessor handling in tiny RCU. Posted to LKML

	at https://lkml.org/lkml/2013/1/27/2.

3. Tag RCU callbacks with grace-period number to simplify callback

	advancement.  Posted to LKML at https://lkml.org/lkml/2013/1/26/203.

4. Miscellaneous fixes. Posted to LKML at

	https://lkml.org/lkml/2013/1/26/204.

All of these commits have been subject to -next testing.

These changes are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/next

--------------------->

Cody P Schafer (1):
rcu: Correct 'optimized' to 'optimize' in header comment

Dave Hansen (1):
rcu: Consolidate debugging Kconfig options

Frederic Weisbecker (1):
context_tracking: Add comments on interface and internals

Josh Triplett (1):
rcu: Make rcu_is_cpu_rrupt_from_idle helper functions static

Li Zhong (2):
rcu: Use new nesting value for rcu_dyntick trace in rcu_eqs_enter_common
rcu: Remove unused code originally used for context tracking

Paul E. McKenney (11):
tracing: Export trace_clock_local()
rcu: Reduce rcutorture tracing
rcu: Fix blimit type for trace_rcu_batch_start()
rcu: Silence compiler array out-of-bounds false positive
rcu: Tag callback lists with corresponding grace-period number
rcu: Trace callback acceleration
rcu: Remove obsolete Kconfig option from comment
rcu: Provide RCU CPU stall warnings for tiny RCU
rcu: Allow TREE_PREEMPT_RCU on UP systems
rcu: Make rcutorture's shuffler task shuffle recently added tasks
Merge branches 'doctorture.2013.01.29a', 'fixes.2013.01.26a', 'tagcb.2013.01.24a' and 'tiny.2013.01.29b' into HEAD

Richard Braun (1):
Documentation: Memory barrier semantics of atomic_xchg()

Sasha Levin (1):
rcutorture: Don't compare ptr with 0

Quoted 16 lines
 Documentation/atomic_ops.txt      |    2 +
 Documentation/memory-barriers.txt |    1 +
 include/linux/rcupdate.h          |   15 ++-
 include/trace/events/rcu.h        |   31 +++--
 init/Kconfig                      |   12 ++-
 kernel/context_tracking.c         |   75 +++++++++--
 kernel/rcu.h                      |    7 +
 kernel/rcupdate.c                 |   60 ++++++++-
 kernel/rcutiny.c                  |    8 +-
 kernel/rcutiny_plugin.h           |   56 ++++++++
 kernel/rcutorture.c               |   57 +++++++--
 kernel/rcutree.c                  |  260 ++++++++++++++++++++++++++-----------
 kernel/rcutree.h                  |   11 +--
 kernel/trace/trace_clock.c        |    1 +
 lib/Kconfig.debug                 |  117 +++++++++--------
 15 files changed, 528 insertions(+), 185 deletions(-)

Pulled, thanks a lot Paul!

Ingo

#2 lore raw

Btw., I'm now getting these build errors in -tip too:

kernel/built-in.o: In function `rcu_torture_reader':
rcutorture.c:(.text+0x657d7): undefined reference to trace_clock_local' kernel/built-in.o: In function rcu_torture_timer':
rcutorture.c:(.text+0x6599f): undefined reference to `trace_clock_local'

Saw the discussion about so I suspect a fix will come?

Thanks,

Ingo

#3 lore raw
Quoted 9 lines · Ingo Molnar

Btw., I'm now getting these build errors in -tip too:

kernel/built-in.o: In function `rcu_torture_reader':
rcutorture.c:(.text+0x657d7): undefined reference to trace_clock_local' kernel/built-in.o: In function rcu_torture_timer':
rcutorture.c:(.text+0x6599f): undefined reference to `trace_clock_local'

Saw the discussion about so I suspect a fix will come?

<red face>

I have a new rcu/next with the fix, and I will post a pull for it assuming that -next does OK with it.

Thanx, Paul

#4 lore raw
Quoted 9 lines · Paul E. McKenney
Quoted 8 lines · Ingo Molnar

Btw., I'm now getting these build errors in -tip too:

kernel/built-in.o: In function `rcu_torture_reader':
rcutorture.c:(.text+0x657d7): undefined reference to trace_clock_local' kernel/built-in.o: In function rcu_torture_timer':
rcutorture.c:(.text+0x6599f): undefined reference to `trace_clock_local'

Quoted 6 lines
Quoted 1 line

Saw the discussion about so I suspect a fix will come?

<red face>

I have a new rcu/next with the fix, and I will post a pull for it assuming that -next does OK with it.

And this change is available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/next

Steven Rostedt (1):
rcu: Allow rcutorture to be built at low optimization levels

 kernel/rcutorture.c |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

Thanx, Paul

#5 lore raw
Quoted 3 lines · Paul E. McKenney

Steven Rostedt (1):
rcu: Allow rcutorture to be built at low optimization levels

I wish git had dual (or more) authorship, as I started with your patch and added on to it. We are really both responsible for that change.

-- Steve

#6 lore raw
Quoted 7 lines · Steven Rostedt
Quoted 2 lines · Paul E. McKenney

Steven Rostedt (1):
rcu: Allow rcutorture to be built at low optimization levels

I wish git had dual (or more) authorship, as I started with your patch and added on to it. We are really both responsible for that change.

We have both our Signed-off-by tags on it, so close enough for me! ;-)

Thanx, Paul

#7 lore raw
In reply to Paul E. McKenney
Quoted 19 lines · Paul E. McKenney
Quoted 9 lines · Paul E. McKenney
Quoted 8 lines · Ingo Molnar

Btw., I'm now getting these build errors in -tip too:

kernel/built-in.o: In function `rcu_torture_reader':
rcutorture.c:(.text+0x657d7): undefined reference to trace_clock_local' kernel/built-in.o: In function rcu_torture_timer':
rcutorture.c:(.text+0x6599f): undefined reference to `trace_clock_local'

Quoted 6 lines
Quoted 1 line

Saw the discussion about so I suspect a fix will come?

<red face>

I have a new rcu/next with the fix, and I will post a pull for it assuming that -next does OK with it.

And this change is available in the git repository at:

Quoted 7 lines

git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/next

Steven Rostedt (1):
rcu: Allow rcutorture to be built at low optimization levels

 kernel/rcutorture.c |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

Cool, thanks guys!

Ingo

#8 lore raw
In reply to Paul E. McKenney

btw., I got a non-trivial conflicts in kernel/context_tracking.c, with the following commits interacting between the RCU tree (tip:core/rcu) and the scheduler tree (tip:sched/core):

6a61671bb2f3 cputime: Safely read cputime of full dynticks CPUs abf917cd91cb cputime: Generic on-demand virtual cputime accounting 4eacdf18374e context_tracking: Add comments on interface and internals 95a79fd458b8 context_tracking: Export context state for generic vtime

I think I managed to resolve the conflicts (will push it out in an hour or two, after some testing) - but please double check me on it...

Thanks,

Ingo

#9 lore raw

2013/2/6 Ingo Molnar <[email protected]>:

Quoted 6 lines

btw., I got a non-trivial conflicts in kernel/context_tracking.c, with the following commits interacting between the RCU tree (tip:core/rcu) and the scheduler tree (tip:sched/core):

Quoted 8 lines

6a61671bb2f3 cputime: Safely read cputime of full dynticks CPUs abf917cd91cb cputime: Generic on-demand virtual cputime accounting 4eacdf18374e context_tracking: Add comments on interface and internals 95a79fd458b8 context_tracking: Export context state for generic vtime

I think I managed to resolve the conflicts (will push it out in an hour or two, after some testing) - but please double check me on it...

Sorry about that conflict. Given that both RCU and cputime were competing with significant changes on this newborn subsystem, such clash was hard to avoid.

The merge is mostly correct. There is just a small issue with context_tracking_task_switch() kerneldoc style comment: it should be moved out of guest_enter/guest_exit, newly introduced APIs, to be right above context_tracking_task_switch() function. Otherwise it's fine.

Thanks!

#10 lore raw
In reply to Paul E. McKenney

Hi, Paul

These (https://lkml.org/lkml/2012/11/29/123) are still not merged.

Thanks,
lai

Quoted 81 lines · Paul E. McKenney

Hello, Ingo,

The major features of this series are:

1. Changes to rcutorture and to RCU documentation. Posted to LKML at

	https://lkml.org/lkml/2013/1/26/188.

2. Enhancements to uniprocessor handling in tiny RCU. Posted to LKML

	at https://lkml.org/lkml/2013/1/27/2.

3. Tag RCU callbacks with grace-period number to simplify callback

	advancement.  Posted to LKML at https://lkml.org/lkml/2013/1/26/203.

4. Miscellaneous fixes. Posted to LKML at

	https://lkml.org/lkml/2013/1/26/204.

All of these commits have been subject to -next testing.

These changes are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/next

--------------------->

Cody P Schafer (1):
rcu: Correct 'optimized' to 'optimize' in header comment

Dave Hansen (1):
rcu: Consolidate debugging Kconfig options

Frederic Weisbecker (1):
context_tracking: Add comments on interface and internals

Josh Triplett (1):
rcu: Make rcu_is_cpu_rrupt_from_idle helper functions static

Li Zhong (2):
rcu: Use new nesting value for rcu_dyntick trace in rcu_eqs_enter_common
rcu: Remove unused code originally used for context tracking

Paul E. McKenney (11):
tracing: Export trace_clock_local()
rcu: Reduce rcutorture tracing
rcu: Fix blimit type for trace_rcu_batch_start()
rcu: Silence compiler array out-of-bounds false positive
rcu: Tag callback lists with corresponding grace-period number
rcu: Trace callback acceleration
rcu: Remove obsolete Kconfig option from comment
rcu: Provide RCU CPU stall warnings for tiny RCU
rcu: Allow TREE_PREEMPT_RCU on UP systems
rcu: Make rcutorture's shuffler task shuffle recently added tasks
Merge branches 'doctorture.2013.01.29a', 'fixes.2013.01.26a', 'tagcb.2013.01.24a' and 'tiny.2013.01.29b' into HEAD

Richard Braun (1):
Documentation: Memory barrier semantics of atomic_xchg()

Sasha Levin (1):
rcutorture: Don't compare ptr with 0

  Documentation/atomic_ops.txt      |    2 +
  Documentation/memory-barriers.txt |    1 +
  include/linux/rcupdate.h          |   15 ++-
  include/trace/events/rcu.h        |   31 +++--
  init/Kconfig                      |   12 ++-
  kernel/context_tracking.c         |   75 +++++++++--
  kernel/rcu.h                      |    7 +
  kernel/rcupdate.c                 |   60 ++++++++-
  kernel/rcutiny.c                  |    8 +-
  kernel/rcutiny_plugin.h           |   56 ++++++++
  kernel/rcutorture.c               |   57 +++++++--
  kernel/rcutree.c                  |  260 ++++++++++++++++++++++++++-----------
  kernel/rcutree.h                  |   11 +--
  kernel/trace/trace_clock.c        |    1 +
  lib/Kconfig.debug                 |  117 +++++++++--------
  15 files changed, 528 insertions(+), 185 deletions(-)

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

#11 lore raw
Quoted 3 lines · Lai Jiangshan

Hi, Paul

These (https://lkml.org/lkml/2012/11/29/123) are still not merged.

Ah, good point...

My intent was to merge as soon as https://lkml.org/lkml/2012/12/5/201
was responded to. The question should not have blocked merging, so I should have followed up, but the again, so should have you. ;-)

I queued the patches, and if testing goes well, will push them to -tip in a few days.

The remaining issue for invoking srcu_read_lock() from offline CPUs is that lockdep does tracing that uses RCU. So your patch 4/8 is incomplete, though a good step towards allowing SRCU to be invoked from offline CPUs. Thoughts on getting the rest of the way there?

Thanx, Paul

Quoted 86 lines

Thanks,
lai

Quoted 81 lines · Paul E. McKenney

Hello, Ingo,

The major features of this series are:

1. Changes to rcutorture and to RCU documentation. Posted to LKML at

	https://lkml.org/lkml/2013/1/26/188.

2. Enhancements to uniprocessor handling in tiny RCU. Posted to LKML

	at https://lkml.org/lkml/2013/1/27/2.

3. Tag RCU callbacks with grace-period number to simplify callback

	advancement.  Posted to LKML at https://lkml.org/lkml/2013/1/26/203.

4. Miscellaneous fixes. Posted to LKML at

	https://lkml.org/lkml/2013/1/26/204.

All of these commits have been subject to -next testing.

These changes are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/next

--------------------->

Cody P Schafer (1):
rcu: Correct 'optimized' to 'optimize' in header comment

Dave Hansen (1):
rcu: Consolidate debugging Kconfig options

Frederic Weisbecker (1):
context_tracking: Add comments on interface and internals

Josh Triplett (1):
rcu: Make rcu_is_cpu_rrupt_from_idle helper functions static

Li Zhong (2):
rcu: Use new nesting value for rcu_dyntick trace in rcu_eqs_enter_common
rcu: Remove unused code originally used for context tracking

Paul E. McKenney (11):
tracing: Export trace_clock_local()
rcu: Reduce rcutorture tracing
rcu: Fix blimit type for trace_rcu_batch_start()
rcu: Silence compiler array out-of-bounds false positive
rcu: Tag callback lists with corresponding grace-period number
rcu: Trace callback acceleration
rcu: Remove obsolete Kconfig option from comment
rcu: Provide RCU CPU stall warnings for tiny RCU
rcu: Allow TREE_PREEMPT_RCU on UP systems
rcu: Make rcutorture's shuffler task shuffle recently added tasks
Merge branches 'doctorture.2013.01.29a', 'fixes.2013.01.26a', 'tagcb.2013.01.24a' and 'tiny.2013.01.29b' into HEAD

Richard Braun (1):
Documentation: Memory barrier semantics of atomic_xchg()

Sasha Levin (1):
rcutorture: Don't compare ptr with 0

 Documentation/atomic_ops.txt      |    2 +
 Documentation/memory-barriers.txt |    1 +
 include/linux/rcupdate.h          |   15 ++-
 include/trace/events/rcu.h        |   31 +++--
 init/Kconfig                      |   12 ++-
 kernel/context_tracking.c         |   75 +++++++++--
 kernel/rcu.h                      |    7 +
 kernel/rcupdate.c                 |   60 ++++++++-
 kernel/rcutiny.c                  |    8 +-
 kernel/rcutiny_plugin.h           |   56 ++++++++
 kernel/rcutorture.c               |   57 +++++++--
 kernel/rcutree.c                  |  260 ++++++++++++++++++++++++++-----------
 kernel/rcutree.h                  |   11 +--
 kernel/trace/trace_clock.c        |    1 +
 lib/Kconfig.debug                 |  117 +++++++++--------
 15 files changed, 528 insertions(+), 185 deletions(-)

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