Re: [PATCH 04/14] spufs: add spu stats in sysfs and ctx stat file in spufs

Re: [PATCH 04/14] spufs: add spu stats in sysfs and ctx stat file in spufs

[Andrew Morton]

On Fri, 20 Jul 2007 15:21:15 +1000
Jeremy Kerr <jk@ozlabs.org> wrote:

> This patch exports per-context statistics in spufs as long as spu
> statistics in sysfs.
> 
> It was formed by merging:
> "spufs: add spu stats in sysfs"   From: Christoph Hellwig
> "spufs: add stat file to spufs"   From: Christoph Hellwig
> "spufs: fix libassist accounting" From: Jeremy Kerr
> "spusched: fix spu utilization statistics" From: Luke Browning
> And some adjustments by myself, after suggestions on cbe-oss-dev.
> 
> Having separate patches was making the review process harder
> than it should, as we end up integrating spus and ctx statistics
> accounting much more than it was on the first implementation.

I hit some rejects here due to Maynard Johnson and Bob Nelson's oprofile
patches.  It was relatively simple to fix up, but there may of course be
clashes in intent as well, so please check it all over carefully when it
lands in mainline.

I'll get all the ps3/spufs/etc stuff into Linus later today.


And what's up with all these powerpc people sending out patchbombs after
the merge window has opened?  Formally, _all_ of this:

oprofile-enable-spu-switch-notification-to-detect-currently-active-spu-tasks.patch
oprofile-add-support-to-oprofile-for-profiling-cell-be-spus.patch
ps3-disk-storage-driver.patch
ps3-disk-storage-driver-use-correct-bio-vector-size.patch
ps3-disk-storage-driver-updates-after-final-review.patch
ps3-bd-dvd-cd-rom-storage-driver.patch
ps3-bd-dvd-cd-rom-storage-driver-updates-after-final-review.patch
ps3-flash-rom-storage-driver.patch
ps3-flash-rom-storage-driver-updates-after-final-review.patch
ps3-fix-build-with-32-bit-toolchains.patch
ps3fb-enable-vt_hw_console_binding-for-proper-kexec.patch
ps3fb-shrink-default-virtual-frame-buffer-size-from-18-to-9-mib.patch
ps3fb-set-fbinfo_reads_fast-to-speed-up-text-console-scrolling.patch
spufs-avoid-unexpectedly-restaring-mfc-during-context-save.patch
spufs-make-signal-notification-files-readonly-for-nosched-contexts.patch
spufs-remove-spurious-warn_on-for-spu_deactivate-for-nosched-contexts.patch
spufs-add-spu-stats-in-sysfs-and-ctx-stat-file-in-spufs.patch
spufs-make-sure-context-are-scheduled-again-after-spu_acquire_saved.patch
spufs-fix-array-size-of-channel-index.patch
spufs-remove-needless-context-save-restore-code.patch
spufs-fix-decr_status-meanings.patch
spufs-fix-read-and-write-for-decr_status-file.patch
spufs-limit-saving-mfc_cntl-bits.patch
spufs-dont-halt-decrementer-at-restore-step-47.patch
spufs-change-decrementer-restore-timing.patch
spufs-remove-unused-file-argument-from-spufs_run_spu.patch
spufs-use-find_first_bit-instead-of-sched_find_first_bit.patch

should be pushed back into 2.6.24 because it all arrived too late.

I guess you're all doing that to Paul on a regular basis.  Bad.

Re: [PATCH 04/14] spufs: add spu stats in sysfs and ctx stat file in spufs

[Scott Wood]

Andrew Morton wrote:
> And what's up with all these powerpc people sending out patchbombs after
> the merge window has opened?  Formally, _all_ of this:

I can't speak for the ones you listed, but in my case, I had people 
asking about the patches and posting conflicting things, so I wanted to 
get it out for review.  I had no real expectation of it making it into 
2.6.23.

-Scott

Re: [PATCH 04/14] spufs: add spu stats in sysfs and ctx stat file in spufs

[Arnd Bergmann]

On Friday 20 July 2007, Andrew Morton wrote:
> And what's up with all these powerpc people sending out patchbombs after
> the merge window has opened? =A0Formally, _all_ of this:
>=20
=2E..
>=20
> should be pushed back into 2.6.24 because it all arrived too late.
>=20
> I guess you're all doing that to Paul on a regular basis. =A0Bad.

Yes, I'm particularly bad at this usually.

However, for the ps3 drivers and oprofile, the problem was really
miscommunication about who gets to merge what first, because there
were interdependencies with other subsystems: Paul wanted to have
that code merged through other subsystems maintainers, which for
different reasons just did not happen at first.

The spufs patches mostly basically fixes that came up after all the
other spufs code got merged.

I'm also still sitting on the fixes (and two new drivers) that I
submitted to you earlier this week, and asked Linus to pull consequently.
My plan was to ask Linus again for merging them today, together
with Jeremy's spufs patches and the oprofile stuff and another patch
from Christoph.

Would you prefer me not to do that but to instead just push out the
patches I have queued myself?

	Arnd <><

Re: [PATCH 04/14] spufs: add spu stats in sysfs and ctx stat file in spufs

[Andrew Morton]

