1. 21 12月, 2013 5 次提交
    • J
      mm: page_alloc: revert NUMA aspect of fair allocation policy · fff4068c
      Johannes Weiner 提交于
      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: NJohannes Weiner <hannes@cmpxchg.org>
      Reviewed-by: NMichal Hocko <mhocko@suse.cz>
      Signed-off-by: NMel Gorman <mgorman@suse.de>
      Cc: <stable@kernel.org> # 3.12
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fff4068c
    • M
      Revert "mm: page_alloc: exclude unreclaimable allocations from zone fairness policy" · 8798cee2
      Mel Gorman 提交于
      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: NMel Gorman <mgorman@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8798cee2
    • K
      mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support · ee53664b
      Kirill A. Shutemov 提交于
      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: NSasha Levin <sasha.levin@oracle.com>
      Acked-by: NAndrea Arcangeli <aarcange@redhat.com>
      [ Additionally remove the now stale test for pmd_trans_huge() inside the
        pmd_bad() case - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ee53664b
    • L
      Merge tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 4203d0eb
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'trace-fixes-v3.13-rc2' of... · 5263f0a8
      Linus Torvalds 提交于
      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. 20 12月, 2013 3 次提交
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f7556698
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 58cac3fa
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'sound-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 9b1be0f9
      Linus Torvalds 提交于
      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. 19 12月, 2013 32 次提交