1. 27 Sep, 2013 10 commits
  2. 26 Sep, 2013 9 commits
  3. 25 Sep, 2013 21 commits
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 4b972806
      Linus Torvalds authored
      Pull Xen fixes from Konrad Rzeszutek Wilk:
       "Bug-fixes and one update to the kernel-paramters.txt documentation.
      
         - Fix PV spinlocks triggering jump_label code bug
         - Remove extraneous code in the tpm front driver
         - Fix ballooning out of pages when non-preemptible
         - Fix deadlock when using a 32-bit initial domain with large amount
           of memory
         - Add xen_nopvpsin parameter to the documentation"
      
      * tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/spinlock: Document the xen_nopvspin parameter.
        xen/p2m: check MFN is in range before using the m2p table
        xen/balloon: don't alloc page while non-preemptible
        xen: Do not enable spinlocks before jump_label_init() has executed
        tpm: xen-tpmfront: Remove the locality sysfs attribute
        tpm: xen-tpmfront: Fix default durations
      4b972806
    • Linus Torvalds's avatar
      Merge tag 'dm-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · e93dd910
      Linus Torvalds authored
      Pull device-mapper fixes from Mike Snitzer:
       "A few fixes for dm-snapshot, a 32 bit fix for dm-stats, a couple error
        handling fixes for dm-multipath.  A fix for the thin provisioning
        target to not expose non-zero discard limits if discards are disabled.
      
        Lastly, add two DM module parameters which allow users to tune the
        emergency memory reserves that DM mainatins per device -- this helps
        fix a long-standing issue for dm-multipath.  The conservative default
        reserve for request-based dm-multipath devices (256) has proven
        problematic for users with many multipathed SCSI devices but
        relatively little memory.  To responsibly select a smaller value users
        should use the new nr_bios tracepoint info (via commit 75afb352
        "block: Add nr_bios to block_rq_remap tracepoint") to determine the
        peak number of bios their workloads create"
      
      * tag 'dm-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm: add reserved_bio_based_ios module parameter
        dm: add reserved_rq_based_ios module parameter
        dm: lower bio-based mempool reservation
        dm thin: do not expose non-zero discard limits if discards disabled
        dm mpath: disable WRITE SAME if it fails
        dm-snapshot: fix performance degradation due to small hash size
        dm snapshot: workaround for a false positive lockdep warning
        dm stats: fix possible counter corruption on 32-bit systems
        dm mpath: do not fail path on -ENOSPC
      e93dd910
    • Linus Torvalds's avatar
      Merge git://git.linux-mips.org/pub/scm/ralf/upstream-linus · b4820416
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
      
       - Fix a comment
      
       - A small cleanup the main purpose of which is to work around an
         internal compiler error bug in certain Codesource toolchains.
      
      * git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: mm: Move some checks out of 'for' loop in DMA operations
        MIPS: cpu-features.h: s/MIPS53/MIPS64/
      b4820416
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 06367d58
      Linus Torvalds authored
      Pull powerpc fixes from Ben Herrenschmidt:
       "Here are a few things for -rc2, this time it's all written by me so it
        can only be perfect .... right ? :)
      
        So we have the fix to call irq_enter/exit on the irq stack we've been
        discussing, plus a cleanup on top to remove an unused (and broken)
        stack limit tracking feature (well, make it 32-bit only in fact where
        it is used and works properly).
      
        Then we have two things that I wrote over the last couple of days and
        made the executive decision to include just because I can (and I'm
        sure you won't object .... right ?).
      
        They fix a couple of annoying and long standing "issues":
      
         - We had separate zImages for when booting via Open Firmware vs.
           booting via a flat device-tree, while it's trivial to make one that
           deals with both
      
         - We wasted a ton of cycles spinning secondary CPUs uselessly at boot
           instead of starting them when needed on pseries, thus contributing
           significantly to global warming"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/pseries: Do not start secondaries in Open Firmware
        powerpc/zImage: make the "OF" wrapper support ePAPR boot
        powerpc: Remove ksp_limit on ppc64
        powerpc/irq: Run softirqs off the top of the irq stack
      06367d58
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 654fdd04
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "An EFI fix and two reboot-quirk fixes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
        x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically
        x86, efi: Don't map Boot Services on i386
      654fdd04
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 82dfaa58
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Three small fixes"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/balancing: Fix cfs_rq->task_h_load calculation
        sched/balancing: Fix 'local->avg_load > busiest->avg_load' case in fix_small_imbalance()
        sched/balancing: Fix 'local->avg_load > sds->avg_load' case in calculate_imbalance()
      82dfaa58
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bdc5663f
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Assorted standalone fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/intel: Add model number for Avoton Silvermont
        perf: Fix capabilities bitfield compatibility in 'struct perf_event_mmap_page'
        perf/x86/intel/uncore: Don't use smp_processor_id() in validate_group()
        perf: Update ABI comment
        tools lib lk: Uninclude linux/magic.h in debugfs.c
        perf tools: Fix old GCC build error in trace-event-parse.c:parse_proc_kallsyms()
        perf probe: Fix finder to find lines of given function
        perf session: Check for SIGINT in more loops
        perf tools: Fix compile with libelf without get_phdrnum
        perf tools: Fix buildid cache handling of kallsyms with kcore
        perf annotate: Fix objdump line parsing offset validation
        perf tools: Fill in new definitions for madvise()/mmap() flags
        perf tools: Sharpen the libaudit dependencies test
      bdc5663f
    • Mikael Pettersson's avatar
      update contact information for Mikael Pettersson · 743a7ecb
      Mikael Pettersson authored
      My old @it.uu.se email address is going away, so update relevant
      files to point to my @gmail.com address instead.  In sata_promise.c
      just delete the address, people can get it from MAINTAINERS.
      Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      743a7ecb
    • Jayachandran C's avatar
      MIPS: mm: Move some checks out of 'for' loop in DMA operations · 55c25c2f
      Jayachandran C authored
      The check cpu_needs_post_dma_flush() in mips_dma_sync_sg_for_cpu() and
      the check !plat_device_is_coherent() in mips_dma_sync_sg_for_device()
      can be moved outside the for loop.
      
      As a side effect, this also avoids a GCC bug that caused kernel compile
      to fail with the error:
      
      arch/mips/mm/dma-default.c: In function 'mips_dma_sync_sg_for_cpu':
      arch/mips/mm/dma-default.c:316:1: internal compiler error: in add_insn_before, at emit-rtl.c:3852
      
      This gcc failure is seen in Code Sourcery toolchains [e.g. gcc version
      4.7.2 (Sourcery CodeBench Lite 2012.09-99)] after commit "MIPS: Optimize
      current_cpu_type() for better code."
      Signed-off-by: default avatarJayachandran C <jchandra@broadcom.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5907/Reviewed-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Tested-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      55c25c2f
    • Konrad Rzeszutek Wilk's avatar
      xen/spinlock: Document the xen_nopvspin parameter. · 15a3eac0
      Konrad Rzeszutek Wilk authored
      Which disables in the ticketlock slowpath the Xen PV optimization's.
      Useful for diagnosing issues and comparing benchmarks in
      over-commit CPU scenarios.
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      15a3eac0
    • David Vrabel's avatar
      xen/p2m: check MFN is in range before using the m2p table · 0160676b
      David Vrabel authored
      On hosts with more than 168 GB of memory, a 32-bit guest may attempt
      to grant map an MFN that is error cannot lookup in its mapping of the
      m2p table.  There is an m2p lookup as part of m2p_add_override() and
      m2p_remove_override().  The lookup falls off the end of the mapped
      portion of the m2p and (because the mapping is at the highest virtual
      address) wraps around and the lookup causes a fault on what appears to
      be a user space address.
      
      do_page_fault() (thinking it's a fault to a userspace address), tries
      to lock mm->mmap_sem.  If the gntdev device is used for the grant map,
      m2p_add_override() is called from from gnttab_mmap() with mm->mmap_sem
      already locked.  do_page_fault() then deadlocks.
      
      The deadlock would most commonly occur when a 64-bit guest is started
      and xenconsoled attempts to grant map its console ring.
      
      Introduce mfn_to_pfn_no_overrides() which checks the MFN is within the
      mapped portion of the m2p table before accessing the table and use
      this in m2p_add_override(), m2p_remove_override(), and mfn_to_pfn()
      (which already had the correct range check).
      
      All faults caused by accessing the non-existant parts of the m2p are
      thus within the kernel address space and exception_fixup() is called
      without trying to lock mm->mmap_sem.
      
      This means that for MFNs that are outside the mapped range of the m2p
      then mfn_to_pfn() will always look in the m2p overrides.  This is
      correct because it must be a foreign MFN (and the PFN in the m2p in
      this case is only relevant for the other domain).
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Cc: Stefano Stabellini <stefano.stabellini@citrix.com>
      Cc: Jan Beulich <JBeulich@suse.com>
      --
      v3: check for auto_translated_physmap in mfn_to_pfn_no_overrides()
      v2: in mfn_to_pfn() look in m2p_overrides if the MFN is out of
          range as it's probably foreign.
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
      0160676b
    • Dave Jones's avatar
      x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround · 7a20c2fa
      Dave Jones authored
      This seems to have been copied from the Optiplex 990 entry
      above, but somoene forgot to change the ident text.
      Signed-off-by: default avatarDave Jones <davej@fedoraproject.org>
      Link: http://lkml.kernel.org/r/20130925001344.GA13554@redhat.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      7a20c2fa
    • Benjamin Herrenschmidt's avatar
      powerpc/pseries: Do not start secondaries in Open Firmware · dbe78b40
      Benjamin Herrenschmidt authored
      Starting secondary CPUs early on from Open Firmware and placing them
      in a holding spin loop slows down the boot process significantly under
      some hypervisors such as KVM.
      
      This is also unnecessary when RTAS supports querying the CPU state
      
      So let's not do it.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      dbe78b40
    • Benjamin Herrenschmidt's avatar
      powerpc/zImage: make the "OF" wrapper support ePAPR boot · 0c9fa291
      Benjamin Herrenschmidt authored
      This makes the "OF" zImage wrapper (zImage.pseries, zImage.pmac,
      zImage.maple) work if booted via a flat device-tree (ePAPR boot
      mode), and thus potentially usable with kexec.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      0c9fa291
    • Benjamin Herrenschmidt's avatar
      powerpc: Remove ksp_limit on ppc64 · cbc9565e
      Benjamin Herrenschmidt authored
      We've been keeping that field in thread_struct for a while, it contains
      the "limit" of the current stack pointer and is meant to be used for
      detecting stack overflows.
      
      It has a few problems however:
      
       - First, it was never actually *used* on 64-bit. Set and updated but
      not actually exploited
      
       - When switching stack to/from irq and softirq stacks, it's update
      is racy unless we hard disable interrupts, which is costly. This
      is fine on 32-bit as we don't soft-disable there but not on 64-bit.
      
      Thus rather than fixing 2 in order to implement 1 in some hypothetical
      future, let's remove the code completely from 64-bit. In order to avoid
      a clutter of ifdef's, we remove the updates from C code completely
      during interrupt stack switching, and instead maintain it from the
      asm helper that is used to do the stack switching in the first place.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      cbc9565e
    • Benjamin Herrenschmidt's avatar
      powerpc/irq: Run softirqs off the top of the irq stack · 0366a1c7
      Benjamin Herrenschmidt authored
      Nowadays, irq_exit() calls __do_softirq() pretty much directly
      instead of calling do_softirq() which switches to the decicated
      softirq stack.
      
      This has lead to observed stack overflows on powerpc since we call
      irq_enter() and irq_exit() outside of the scope that switches to
      the irq stack.
      
      This fixes it by moving the stack switching up a level, making
      irq_enter() and irq_exit() run off the irq stack.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      0366a1c7
    • Paul E. McKenney's avatar
      mm: Place preemption point in do_mlockall() loop · 22356f44
      Paul E. McKenney authored
      There is a loop in do_mlockall() that lacks a preemption point, which
      means that the following can happen on non-preemptible builds of the
      kernel. Dave Jones reports:
      
       "My fuzz tester keeps hitting this.  Every instance shows the non-irq
        stack came in from mlockall.  I'm only seeing this on one box, but
        that has more ram (8gb) than my other machines, which might explain
        it.
      
          INFO: rcu_preempt self-detected stall on CPU { 3}  (t=6500 jiffies g=470344 c=470343 q=0)
          sending NMI to all CPUs:
          NMI backtrace for cpu 3
          CPU: 3 PID: 29664 Comm: trinity-child2 Not tainted 3.11.0-rc1+ #32
          Call Trace:
            lru_add_drain_all+0x15/0x20
            SyS_mlockall+0xa5/0x1a0
            tracesys+0xdd/0xe2"
      
      This commit addresses this problem by inserting the required preemption
      point.
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Cc: KOSAKI Motohiro <kosaki.motohiro@gmail.com>
      Cc: Michel Lespinasse <walken@google.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      22356f44
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew Morton) · a153e67b
      Linus Torvalds authored
      Merge fixes from Andrew Morton:
       "Bunch of fixes.
      
        And a reversion of mhocko's "Soft limit rework" patch series.  This is
        actually your fault for opening the merge window when I was off racing ;)
      
        I didn't read the email thread before sending everything off.
        Johannes Weiner raised significant issues:
      
          http://www.spinics.net/lists/cgroups/msg08813.html
      
        and we agreed to back it all out"
      
      I clearly need to be more aware of Andrew's racing schedule.
      
      * akpm:
        MAINTAINERS: update mach-bcm related email address
        checkpatch: make extern in .h prototypes quieter
        cciss: fix info leak in cciss_ioctl32_passthru()
        cpqarray: fix info leak in ida_locked_ioctl()
        kernel/reboot.c: re-enable the function of variable reboot_default
        audit: fix endless wait in audit_log_start()
        revert "memcg, vmscan: integrate soft reclaim tighter with zone shrinking code"
        revert "memcg: get rid of soft-limit tree infrastructure"
        revert "vmscan, memcg: do softlimit reclaim also for targeted reclaim"
        revert "memcg: enhance memcg iterator to support predicates"
        revert "memcg: track children in soft limit excess to improve soft limit"
        revert "memcg, vmscan: do not attempt soft limit reclaim if it would not scan anything"
        revert "memcg: track all children over limit in the root"
        revert "memcg, vmscan: do not fall into reclaim-all pass too quickly"
        fs/ocfs2/super.c: use a bigger nodestr in ocfs2_dismount_volume
        watchdog: update watchdog_thresh properly
        watchdog: update watchdog attributes atomically
      a153e67b
    • Christian Daudt's avatar
      MAINTAINERS: update mach-bcm related email address · 497a045d
      Christian Daudt authored
      Update email address on mach-bcm + drivers for Broadcom mobile SoCs.
      Signed-off-by: default avatarChristian Daudt <csd@broadcom.com>
      Cc: Olof Johansson <olof@lixom.net>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      497a045d
    • Joe Perches's avatar
      checkpatch: make extern in .h prototypes quieter · d1d85780
      Joe Perches authored
      The use of extern in .h files is a bit contentious.
      
      Make the warning be emitted only when --strict is used on the command
      line.
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Cc: David Howells <dhowells@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d1d85780
    • Dan Carpenter's avatar
      cciss: fix info leak in cciss_ioctl32_passthru() · 58f09e00
      Dan Carpenter authored
      The arg64 struct has a hole after ->buf_size which isn't cleared.  Or if
      any of the calls to copy_from_user() fail then that would cause an
      information leak as well.
      
      This was assigned CVE-2013-2147.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: default avatarMike Miller <mike.miller@hp.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      58f09e00