linux-next: Tree for July 29
Subsystems (2)
Hi all,
Changes since 20090728:
New trees: kmemleak
Removed tree: ttydev
This tree fails to build for powerpc allyesconfig (final link problem).
The drbd tree gained a couple of build failures due to interactions with the block tree. I applied a couple of patches.
The staging tree gained a conflict against the net tree.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below).
You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 135 trees (counting Linus' and 19 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
Signature · 172 lines
Cheers, Stephen Rothwell [email protected] $ git checkout master $ git reset --hard stable Merging origin/master Merging fixes/fixes Merging arm-current/master Merging m68k-current/for-linus Merging powerpc-merge/merge Merging sparc-current/master Merging scsi-rc-fixes/master Merging net-current/master Merging sound-current/for-linus Merging pci-current/for-linus Merging wireless-current/master Merging kbuild-current/master Merging quilt/driver-core.current Merging quilt/usb.current Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-linus Merging audit-current/for-linus Merging crypto-current/master Merging dwmw2/master Merging arm/devel Merging davinci/for-next Merging pxa/for-next Merging thumb-2/thumb-2 Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c Merging parisc/master Merging powerpc/next Merging 4xx/next Merging galak/next Merging s390/features Merging sh/master Merging sparc/master Merging xtensa/master Merging cifs/master Merging configfs/linux-next CONFLICT (content): Merge conflict in fs/configfs/dir.c Merging ecryptfs/next Merging ext3/for_next Merging ext4/next Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging jfs/next Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging v9fs/for-next Merging ubifs/linux-next Merging xfs/master Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 CONFLICT (content): Merge conflict in fs/reiserfs/journal.c CONFLICT (content): Merge conflict in fs/reiserfs/super.c Merging vfs/for-next Merging pci/linux-next Merging hid/for-next Merging quilt/i2c CONFLICT (content): Merge conflict in drivers/i2c/chips/tsl2550.c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h CONFLICT (content): Merge conflict in drivers/media/dvb/b2c2/flexcop-fe-tuner.c Merging quota/for_next Merging kbuild/master Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/master Merging dlm/next Merging scsi/master Merging async_tx/next Merging udf/for_next Merging net/master CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-3945.h CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-tx.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl3945-base.c Merging wireless/master Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr Merging mmc/next Merging input/next Merging lsm/for-next Merging block/for-next Merging quilt/device-mapper Merging embedded/master Merging firmware/master Merging pcmcia/master Merging battery/master Merging leds/for-mm Merging backlight/for-mm Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next Merging voltage/for-next Merging security-testing/next Merging lblnet/master Merging agp/agp-next Merging uwb/for-upstream Merging watchdog/master Merging bdev/master Merging dwmw2-iommu/master Merging cputime/cputime Merging osd/linux-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next Merging audit/for-next Merging omap/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging edac-amd/for-next Merging fsnotify/for-next CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c Merging irda/for-next Merging hwlat/for-linus Merging drbd/drbd Applying: drbd: fixups for block api changes Applying: drbd: fix for removal of blk_queue_stack_limits Merging tip/auto-latest CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c CONFLICT (content): Merge conflict in include/linux/rcupdate.h Merging percpu/for-next CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c Merging sfi/sfi-test Merging asm-generic/next Merging quilt/driver-core CONFLICT (content): Merge conflict in init/main.c Merging quilt/usb CONFLICT (content): Merge conflict in drivers/usb/gadget/m66592-udc.c Merging quilt/staging CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree. $ git rm -f drivers/staging/epl/VirtualEthernetLinux.c Merging scsi-post-merge/master
Next July 29 : Hugetlb test failure (OOPS free_hugepte_range)
While executing hugetlb tests against today's Next tree on a Power 6 box came across following OOPS.
------------[ cut here ]------------ Oops: Exception in kernel mode, sig: 5 [#1] SMP NR_CPUS=1024 NUMA pSeries Modules linked in: ipv6 fuse loop dm_mod ehea sg sd_mod crc_t10dif ibmvscsic scsi_transport_srp scsi_tgt scsi_mod NIP: c00000000003e794 LR: c00000000003e9ec CTR: 000000000000bba4 REGS: c00000006a72b5d0 TRAP: 0700 Not tainted (2.6.31-rc4-autotest-next-20090729-5-ppc64) MSR: 8000000000029032 <EE,ME,CE,IR,DR> CR: 22044444 XER: 00000001
TASK = c000000069c00180[1115] 'readback' THREAD: c00000006a728000 CPU: 2
GPR00: 0000000000000001 c00000006a72b850 c000000000a93190 c00000006f6f04d0
GPR04: c00000006b810001 0000000000000008 0000000000000000 0000040000000000
GPR08: c00000006ece0ca8 c00000006a137ff8 c00000006ece0ca8 0000000000000018
GPR12: 0000000042000448 c000000000b72800 00000000ffffffff ffffffffffffffff
GPR16: 00000000477555d0 0000000000000000 0000000000000001 000003ffffffffff
GPR20: 0000040000000000 0000000000000000 0000010000000000 0000040000000000
GPR24: c00000006f6f04d0 000003ffffffffff 0000000000000007 c00000006cdc28d0
GPR28: 0000040000000000 000003fff0000000 c00000006a137ff8 0000040000000000 NIP [c00000000003e794] .free_hugepte_range+0x44/0x68
LR [c00000000003e9ec] .hugetlb_free_pgd_range+0x234/0x374
Call Trace:
[c00000006a72b850] [0000175c08000393] 0x175c08000393 (unreliable) [c00000006a72b8c0] [c00000000003e9ec] .hugetlb_free_pgd_range+0x234/0x374 [c00000006a72b9b0] [c00000000013742c] .free_pgtables+0x90/0x140 [c00000006a72ba60] [c0000000001393c4] .exit_mmap+0x12c/0x1b8 [c00000006a72bb10] [c00000000008d460] .mmput+0x54/0x14c [c00000006a72bba0] [c000000000092428] .exit_mm+0x17c/0x1a0 [c00000006a72bc50] [c00000000009481c] .do_exit+0x204/0x774 [c00000006a72bd30] [c000000000094e40] .do_group_exit+0xb4/0xe8 [c00000006a72bdc0] [c000000000094e88] .SyS_exit_group+0x14/0x28 [c00000006a72be30] [c0000000000085b4] syscall_exit+0x0/0x40 Instruction dump:
68800001 780007e0 0b000000 38a50001 38000000 7ca507b4 f8090000 38000001 2f850007 9003000c 7c101026 5400f7fe <0b000000> 78840724 7ca42378 4bff8ed5
next-20090728 worked fine. Last commit that changed arch/powerpc/mm/hugetlbpage.c was cb7f3f2d92d1b26c13e30e639b6ee4a78e9a3afa
powerpc: Add memory management headers for new 64-bit BookE
I will try reverting that commit and check if that helps.
Thanks
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
Re: Next July 29 : Hugetlb test failure (OOPS free_hugepte_range)
Quoted 6 lines · Sachin Sant
next-20090728 worked fine. Last commit that changed
arch/powerpc/mm/hugetlbpage.cwascb7f3f2d92d1b26c13e30e639b6ee4a78e9a3afapowerpc: Add memory management headers for new 64-bit BookE
I will try reverting that commit and check if that helps.
Hi Ben,
Reverting the above patch helped. The tests ran fine against the patched kernel. But ofcourse that's not the solution :-)
Here is some data from xmon that might help find the reason for the failure. This is with today's next.
: ------------[ cut here ]------------
cpu 0x0: Vector: 700 (Program Check) at [c000000038923560]
pc: c0000000000486d4: .free_hugepte_range+0x68/0xa0
lr: c000000000048954: .hugetlb_free_pgd_range+0x248/0x38c
sp: c0000000389237e0
msr: 8000000000029032
current = 0xc00000003b1d7780
paca = 0xc000000001002400
pid = 2839, comm = readback
kernel BUG at /home/linux-2.6.31-rc4/arch/powerpc/include/asm/pgalloc.h:36! enter ? for help
[c000000038923880] c000000000048954 .hugetlb_free_pgd_range+0x248/0x38c [c000000038923970] c000000000165a48 .free_pgtables+0xa0/0x154 [c000000038923a30] c000000000167f78 .exit_mmap+0x13c/0x1cc [c000000038923ae0] c0000000000997ec .mmput+0x68/0x14c [c000000038923b70] c00000000009f1d4 .exit_mm+0x190/0x1b8 [c000000038923c20] c0000000000a16e8 .do_exit+0x214/0x784 [c000000038923d00] c0000000000a1d1c .do_group_exit+0xc4/0xf8 [c000000038923da0] c0000000000a1d7c .SyS_exit_group+0x2c/0x48 [c000000038923e30] c0000000000085b4 syscall_exit+0x0/0x40
--- Exception: c01 (System Call) at 000000000fe15038
SP (ffb8e030) is in userspace
0:mon> e
cpu 0x0: Vector: 700 (Program Check) at [c000000038923560]
pc: c0000000000486d4: .free_hugepte_range+0x68/0xa0
lr: c000000000048954: .hugetlb_free_pgd_range+0x248/0x38c
sp: c0000000389237e0
msr: 8000000000029032
current = 0xc00000003b1d7780
paca = 0xc000000001002400
pid = 2839, comm = readback
kernel BUG at /home/linux-2.6.31-rc4/arch/powerpc/include/asm/pgalloc.h:36! 0:mon> r
R00 = 0000000000000001 R16 = 0000000000000000 R01 = c0000000389237e0 R17 = 0000000000000001 R02 = c000000000f165a8 R18 = 000000003fffffff R03 = c0000000014504d0 R19 = 0000000000000000 R04 = c000000039390001 R20 = 0000000000000000 R05 = 0000000000000007 R21 = 0000010000000000 R06 = 0000000000000000 R22 = 0000000040000000 R07 = 0000000040000000 R23 = c0000000014504d0 R08 = c00000003d708188 R24 = 000000003fffffff R09 = c00000003eb40000 R25 = 0000000000000007 R10 = c00000003d708188 R26 = c00000003ebd41b8 R11 = 0000000000000018 R27 = c0000000014504d0 R12 = 0000000040000448 R28 = c00000003eb40018 R13 = c000000001002400 R29 = 0000000000000008 R14 = 00000000ffffffff R30 = 0000000040000000 R15 = 00000000ffffffff R31 = c0000000389237e0
pc = c0000000000486d4 .free_hugepte_range+0x68/0xa0 lr = c000000000048954 .hugetlb_free_pgd_range+0x248/0x38c
msr = 8000000000029032 cr = 20042444
ctr = 800000000000b6f4 xer = 0000000000000001 trap = 700
0:mon>
Line 36 of arch/powerpc/include/asm/pgalloc.h corresponds to
BUG_ON(cachenum > PGF_CACHENUM_MASK);
May be something to do with number of elements in huge_pgtable_cache_name ??
Thanks
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
Re: Next July 29 : Hugetlb test failure (OOPS free_hugepte_range)
Quoted 7 lines · Sachin Sant
Quoted 6 lines · Sachin Sant
next-20090728 worked fine. Last commit that changed
arch/powerpc/mm/hugetlbpage.cwascb7f3f2d92d1b26c13e30e639b6ee4a78e9a3afapowerpc: Add memory management headers for new 64-bit BookE
Quoted 8 lines
Quoted 1 line
I will try reverting that commit and check if that helps.
Hi Ben,
Reverting the above patch helped. The tests ran fine against the patched kernel. But ofcourse that's not the solution :-)
Here is some data from xmon that might help find the reason for the failure. This is with today's next.
Thanks. I'll have a look next week. I think when I changed the indices I may have forgotten to update something.
Cheers,
Ben.
Quoted 64 lines
: ------------[ cut here ]------------
cpu0x0: Vector: 700 (Program Check) at [c000000038923560]pc: c0000000000486d4: .free_hugepte_range+0x68/0xa0 lr: c000000000048954: .hugetlb_free_pgd_range+0x248/0x38c sp: c0000000389237e0msr: 8000000000029032
current =0xc00000003b1d7780
paca =0xc000000001002400
pid = 2839, comm = readback
kernel BUG at/home/linux-2.6.31-rc4/arch/powerpc/include/asm/pgalloc.h:36! enter ? for help
[c000000038923880]c000000000048954.hugetlb_free_pgd_range+0x248/0x38c [c000000038923970]c000000000165a48.free_pgtables+0xa0/0x154 [c000000038923a30]c000000000167f78.exit_mmap+0x13c/0x1cc [c000000038923ae0]c0000000000997ec.mmput+0x68/0x14c [c000000038923b70]c00000000009f1d4.exit_mm+0x190/0x1b8 [c000000038923c20]c0000000000a16e8.do_exit+0x214/0x784 [c000000038923d00]c0000000000a1d1c.do_group_exit+0xc4/0xf8 [c000000038923da0]c0000000000a1d7c.SyS_exit_group+0x2c/0x48 [c000000038923e30]c0000000000085b4syscall_exit+0x0/0x40
--- Exception: c01 (System Call) at000000000fe15038
SP (ffb8e030) is in userspace
0:mon> e
cpu0x0: Vector: 700 (Program Check) at [c000000038923560]pc: c0000000000486d4: .free_hugepte_range+0x68/0xa0 lr: c000000000048954: .hugetlb_free_pgd_range+0x248/0x38c sp: c0000000389237e0msr: 8000000000029032
current =0xc00000003b1d7780
paca =0xc000000001002400
pid = 2839, comm = readback
kernel BUG at/home/linux-2.6.31-rc4/arch/powerpc/include/asm/pgalloc.h:36! 0:mon> rR00 = 0000000000000001 R16 = 0000000000000000 R01 = c0000000389237e0 R17 = 0000000000000001 R02 = c000000000f165a8 R18 = 000000003fffffff R03 = c0000000014504d0 R19 = 0000000000000000 R04 = c000000039390001 R20 = 0000000000000000 R05 = 0000000000000007 R21 = 0000010000000000 R06 = 0000000000000000 R22 = 0000000040000000 R07 = 0000000040000000 R23 = c0000000014504d0 R08 = c00000003d708188 R24 = 000000003fffffff R09 = c00000003eb40000 R25 = 0000000000000007 R10 = c00000003d708188 R26 = c00000003ebd41b8 R11 = 0000000000000018 R27 = c0000000014504d0 R12 = 0000000040000448 R28 = c00000003eb40018 R13 = c000000001002400 R29 = 0000000000000008 R14 = 00000000ffffffff R30 = 0000000040000000 R15 = 00000000ffffffff R31 = c0000000389237e0pc =
c0000000000486d4.free_hugepte_range+0x68/0xa0 lr =c000000000048954.hugetlb_free_pgd_range+0x248/0x38c
msr = 8000000000029032 cr = 20042444
ctr =800000000000b6f4xer = 0000000000000001 trap = 700
0:mon>Line 36 of
arch/powerpc/include/asm/pgalloc.hcorresponds to
BUG_ON(cachenum > PGF_CACHENUM_MASK);May be something to do with number of elements in
huge_pgtable_cache_name??Thanks
-Sachin
Re: Next July 29 : Hugetlb test failure (OOPS free_hugepte_range)
Quoted 3 lines · Benjamin Herrenschmidt
Thanks. I'll have a look next week. I think when I changed the indices I may have forgotten to update something.
Ben,
I can recreate this issue with today's next. Let me know if i can help in any way to fix this issue.
Thanks
-Sachin
Quoted 63 lines
Quoted 63 lines
: ------------[ cut here ]------------
cpu0x0: Vector: 700 (Program Check) at [c000000038923560]pc: c0000000000486d4: .free_hugepte_range+0x68/0xa0 lr: c000000000048954: .hugetlb_free_pgd_range+0x248/0x38c sp: c0000000389237e0msr: 8000000000029032
current =0xc00000003b1d7780
paca =0xc000000001002400
pid = 2839, comm = readback
kernel BUG at/home/linux-2.6.31-rc4/arch/powerpc/include/asm/pgalloc.h:36! enter ? for help
[c000000038923880]c000000000048954.hugetlb_free_pgd_range+0x248/0x38c [c000000038923970]c000000000165a48.free_pgtables+0xa0/0x154 [c000000038923a30]c000000000167f78.exit_mmap+0x13c/0x1cc [c000000038923ae0]c0000000000997ec.mmput+0x68/0x14c [c000000038923b70]c00000000009f1d4.exit_mm+0x190/0x1b8 [c000000038923c20]c0000000000a16e8.do_exit+0x214/0x784 [c000000038923d00]c0000000000a1d1c.do_group_exit+0xc4/0xf8 [c000000038923da0]c0000000000a1d7c.SyS_exit_group+0x2c/0x48 [c000000038923e30]c0000000000085b4syscall_exit+0x0/0x40
--- Exception: c01 (System Call) at000000000fe15038
SP (ffb8e030) is in userspace
0:mon> e
cpu0x0: Vector: 700 (Program Check) at [c000000038923560]pc: c0000000000486d4: .free_hugepte_range+0x68/0xa0 lr: c000000000048954: .hugetlb_free_pgd_range+0x248/0x38c sp: c0000000389237e0msr: 8000000000029032
current =0xc00000003b1d7780
paca =0xc000000001002400
pid = 2839, comm = readback
kernel BUG at/home/linux-2.6.31-rc4/arch/powerpc/include/asm/pgalloc.h:36! 0:mon> rR00 = 0000000000000001 R16 = 0000000000000000 R01 = c0000000389237e0 R17 = 0000000000000001 R02 = c000000000f165a8 R18 = 000000003fffffff R03 = c0000000014504d0 R19 = 0000000000000000 R04 = c000000039390001 R20 = 0000000000000000 R05 = 0000000000000007 R21 = 0000010000000000 R06 = 0000000000000000 R22 = 0000000040000000 R07 = 0000000040000000 R23 = c0000000014504d0 R08 = c00000003d708188 R24 = 000000003fffffff R09 = c00000003eb40000 R25 = 0000000000000007 R10 = c00000003d708188 R26 = c00000003ebd41b8 R11 = 0000000000000018 R27 = c0000000014504d0 R12 = 0000000040000448 R28 = c00000003eb40018 R13 = c000000001002400 R29 = 0000000000000008 R14 = 00000000ffffffff R30 = 0000000040000000 R15 = 00000000ffffffff R31 = c0000000389237e0pc =
c0000000000486d4.free_hugepte_range+0x68/0xa0 lr =c000000000048954.hugetlb_free_pgd_range+0x248/0x38c
msr = 8000000000029032 cr = 20042444
ctr =800000000000b6f4xer = 0000000000000001 trap = 700
0:mon>Line 36 of
arch/powerpc/include/asm/pgalloc.hcorresponds to
BUG_ON(cachenum > PGF_CACHENUM_MASK);May be something to do with number of elements in
huge_pgtable_cache_name??Thanks
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
Re: Next July 29 : Hugetlb test failure (OOPS free_hugepte_range)
Quoted 8 lines · Sachin Sant
Quoted 3 lines · Benjamin Herrenschmidt
Thanks. I'll have a look next week. I think when I changed the indices I may have forgotten to update something.
Ben,
I can recreate this issue with today's next. Let me know if i can help in any way to fix this issue.
Does this patch fixes it ?
[PATCH] powerpc/mm: Fix encoding of page table cache numbers
The mask used to encode the page table cache number in the batch when freeing page tables was too small for the new possible values of MMU page sizes. This increases it along with a comment explaining the constraints.
--- arch/powerpc/include/asm/pgalloc.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
arch/powerpc/include/asm/pgalloc.h +6 -1
@@ -28,7 +28,12 @@ typedef struct pgtable_free {unsigned long val; } pgtable_free_t; -#define PGF_CACHENUM_MASK 0x7 +/* This needs to be big enough to allow for MMU_PAGE_COUNT + 2 to be stored +* and small enough to fit in the low bits of any naturally aligned page +* table cache entry. Arbitrarily set to 0x1f, that should give us some +* room to grow +*/ +#define PGF_CACHENUM_MASK 0x1fstatic inline pgtable_free_t pgtable_free_cache (void *p,int cachenum,unsigned long mask)
Signature · 1 line
1.6.0.4
Quoted 66 lines
Thanks
-SachinQuoted 63 lines
Quoted 63 lines
: ------------[ cut here ]------------
cpu0x0: Vector: 700 (Program Check) at [c000000038923560]pc: c0000000000486d4: .free_hugepte_range+0x68/0xa0 lr: c000000000048954: .hugetlb_free_pgd_range+0x248/0x38c sp: c0000000389237e0msr: 8000000000029032
current =0xc00000003b1d7780
paca =0xc000000001002400
pid = 2839, comm = readback
kernel BUG at/home/linux-2.6.31-rc4/arch/powerpc/include/asm/pgalloc.h:36! enter ? for help
[c000000038923880]c000000000048954.hugetlb_free_pgd_range+0x248/0x38c [c000000038923970]c000000000165a48.free_pgtables+0xa0/0x154 [c000000038923a30]c000000000167f78.exit_mmap+0x13c/0x1cc [c000000038923ae0]c0000000000997ec.mmput+0x68/0x14c [c000000038923b70]c00000000009f1d4.exit_mm+0x190/0x1b8 [c000000038923c20]c0000000000a16e8.do_exit+0x214/0x784 [c000000038923d00]c0000000000a1d1c.do_group_exit+0xc4/0xf8 [c000000038923da0]c0000000000a1d7c.SyS_exit_group+0x2c/0x48 [c000000038923e30]c0000000000085b4syscall_exit+0x0/0x40
--- Exception: c01 (System Call) at000000000fe15038
SP (ffb8e030) is in userspace
0:mon> e
cpu0x0: Vector: 700 (Program Check) at [c000000038923560]pc: c0000000000486d4: .free_hugepte_range+0x68/0xa0 lr: c000000000048954: .hugetlb_free_pgd_range+0x248/0x38c sp: c0000000389237e0msr: 8000000000029032
current =0xc00000003b1d7780
paca =0xc000000001002400
pid = 2839, comm = readback
kernel BUG at/home/linux-2.6.31-rc4/arch/powerpc/include/asm/pgalloc.h:36! 0:mon> rR00 = 0000000000000001 R16 = 0000000000000000 R01 = c0000000389237e0 R17 = 0000000000000001 R02 = c000000000f165a8 R18 = 000000003fffffff R03 = c0000000014504d0 R19 = 0000000000000000 R04 = c000000039390001 R20 = 0000000000000000 R05 = 0000000000000007 R21 = 0000010000000000 R06 = 0000000000000000 R22 = 0000000040000000 R07 = 0000000040000000 R23 = c0000000014504d0 R08 = c00000003d708188 R24 = 000000003fffffff R09 = c00000003eb40000 R25 = 0000000000000007 R10 = c00000003d708188 R26 = c00000003ebd41b8 R11 = 0000000000000018 R27 = c0000000014504d0 R12 = 0000000040000448 R28 = c00000003eb40018 R13 = c000000001002400 R29 = 0000000000000008 R14 = 00000000ffffffff R30 = 0000000040000000 R15 = 00000000ffffffff R31 = c0000000389237e0pc =
c0000000000486d4.free_hugepte_range+0x68/0xa0 lr =c000000000048954.hugetlb_free_pgd_range+0x248/0x38c
msr = 8000000000029032 cr = 20042444
ctr =800000000000b6f4xer = 0000000000000001 trap = 700
0:mon>Line 36 of
arch/powerpc/include/asm/pgalloc.hcorresponds to
BUG_ON(cachenum > PGF_CACHENUM_MASK);May be something to do with number of elements in
huge_pgtable_cache_name??Thanks
-Sachin
Sachin Sant
Tested-byRe: Next July 29 : Hugetlb test failure (OOPS free_hugepte_range)
Quoted 4 lines · Benjamin Herrenschmidt
Does this patch fixes it ?
[PATCH] powerpc/mm: Fix encoding of page table cache numbers
Quoted 8 lines
The mask used to encode the page table cache number in the batch when freeing page tables was too small for the new possible values of MMU page sizes. This increases it along with a comment explaining the constraints.
Signed-off-by Benjamin Herrenschmidt <[email protected]>---
Yes this patch fixed the issue for me. Thanks Ben.
Regards
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
Re: Next July 29 : Hugetlb test failure (OOPS free_hugepte_range)
In reply to Sachin SantQuoted 2 lines · Sachin Sant
While executing hugetlb tests against today's Next tree on a Power 6 box came across following OOPS.
out of interest what tests are you running for hugetlb?
- k
Re: Next July 29 : Hugetlb test failure (OOPS free_hugepte_range)
Quoted 7 lines · Kumar Gala
Quoted 2 lines · Sachin Sant
While executing hugetlb tests against today's Next tree on a Power 6 box came across following OOPS.
out of interest what tests are you running for hugetlb?
The one maintained at : http://libhugetlbfs.ozlabs.org/ which points to the sourceforge libhugetlbfs project.
Latest release can be downloaded from sourceforge using
http://sourceforge.net/projects/libhugetlbfs/files/
I am using version 2.5
Thanks
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
PATCH 1/1 next-20090730 lguest build breaks with pfn_pmd()
In reply to Stephen RothwellHi Rusty,
next-20090729 allmodconfig build breaks at
drivers/lguest/page_tables.c: In function 'setup_pagetables':drivers/lguest/page_tables.c:987: error: incompatible type for argument 2 of 'pfn_pmd' drivers/lguest/page_tables.c:994: error: expected ';' before ')' token drivers/lguest/page_tables.c:994: error: expected statement before ')' token make[2]: *** [drivers/lguest/page_tables.o] Error 1
build failure is introduced by commit e07dd6220a4bf81a2549e7e37523a2557547d9d7 I have tested the patch for the build failure only.
--
drivers/lguest/page_tables.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/lguest/page_tables.c +2 -2
@@ -984,14 +984,14 @@ static unsigned long setup_pagetables(struct lguest *lg,for (i = j =0 ; i < mapped_pages && j <PTRS_PER_PMD ; i +=PTRS_PER_PTE , j++) { pmd =pfn_pmd (((unsigned long )&linear[i] - mem_base)/PAGE_SIZE , - _PAGE_PRESENT | _PAGE_RW | _PAGE_USER); +__pgrot (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER));if (copy_to_user (&pmds[j], &pmd,sizeof (pmd)) !=0 )return -EFAULT ; }/* One PGD entry, pointing to that PMD page. */ - pgd = __pgd(((unsigned long)pmds - mem_base) | _PAGE_PRESENT)); + pgd =__pgd (((unsigned long )pmds - mem_base) | _PAGE_PRESENT);/* Copy it in as the first PGD entry (ie. addresses 0-1G). */ if (copy_to_user (&pgdir[0 ], &pgd,sizeof (pgd)) !=0 )return -EFAULT ;
Kamalesh
Rusty Russell
AppliedRe: [PATCH] next-20090730 lguest build breaks with pfn_pmd()
Quoted 10 lines · Kamalesh Babulal
Hi Rusty,
next-20090729 allmodconfig build breaks at
drivers/lguest/page_tables.c: In function 'setup_pagetables':drivers/lguest/page_tables.c:987: error: incompatible type for argument 2 of 'pfn_pmd'drivers/lguest/page_tables.c:994: error: expected ';' before ')' tokendrivers/lguest/page_tables.c:994: error: expected statement before ')' token make[2]: *** [drivers/lguest/page_tables.o] Error 1
Quoted 4 lines
build failure is introduced by commit
e07dd6220a4bf81a2549e7e37523a2557547d9d7I have tested the patch for the build failure only.Signed-off-by Kamalesh Babulal <[email protected]>
Thanks, applied!
Rusty.
Re: [PATCH] next-20090730 lguest build breaks with pfn_pmd()
In reply to Kamalesh BabulalQuoted 23 lines · On Thu, 30 Jul 2009 17:35:33 +0530 Kamalesh Babulal wrote:
Hi Rusty,
next-20090729 allmodconfig build breaks at
drivers/lguest/page_tables.c: In function 'setup_pagetables':drivers/lguest/page_tables.c:987: error: incompatible type for argument 2 of 'pfn_pmd'drivers/lguest/page_tables.c:994: error: expected ';' before ')' tokendrivers/lguest/page_tables.c:994: error: expected statement before ')' token make[2]: *** [drivers/lguest/page_tables.o] Error 1build failure is introduced by commit
e07dd6220a4bf81a2549e7e37523a2557547d9d7I have tested the patch for the build failure only.Signed-off-by Kamalesh Babulal <[email protected]>--
drivers/lguest/page_tables.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)drivers/lguest/page_tables.c +0
-0
drivers/lguest/page_tables.c static unsigned long setup_pagetables(struct lguest *lg, · line 987
Quoted 5 lines
drivers/lguest/page_tables.c +1
-1@@ -984,14 +984,14 @@ static unsigned long setup_pagetables(struct lguest *lg,for (i = j =0 ; i < mapped_pages && j <PTRS_PER_PMD ; i +=PTRS_PER_PTE , j++) { pmd =pfn_pmd (((unsigned long )&linear[i] - mem_base)/PAGE_SIZE , - _PAGE_PRESENT | _PAGE_RW | _PAGE_USER); +__pgrot (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER));
s/__pgrot/__pgprot/
drivers/lguest/page_tables.c static unsigned long setup_pagetables(struct lguest *lg, · line 997
Quoted 11 lines
drivers/lguest/page_tables.c +1
-1if (copy_to_user (&pmds[j], &pmd,sizeof (pmd)) !=0 )return -EFAULT ; }/* One PGD entry, pointing to that PMD page. */ - pgd = __pgd(((unsigned long)pmds - mem_base) | _PAGE_PRESENT)); + pgd =__pgd (((unsigned long )pmds - mem_base) | _PAGE_PRESENT);/* Copy it in as the first PGD entry (ie. addresses 0-1G). */ if (copy_to_user (&pgdir[0 ], &pgd,sizeof (pgd)) !=0 )return -EFAULT ;
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
[RESEND-PATCH] next-20090730 lguest build breaks with pfn_pmd()
Quoted 20 lines · Randy Dunlap
Quoted 18 lines · On Thu, 30 Jul 2009 17:35:33 +0530 Kamalesh Babulal wrote:
Hi Rusty,
next-20090729 allmodconfig build breaks at
drivers/lguest/page_tables.c: In function 'setup_pagetables':drivers/lguest/page_tables.c:987: error: incompatible type for argument 2 of 'pfn_pmd'drivers/lguest/page_tables.c:994: error: expected ';' before ')' tokendrivers/lguest/page_tables.c:994: error: expected statement before ')' token make[2]: *** [drivers/lguest/page_tables.o] Error 1build failure is introduced by commit
e07dd6220a4bf81a2549e7e37523a2557547d9d7I have tested the patch for the build failure only.Signed-off-by Kamalesh Babulal <[email protected]>--
drivers/lguest/page_tables.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Quoted 13 lines
drivers/lguest/page_tables.c static unsigned long setup_pagetables(struct lguest *lg, · line 987
Quoted 10 lines
drivers/lguest/page_tables.c +1
-1@@ -984,14 +984,14 @@ static unsigned long setup_pagetables(struct lguest *lg,for (i = j =0 ; i < mapped_pages && j <PTRS_PER_PMD ; i +=PTRS_PER_PTE , j++) { pmd =pfn_pmd (((unsigned long )&linear[i] - mem_base)/PAGE_SIZE , - _PAGE_PRESENT | _PAGE_RW | _PAGE_USER); +__pgrot (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER));s/__pgrot/__pgprot/
Thanks randy, resending the patch after correcting the typo
--
drivers/lguest/page_tables.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/lguest/page_tables.c +2 -2
@@ -984,14 +984,14 @@ static unsigned long setup_pagetables(struct lguest *lg,for (i = j =0 ; i < mapped_pages && j <PTRS_PER_PMD ; i +=PTRS_PER_PTE , j++) { pmd =pfn_pmd (((unsigned long )&linear[i] - mem_base)/PAGE_SIZE , - _PAGE_PRESENT | _PAGE_RW | _PAGE_USER); +__pgprot (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER));if (copy_to_user (&pmds[j], &pmd,sizeof (pmd)) !=0 )return -EFAULT ; }/* One PGD entry, pointing to that PMD page. */ - pgd = __pgd(((unsigned long)pmds - mem_base) | _PAGE_PRESENT)); + pgd =__pgd (((unsigned long )pmds - mem_base) | _PAGE_PRESENT);/* Copy it in as the first PGD entry (ie. addresses 0-1G). */ if (copy_to_user (&pgdir[0 ], &pgd,sizeof (pgd)) !=0 )return -EFAULT ;
Kamalesh
Re: [PATCH] next-20090730 lguest build breaks with pfn_pmd()
In reply to Randy DunlapQuoted 9 lines · Randy Dunlap
drivers/lguest/page_tables.c static unsigned long setup_pagetables(struct lguest *lg, · line 987
Quoted 6 lines · On Thu, 30 Jul 2009 17:35:33 +0530 Kamalesh Babulal wrote:
drivers/lguest/page_tables.c +1
-1@@ -984,14 +984,14 @@ static unsigned long setup_pagetables(struct lguest *lg,for (i = j =0 ; i < mapped_pages && j <PTRS_PER_PMD ; i +=PTRS_PER_PTE , j++) { pmd =pfn_pmd (((unsigned long )&linear[i] - mem_base)/PAGE_SIZE , - _PAGE_PRESENT | _PAGE_RW | _PAGE_USER); +__pgrot (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER));s/__pgrot/__pgprot/
Damn, sorry. I threw this patch in linux-next and went skiing.
Kamalesh said:
"I have tested the patch for the build failure only."
This was clearly untrue. Don't do that again, or I'll just ignore your emails.
Rusty.