Skip to content
  1. Dec 21, 2013
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · a81ce79b
      Linus Torvalds authored
      Pull arm64 ptrace fix from Catalin Marinas.
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: ptrace: avoid using HW_BREAKPOINT_EMPTY for disabled events
      a81ce79b
    • Tony Luck's avatar
      pstore: Don't allow high traffic options on fragile devices · df36ac1b
      Tony Luck authored
      
      
      Some pstore backing devices use on board flash as persistent
      storage. These have limited numbers of write cycles so it
      is a poor idea to use them from high frequency operations.
      
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      df36ac1b
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-fixes-3.13-rc4' of... · eaadcfeb
      Linus Torvalds authored
      Merge tag 'dmaengine-fixes-3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine
      
      Pull dmaengine fixes from Dan Williams:
      
       - deprecation of net_dma to be removed in 3.14
      
       - crash regression fix in pl330 from the dmaengine_unmap rework
      
       - crash regression fix for any channel running raid ops without
         CONFIG_ASYNC_TX_DMA from dmaengine_unmap
      
       - memory leak regression in mv_xor from dmaengine_unmap
      
       - build warning regressions in mv_xor, fsldma, ppc4xx, txx9, and
         at_hdmac from dmaengine_unmap
      
       - sleep in atomic regression in dma_async_memcpy_pg_to_pg
      
       - new fix in mv_xor for handling channel initialization failures
      
      * tag 'dmaengine-fixes-3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
        net_dma: mark broken
        dma: pl330: ensure DMA descriptors are zero-initialised
        dmaengine: fix sleep in atomic
        dmaengine: mv_xor: fix oops when channels fail to initialise
        dma: mv_xor: Use dmaengine_unmap_data for the self-tests
        dmaengine: fix enable for high order unmap pools
        dma: fix build warnings in txx9
        dmatest: fix build warning on mips
        dma: fix fsldma build warnings
        dma: fix build warnings in ppc4xx
        dmaengine: at_hdmac: remove unused function
        dma: mv_xor: remove mv_desc_get_dest_addr()
      eaadcfeb
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 46dd0835
      Linus Torvalds authored
      Pull KVM fixes from Paolo Bonzini:
       "The PPC folks had a large amount of changes queued for 3.13, and now
        they are fixing the bugs"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: PPC: Book3S HV: Don't drop low-order page address bits
        powerpc: book3s: kvm: Don't abuse host r2 in exit path
        powerpc/kvm/booke: Fix build break due to stack frame size warning
        KVM: PPC: Book3S: PR: Enable interrupts earlier
        KVM: PPC: Book3S: PR: Make svcpu -> vcpu store preempt savvy
        KVM: PPC: Book3S: PR: Export kvmppc_copy_to|from_svcpu
        KVM: PPC: Book3S: PR: Don't clobber our exit handler id
        powerpc: kvm: fix rare but potential deadlock scene
        KVM: PPC: Book3S HV: Take SRCU read lock around kvm_read_guest() call
        KVM: PPC: Book3S HV: Make tbacct_lock irq-safe
        KVM: PPC: Book3S HV: Refine barriers in guest entry/exit
        KVM: PPC: Book3S HV: Fix physical address calculations
      46dd0835
    • Kirill A. Shutemov's avatar
      mm: do not allocate page->ptl dynamically, if spinlock_t fits to long · 597d795a
      Kirill A. Shutemov authored
      
      
      In struct page we have enough space to fit long-size page->ptl there,
      but we use dynamically-allocated page->ptl if size(spinlock_t) is larger
      than sizeof(int).
      
      It hurts 64-bit architectures with CONFIG_GENERIC_LOCKBREAK, where
      sizeof(spinlock_t) == 8, but it easily fits into struct page.
      
      Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Acked-by: default avatarHugh Dickins <hughd@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      597d795a
    • Johannes Weiner's avatar
      mm: page_alloc: revert NUMA aspect of fair allocation policy · fff4068c
      Johannes Weiner authored
      Commit 81c0a2bb
      
       ("mm: page_alloc: fair zone allocator policy") meant
      to bring aging fairness among zones in system, but it was overzealous
      and badly regressed basic workloads on NUMA systems.
      
      Due to the way kswapd and page allocator interacts, we still want to
      make sure that all zones in any given node are used equally for all
      allocations to maximize memory utilization and prevent thrashing on the
      highest zone in the node.
      
      While the same principle applies to NUMA nodes - memory utilization is
      obviously improved by spreading allocations throughout all nodes -
      remote references can be costly and so many workloads prefer locality
      over memory utilization.  The original change assumed that
      zone_reclaim_mode would be a good enough predictor for that, but it
      turned out to be as indicative as a coin flip.
      
      Revert the NUMA aspect of the fairness until we can find a proper way to
      make it configurable and agree on a sane default.
      
      Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Reviewed-by: default avatarMichal Hocko <mhocko@suse.cz>
      Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
      Cc: <stable@kernel.org> # 3.12
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fff4068c
    • Mel Gorman's avatar
      Revert "mm: page_alloc: exclude unreclaimable allocations from zone fairness policy" · 8798cee2
      Mel Gorman authored
      This reverts commit 73f038b8
      
      .  The NUMA behaviour of this patch is
      less than ideal.  An alternative approch is to interleave allocations
      only within local zones which is implemented in the next patch.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8798cee2
    • Kirill A. Shutemov's avatar
      mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support · ee53664b
      Kirill A. Shutemov authored
      Sasha Levin found a NULL pointer dereference that is due to a missing
      page table lock, which in turn is due to the pmd entry in question being
      a transparent huge-table entry.
      
      The code - introduced in commit 1998cc04
      
       ("mm: make
      madvise(MADV_WILLNEED) support swap file prefetch") - correctly checks
      for this situation using pmd_none_or_trans_huge_or_clear_bad(), but it
      turns out that that function doesn't work correctly.
      
      pmd_none_or_trans_huge_or_clear_bad() expected that pmd_bad() would
      trigger if the transparent hugepage bit was set, but it doesn't do that
      if pmd_numa() is also set. Note that the NUMA bit only gets set on real
      NUMA machines, so people trying to reproduce this on most normal
      development systems would never actually trigger this.
      
      Fix it by removing the very subtle (and subtly incorrect) expectation,
      and instead just checking pmd_trans_huge() explicitly.
      
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Acked-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
      [ Additionally remove the now stale test for pmd_trans_huge() inside the
        pmd_bad() case - Linus ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ee53664b
    • Paolo Bonzini's avatar
      Merge tag 'signed-for-3.13' of git://github.com/agraf/linux-2.6 into kvm-master · 5e6d26cf
      Paolo Bonzini authored
      Patch queue for 3.13 - 2013-12-18
      
      This fixes some grave issues we've only found after 3.13-rc1:
      
        - Make the modularized HV/PR book3s kvm work well as modules
        - Fix some race conditions
        - Fix compilation with certain compilers (booke)
        - Fix THP for book3s_hv
        - Fix preemption for book3s_pr
      
      Alexander Graf (4):
            KVM: PPC: Book3S: PR: Don't clobber our exit handler id
            KVM: PPC: Book3S: PR: Export kvmppc_copy_to|from_svcpu
            KVM: PPC: Book3S: PR: Make svcpu -> vcpu store preempt savvy
            KVM: PPC: Book3S: PR: Enable interrupts earlier
      
      Aneesh Kumar K.V (1):
            powerpc: book3s: kvm: Don't abuse host r2 in exit path
      
      Paul Mackerras (5):
            KVM: PPC: Book3S HV: Fix physical address calculations
            KVM: PPC: Book3S HV: Refine barriers in guest entry/exit
            KVM: PPC: Book3S HV: Make tbacct_lock irq-safe
            KVM: PPC: Book3S HV: Take SRCU read lock around kvm_read_guest() call
            KVM: PPC: Book3S HV: Don't drop low-order page address bits
      
      Scott Wood (1):
            powerpc/kvm/booke: Fix build break due to stack frame size warning
      
      pingfan liu (1):
            powerpc: kvm: fix rare but potential deadlock scene
      5e6d26cf
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 4203d0eb
      Linus Torvalds authored
      Pull Xen bugfixes from Konrad Rzeszutek Wilk:
       - Fix balloon driver for auto-translate guests (PVHVM, ARM) to not use
         scratch pages.
       - Fix block API header for ARM32 and ARM64 to have proper layout
       - On ARM when mapping guests, stick on PTE_SPECIAL
       - When using SWIOTLB under ARM, don't call swiotlb functions twice
       - When unmapping guests memory and if we fail, don't return pages which
         failed to be unmapped.
       - Grant driver was using the wrong address on ARM.
      
      * tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/balloon: Seperate the auto-translate logic properly (v2)
        xen/block: Correctly define structures in public headers on ARM32 and ARM64
        arm: xen: foreign mapping PTEs are special.
        xen/arm64: do not call the swiotlb functions twice
        xen: privcmd: do not return pages which we have failed to unmap
        XEN: Grant table address, xen_hvm_resume_frames, is a phys_addr not a pfn
      4203d0eb
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-v3.13-rc2' of... · 5263f0a8
      Linus Torvalds authored
      Merge tag 'trace-fixes-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull ftrace fix from Steven Rostedt:
       "This fixes a long standing bug in the ftrace profiler.  The problem is
        that the profiler only initializes the online CPUs, and not possible
        CPUs.  This causes issues if the user takes CPUs online or offline
        while the profiler is running.
      
        If we online a CPU after starting the profiler, we lose all the trace
        information on the CPU going online.
      
        If we offline a CPU after running a test and start a new test, it will
        not clear the old data from that CPU.
      
        This bug causes incorrect data to be reported to the user if they
        online or offline CPUs during the profiling"
      
      * tag 'trace-fixes-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace: Initialize the ftrace profiler for each possible cpu
      5263f0a8
  2. Dec 20, 2013
    • Will Deacon's avatar
      arm64: ptrace: avoid using HW_BREAKPOINT_EMPTY for disabled events · cdc27c27
      Will Deacon authored
      Commit 8f34a1da
      
       ("arm64: ptrace: use HW_BREAKPOINT_EMPTY type for
      disabled breakpoints") fixed an issue with GDB trying to zero breakpoint
      control registers. The problem there is that the arch hw_breakpoint code
      will attempt to create a (disabled), execute breakpoint of length 0.
      
      This will fail validation and report unexpected failure to GDB. To avoid
      this, we treated disabled breakpoints as HW_BREAKPOINT_EMPTY, but that
      seems to have broken with recent kernels, causing watchpoints to be
      treated as TYPE_INST in the core code and returning ENOSPC for any
      further breakpoints.
      
      This patch fixes the problem by prioritising the `enable' field of the
      breakpoint: if it is cleared, we simply update the perf_event_attr to
      indicate that the thing is disabled and don't bother changing either the
      type or the length. This reinforces the behaviour that the breakpoint
      control register is essentially read-only apart from the enable bit
      when disabling a breakpoint.
      
      Cc: <stable@vger.kernel.org>
      Reported-by: default avatarAaron Liu <liucy214@gmail.com>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      cdc27c27
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f7556698
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "An RT group-scheduling fix and the sched-domains topology setup fix
        from Mel"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/rt: Fix rq's cpupri leak while enqueue/dequeue child RT entities
        sched: Assign correct scheduling domain to 'sd_llc'
      f7556698
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 58cac3fa
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "An ABI documentation fix, and a mixed-PMU perf-info-corruption fix"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf: Document the new transaction sample type
        perf: Disable all pmus on unthrottling and rescheduling
      58cac3fa
    • Linus Torvalds's avatar
      Merge tag 'sound-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 9b1be0f9
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "We have a bit more changes than usual in ASoC here, as it was slipped
        from the previous update.  There are one minr ASoC PCM code fix and
        ASoC dmaengine fix, in addition of a collection of small ASoC driver
        fixes.  The rest are a couple of HD-audio stable fixups, and a
        long-standing fix for the paused stream handling.
      
        So, all commits look not scary (and hopefully won't give you
        disastrous holiday season)"
      
      * tag 'sound-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Add Dell headset detection quirk for one more laptop model
        ASoC: wm8904: fix DSP mode B configuration
        ASoC: wm_adsp: Add small delay while polling DSP RAM start
        ALSA: Add SNDRV_PCM_STATE_PAUSED case in wait_for_avail function
        ASoC: kirkwood: Fix the CPU DAI rates
        ASoC: wm5110: Correct HPOUT3 DAPM route typo
        ALSA: hda - Add Dell headset detection quirk for three laptop models
        ALSA: hda - Add enable_msi=0 workaround for four HP machines
        ASoC: don't leak on error in snd_dmaengine_pcm_register
        ASoC: fsl: imx-wm8962: Don't update bias_level in machine driver
        ASoC: tegra: fix uninitialized variables in set_fmt
        ASoC: wm8962: Enable SYSCLK provisonally before fetching generated DSPCLK_DIV
        ASoC: sam9x5_wm8731: change to work in DSP A mode
        ASoC: atmel_ssc_dai: add dai trigger ops
        ASoC: soc-pcm: Use valid condition for snd_soc_dai_digital_mute() in hw_free()
      9b1be0f9
  3. Dec 19, 2013