On Fri, 20 Jul 2007 20:59:25 +0200
Arnd Bergmann <arnd@arndb.de> wrote:

> On Friday 20 July 2007, Andrew Morton wrote:
> > And what's up with all these powerpc people sending out patchbombs after
> > the merge window has opened? __Formally, _all_ of this:
> > 
> ...
> > 
> > should be pushed back into 2.6.24 because it all arrived too late.
> > 
> > I guess you're all doing that to Paul on a regular basis. __Bad.
> 
> Yes, I'm particularly bad at this usually.
> 
> However, for the ps3 drivers and oprofile, the problem was really
> miscommunication about who gets to merge what first, because there
> were interdependencies with other subsystems: Paul wanted to have
> that code merged through other subsystems maintainers, which for
> different reasons just did not happen at first.
> 
> The spufs patches mostly basically fixes that came up after all the
> other spufs code got merged.
> 
> I'm also still sitting on the fixes (and two new drivers) that I
> submitted to you earlier this week, and asked Linus to pull consequently.
> My plan was to ask Linus again for merging them today, together
> with Jeremy's spufs patches and the oprofile stuff and another patch
> from Christoph.
> 
> Would you prefer me not to do that but to instead just push out the
> patches I have queued myself?
> 

I think it's better if you do it, please - I'm not doing anything useful
here.

Bob has just sent out an udpate to the oprofile patches btw.  I'll cc you
on the incrementals in case that's some use.

btw, I also found the below which I guess I'll merge:


From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>

allnoconfig results in this:

 CC      arch/powerpc/mm/tlb_32.o
In file included from include/asm/tlb.h:60,
                 from arch/powerpc/mm/tlb_32.c:30:
include/asm-generic/tlb.h: In function 'tlb_flush_mmu':
include/asm-generic/tlb.h:76: error: implicit declaration of function 'release_pages'
include/asm-generic/tlb.h: In function 'tlb_remove_page':
include/asm-generic/tlb.h:105: error: implicit declaration of function 'page_cache_release'

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/powerpc/mm/tlb_32.c |    2 ++
 1 files changed, 2 insertions(+)

diff -puN arch/powerpc/mm/tlb_32.c~powerpc-tlb_32c-build-fix arch/powerpc/mm/tlb_32.c
--- a/arch/powerpc/mm/tlb_32.c~powerpc-tlb_32c-build-fix
+++ a/arch/powerpc/mm/tlb_32.c
@@ -26,6 +26,8 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/highmem.h>
+#include <linux/pagemap.h>
+
 #include <asm/tlbflush.h>
 #include <asm/tlb.h>
 
_

Re: [PATCH 04/14] spufs: add spu stats in sysfs and ctx stat file in spufs

[Arnd Bergmann]

On Friday 20 July 2007, Andrew Morton wrote:
>=20
> I think it's better if you do it, please - I'm not doing anything useful
> here.

Ok, I'm giving it some final testing, then send out the pull request.

Do you also want me to handle the ps3 drivers? I think I'd prefer to
leave those to you if you don't mind.

> Bob has just sent out an udpate to the oprofile patches btw. =A0I'll cc y=
ou
> on the incrementals in case that's some use.

I already have his patch and fixed up the remaining rejects I got against
Christoph's patch.

> btw, I also found the below which I guess I'll merge:
>=20
> From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
>=20
> allnoconfig results in this:
=2E..

Ok.

	Arnd <><

Re: [PATCH 04/14] spufs: add spu stats in sysfs and ctx stat file in spufs

[Andrew Morton]

On Fri, 20 Jul 2007 21:29:20 +0200
Arnd Bergmann <arnd@arndb.de> wrote:

> On Friday 20 July 2007, Andrew Morton wrote:
> > 
> > I think it's better if you do it, please - I'm not doing anything useful
> > here.
> 
> Ok, I'm giving it some final testing, then send out the pull request.
> 
> Do you also want me to handle the ps3 drivers? I think I'd prefer to
> leave those to you if you don't mind.

No probs.  Please cc me on the Linus pull request and I'll offer a little
encouragement.

Re: [PATCH 04/14] spufs: add spu stats in sysfs and ctx stat file in spufs

[Arnd Bergmann]

On Friday 20 July 2007, Andrew Morton wrote:
> And what's up with all these powerpc people sending out patchbombs after
> the merge window has opened? =A0Formally, _all_ of this:
>=20
=2E..
>=20
> should be pushed back into 2.6.24 because it all arrived too late.
>=20
> I guess you're all doing that to Paul on a regular basis. =A0Bad.

Yes, I'm particularly bad at this usually.

However, for the ps3 drivers and oprofile, the problem was really
miscommunication about who gets to merge what first, because there
were interdependencies with other subsystems: Paul wanted to have
that code merged through other subsystems maintainers, which for
different reasons just did not happen at first.

The spufs patches mostly basically fixes that came up after all the
other spufs code got merged.

I'm also still sitting on the fixes (and two new drivers) that I
submitted to you earlier this week, and asked Linus to pull consequently.
My plan was to ask Linus again for merging them today, together
with Jeremy's spufs patches and the updated oprofile stuff and another
patch from Christoph.

Would you prefer me to discard my new git tree and only ask him to pull
what I had last week instead. Just trying to find out how to avoid
merge conflicts on this.

	Arnd <><