1. 23 Jul, 2015 1 commit
    • Eric W. Biederman's avatar
      mnt: Clarify and correct the disconnect logic in umount_tree · f2d0a123
      Eric W. Biederman authored
      rmdir mntpoint will result in an infinite loop when there is
      a mount locked on the mountpoint in another mount namespace.
      
      This is because the logic to test to see if a mount should
      be disconnected in umount_tree is buggy.
      
      Move the logic to decide if a mount should remain connected to
      it's mountpoint into it's own function disconnect_mount so that
      clarity of expression instead of terseness of expression becomes
      a virtue.
      
      When the conditions where it is invalid to leave a mount connected
      are first ruled out, the logic for deciding if a mount should
      be disconnected becomes much clearer and simpler.
      
      Fixes: e0c9c0af mnt: Update detach_mounts to leave mounts connected
      Fixes: ce07d891 mnt: Honor MNT_LOCKED when detaching mounts
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      f2d0a123
  2. 05 Jul, 2015 4 commits
    • Linus Torvalds's avatar
      Linux 4.2-rc1 · d770e558
      Linus Torvalds authored
      d770e558
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.2-2' of... · a585d2b7
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull late x86 platform driver updates from Darren Hart:
       "The following came in a bit later and I wanted them to bake in next a
        few more days before submitting, thus the second pull.
      
        A new intel_pmc_ipc driver, a symmetrical allocation and free fix in
        dell-laptop, a couple minor fixes, and some updated documentation in
        the dell-laptop comments.
      
        intel_pmc_ipc:
         - Add Intel Apollo Lake PMC IPC driver
      
        tc1100-wmi:
         - Delete an unnecessary check before the function call "kfree"
      
        dell-laptop:
         - Fix allocating & freeing SMI buffer page
         - Show info about WiGig and UWB in debugfs
         - Update information about wireless control"
      
      * tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        intel_pmc_ipc: Add Intel Apollo Lake PMC IPC driver
        tc1100-wmi: Delete an unnecessary check before the function call "kfree"
        dell-laptop: Fix allocating & freeing SMI buffer page
        dell-laptop: Show info about WiGig and UWB in debugfs
        dell-laptop: Update information about wireless control
      a585d2b7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 1dc51b82
      Linus Torvalds authored
      Pull more vfs updates from Al Viro:
       "Assorted VFS fixes and related cleanups (IMO the most interesting in
        that part are f_path-related things and Eric's descriptor-related
        stuff).  UFS regression fixes (it got broken last cycle).  9P fixes.
        fs-cache series, DAX patches, Jan's file_remove_suid() work"
      
      [ I'd say this is much more than "fixes and related cleanups".  The
        file_table locking rule change by Eric Dumazet is a rather big and
        fundamental update even if the patch isn't huge.   - Linus ]
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (49 commits)
        9p: cope with bogus responses from server in p9_client_{read,write}
        p9_client_write(): avoid double p9_free_req()
        9p: forgetting to cancel request on interrupted zero-copy RPC
        dax: bdev_direct_access() may sleep
        block: Add support for DAX reads/writes to block devices
        dax: Use copy_from_iter_nocache
        dax: Add block size note to documentation
        fs/file.c: __fget() and dup2() atomicity rules
        fs/file.c: don't acquire files->file_lock in fd_install()
        fs:super:get_anon_bdev: fix race condition could cause dev exceed its upper limitation
        vfs: avoid creation of inode number 0 in get_next_ino
        namei: make set_root_rcu() return void
        make simple_positive() public
        ufs: use dir_pages instead of ufs_dir_pages()
        pagemap.h: move dir_pages() over there
        remove the pointless include of lglock.h
        fs: cleanup slight list_entry abuse
        xfs: Correctly lock inode when removing suid and file capabilities
        fs: Call security_ops->inode_killpriv on truncate
        fs: Provide function telling whether file_remove_privs() will do anything
        ...
      1dc51b82
    • Linus Torvalds's avatar
      bluetooth: fix list handling · 9b284cbd
      Linus Torvalds authored
      Commit 835a6a2f ("Bluetooth: Stop sabotaging list poisoning")
      thought that the code was sabotaging the list poisoning when NULL'ing
      out the list pointers and removed it.
      
      But what was going on was that the bluetooth code was using NULL
      pointers for the list as a way to mark it empty, and that commit just
      broke it (and replaced the test with NULL with a "list_empty()" test on
      a uninitialized list instead, breaking things even further).
      
      So fix it all up to use the regular and real list_empty() handling
      (which does not use NULL, but a pointer to itself), also making sure to
      initialize the list properly (the previous NULL case was initialized
      implicitly by the session being allocated with kzalloc())
      
      This is a combination of patches by Marcel Holtmann and Tedd Ho-Jeong
      An.
      
      [ I would normally expect to get this through the bt tree, but I'm going
        to release -rc1, so I'm just committing this directly   - Linus ]
      Reported-and-tested-by: default avatarJörg Otte <jrg.otte@gmail.com>
      Cc: Alexey Dobriyan <adobriyan@gmail.com>
      Original-by: default avatarTedd Ho-Jeong An <tedd.an@intel.com>
      Original-by: Marcel Holtmann <marcel@holtmann.org>:
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9b284cbd
  3. 04 Jul, 2015 35 commits
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 5c755fe1
      Linus Torvalds authored
      Pull SCSI target updates from Nicholas Bellinger:
       "It's been a busy development cycle for target-core in a number of
        different areas.
      
        The fabric API usage for se_node_acl allocation is now within
        target-core code, dropping the external API callers for all fabric
        drivers tree-wide.
      
        There is a new conversion to RCU hlists for se_node_acl and
        se_portal_group LUN mappings, that turns fast-past LUN lookup into a
        completely lockless code-path.  It also removes the original
        hard-coded limitation of 256 LUNs per fabric endpoint.
      
        The configfs attributes for backends can now be shared between core
        and driver code, allowing existing drivers to use common code while
        still allowing flexibility for new backend provided attributes.
      
        The highlights include:
      
         - Merge sbc_verify_dif_* into common code (sagi)
         - Remove iscsi-target support for obsolete IFMarker/OFMarker
           (Christophe Vu-Brugier)
         - Add bidi support in target/user backend (ilias + vangelis + agover)
         - Move se_node_acl allocation into target-core code (hch)
         - Add crc_t10dif_update common helper (akinobu + mkp)
         - Handle target-core odd SGL mapping for data transfer memory
           (akinobu)
         - Move transport ID handling into target-core (hch)
         - Move task tag into struct se_cmd + support 64-bit tags (bart)
         - Convert se_node_acl->device_list[] to RCU hlist (nab + hch +
           paulmck)
         - Convert se_portal_group->tpg_lun_list[] to RCU hlist (nab + hch +
           paulmck)
         - Simplify target backend driver registration (hch)
         - Consolidate + simplify target backend attribute implementations
           (hch + nab)
         - Subsume se_port + t10_alua_tg_pt_gp_member into se_lun (hch)
         - Drop lun_sep_lock for se_lun->lun_se_dev RCU usage (hch + nab)
         - Drop unnecessary core_tpg_register TFO parameter (nab)
         - Use 64-bit LUNs tree-wide (hannes)
         - Drop left-over TARGET_MAX_LUNS_PER_TRANSPORT limit (hannes)"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (76 commits)
        target: Bump core version to v5.0
        target: remove target_core_configfs.h
        target: remove unused TARGET_CORE_CONFIG_ROOT define
        target: consolidate version defines
        target: implement WRITE_SAME with UNMAP bit using ->execute_unmap
        target: simplify UNMAP handling
        target: replace se_cmd->execute_rw with a protocol_data field
        target/user: Fix inconsistent kmap_atomic/kunmap_atomic
        target: Send UA when changing LUN inventory
        target: Send UA upon LUN RESET tmr completion
        target: Send UA on ALUA target port group change
        target: Convert se_lun->lun_deve_lock to normal spinlock
        target: use 'se_dev_entry' when allocating UAs
        target: Remove 'ua_nacl' pointer from se_ua structure
        target_core_alua: Correct UA handling when switching states
        xen-scsiback: Fix compile warning for 64-bit LUN
        target: Remove TARGET_MAX_LUNS_PER_TRANSPORT
        target: use 64-bit LUNs
        target: Drop duplicate + unused se_dev_check_wce
        target: Drop unnecessary core_tpg_register TFO parameter
        ...
      5c755fe1
    • Linus Torvalds's avatar
      Merge tag 'ntb-4.2' of git://github.com/jonmason/ntb · 6d7c8e1b
      Linus Torvalds authored
      Pull NTB updates from Jon Mason:
       "This includes a pretty significant reworking of the NTB core code, but
        has already produced some significant performance improvements.
      
        An abstraction layer was added to allow the hardware and clients to be
        easily added.  This required rewriting the NTB transport layer for
        this abstraction layer.  This modification will allow future "high
        performance" NTB clients.
      
        In addition to this change, a number of performance modifications were
        added.  These changes include NUMA enablement, using CPU memcpy
        instead of asyncdma, and modification of NTB layer MTU size"
      
      * tag 'ntb-4.2' of git://github.com/jonmason/ntb: (22 commits)
        NTB: Add split BAR output for debugfs stats
        NTB: Change WARN_ON_ONCE to pr_warn_once on unsafe
        NTB: Print driver name and version in module init
        NTB: Increase transport MTU to 64k from 16k
        NTB: Rename Intel code names to platform names
        NTB: Default to CPU memcpy for performance
        NTB: Improve performance with write combining
        NTB: Use NUMA memory in Intel driver
        NTB: Use NUMA memory and DMA chan in transport
        NTB: Rate limit ntb_qp_link_work
        NTB: Add tool test client
        NTB: Add ping pong test client
        NTB: Add parameters for Intel SNB B2B addresses
        NTB: Reset transport QP link stats on down
        NTB: Do not advance transport RX on link down
        NTB: Differentiate transport link down messages
        NTB: Check the device ID to set errata flags
        NTB: Enable link for Intel root port mode in probe
        NTB: Read peer info from local SPAD in transport
        NTB: Split ntb_hw_intel and ntb_transport drivers
        ...
      6d7c8e1b
    • Al Viro's avatar
      9p: cope with bogus responses from server in p9_client_{read,write} · 0f1db7de
      Al Viro authored
      if server claims to have written/read more than we'd told it to,
      warn and cap the claimed byte count to avoid advancing more than
      we are ready to.
      0f1db7de
    • Al Viro's avatar
      p9_client_write(): avoid double p9_free_req() · 67e808fb
      Al Viro authored
      Braino in "9p: switch p9_client_write() to passing it struct iov_iter *";
      if response is impossible to parse and we discard the request, get the
      out of the loop right there.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      67e808fb
    • Al Viro's avatar
      9p: forgetting to cancel request on interrupted zero-copy RPC · a84b69cb
      Al Viro authored
      If we'd already sent a request and decide to abort it, we *must*
      issue TFLUSH properly and not just blindly reuse the tag, or
      we'll get seriously screwed when response eventually arrives
      and we confuse it for response to later request that had reused
      the same tag.
      
      Cc: stable@vger.kernel.org # v3.2 and later
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      a84b69cb
    • Matthew Wilcox's avatar
      dax: bdev_direct_access() may sleep · 43c3dd08
      Matthew Wilcox authored
      The brd driver is the only in-tree driver that may sleep currently.
      After some discussion on linux-fsdevel, we decided that any driver
      may choose to sleep in its ->direct_access method.  To ensure that all
      callers of bdev_direct_access() are prepared for this, add a call
      to might_sleep().
      Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      43c3dd08
    • Matthew Wilcox's avatar
      block: Add support for DAX reads/writes to block devices · bbab37dd
      Matthew Wilcox authored
      If a block device supports the ->direct_access methods, bypass the normal
      DIO path and use DAX to go straight to memcpy() instead of allocating
      a DIO and a BIO.
      
      Includes support for the DIO_SKIP_DIO_COUNT flag in DAX, as is done in
      do_blockdev_direct_IO().
      Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      bbab37dd
    • Matthew Wilcox's avatar
      dax: Use copy_from_iter_nocache · 872eb127
      Matthew Wilcox authored
      When userspace does a write, there's no need for the written data to
      pollute the CPU cache.  This matches the original XIP code.
      Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      872eb127
    • Matthew Wilcox's avatar
      dax: Add block size note to documentation · 44f4c054
      Matthew Wilcox authored
      For block devices which are small enough, mkfs will default to creating
      a filesystem with block sizes smaller than page size.
      Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      44f4c054
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 1b3618b6
      Linus Torvalds authored
      Pull kvm fixes from Paolo Bonzini:
       "Except for the preempt notifiers fix, these are all small bugfixes
        that could have been waited for -rc2.  Sending them now since I was
        taking care of Peter's patch anyway"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        kvm: add hyper-v crash msrs values
        KVM: x86: remove data variable from kvm_get_msr_common
        KVM: s390: virtio-ccw: don't overwrite config space values
        KVM: x86: keep track of LVT0 changes under APICv
        KVM: x86: properly restore LVT0
        KVM: x86: make vapics_in_nmi_mode atomic
        sched, preempt_notifier: separate notifier registration from static_key inc/dec
      1b3618b6
    • Dave Jiang's avatar
      NTB: Add split BAR output for debugfs stats · bf44fe46
      Dave Jiang authored
      When split BAR is enabled, the driver needs to dump out the split BAR
      registers rather than the original 64bit BAR registers.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      bf44fe46
    • Dave Jiang's avatar
      NTB: Change WARN_ON_ONCE to pr_warn_once on unsafe · fd839bf8
      Dave Jiang authored
      The unsafe doorbell and scratchpad access should display reason when
      WARN is called.  Otherwise we get a stack dump without any explanation.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      fd839bf8
    • Dave Jiang's avatar
      NTB: Print driver name and version in module init · 7eb38781
      Dave Jiang authored
      Printouts driver name and version to indicate what is being loaded.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      7eb38781
    • Dave Jiang's avatar
      NTB: Increase transport MTU to 64k from 16k · 9891417d
      Dave Jiang authored
      Benchmarking showed a significant performance increase with the MTU size
      to 64k instead of 16k.  Change the driver default to 64k.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      9891417d
    • Dave Jiang's avatar
      NTB: Rename Intel code names to platform names · 2f887b9a
      Dave Jiang authored
      Instead of using the platform code names, use the correct platform names
      to identify the respective Intel NTB hardware.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      2f887b9a
    • Dave Jiang's avatar
      NTB: Default to CPU memcpy for performance · a41ef053
      Dave Jiang authored
      Disable DMA usage by default, since the CPU provides much better
      performance with write combining.  Provide a module parameter to enable
      DMA usage when offloading the memcpy is preferred.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      a41ef053
    • Dave Jiang's avatar
      NTB: Improve performance with write combining · 06917f75
      Dave Jiang authored
      Changing the memory window BAR mappings to write combining significantly
      boosts the performance.  We will also use memcpy that uses non-temporal
      store, which showed performance improvement when doing non-cached
      memcpys.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      06917f75
    • Allen Hubbe's avatar
      NTB: Use NUMA memory in Intel driver · 0e041fb5
      Allen Hubbe authored
      Allocate memory for the NUMA node of the NTB device.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      0e041fb5
    • Allen Hubbe's avatar
      NTB: Use NUMA memory and DMA chan in transport · 1199aa61
      Allen Hubbe authored
      Allocate memory and request the DMA channel for the same NUMA node as
      the NTB device.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      1199aa61
    • Allen Hubbe's avatar
      NTB: Rate limit ntb_qp_link_work · 28762289
      Allen Hubbe authored
      When the ntb transport is connecting and waiting for the peer, the debug
      console receives lots of debug level messages about the remote qp link
      status being down.  Rate limit those messages.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      28762289
    • Allen Hubbe's avatar
      NTB: Add tool test client · 578b881b
      Allen Hubbe authored
      This is a simple debugging driver that enables the doorbell and
      scratch pad registers to be read and written from the debugfs.  This
      tool enables more complicated debugging to be scripted from user space.
      This driver may be used to test that your ntb hardware and drivers are
      functioning at a basic level.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      578b881b
    • Allen Hubbe's avatar
      NTB: Add ping pong test client · 963de473
      Allen Hubbe authored
      This is a simple ping pong driver that exercises the scratch pads and
      doorbells of the ntb hardware.  This driver may be used to test that
      your ntb hardware and drivers are functioning at a basic level.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      963de473
    • Allen Hubbe's avatar
      NTB: Add parameters for Intel SNB B2B addresses · 42fefc86
      Allen Hubbe authored
      Add module parameters for the addresses to be used in B2B topology.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      42fefc86
    • Allen Hubbe's avatar
      NTB: Reset transport QP link stats on down · 2849b5d7
      Allen Hubbe authored
      Reset the link stats when the link goes down.  In particular, the TX and
      RX index and count must be reset, or else the TX side will be sending
      packets to the RX side where the RX side is not expecting them.  Reset
      all the stats, to be consistent.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      2849b5d7
    • Allen Hubbe's avatar
      NTB: Do not advance transport RX on link down · c0900b33
      Allen Hubbe authored
      On link down, don't advance RX index to the next entry.  The next entry
      should never be valid after receiving the link down flag.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      c0900b33
    • Allen Hubbe's avatar
      NTB: Differentiate transport link down messages · e22e0b9d
      Allen Hubbe authored
      The same message "qp %d: Link Down\n" was printed at two locations in
      ntb_transport.  Change the messages so they are distinct.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      e22e0b9d
    • Dave Jiang's avatar
      NTB: Check the device ID to set errata flags · dd5d4d8e
      Dave Jiang authored
      Set errata flags for the specific device IDs to which they apply,
      instead of the whole Xeon hardware class.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      dd5d4d8e
    • Dave Jiang's avatar
      NTB: Enable link for Intel root port mode in probe · 5ae0beb6
      Dave Jiang authored
      Link training should be enabled in the driver probe for root port mode.
      We should not have to wait for transport to be loaded for this to
      happen.  Otherwise the ntb device will not show up on the transparent
      bridge side of the link.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      5ae0beb6
    • Dave Jiang's avatar
      NTB: Read peer info from local SPAD in transport · 0f69a7df
      Dave Jiang authored
      The transport was writing and then reading the peer scratch pad,
      essentially reading what it just wrote instead of exchanging any
      information with the peer.  The transport expects the peer values to be
      the same as the local values, so this issue was not obvious.
      Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      0f69a7df
    • Allen Hubbe's avatar
      NTB: Split ntb_hw_intel and ntb_transport drivers · e26a5843
      Allen Hubbe authored
      Change ntb_hw_intel to use the new NTB hardware abstraction layer.
      
      Split ntb_transport into its own driver.  Change it to use the new NTB
      hardware abstraction layer.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      e26a5843
    • Allen Hubbe's avatar
      NTB: Add NTB hardware abstraction layer · a1bd3bae
      Allen Hubbe authored
      Abstract the NTB device behind a programming interface, so that it can
      support different hardware and client drivers.
      Signed-off-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
      Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
      a1bd3bae
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 14a6f198
      Linus Torvalds authored
      Pull irq update from Thomas Gleixner:
       "The last update for 4.2 is just moving a macro from a local header to
        the global one, so it can be used in architecture code as well.
      
        Cleanup of the now empty local header is 4.3 material"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h
      14a6f198
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b1be9ead
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Two FPU rewrite related fixes.  This addresses all known x86
        regressions at this stage.  Also some other misc fixes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/fpu: Fix boot crash in the early FPU code
        x86/asm/entry/64: Update path names
        x86/fpu: Fix FPU related boot regression when CPUID masking BIOS feature is enabled
        x86/boot/setup: Clean up the e820_reserve_setup_data() code
        x86/kaslr: Fix typo in the KASLR_FLAG documentation
      b1be9ead
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 22a093b2
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Debug info and other statistics fixes and related enhancements"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/numa: Fix numa balancing stats in /proc/pid/sched
        sched/numa: Show numa_group ID in /proc/sched_debug task listings
        sched/debug: Move print_cfs_rq() declaration to kernel/sched/sched.h
        sched/stat: Expose /proc/pid/schedstat if CONFIG_SCHED_INFO=y
        sched/stat: Simplify the sched_info accounting dependency
      22a093b2
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c1776a18
      Linus Torvalds authored
      Pull perf updates from Ingo Molnar:
       "This tree includes an x86 PMU scheduling fix, but most changes are
        late breaking tooling fixes and updates:
      
        User visible fixes:
      
         - Create config.detected into OUTPUT directory, fixing parallel
           builds sharing the same source directory (Aaro Kiskinen)
      
         - Allow to specify custom linker command, fixing some MIPS64 builds.
           (Aaro Kiskinen)
      
         - Fix to show proper convergence stats in 'perf bench numa' (Srikar
           Dronamraju)
      
        User visible changes:
      
         - Validate syscall list passed via -e argument to 'perf trace'.
           (Arnaldo Carvalho de Melo)
      
         - Introduce 'perf stat --per-thread' (Jiri Olsa)
      
         - Check access permission for --kallsyms and --vmlinux (Li Zhang)
      
         - Move toggling event logic from 'perf top' and into hists browser,
           allowing freeze/unfreeze with event lists with more than one entry
           (Namhyung Kim)
      
         - Add missing newlines when dumping PERF_RECORD_FINISHED_ROUND and
           showing the Aggregated stats in 'perf report -D' (Adrian Hunter)
      
        Infrastructure fixes:
      
         - Add missing break for PERF_RECORD_ITRACE_START, which caused those
           events samples to be parsed as well as PERF_RECORD_LOST_SAMPLES.
           ITRACE_START only appears when Intel PT or BTS are present, so..
           (Jiri Olsa)
      
         - Call the perf_session destructor when bailing out in the inject,
           kmem, report, kvm and mem tools (Taeung Song)
      
        Infrastructure changes:
      
         - Move stuff out of 'perf stat' and into the lib for further use
           (Jiri Olsa)
      
         - Reference count the cpu_map and thread_map classes (Jiri Olsa)
      
         - Set evsel->{cpus,threads} from the evlist, if not set, allowing the
           generalization of some 'perf stat' functions that previously were
           accessing private static evlist variable (Jiri Olsa)
      
         - Delete an unnecessary check before the calling free_event_desc()
           (Markus Elfring)
      
         - Allow auxtrace data alignment (Adrian Hunter)
      
         - Allow events with dot (Andi Kleen)
      
         - Fix failure to 'perf probe' events on arm (He Kuang)
      
         - Add testing for Makefile.perf (Jiri Olsa)
      
         - Add test for make install with prefix (Jiri Olsa)
      
         - Fix single target build dependency check (Jiri Olsa)
      
         - Access thread_map entries via accessors, prep patch to hold more
           info per entry, for ongoing 'perf stat --per-thread' work (Jiri
           Olsa)
      
         - Use __weak definition from compiler.h (Sukadev Bhattiprolu)
      
         - Split perf_pmu__new_alias() (Sukadev Bhattiprolu)"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (54 commits)
        perf tools: Allow to specify custom linker command
        perf tools: Create config.detected into OUTPUT directory
        perf mem: Fill in the missing session freeing after an error occurs
        perf kvm: Fill in the missing session freeing after an error occurs
        perf report: Fill in the missing session freeing after an error occurs
        perf kmem: Fill in the missing session freeing after an error occurs
        perf inject: Fill in the missing session freeing after an error occurs
        perf tools: Add missing break for PERF_RECORD_ITRACE_START
        perf/x86: Fix 'active_events' imbalance
        perf symbols: Check access permission when reading symbol files
        perf stat: Introduce --per-thread option
        perf stat: Introduce print_counters function
        perf stat: Using init_stats instead of memset
        perf stat: Rename print_interval to process_interval
        perf stat: Remove perf_evsel__read_cb function
        perf stat: Move perf_stat initialization counter process code
        perf stat: Move zero_per_pkg into counter process code
        perf stat: Separate counters reading and processing
        perf stat: Introduce read_counters function
        perf stat: Introduce perf_evsel__read function
        ...
      c1776a18