13 Apr, 2010

40 commits

  • Conflicts:
    lib/Kconfig.debug

    David S. Miller
     
  • Found by kmemleak.

    If request_resource() fails, we leak the struct resource we
    allocated to represent the IOMMU mapping area.

    This actually happens on sun4v machines because the IOMEM area is only
    reported sans the IOMMU region, unlike all previous systems. I'll
    need to fix that at some point, but for now fix the leak.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • The only reference we store to this memory is in the form of a
    physical address, so kmemleak can't see it.

    Add a kmemleak_not_leak() annotation.

    It's probably useful to be able to look at a dump of these things
    either via debugfs or similar, and thus we could at some point store
    them in some kind of table and therefore get rid of this annotation.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Only missing thing was an _sdata marker in vmlinux.lds.S

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Signed-off-by: David S. Miller

    David S. Miller
     
  • It's the only way we'll be able to implement the function
    graph tracer properly.

    A positive is that we no longer have to worry about the
    linker over-optimizing the tail call, since we don't
    use a tail call any more.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • This keeps us from having to use kstat_irqs_cpu() from the NMI handler,
    the former of which is a profiled function.

    Instead we use a currently empty slot in the cpu_data

    Signed-off-by: David S. Miller

    David S. Miller
     
  • These include the timer implementation, perf events support, and the
    performance counter register (pcr) programming layer.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Signed-off-by: David S. Miller

    David S. Miller
     
  • The generic stack tracer does this job just as well.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Check function_trace_stop at ftrace_caller

    Toss mcount_call and dummy call of ftrace_stub, unnecessary.

    Document problems we'll have if the final kernel image link
    ever turns on relaxation.

    Properly size 'ftrace_call' so it looks right when inspecting
    instructions under gdb et al.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • If we are in an NMI then doing a plain raw_local_irq_disable() will
    write PIL_NORMAL_MAX into %pil, which is lower than PIL_NMI, and thus
    we'll re-enable NMIs and recurse.

    Doing a simple:

    %pil = %pil | PIL_NORMAL_MAX

    does what we want, if we're already at PIL_NMI (15) we leave it at
    that setting, else we set it to PIL_NORMAL_MAX (14).

    This should get the function tracer working on sparc64.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • This gets rid of a local function (is_kernel_stack()) which tries to
    do the same thing, yet poorly in that it doesn't handle IRQ stacks
    properly.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Linus Torvalds
     
  • * anonvma:
    anonvma: when setting up page->mapping, we need to pick the _oldest_ anonvma
    anon_vma: clone the anon_vma chain in the right order
    vma_adjust: fix the copying of anon_vma chains
    Simplify and comment on anon_vma re-use for anon_vma_prepare()

    Linus Torvalds
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm: (21 commits)
    ARM: Fix ioremap_cached()/ioremap_wc() for SMP platforms
    ARM: 6043/1: AT91 slow-clock resume: Don't wait for a disabled PLL to lock
    ARM: 6031/1: fix Thumb-2 decompressor
    ARM: 6029/1: ep93xx: gpio.c: local functions should be static
    ARM: 6028/1: ARM: add MAINTAINERS for U300
    ARM: 6024/1: bcmring: fix missing down on semaphore in dma.c
    MXC: mach_armadillo5x0: Add USB Host support.
    ARM mach-mx3: duplicated include
    ARM mach-mx3: duplicated include
    imx31: add watchdog device on litekit board.
    imx3: Add watchdog platform device support
    MXC: mach-mx31_3ds: add support for freescale mc13783 power management device.
    MXC: mach-mx31_3ds: Add SPI1 device support.
    MXC: mach-mx31_3ds: Add support for on board NAND Flash.
    MXC: mach-mx31_3ds: Update variable names over recent mach name modification.
    imx31: fix parent clock for rtc
    i.MX51: remove NFC AXI static mapping
    i.MX51: determine silicon revision dynamically
    i.MX51: map TZIC dynamically
    i.MX51: Use correct clock for gpt
    ...

    Linus Torvalds
     
  • * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
    Btrfs: make sure the chunk allocator doesn't create zero length chunks
    Btrfs: fix data enospc check overflow

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
    quota: Fix possible dq_flags corruption
    quota: Hide warnings about writes to the filesystem before quota was turned on
    ext3: symlink must be handled via filesystem specific operation
    ext2: symlink must be handled via filesystem specific operation

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
    udf: add speciffic ->setattr callback
    udf: potential integer overflow

    Linus Torvalds
     
  • * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (36 commits)
    MIPS: Calculate proper ebase value for 64-bit kernels
    MIPS: Alchemy: DB1200: Remove custom wait implementation
    MIPS: Big Sur: Make defconfig more useful.
    MIPS: Fix __vmalloc() etc. on MIPS for non-GPL modules
    MIPS: Sibyte: Fix M3 TLB exception handler workaround.
    MIPS: BCM63xx: Fix build failure in board_bcm963xx.c
    MIPS: uasm: Add OR instruction.
    MIPS: Sibyte: Apply M3 workaround only on affected chip types and versions.
    MIPS: BCM63xx: Initialize gpio_out_low & out_high to current value at boot.
    MIPS: BCM63xx: Register SSB SPROM fallback in board's first stage callback
    MIPS: BCM63xx: Fix typo in cpu-feature-overrides file.
    MIPS: BCM63xx: Add support for second uart.
    MIPS: BCM63xx: Fix double gpio registration.
    MIPS: BCM63xx: Add DWVS0 board
    MIPS: BCM63xx: Add the RTA1025W-16 BCM6348-based board to suppported boards.
    MIPS: BCM63xx: Fix BCM6338 and BCM6345 gpio count
    MIPS: libgcc.h: Checkpatch cleanup
    MIPS: Loongson-2F: Flush the branch target history in BTB and RAS
    MIPS: Move signal trampolines off of the stack.
    MIPS: Preliminary VDSO
    ...

    Linus Torvalds
     
  • * 'for-2.6.34' of git://linux-nfs.org/~bfields/linux:
    svcrdma: RDMA support not yet compatible with RPC6

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
    nilfs2: fix typo "numer" -> "number" in alloc.c
    nilfs2: Remove an uninitialization warning in nilfs_btree_propagate_v()
    nilfs2: fix a wrong type conversion in nilfs_ioctl()

    Linus Torvalds
     
  • Otherwise we might be mapping in a page in a new mapping, but that page
    (through the swapcache) would later be mapped into an old mapping too.
    The page->mapping must be the case that works for everybody, not just
    the mapping that happened to page it in first.

    Here's the scenario:

    - page gets allocated/mapped by process A. Let's call the anon_vma we
    associate the page with 'A' to keep it easy to track.

    - Process A forks, creating process B. The anon_vma in B is 'B', and has
    a chain that looks like 'B' -> 'A'. Everything is fine.

    - Swapping happens. The page (with mapping pointing to 'A') gets swapped
    out (perhaps not to disk - it's enough to assume that it's just not
    mapped any more, and lives entirely in the swap-cache)

    - Process B pages it in, which goes like this:

    do_swap_page ->
    page = lookup_swap_cache(entry);
    ...
    set_pte_at(mm, address, page_table, pte);
    page_add_anon_rmap(page, vma, address);

    And think about what happens here!

    In particular, what happens is that this will now be the "first"
    mapping of that page, so page_add_anon_rmap() used to do

    if (first)
    __page_set_anon_rmap(page, vma, address);

    and notice what anon_vma it will use? It will use the anon_vma for
    process B!

    What happens then? Trivial: process 'A' also pages it in (nothing
    happens, it's not the first mapping), and then process 'B' execve's
    or exits or unmaps, making anon_vma B go away.

    End result: process A has a page that points to anon_vma B, but
    anon_vma B does not exist any more. This can go on forever. Forget
    about RCU grace periods, forget about locking, forget anything like
    that. The bug is simply that page->mapping points to an anon_vma
    that was correct at one point, but was _not_ the one that was shared
    by all users of that possible mapping.

    Changing it to always use the deepest anon_vma in the anonvma chain gets
    us to the safest model.

    This can be improved in certain cases: if we know the page is private to
    just this particular mapping (for example, it's a new page, or it is the
    only swapcache entry), we could pick the top (most specific) anon_vma.

    But that's a future optimization. Make it _work_ reliably first.

    Reviewed-by: Rik van Riel
    Acked-by: Johannes Weiner
    Tested-by: Borislav Petkov [ "What do you know, I think you fixed it!" ]
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • We want to walk the chain in reverse order when cloning it, so that the
    order of the result chain will be the same as the order in the source
    chain. When we add entries to the chain, they go at the head of the
    chain, so we want to add the source head last.

    Reviewed-by: Rik van Riel
    Acked-by: Johannes Weiner
    Tested-by: Borislav Petkov [ "No, it still oopses" ]
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • When we move the boundaries between two vma's due to things like
    mprotect, we need to make sure that the anon_vma of the pages that got
    moved from one vma to another gets properly copied around. And that was
    not always the case, in this rather hard-to-follow code sequence.

    Clarify the code, and fix it so that it copies the anon_vma from the
    right source.

    Reviewed-by: Rik van Riel
    Acked-by: Johannes Weiner
    Tested-by: Borislav Petkov [ "Yeah, not so much this one either" ]
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • This changes the anon_vma reuse case to require that we only reuse
    simple anon_vma's - ie the case when the vma only has a single anon_vma
    associated with it.

    This means that a reuse of an anon_vma from an adjacent vma will always
    guarantee that both vma's are associated not only with the same
    anon_vma, they will also have the same anon_vma chain (of just a single
    entry in this case).

    And since anon_vma re-use was the only case where the same anon_vma
    might be associated with different chains of anon_vma's, we now have the
    case that every vma that shares the same anon_vma will always also have
    the same chain. That makes it much easier to think about merging vma's
    that share the same anon_vma's: you can always just drop the other
    anon_vma chain in anon_vma_merge() since you know that they are always
    identical.

    This also splits up the function to validate the anon_vma re-use, and
    adds a lot of commentary about the possible races.

    Reviewed-by: Rik van Riel
    Acked-by: Johannes Weiner
    Tested-by: Borislav Petkov [ "That didn't fix it" ]
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • dq_flags are modified non-atomically in do_set_dqblk via __set_bit calls and
    atomically for example in mark_dquot_dirty or clear_dquot_dirty. Hence a
    change done by an atomic operation can be overwritten by a change done by a
    non-atomic one. Fix the problem by using atomic bitops even in do_set_dqblk.

    Signed-off-by: Andrew Perepechko
    Signed-off-by: Jan Kara

    Andrew Perepechko
     
  • For a root filesystem write to the filesystem before quota is turned on happens
    regularly and there's no way around it because of writes to syslog, /etc/mtab,
    and similar. So the warning is rather pointless for ordinary users. It's
    still useful during development so we just hide the warning behind
    __DQUOT_PARANOIA config option.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • generic setattr implementation is no longer responsible for
    quota transfer so synlinks must be handled via ext3_setattr.

    Signed-off-by: Dmitry Monakhov
    Signed-off-by: Jan Kara

    Dmitry Monakhov
     
  • generic setattr implementation is no longer responsible for
    quota transfer so synlinks must be handled via ext2_setattr.

    Signed-off-by: Dmitry Monakhov
    Signed-off-by: Jan Kara

    Dmitry Monakhov
     
  • The ebase is relative to CKSEG0 not CAC_BASE. On a 32-bit kernel they
    are the same thing, for a 64-bit kernel they are not.

    It happens to kind of work on a 64-bit kernel as they both reference
    the same physical memory. However since the CPU uses the CKSEG0 base,
    determining if a J instruction will reach always gives the wrong result
    unless we use the same number the CPU uses.

    Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/1093/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • While playing with the out-of-tree MAE driver module, the system would
    panic after a while in the db1200 custom wait code after wakeup due to
    a clobbered k0 register being used as target address of a store op.

    Remove the custom wait implementation and revert back to the Alchemy-
    recommended implementation already set as default.

    Signed-off-by: Manuel Lauss
    To: Linux-MIPS
    Patchwork: http://patchwork.linux-mips.org/patch/1092/
    Signed-off-by: Ralf Baechle

    Manuel Lauss
     
  • Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Commit b3594a089f1c17ff919f8f78505c3f20e1f6f8ce (lmo) rsp.
    351336929ccf222ae38ff0cb7a8dd5fd5c6236a0 (kernel.org) break non-GPL modules
    that use __vmalloc() or any of the vmap(), vm_map_ram(), etc functions on
    MIPS.

    All those functions are EXPORT_SYMBOL() so are meant to be allowed to be
    used by non-GPL kernel modules. These calls all take page protection as
    an argument which is normally a constant like PAGE_KERNEL.

    This commit causes all protection constants like PAGE_KERNEL to not be
    constants and instead to contain the GPL-only symbol _page_cachable_default.

    This means that all calls to __vmalloc(), vmap(), etc, cause non-GPL
    modules to fail to link with the complaint that they are trying to use the
    GPL-only symbol _page_cachable_default...

    Change EXPORT_SYMBOL_GPL(_page_cachable_default) to EXPORT_SYMBOL() for
    non-GPL modules that call __vmalloc(), vmap(), vm_map_ram() etc.

    Signed-off-by: Anton Altaparmakov
    Cc: Chris Dearman
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: http://patchwork.linux-mips.org/patch/1084/
    Signed-off-by: Ralf Baechle

    Anton Altaparmakov
     
  • The M3 workaround needs to cmpare the region and VPN2 fields only.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Since 2083e8327aeeaf818b0e4522a9d2539835c60423, the SPROM is now registered
    in the board_prom_init callback, but it references variables and functions
    which are declared below. Move the variables and functions above
    board_prom_init.

    Signed-off-by: Florian Fainelli
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/1077/
    Signed-off-by: Ralf Baechle

    Florian Fainelli
     
  • This is needed for the fix of the M3 workaround.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Previously it was unconditionally used on all Sibyte family SOCs. The
    M3 bug has to be handled in the TLB exception handler which is extremly
    performance sensitive, so this modification is expected to deliver around
    2-3% performance improvment. This is important as required changes to the
    M3 workaround will make it more costly.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • To avoid a glitch during GPIO initialisation read GPIO output register
    values left by the firmware.

    Signed-off-by: Maxime Bizon
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/903/
    Signed-off-by: Ralf Baechle

    Maxime Bizon
     
  • Signed-off-by: Florian Fainelli
    To: Maxime Bizon
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/1017/
    Signed-off-by: Ralf Baechle

    Florian Fainelli