1. 05 Jul, 2017 6 commits
    • Andy Lutomirski's avatar
      x86/mm: Add the 'nopcid' boot option to turn off PCID · 0790c9aa
      Andy Lutomirski authored
      
      
      The parameter is only present on x86_64 systems to save a few bytes,
      as PCID is always disabled on x86_32.
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Reviewed-by: default avatarNadav Amit <nadav.amit@gmail.com>
      Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
      Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: linux-mm@kvack.org
      Link: http://lkml.kernel.org/r/8bbb2e65bcd249a5f18bfb8128b4689f08ac2b60.1498751203.git.luto@kernel.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      0790c9aa
    • Andy Lutomirski's avatar
      x86/mm: Disable PCID on 32-bit kernels · cba4671a
      Andy Lutomirski authored
      
      
      32-bit kernels on new hardware will see PCID in CPUID, but PCID can
      only be used in 64-bit mode.  Rather than making all PCID code
      conditional, just disable the feature on 32-bit builds.
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Reviewed-by: default avatarNadav Amit <nadav.amit@gmail.com>
      Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
      Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: linux-mm@kvack.org
      Link: http://lkml.kernel.org/r/2e391769192a4d31b808410c383c6bf0734bc6ea.1498751203.git.luto@kernel.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      cba4671a
    • Andy Lutomirski's avatar
      x86/mm: Stop calling leave_mm() in idle code · 43858b4f
      Andy Lutomirski authored
      
      
      Now that lazy TLB suppresses all flush IPIs (as opposed to all but
      the first), there's no need to leave_mm() when going idle.
      
      This means we can get rid of the rcuidle hack in
      switch_mm_irqs_off() and we can unexport leave_mm().
      
      This also removes acpi_unlazy_tlb() from the x86 and ia64 headers,
      since it has no callers any more.
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Reviewed-by: default avatarNadav Amit <nadav.amit@gmail.com>
      Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
      Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: linux-mm@kvack.org
      Link: http://lkml.kernel.org/r/03c699cfd6021e467be650d6b73deaccfe4b4bd7.1498751203.git.luto@kernel.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      43858b4f
    • Andy Lutomirski's avatar
      x86/mm: Rework lazy TLB mode and TLB freshness tracking · 94b1b03b
      Andy Lutomirski authored
      x86's lazy TLB mode used to be fairly weak -- it would switch to
      init_mm the first time it tried to flush a lazy TLB.  This meant an
      unnecessary CR3 write and, if the flush was remote, an unnecessary
      IPI.
      
      Rewrite it entirely.  When we enter lazy mode, we simply remove the
      CPU from mm_cpumask.  This means that we need a way to figure out
      whether we've missed a flush when we switch back out of lazy mode.
      I use the tlb_gen machinery to track whether a context is up to
      date.
      
      Note to reviewers: this patch, my itself, looks a bit odd.  I'm
      using an array of length 1 containing (ctx_id, tlb_gen) rather than
      just storing tlb_gen, and making it at array isn't necessary yet.
      I'm doing this because the next few patches add PCID support, and,
      with PCID, we need ctx_id, and the array will end up with a length
      greater than 1.  Making it an array now means that there will be
      less churn and therefore less stress on your eyeballs.
      
      NB: This is dubious but, AFAICT, still correct on Xen and UV.
      xen_exit_mmap() uses mm_cpumask() for nefarious purposes and this
      patch changes the way that mm_cpumask() works.  This should be okay,
      since Xen *also* iterates all online CPUs to find all the CPUs it
      needs to twiddle.
      
      The UV tlbflush code is rather dated and should be changed.
      
      Here are some benchmark results, done on a Skylake laptop at 2.3 GHz
      (turbo off, intel_pstate requesting max performance) under KVM with
      the guest using idle=poll (to avoid artifacts when bouncing between
      CPUs).  I haven't done any real statistics here -- I just ran them
      in a loop and picked the fastest results that didn't look like
      outliers.  Unpatched means commit a4eb8b99
      
      , so all the
      bookkeeping overhead is gone.
      
      MADV_DONTNEED; touch the page; switch CPUs using sched_setaffinity.  In
      an unpatched kernel, MADV_DONTNEED will send an IPI to the previous CPU.
      This is intended to be a nearly worst-case test.
      
        patched:         13.4µs
        unpatched:       21.6µs
      
      Vitaly's pthread_mmap microbenchmark with 8 threads (on four cores),
      nrounds = 100, 256M data
      
        patched:         1.1 seconds or so
        unpatched:       1.9 seconds or so
      
      The sleepup on Vitaly's test appearss to be because it spends a lot
      of time blocked on mmap_sem, and this patch avoids sending IPIs to
      blocked CPUs.
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Reviewed-by: default avatarNadav Amit <nadav.amit@gmail.com>
      Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Banman <abanman@sgi.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Dimitri Sivanich <sivanich@sgi.com>
      Cc: Juergen Gross <jgross@suse.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Mike Travis <travis@sgi.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: linux-mm@kvack.org
      Link: http://lkml.kernel.org/r/ddf2c92962339f4ba39d8fc41b853936ec0b44f1.1498751203.git.luto@kernel.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      94b1b03b
    • Andy Lutomirski's avatar
      x86/mm: Track the TLB's tlb_gen and update the flushing algorithm · b0579ade
      Andy Lutomirski authored
      
      
      There are two kernel features that would benefit from tracking
      how up-to-date each CPU's TLB is in the case where IPIs aren't keeping
      it up to date in real time:
      
       - Lazy mm switching currently works by switching to init_mm when
         it would otherwise flush.  This is wasteful: there isn't fundamentally
         any need to update CR3 at all when going lazy or when returning from
         lazy mode, nor is there any need to receive flush IPIs at all.  Instead,
         we should just stop trying to keep the TLB coherent when we go lazy and,
         when unlazying, check whether we missed any flushes.
      
       - PCID will let us keep recent user contexts alive in the TLB.  If we
         start doing this, we need a way to decide whether those contexts are
         up to date.
      
      On some paravirt systems, remote TLBs can be flushed without IPIs.
      This won't update the target CPUs' tlb_gens, which may cause
      unnecessary local flushes later on.  We can address this if it becomes
      a problem by carefully updating the target CPU's tlb_gen directly.
      
      By itself, this patch is a very minor optimization that avoids
      unnecessary flushes when multiple TLB flushes targetting the same CPU
      race.  The complexity in this patch would not be worth it on its own,
      but it will enable improved lazy TLB tracking and PCID.
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Reviewed-by: default avatarNadav Amit <nadav.amit@gmail.com>
      Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: linux-mm@kvack.org
      Link: http://lkml.kernel.org/r/1210fb244bc9cbe7677f7f0b72db4d359675f24b.1498751203.git.luto@kernel.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      b0579ade
    • Andy Lutomirski's avatar
      x86/mm: Give each mm TLB flush generation a unique ID · f39681ed
      Andy Lutomirski authored
      
      
      This adds two new variables to mmu_context_t: ctx_id and tlb_gen.
      ctx_id uniquely identifies the mm_struct and will never be reused.
      For a given mm_struct (and hence ctx_id), tlb_gen is a monotonic
      count of the number of times that a TLB flush has been requested.
      The pair (ctx_id, tlb_gen) can be used as an identifier for TLB
      flush actions and will be used in subsequent patches to reliably
      determine whether all needed TLB flushes have occurred on a given
      CPU.
      
      This patch is split out for ease of review.  By itself, it has no
      real effect other than creating and updating the new variables.
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Reviewed-by: default avatarNadav Amit <nadav.amit@gmail.com>
      Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: linux-mm@kvack.org
      Link: http://lkml.kernel.org/r/413a91c24dab3ed0caa5f4e4d017d87b0857f920.1498751203.git.luto@kernel.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      f39681ed
  2. 04 Jul, 2017 4 commits
    • Linus Torvalds's avatar
      Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4422d80e
      Linus Torvalds authored
      Pull RAS updates from Thomas Gleixner:
       "The RAS updates for the 4.13 merge window:
      
         - Cleanup of the MCE injection facility (Borsilav Petkov)
      
         - Rework of the AMD/SMCA handling (Yazen Ghannam)
      
         - Enhancements for ACPI/APEI to handle new notitication types (Shiju
           Jose)
      
         - atomic_t to refcount_t conversion (Elena Reshetova)
      
         - A few fixes and enhancements all over the place"
      
      * 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        RAS/CEC: Check the correct variable in the debugfs error handling
        x86/mce: Always save severity in machine_check_poll()
        x86/MCE, xen/mcelog: Make /dev/mcelog registration messages more precise
        x86/mce: Update bootlog description to reflect behavior on AMD
        x86/mce: Don't disable MCA banks when offlining a CPU on AMD
        x86/mce/mce-inject: Preset the MCE injection struct
        x86/mce: Clean up include files
        x86/mce: Get rid of register_mce_write_callback()
        x86/mce: Merge mce_amd_inj into mce-inject
        x86/mce/AMD: Use saved threshold block info in interrupt handler
        x86/mce/AMD: Use msr_stat when clearing MCA_STATUS
        x86/mce/AMD: Carve out SMCA bank configuration
        x86/mce/AMD: Redo error logging from APIC LVT interrupt handlers
        x86/mce: Convert threshold_bank.cpus from atomic_t to refcount_t
        RAS: Make local function parse_ras_param() static
        ACPI/APEI: Handle GSIV and GPIO notification types
      4422d80e
    • Linus Torvalds's avatar
      Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9a9594ef
      Linus Torvalds authored
      Pull SMP hotplug updates from Thomas Gleixner:
       "This update is primarily a cleanup of the CPU hotplug locking code.
      
        The hotplug locking mechanism is an open coded RWSEM, which allows
        recursive locking. The main problem with that is the recursive nature
        as it evades the full lockdep coverage and hides potential deadlocks.
      
        The rework replaces the open coded RWSEM with a percpu RWSEM and
        establishes full lockdep coverage that way.
      
        The bulk of the changes fix up recursive locking issues and address
        the now fully reported potential deadlocks all over the place. Some of
        these deadlocks have been observed in the RT tree, but on mainline the
        probability was low enough to hide them away."
      
      * 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (37 commits)
        cpu/hotplug: Constify attribute_group structures
        powerpc: Only obtain cpu_hotplug_lock if called by rtasd
        ARM/hw_breakpoint: Fix possible recursive locking for arch_hw_breakpoint_init
        cpu/hotplug: Remove unused check_for_tasks() function
        perf/core: Don't release cred_guard_mutex if not taken
        cpuhotplug: Link lock stacks for hotplug callbacks
        acpi/processor: Prevent cpu hotplug deadlock
        sched: Provide is_percpu_thread() helper
        cpu/hotplug: Convert hotplug locking to percpu rwsem
        s390: Prevent hotplug rwsem recursion
        arm: Prevent hotplug rwsem recursion
        arm64: Prevent cpu hotplug rwsem recursion
        kprobes: Cure hotplug lock ordering issues
        jump_label: Reorder hotplug lock and jump_label_lock
        perf/tracing/cpuhotplug: Fix locking order
        ACPI/processor: Use cpu_hotplug_disable() instead of get_online_cpus()
        PCI: Replace the racy recursion prevention
        PCI: Use cpu_hotplug_disable() instead of get_online_cpus()
        perf/x86/intel: Drop get_online_cpus() in intel_snb_check_microcode()
        x86/perf: Drop EXPORT of perf_check_microcode
        ...
      9a9594ef
    • Linus Torvalds's avatar
      Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3ad918e6
      Linus Torvalds authored
      Pull x86 timers updates from Thomas Gleixner:
       "This update contains:
      
         - The solution for the TSC deadline timer borkage, which is caused by
           a hardware problem in the TSC_ADJUST/TSC_DEADLINE_TIMER logic.
      
           The problem is documented now and fixed with a microcode update, so
           we can remove the workaround and just check for the microcode version.
      
           If the microcode is not up to date, then the TSC deadline timer is
           disabled. If the borkage is fixed by the proper microcode version,
           then the deadline timer can be used. In both cases the restrictions
           to the range of the TSC_ADJUST value, which were added as
           workarounds, are removed.
      
        - A few simple fixes and updates to the timer related x86 code"
      
      * 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/tsc: Call check_system_tsc_reliable() before unsynchronized_tsc()
        x86/hpet: Do not use smp_processor_id() in preemptible code
        x86/time: Make setup_default_timer_irq() static
        x86/tsc: Remove the TSC_ADJUST clamp
        x86/apic: Add TSC_DEADLINE quirk due to errata
        x86/apic: Change the lapic name in deadline mode
      3ad918e6
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8c073517
      Linus Torvalds authored
      Pull x86 PCI updates from Thomas Gleixner:
       "This update provides the seperation of x86 PCI accessors from the
        global PCI lock in the generic PCI config space accessors.
      
        The reasons for this are:
      
         - x86 has it's own PCI config lock for various reasons, so the
           accessors have to lock two locks nested.
      
         - The ECAM (mmconfig) access to the extended configuration space does
           not require locking. The existing generic locking causes a massive
           lock contention when accessing the extended config space of the
           Uncore facility for performance monitoring.
      
        The commit which switched the access to the primary config space over
        to ECAM mode has been removed from the branch, so the primary config
        space is still accessed with type1 accessors properly serialized by
        the x86 internal locking.
      
        Bjorn agreed on merging this through the x86 tree"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/PCI: Select CONFIG_PCI_LOCKLESS_CONFIG
        PCI: Provide Kconfig option for lockless config space accessors
        x86/PCI/ce4100: Properly lock accessor functions
        x86/PCI: Abort if legacy init fails
        x86/PCI: Remove duplicate defines
      8c073517
  3. 03 Jul, 2017 25 commits
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 03ffbcdd
      Linus Torvalds authored
      Pull irq updates from Thomas Gleixner:
       "The irq department delivers:
      
         - Expand the generic infrastructure handling the irq migration on CPU
           hotplug and convert X86 over to it. (Thomas Gleixner)
      
           Aside of consolidating code this is a preparatory change for:
      
         - Finalizing the affinity management for multi-queue devices. The
           main change here is to shut down interrupts which are affine to a
           outgoing CPU and reenabling them when the CPU comes online again.
           That avoids moving interrupts pointlessly around and breaking and
           reestablishing affinities for no value. (Christoph Hellwig)
      
           Note: This contains also the BLOCK-MQ and NVME changes which depend
           on the rework of the irq core infrastructure. Jens acked them and
           agreed that they should go with the irq changes.
      
         - Consolidation of irq domain code (Marc Zyngier)
      
         - State tracking consolidation in the core code (Jeffy Chen)
      
         - Add debug infrastructure for hierarchical irq domains (Thomas
           Gleixner)
      
         - Infrastructure enhancement for managing generic interrupt chips via
           devmem (Bartosz Golaszewski)
      
         - Constification work all over the place (Tobias Klauser)
      
         - Two new interrupt controller drivers for MVEBU (Thomas Petazzoni)
      
         - The usual set of fixes, updates and enhancements all over the
           place"
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (112 commits)
        irqchip/or1k-pic: Fix interrupt acknowledgement
        irqchip/irq-mvebu-gicp: Allocate enough memory for spi_bitmap
        irqchip/gic-v3: Fix out-of-bound access in gic_set_affinity
        nvme: Allocate queues for all possible CPUs
        blk-mq: Create hctx for each present CPU
        blk-mq: Include all present CPUs in the default queue mapping
        genirq: Avoid unnecessary low level irq function calls
        genirq: Set irq masked state when initializing irq_desc
        genirq/timings: Add infrastructure for estimating the next interrupt arrival time
        genirq/timings: Add infrastructure to track the interrupt timings
        genirq/debugfs: Remove pointless NULL pointer check
        irqchip/gic-v3-its: Don't assume GICv3 hardware supports 16bit INTID
        irqchip/gic-v3-its: Add ACPI NUMA node mapping
        irqchip/gic-v3-its-platform-msi: Make of_device_ids const
        irqchip/gic-v3-its: Make of_device_ids const
        irqchip/irq-mvebu-icu: Add new driver for Marvell ICU
        irqchip/irq-mvebu-gicp: Add new driver for Marvell GICP
        dt-bindings/interrupt-controller: Add DT binding for the Marvell ICU
        genirq/irqdomain: Remove auto-recursive hierarchy support
        irqchip/MSI: Use irq_domain_update_bus_token instead of an open coded access
        ...
      03ffbcdd
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1b044f1c
      Linus Torvalds authored
      Pull timer updates from Thomas Gleixner:
       "A rather large update for timers/timekeeping:
      
         - compat syscall consolidation (Al Viro)
      
         - Posix timer consolidation (Christoph Helwig / Thomas Gleixner)
      
         - Cleanup of the device tree based initialization for clockevents and
           clocksources (Daniel Lezcano)
      
         - Consolidation of the FTTMR010 clocksource/event driver (Linus
           Walleij)
      
         - The usual set of small fixes and updates all over the place"
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (93 commits)
        timers: Make the cpu base lock raw
        clocksource/drivers/mips-gic-timer: Fix an error code in 'gic_clocksource_of_init()'
        clocksource/drivers/fsl_ftm_timer: Unmap region obtained by of_iomap
        clocksource/drivers/tcb_clksrc: Make IO endian agnostic
        clocksource/drivers/sun4i: Switch to the timer-of common init
        clocksource/drivers/timer-of: Fix invalid iomap check
        Revert "ktime: Simplify ktime_compare implementation"
        clocksource/drivers: Fix uninitialized variable use in timer_of_init
        kselftests: timers: Add test for frequency step
        kselftests: timers: Fix inconsistency-check to not ignore first timestamp
        time: Add warning about imminent deprecation of CONFIG_GENERIC_TIME_VSYSCALL_OLD
        time: Clean up CLOCK_MONOTONIC_RAW time handling
        posix-cpu-timers: Make timespec to nsec conversion safe
        itimer: Make timeval to nsec conversion range limited
        timers: Fix parameter description of try_to_del_timer_sync()
        ktime: Simplify ktime_compare implementation
        clocksource/drivers/fttmr010: Factor out clock read code
        clocksource/drivers/fttmr010: Implement delay timer
        clocksource/drivers: Add timer-of common init routine
        clocksource/drivers/tcb_clksrc: Save timer context on suspend/resume
        ...
      1b044f1c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e0f3e8f1
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The bulk of the s390 patches for 4.13. Some new things but mostly bug
        fixes and cleanups. Noteworthy changes:
      
         - The SCM block driver is converted to blk-mq
      
         - Switch s390 to 5 level page tables. The virtual address space for a
           user space process can now have up to 16EB-4KB.
      
         - Introduce a ELF phdr flag for qemu to avoid the global
           vm.alloc_pgste which forces all processes to large page tables
      
         - A couple of PCI improvements to improve error recovery
      
         - Included is the merge of the base support for proper machine checks
           for KVM"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (52 commits)
        s390/dasd: Fix faulty ENODEV for RO sysfs attribute
        s390/pci: recognize name clashes with uids
        s390/pci: provide more debug information
        s390/pci: fix handling of PEC 306
        s390/pci: improve pci hotplug
        s390/pci: introduce clp_get_state
        s390/pci: improve error handling during fmb (de)registration
        s390/pci: improve unreg_ioat error handling
        s390/pci: improve error handling during interrupt deregistration
        s390/pci: don't cleanup in arch_setup_msi_irqs
        KVM: s390: Backup the guest's machine check info
        s390/nmi: s390: New low level handling for machine check happening in guest
        s390/fpu: export save_fpu_regs for all configs
        s390/kvm: avoid global config of vm.alloc_pgste=1
        s390: rename struct psw_bits members
        s390: rename psw_bits enums
        s390/mm: use correct address space when enabling DAT
        s390/cio: introduce io_subchannel_type
        s390/ipl: revert Load Normal semantics for LPAR CCW-type re-IPL
        s390/dumpstack: remove raw stack dump
        ...
      e0f3e8f1
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · e5859eb8
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       "Main changes are:
      
         - Added support to the parisc dma functions to return DMA_ERROR_CODE
           if DMA isn't possible. This fixes a long standing kernel crash if
           parport_pc is enabled (by Thomas Bogendoerfer, marked for stable
           series).
      
         - Use the compat_sys_keyctl() in compat mode (by Eric Biggers, marked
           for stable series).
      
         - Initial support for the Page Deallocation Table (PDT) which is
           maintained by firmware and holds the list of memory addresses which
           had physical errors. By checking that list we can prevent Linux to
           use those broken memory areas.
      
         - Ensure IRQs are off in switch_mm().
      
         - Report SIGSEGV instead of SIGBUS when running out of stack.
      
         - Mark the cr16 clocksource stable on single-socket and single-core
           machines"
      
      * 'parisc-4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: DMA API: return error instead of BUG_ON for dma ops on non dma devs
        parisc: Report SIGSEGV instead of SIGBUS when running out of stack
        parisc: use compat_sys_keyctl()
        parisc: Don't hardcode PSW values in hpmc code
        parisc: Don't hardcode PSW values in gsc_*() functions
        parisc: Avoid zeroing gr[0] in fixup_exception()
        parisc/mm: Ensure IRQs are off in switch_mm()
        parisc: Add Page Deallocation Table (PDT) support
        parisc: Enhance detection of synchronous cr16 clocksources
        parisc: Drop per_cpu uaccess related exception_data struct
        parisc: Inline trivial exception code in lusercopy.S
      e5859eb8
    • Linus Torvalds's avatar
      Merge tag 'microblaze-4.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze · 058e88d3
      Linus Torvalds authored
      Pull microblaze updates from Michal Simek:
      
       - timer fix
      
       - use simplified macro in dma.c
      
       - wire-up new syscall
      
       - remove asp-generic wrappers
      
       - fix MMU table handling
      
       - defconfig updates
      
       - low-level entry.S changes
      
      * tag 'microblaze-4.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Fix MSR flags when returning from exception
        microblaze: Separate GP registers from MSR handling
        microblaze: Enabling CONFIG_BRIDGE in mmu_defconfig
        microblaze: Enabling CONFIGS related to MTD
        microblaze: Update defconfigs
        microblaze: mm: Flush TLB to ensure correct mapping when higmem ON
        microblaze: remove asm-generic wrapper headers
        microblaze: wire up statx syscall
        microblaze: Set ->min_delta_ticks and ->max_delta_ticks for timer
        microblaze: use sg_phys()
      058e88d3
    • Linus Torvalds's avatar
      Merge tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 241e5e6f
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
      
        - NuBus improvements and cleanups
      
        - defconfig updates
      
        - Fix debugger syscall restart interactions, leading to the global
          removal of ptrace_signal_deliver()
      
      * tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Remove ptrace_signal_deliver
        m68k/defconfig: Update defconfigs for v4.12-rc1
        nubus: Fix pointer validation
        nubus: Remove slot zero probe
      241e5e6f
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7a69f9c6
      Linus Torvalds authored
      Pull x86 mm updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Continued work to add support for 5-level paging provided by future
           Intel CPUs. In particular we switch the x86 GUP code to the generic
           implementation. (Kirill A. Shutemov)
      
         - Continued work to add PCID CPU support to native kernels as well.
           In this round most of the focus is on reworking/refreshing the TLB
           flush infrastructure for the upcoming PCID changes. (Andy
           Lutomirski)"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (34 commits)
        x86/mm: Delete a big outdated comment about TLB flushing
        x86/mm: Don't reenter flush_tlb_func_common()
        x86/KASLR: Fix detection 32/64 bit bootloaders for 5-level paging
        x86/ftrace: Exclude functions in head64.c from function-tracing
        x86/mmap, ASLR: Do not treat unlimited-stack tasks as legacy mmap
        x86/mm: Remove reset_lazy_tlbstate()
        x86/ldt: Simplify the LDT switching logic
        x86/boot/64: Put __startup_64() into .head.text
        x86/mm: Add support for 5-level paging for KASLR
        x86/mm: Make kernel_physical_mapping_init() support 5-level paging
        x86/mm: Add sync_global_pgds() for configuration with 5-level paging
        x86/boot/64: Add support of additional page table level during early boot
        x86/boot/64: Rename init_level4_pgt and early_level4_pgt
        x86/boot/64: Rewrite startup_64() in C
        x86/boot/compressed: Enable 5-level paging during decompression stage
        x86/boot/efi: Define __KERNEL32_CS GDT on 64-bit configurations
        x86/boot/efi: Fix __KERNEL_CS definition of GDT entry on 64-bit configurations
        x86/boot/efi: Cleanup initialization of GDT entries
        x86/asm: Fix comment in return_from_SYSCALL_64()
        x86/mm/gup: Switch GUP to the generic get_user_page_fast() implementation
        ...
      7a69f9c6
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9bc088ab
      Linus Torvalds authored
      Pull x86 microcode updates from Ingo Molnar:
       "The main changes are a fix early microcode application for
        resume-from-RAM, plus a 32-bit initrd placement fix - by Borislav
        Petkov"
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/microcode: Make a couple of symbols static
        x86/microcode/intel: Save pointer to ucode patch for early AP loading
        x86/microcode: Look for the initrd at the correct address on 32-bit
      9bc088ab
    • Linus Torvalds's avatar
      Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e1449007
      Linus Torvalds authored
      Pull x86 hyperv updates from Ingo Molnar:
       "Avoid boot time TSC calibration on Hyper-V hosts, to improve
        calibration robustness. (Vitaly Kuznetsov)"
      
      * 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/hyperv: Read TSC frequency from a synthetic MSR
        x86/hyperv: Check frequency MSRs presence according to the specification
      e1449007
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e6529f6f
      Linus Torvalds authored
      Pull x86 debug update from Ingo Molnar:
       "A single fix for an off-by one bug in test_nmi_ipi() that probably
        doesn't matter in practice"
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/nmi: Fix timeout test in test_nmi_ipi()
      e6529f6f
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6553698b
      Linus Torvalds authored
      Pull x86 cleanups from Ingo Molnar:
       "Two small cleanups"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/paravirt: Remove unnecessary return from void function
        x86/boot: Add missing strchr() declaration
      6553698b
    • Linus Torvalds's avatar
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 25e09ca5
      Linus Torvalds authored
      Pull x86 boot updates from Ingo Molnar:
       "The main changes in this cycle were KASLR improvements for rare
        environments with special boot options, by Baoquan He. Also misc
        smaller changes/cleanups"
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/debug: Extend the lower bound of crash kernel low reservations
        x86/boot: Remove unused copy_*_gs() functions
        x86/KASLR: Use the right memcpy() implementation
        Documentation/kernel-parameters.txt: Update 'memmap=' boot option description
        x86/KASLR: Handle the memory limit specified by the 'memmap=' and 'mem=' boot options
        x86/KASLR: Parse all 'memmap=' boot option entries
      25e09ca5
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 48b5259c
      Linus Torvalds authored
      Pull x86 asm updates from Ingo Molnar:
       "A single commit micro-optimizing short user copies on certain Intel
        CPUs"
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/uaccess: Optimize copy_user_enhanced_fast_string() for short strings
      48b5259c
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2a275382
      Linus Torvalds authored
      Pull x86 apic updates from Ingo Molnar:
       "Janitorial changes: removal of an unused function plus __init
        annotations"
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/apic: Make arch_init_msi/htirq_domain __init
        x86/apic: Make init_legacy_irqs() __init
        x86/ioapic: Remove unused IO_APIC_irq_trigger() function
      2a275382
    • Linus Torvalds's avatar
      Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 59b60185
      Linus Torvalds authored
      Pull nohz updates from Ingo Molnar:
       "The main changes in this cycle relate to fixing another bad (but
        sporadic and hard to detect) interaction between the dynticks
        scheduler tick and hrtimers, plus related improvements to better
        detection and handling of similar problems - by Frédéric Weisbecker"
      
      * 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        nohz: Fix spurious warning when hrtimer and clockevent get out of sync
        nohz: Fix buggy tick delay on IRQ storms
        nohz: Reset next_tick cache even when the timer has no regs
        nohz: Fix collision between tick and other hrtimers, again
        nohz: Add hrtimer sanity check
      59b60185
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9bd42183
      Linus Torvalds authored
      Pull scheduler updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Add the SYSTEM_SCHEDULING bootup state to move various scheduler
           debug checks earlier into the bootup. This turns silent and
           sporadically deadly bugs into nice, deterministic splats. Fix some
           of the splats that triggered. (Thomas Gleixner)
      
         - A round of restructuring and refactoring of the load-balancing and
           topology code (Peter Zijlstra)
      
         - Another round of consolidating ~20 of incremental scheduler code
           history: this time in terms of wait-queue nomenclature. (I didn't
           get much feedback on these renaming patches, and we can still
           easily change any names I might have misplaced, so if anyone hates
           a new name, please holler and I'll fix it.) (Ingo Molnar)
      
         - sched/numa improvements, fixes and updates (Rik van Riel)
      
         - Another round of x86/tsc scheduler clock code improvements, in hope
           of making it more robust (Peter Zijlstra)
      
         - Improve NOHZ behavior (Frederic Weisbecker)
      
         - Deadline scheduler improvements and fixes (Luca Abeni, Daniel
           Bristot de Oliveira)
      
         - Simplify and optimize the topology setup code (Lauro Ramos
           Venancio)
      
         - Debloat and decouple scheduler code some more (Nicolas Pitre)
      
         - Simplify code by making better use of llist primitives (Byungchul
           Park)
      
         - ... plus other fixes and improvements"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (103 commits)
        sched/cputime: Refactor the cputime_adjust() code
        sched/debug: Expose the number of RT/DL tasks that can migrate
        sched/numa: Hide numa_wake_affine() from UP build
        sched/fair: Remove effective_load()
        sched/numa: Implement NUMA node level wake_affine()
        sched/fair: Simplify wake_affine() for the single socket case
        sched/numa: Override part of migrate_degrades_locality() when idle balancing
        sched/rt: Move RT related code from sched/core.c to sched/rt.c
        sched/deadline: Move DL related code from sched/core.c to sched/deadline.c
        sched/cpuset: Only offer CONFIG_CPUSETS if SMP is enabled
        sched/fair: Spare idle load balancing on nohz_full CPUs
        nohz: Move idle balancer registration to the idle path
        sched/loadavg: Generalize "_idle" naming to "_nohz"
        sched/core: Drop the unused try_get_task_struct() helper function
        sched/fair: WARN() and refuse to set buddy when !se->on_rq
        sched/debug: Fix SCHED_WARN_ON() to return a value on !CONFIG_SCHED_DEBUG as well
        sched/wait: Disambiguate wq_entry->task_list and wq_head->task_list naming
        sched/wait: Move bit_wait_table[] and related functionality from sched/core.c to sched/wait_bit.c
        sched/wait: Split out the wait_bit*() APIs from <linux/wait.h> into <linux/wait_bit.h>
        sched/wait: Re-adjust macro line continuation backslashes in <linux/wait.h>
        ...
      9bd42183
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7447d562
      Linus Torvalds authored
      Pull perf updates from Ingo Molnar:
       "Most of the changes are for tooling, the main changes in this cycle were:
      
         - Improve Intel-PT hardware tracing support, both on the kernel and
           on the tooling side: PTWRITE instruction support, power events for
           C-state tracing, etc. (Adrian Hunter)
      
         - Add support to measure SMI cost to the x86 architecture, with
           tooling support in 'perf stat' (Kan Liang)
      
         - Support function filtering in 'perf ftrace', plus related
           improvements (Namhyung Kim)
      
         - Allow adding and removing fields to the default 'perf script'
           columns, using + or - as field prefixes to do so (Andi Kleen)
      
         - Allow resolving the DSO name with 'perf script -F brstack{sym,off},dso'
           (Mark Santaniello)
      
         - Add perf tooling unwind support for PowerPC (Paolo Bonzini)
      
         - ... and various other improvements as well"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (84 commits)
        perf auxtrace: Add CPU filter support
        perf intel-pt: Do not use TSC packets for calculating CPU cycles to TSC
        perf intel-pt: Update documentation to include new ptwrite and power events
        perf intel-pt: Add example script for power events and PTWRITE
        perf intel-pt: Synthesize new power and "ptwrite" events
        perf intel-pt: Move code in intel_pt_synth_events() to simplify attr setting
        perf intel-pt: Factor out intel_pt_set_event_name()
        perf intel-pt: Tidy messages into called function intel_pt_synth_event()
        perf intel-pt: Tidy Intel PT evsel lookup into separate function
        perf intel-pt: Join needlessly wrapped lines
        perf intel-pt: Remove unused instructions_sample_period
        perf intel-pt: Factor out common code synthesizing event samples
        perf script: Add synthesized Intel PT power and ptwrite events
        perf/x86/intel: Constify the 'lbr_desc[]' array and make a function static
        perf script: Add 'synth' field for synthesized event payloads
        perf auxtrace: Add itrace option to output power events
        perf auxtrace: Add itrace option to output ptwrite events
        tools include: Add byte-swapping macros to kernel.h
        perf script: Add 'synth' event type for synthesized events
        x86/insn: perf tools: Add new ptwrite instruction
        ...
      7447d562
    • Linus Torvalds's avatar
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 892ad5ac
      Linus Torvalds authored
      Pull locking updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Add CONFIG_REFCOUNT_FULL=y to allow the disabling of the 'full'
           (robustness checked) refcount_t implementation with slightly lower
           runtime overhead. (Kees Cook)
      
           The lighter weight variant is the default. The two variants use the
           same API. Having this variant was a precondition by some
           maintainers to merge refcount_t cleanups.
      
         - Add lockdep support for rtmutexes (Peter Zijlstra)
      
         - liblockdep fixes and improvements (Sasha Levin, Ben Hutchings)
      
         - ... misc fixes and improvements"
      
      * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (30 commits)
        locking/refcount: Remove the half-implemented refcount_sub() API
        locking/refcount: Create unchecked atomic_t implementation
        locking/rtmutex: Don't initialize lockdep when not required
        locking/selftest: Add RT-mutex support
        locking/selftest: Remove the bad unlock ordering test
        rt_mutex: Add lockdep annotations
        MAINTAINERS: Claim atomic*_t maintainership
        locking/x86: Remove the unused atomic_inc_short() methd
        tools/lib/lockdep: Remove private kernel headers
        tools/lib/lockdep: Hide liblockdep output from test results
        tools/lib/lockdep: Add dummy current_gfp_context()
        tools/include: Add IS_ERR_OR_NULL to err.h
        tools/lib/lockdep: Add empty __is_[module,kernel]_percpu_address
        tools/lib/lockdep: Include err.h
        tools/include: Add (mostly) empty include/linux/sched/mm.h
        tools/lib/lockdep: Use LDFLAGS
        tools/lib/lockdep: Remove double-quotes from soname
        tools/lib/lockdep: Fix object file paths used in an out-of-tree build
        tools/lib/lockdep: Fix compilation for 4.11
        tools/lib/lockdep: Don't mix fd-based and stream IO
        ...
      892ad5ac
    • Linus Torvalds's avatar
      Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 162b246e
      Linus Torvalds authored
      Pull EFI updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Rework the EFI capsule loader to allow for workarounds for
           non-compliant firmware (Ard Biesheuvel)
      
         - Implement a capsule loader quirk for Quark X102x (Jan Kiszka)
      
         - Enable SMBIOS/DMI support for the ARM architecture (Ard Biesheuvel)
      
         - Add CONFIG_EFI_PGT_DUMP=y support for x86-32 and kexec (Sai
           Praneeth)
      
         - Fixes for EFI support for Xen dom0 guests running under x86-64
           hosts (Daniel Kiper)"
      
      * 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/xen/efi: Initialize only the EFI struct members used by Xen
        efi: Process the MEMATTR table only if EFI_MEMMAP is enabled
        efi/arm: Enable DMI/SMBIOS
        x86/efi: Extend CONFIG_EFI_PGT_DUMP support to x86_32 and kexec as well
        efi/efi_test: Use memdup_user() helper
        efi/capsule: Add support for Quark security header
        efi/capsule-loader: Use page addresses rather than struct page pointers
        efi/capsule-loader: Redirect calls to efi_capsule_setup_info() via weak alias
        efi/capsule: Remove NULL test on kmap()
        efi/capsule-loader: Use a cached copy of the capsule header
        efi/capsule: Adjust return type of efi_capsule_setup_info()
        efi/capsule: Clean up pr_err/_info() messages
        efi/capsule: Remove pr_debug() on ENOMEM or EFAULT
        efi/capsule: Fix return code on failing kmap/vmap
      162b246e
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 330e9e46
      Linus Torvalds authored
      Pull RCU updates from Ingo Molnar:
       "The sole purpose of these changes is to shrink and simplify the RCU
        code base, which has suffered from creeping bloat over the past couple
        of years. The end result is a net removal of ~2700 lines of code:
      
           79 files changed, 1496 insertions(+), 4211 deletions(-)
      
        Plus there's a marked reduction in the Kconfig space complexity as
        well, here's the number of matches on 'grep RCU' in the .config:
      
                                     before       after
      
           x86-defconfig                 17          15
           x86-allmodconfig              33          20"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (86 commits)
        rcu: Remove RCU CPU stall warnings from Tiny RCU
        rcu: Remove event tracing from Tiny RCU
        rcu: Move RCU debug Kconfig options to kernel/rcu
        rcu: Move RCU non-debug Kconfig options to kernel/rcu
        rcu: Eliminate NOCBs CPU-state Kconfig options
        rcu: Remove debugfs tracing
        srcu: Remove Classic SRCU
        srcu: Fix rcutorture-statistics typo
        rcu: Remove SPARSE_RCU_POINTER Kconfig option
        rcu: Remove the now-obsolete PROVE_RCU_REPEATEDLY Kconfig option
        rcu: Remove typecheck() from RCU locking wrapper functions
        rcu: Remove #ifdef moving rcu_end_inkernel_boot from rcupdate.h
        rcu: Remove nohz_full full-system-idle state machine
        rcu: Remove the RCU_KTHREAD_PRIO Kconfig option
        rcu: Remove *_SLOW_* Kconfig options
        srcu: Use rnp->lock wrappers to replace explicit memory barriers
        rcu: Move rnp->lock wrappers for SRCU use
        rcu: Convert rnp->lock wrappers to macros for SRCU use
        rcu: Refactor #includes from include/linux/rcupdate.h
        bcm47xx: Fix build regression
        ...
      330e9e46
    • Linus Torvalds's avatar
      Merge branch 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e94693f7
      Linus Torvalds authored
      Pull objtool updates from Ingo Molnar:
       "This is an extensive rewrite of the objdump tool to track all stack
        pointer modifications through the machine instructions of disassembled
        functions found in kernel .o files.
      
        This re-design removes the prior dependency on CONFIG_FRAME_POINTERS,
        with the goal to prepare the tool to generate kernel debuginfo data in
        the future. There's also an increase in checking/tracking robustness
        as a side effect as well.
      
        No (intended) changes to existing functionality"
      
      * 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        objtool: Silence warnings for functions which use IRET
        objtool: Implement stack validation 2.0
        objtool, x86: Add several functions and files to the objtool whitelist
        objtool: Move checking code to check.c
      e94693f7
    • Linus Torvalds's avatar
      Merge tag 'edac_for_4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 26d3a77d
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       "Nothing earth-shattering - just the normal development flow of
        cleanups, improvements, fixes and such.
      
        Summary:
      
         - i31200_edac: Add Kabylake support (Jason Baron)
      
         - sb_edac: resolve memory controller detection issues on asymmetric
           setups with not all DIMM slots being populated (Tony Luck and Qiuxu
           Zhuo)
      
         - misc cleanups and fixlets all over"
      
      * tag 'edac_for_4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (22 commits)
        EDAC, pnd2: Fix Apollo Lake DIMM detection
        EDAC, i5000, i5400: Fix definition of NRECMEMB register
        EDAC, pnd2: Make function sbi_send() static
        EDAC, pnd2: Return proper error value from apl_rd_reg()
        EDAC, altera: Simplify calculation of total memory
        EDAC, sb_edac: Avoid creating SOCK memory controller
        EDAC, mce_amd: Fix typo in SMCA error description
        EDAC, mv64x60: Sanity check edac_op_state before registering
        EDAC, thunderx: Fix a warning during l2c debugfs node creation
        EDAC, mv64x60: Check driver registration success
        EDAC, ie31200: Add Intel Kaby Lake CPU support
        EDAC, mv64x60: Replace in_le32()/out_le32() with readl()/writel()
        EDAC, mv64x60: Fix pdata->name
        EDAC, sb_edac: Bump driver version and do some cleanups
        EDAC, sb_edac: Check if ECC enabled when at least one DIMM is present
        EDAC, sb_edac: Drop NUM_CHANNELS from 8 back to 4
        EDAC, sb_edac: Carve out dimm-populating loop
        EDAC, sb_edac: Fix mod_name
        EDAC, sb_edac: Assign EDAC memory controller per h/w controller
        EDAC, sb_edac: Don't use "Socket#" in the memory controller name
        ...
      26d3a77d
    • Linus Torvalds's avatar
      Merge branch 'for-4.13/block' of git://git.kernel.dk/linux-block · c6b1e36c
      Linus Torvalds authored
      Pull core block/IO updates from Jens Axboe:
       "This is the main pull request for the block layer for 4.13. Not a huge
        round in terms of features, but there's a lot of churn related to some
        core cleanups.
      
        Note this depends on the UUID tree pull request, that Christoph
        already sent out.
      
        This pull request contains:
      
         - A series from Christoph, unifying the error/stats codes in the
           block layer. We now use blk_status_t everywhere, instead of using
           different schemes for different places.
      
         - Also from Christoph, some cleanups around request allocation and IO
           scheduler interactions in blk-mq.
      
         - And yet another series from Christoph, cleaning up how we handle
           and do bounce buffering in the block layer.
      
         - A blk-mq debugfs series from Bart, further improving on the support
           we have for exporting internal information to aid debugging IO
           hangs or stalls.
      
         - Also from Bart, a series that cleans up the request initialization
           differences across types of devices.
      
         - A series from Goldwyn Rodrigues, allowing the block layer to return
           failure if we will block and the user asked for non-blocking.
      
         - Patch from Hannes for supporting setting loop devices block size to
           that of the underlying device.
      
         - Two series of patches from Javier, fixing various issues with
           lightnvm, particular around pblk.
      
         - A series from me, adding support for write hints. This comes with
           NVMe support as well, so applications can help guide data placement
           on flash to improve performance, latencies, and write
           amplification.
      
         - A series from Ming, improving and hardening blk-mq support for
           stopping/starting and quiescing hardware queues.
      
         - Two pull requests for NVMe updates. Nothing major on the feature
           side, but lots of cleanups and bug fixes. From the usual crew.
      
         - A series from Neil Brown, greatly improving the bio rescue set
           support. Most notably, this kills the bio rescue work queues, if we
           don't really need them.
      
         - Lots of other little bug fixes that are all over the place"
      
      * 'for-4.13/block' of git://git.kernel.dk/linux-block: (217 commits)
        lightnvm: pblk: set line bitmap check under debug
        lightnvm: pblk: verify that cache read is still valid
        lightnvm: pblk: add initialization check
        lightnvm: pblk: remove target using async. I/Os
        lightnvm: pblk: use vmalloc for GC data buffer
        lightnvm: pblk: use right metadata buffer for recovery
        lightnvm: pblk: schedule if data is not ready
        lightnvm: pblk: remove unused return variable
        lightnvm: pblk: fix double-free on pblk init
        lightnvm: pblk: fix bad le64 assignations
        nvme: Makefile: remove dead build rule
        blk-mq: map all HWQ also in hyperthreaded system
        nvmet-rdma: register ib_client to not deadlock in device removal
        nvme_fc: fix error recovery on link down.
        nvmet_fc: fix crashes on bad opcodes
        nvme_fc: Fix crash when nvme controller connection fails.
        nvme_fc: replace ioabort msleep loop with completion
        nvme_fc: fix double calls to nvme_cleanup_cmd()
        nvme-fabrics: verify that a controller returns the correct NQN
        nvme: simplify nvme_dev_attrs_are_visible
        ...
      c6b1e36c
    • Linus Torvalds's avatar
      Merge tag 'uuid-for-4.13' of git://git.infradead.org/users/hch/uuid · 81e3e044
      Linus Torvalds authored
      Pull uuid subsystem from Christoph Hellwig:
       "This is the new uuid subsystem, in which Amir, Andy and I have started
        consolidating our uuid/guid helpers and improving the types used for
        them. Note that various other subsystems have pulled in this tree, so
        I'd like it to go in early.
      
        UUID/GUID summary:
      
         - introduce the new uuid_t/guid_t types that are going to replace the
           somewhat confusing uuid_be/uuid_le types and make the terminology
           fit the various specs, as well as the userspace libuuid library.
           (me, based on a previous version from Amir)
      
         - consolidated generic uuid/guid helper functions lifted from XFS and
           libnvdimm (Amir and me)
      
         - conversions to the new types and helpers (Amir, Andy and me)"
      
      * tag 'uuid-for-4.13' of git://git.infradead.org/users/hch/uuid: (34 commits)
        ACPI: hns_dsaf_acpi_dsm_guid can be static
        mmc: sdhci-pci: make guid intel_dsm_guid static
        uuid: Take const on input of uuid_is_null() and guid_is_null()
        thermal: int340x_thermal: fix compile after the UUID API switch
        thermal: int340x_thermal: Switch to use new generic UUID API
        acpi: always include uuid.h
        ACPI: Switch to use generic guid_t in acpi_evaluate_dsm()
        ACPI / extlog: Switch to use new generic UUID API
        ACPI / bus: Switch to use new generic UUID API
        ACPI / APEI: Switch to use new generic UUID API
        acpi, nfit: Switch to use new generic UUID API
        MAINTAINERS: add uuid entry
        tmpfs: generate random sb->s_uuid
        scsi_debug: switch to uuid_t
        nvme: switch to uuid_t
        sysctl: switch to use uuid_t
        partitions/ldm: switch to use uuid_t
        overlayfs: use uuid_t instead of uuid_be
        fs: switch ->s_uuid to uuid_t
        ima/policy: switch to use uuid_t
        ...
      81e3e044
    • Thomas Bogendoerfer's avatar
      parisc: DMA API: return error instead of BUG_ON for dma ops on non dma devs · 33f9e024
      Thomas Bogendoerfer authored
      Enabling parport pc driver on a B2600 (and probably other 64bit PARISC
      systems) produced following BUG:
      
      CPU: 0 PID: 1 Comm: swapper Not tainted 4.12.0-rc5-30198-g1132d5e7
      
       #156
      task: 000000009e050000 task.stack: 000000009e04c000
      
           YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI
      PSW: 00001000000001101111111100001111 Not tainted
      r00-03  000000ff0806ff0f 000000009e04c990 0000000040871b78 000000009e04cac0
      r04-07  0000000040c14de0 ffffffffffffffff 000000009e07f098 000000009d82d200
      r08-11  000000009d82d210 0000000000000378 0000000000000000 0000000040c345e0
      r12-15  0000000000000005 0000000040c345e0 0000000000000000 0000000040c9d5e0
      r16-19  0000000040c345e0 00000000f00001c4 00000000f00001bc 0000000000000061
      r20-23  000000009e04ce28 0000000000000010 0000000000000010 0000000040b89e40
      r24-27  0000000000000003 0000000000ffffff 000000009d82d210 0000000040c14de0
      r28-31  0000000000000000 000000009e04ca90 000000009e04cb40 0000000000000000
      sr00-03  0000000000000000 0000000000000000 0000000000000000 0000000000000000
      sr04-07  0000000000000000 0000000000000000 0000000000000000 0000000000000000
      
      IASQ: 0000000000000000 0000000000000000 IAOQ: 00000000404aece0 00000000404aece4
       IIR: 03ffe01f    ISR: 0000000010340000  IOR: 000001781304cac8
       CPU:        0   CR30: 000000009e04c000 CR31: 00000000e2976de2
       ORIG_R28: 0000000000000200
       IAOQ[0]: sba_dma_supported+0x80/0xd0
       IAOQ[1]: sba_dma_supported+0x84/0xd0
       RP(r2): parport_pc_probe_port+0x178/0x1200
      
      Cause is a call to dma_coerce_mask_and_coherenet in parport_pc_probe_port,
      which PARISC DMA API doesn't handle very nicely. This commit gives back
      DMA_ERROR_CODE for DMA API calls, if device isn't capable of DMA
      transaction.
      
      Cc: <stable@vger.kernel.org> # v3.13+
      Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      33f9e024
  4. 02 Jul, 2017 5 commits