linux-next: manual merge of the tests tree

linux-next: manual merge of the tests tree

[Stephen Rothwell]

Hi Ananth,

Today's linux-next merge of the tests tree got conflicts in
lib/Kconfig.debug against Linus' tree.

I have been carrying the fix to these conflicts for a while but no that
they are in Linus' tree, you should rebase/merge your tree against his
and carefully check/test the results.

My current fixup patch to your tests/Kconfig is below.  It may not be
complete.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/tests/Kconfig b/tests/Kconfig
index fc7e0bd..2432161 100644
--- a/tests/Kconfig
+++ b/tests/Kconfig
@@ -21,16 +21,34 @@ config DEBUG_LOCKING_API_SELFTESTS
 config RCU_TORTURE_TEST
 	tristate "torture tests for RCU"
 	depends on DEBUG_KERNEL
-	depends on m
 	default n
 	help
 	  This option provides a kernel module that runs torture tests
 	  on the RCU infrastructure.  The kernel module may be built
 	  after the fact on the running kernel to be tested, if desired.
 
+	  Say Y here if you want RCU torture tests to be built into
+	  the kernel.
 	  Say M if you want the RCU torture tests to build as a module.
 	  Say N if you are unsure.
 
+config RCU_TORTURE_TEST_RUNNABLE
+	bool "torture tests for RCU runnable by default"
+	depends on RCU_TORTURE_TEST = y
+	default n
+	help
+	  This option provides a way to build the RCU torture tests
+	  directly into the kernel without them starting up at boot
+	  time.  You can use /proc/sys/kernel/rcutorture_runnable
+	  to manually override this setting.  This /proc file is
+	  available only when the RCU torture tests have been built
+	  into the kernel.
+
+	  Say Y here if you want the RCU torture tests to start during
+	  boot (you probably don't).
+	  Say N here if you want the RCU torture tests to start only
+	  after being manually enabled via /proc.
+
 config RT_MUTEX_TESTER
 	bool "Built-in scriptable tester for rt-mutexes"
 	depends on DEBUG_KERNEL && RT_MUTEXES
@@ -75,6 +93,9 @@ config BACKTRACE_SELF_TEST
 	  for distributions or general kernels, but only for kernel
 	  developers working on architecture code.
 
+	  Note that if you want to also test saved backtraces, you will
+	  have to enable STACKTRACE as well.
+
 	  Say N if you are unsure.
 
 endif # KERNEL_TESTS

Re: linux-next: manual merge of the tests tree

[Ananth N Mavinakayanahalli]

On Tue, Jul 22, 2008 at 01:56:42PM +1000, Stephen Rothwell wrote:
> Hi Ananth,
> 
> Today's linux-next merge of the tests tree got conflicts in
> lib/Kconfig.debug against Linus' tree.
> 
> I have been carrying the fix to these conflicts for a while but no that
> they are in Linus' tree, you should rebase/merge your tree against his
> and carefully check/test the results.
> 
> My current fixup patch to your tests/Kconfig is below.  It may not be
> complete.

Thanks Stephen!

Sam,

Can you please request Linus to pull the tests tree now that 2.6.27
window is open?

Thanks,
Ananth

Re: linux-next: manual merge of the tests tree

[Ananth N Mavinakayanahalli]

On Wed, Nov 05, 2008 at 07:06:31AM +0100, Sam Ravnborg wrote:
> On Wed, Nov 05, 2008 at 01:52:11PM +1100, Stephen Rothwell wrote:
> > Hi Ananth,
> > 
> > On Wed, 15 Oct 2008 17:05:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the tests tree got a conflicts in lib/Kconfig.debug.
> > > 
> > > You need to determine if this tree is ever going to be merged into Linus'
> > > tree.  I am going to drop it until you decide.
> > 
> > Given the discussion, I am dropping the tests tree until something is
> > decided.  (in which case, I assume the tree will have its conflicts with
> > Linus' tree fixed up)
> 
> Agreed. We can revisit this when we have a proper framework to execute
> small user space test programs.
> 
> Ananth - thanks for your effort but I will drop the tree too.

OK by me :-)

Ananth

Re: linux-next: manual merge of the tests tree

[Sam Ravnborg]

On Wed, Nov 05, 2008 at 01:52:11PM +1100, Stephen Rothwell wrote:
> Hi Ananth,
> 
> On Wed, 15 Oct 2008 17:05:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the tests tree got a conflicts in lib/Kconfig.debug.
> > 
> > You need to determine if this tree is ever going to be merged into Linus'
> > tree.  I am going to drop it until you decide.
> 
> Given the discussion, I am dropping the tests tree until something is
> decided.  (in which case, I assume the tree will have its conflicts with
> Linus' tree fixed up)

Agreed. We can revisit this when we have a proper framework to execute
small user space test programs.

Ananth - thanks for your effort but I will drop the tree too.

	Sam

Re: linux-next: manual merge of the tests tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 594 bytes --]

Hi Ananth,

On Wed, 15 Oct 2008 17:05:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tests tree got a conflicts in lib/Kconfig.debug.
> 
> You need to determine if this tree is ever going to be merged into Linus'
> tree.  I am going to drop it until you decide.

Given the discussion, I am dropping the tests tree until something is
decided.  (in which case, I assume the tree will have its conflicts with
Linus' tree fixed up)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the tests tree

[Ananth N Mavinakayanahalli]

On Wed, Oct 15, 2008 at 05:05:03PM +1100, Stephen Rothwell wrote:
> Hi Ananth,
> 
> Today's linux-next merge of the tests tree got a conflicts in lib/Kconfig.debug.
> 
> You need to determine if this tree is ever going to be merged into Linus'
> tree.  I am going to drop it until you decide.

Stephen,

I am at a loss to determine the same. Sam Ravnborg had taken on the task
to push it upstream and he has also tried a couple of times, without
success.

Sam?

Ananth

linux-next: manual merge of the tests tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

Hi Ananth,

Today's linux-next merge of the tests tree got a conflicts in lib/Kconfig.debug.

You need to determine if this tree is ever going to be merged into Linus'
tree.  I am going to drop it until you decide.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the tests tree

[Ananth N Mavinakayanahalli]

On Fri, Aug 15, 2008 at 02:59:48PM +1000, Stephen Rothwell wrote:
> Hi Ananth,
> 
> Today's linux-next merge of the tests tree got a conflict in
> lib/Kconfig.debug between commit 67182ae1c42206e516f7efb292b745e826497b24
> ("rcu, debug: detect stalled grace periods") from the sched tree and
> commit 2b9b631dd2507b5480b752bcca946b9767b9bae1 ("Move rcutorture to
> tests/") from the tests tree.
> 
> I sort of fixed it up.

Thanks Stephen.

> Ananth, you should try to get the testing stuff into Linus' tree ...

We've tried multiple times already (last attempt was
http://marc.info/?l=linux-kernel&m=121727532926590&w=2).

Guess as Andrew said, this is way below in the priority scale. I am not
sure at this point if we should just let things be as they are if there
isn't much interest in merging it upstream.

Ananth

linux-next: manual merge of the tests tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

Hi Ananth,

Today's linux-next merge of the tests tree got a conflict in
lib/Kconfig.debug between commit 67182ae1c42206e516f7efb292b745e826497b24
("rcu, debug: detect stalled grace periods") from the sched tree and
commit 2b9b631dd2507b5480b752bcca946b9767b9bae1 ("Move rcutorture to
tests/") from the tests tree.

I sort of fixed it up.

Ananth, you should try to get the testing stuff into Linus' tree ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the tests tree

[Paul E. McKenney]

On Wed, Jun 25, 2008 at 03:03:15PM +1000, Stephen Rothwell wrote:
> Hi Ananth,
> 
> Today's linux-next merge of the tests tree got a conflict in
> lib/Kconfig.debug between commit 31a72bce0bd6f3e0114009288bccbc96376eeeca
> ("rcu: make rcutorture more vicious: reinstate boot-time testing") from
> the sched tree and commit db00d6090740863199393461c8332812986ce4ad ("Move
> rcutorture to tests/") from the tests tree.
> 
> Paul has added another CONFIG option related to the RCU tests. I fixed it
> up, hopefully correctly.  Probably worth a look when I publish the tree.

Let me know, I will be happy to look it over.

							Thanx, Paul

Re: linux-next: manual merge of the tests tree

[Ananth N Mavinakayanahalli]

On Wed, Jun 25, 2008 at 03:03:15PM +1000, Stephen Rothwell wrote:
> Hi Ananth,
> 
> Today's linux-next merge of the tests tree got a conflict in
> lib/Kconfig.debug between commit 31a72bce0bd6f3e0114009288bccbc96376eeeca
> ("rcu: make rcutorture more vicious: reinstate boot-time testing") from
> the sched tree and commit db00d6090740863199393461c8332812986ce4ad ("Move
> rcutorture to tests/") from the tests tree.
> 
> Paul has added another CONFIG option related to the RCU tests. I fixed it
> up, hopefully correctly.  Probably worth a look when I publish the tree.

Thanks Stephen! I'll take a look.

Its probably worth merging the tests/ tree in 2.6.27-rc1, given its been
in linux-next for over 3 months now.

Ananth

linux-next: manual merge of the tests tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 604 bytes --]

Hi Ananth,

Today's linux-next merge of the tests tree got a conflict in
lib/Kconfig.debug between commit 31a72bce0bd6f3e0114009288bccbc96376eeeca
("rcu: make rcutorture more vicious: reinstate boot-time testing") from
the sched tree and commit db00d6090740863199393461c8332812986ce4ad ("Move
rcutorture to tests/") from the tests tree.

Paul has added another CONFIG option related to the RCU tests. I fixed it
up, hopefully correctly.  Probably worth a look when I publish the tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the tests tree

[Ananth N Mavinakayanahalli]

On Tue, Jun 17, 2008 at 04:22:56PM +1000, Stephen Rothwell wrote:
> Hi Ananth,
> 
> Today's linux-next merge of the tests tree got a new conflict in
> lib/Kconfig.debug between commit 1462a200057df08be12f3719e1f37adbd2c6e4d0
> ("Revert "prohibit rcutorture from being compiled into the kernel"") from
> the sched tree and commit db00d6090740863199393461c8332812986ce4ad ("Move
> rcutorture to tests/").
> 
> It is trivial and I did the obvious fixup and will carry that.

Thank you Stephen!

Ananth

Re: linux-next: manual merge of the tests tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Ananth,
> 
> Today's linux-next merge of the tests tree got a new conflict in 
> lib/Kconfig.debug between commit 
> 1462a200057df08be12f3719e1f37adbd2c6e4d0 ("Revert "prohibit rcutorture 
> from being compiled into the kernel"") from the sched tree and commit 
> db00d6090740863199393461c8332812986ce4ad ("Move rcutorture to 
> tests/").
> 
> It is trivial and I did the obvious fixup and will carry that.

thanks.

	Ingo

linux-next: manual merge of the tests tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

Hi Ananth,

Today's linux-next merge of the tests tree got a new conflict in
lib/Kconfig.debug between commit 1462a200057df08be12f3719e1f37adbd2c6e4d0
("Revert "prohibit rcutorture from being compiled into the kernel"") from
the sched tree and commit db00d6090740863199393461c8332812986ce4ad ("Move
rcutorture to tests/").

It is trivial and I did the obvious fixup and will carry that.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]