1. 07 7月, 2017 34 次提交
  2. 06 7月, 2017 6 次提交
    • L
      Merge branch 'for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · a4c20b9a
      Linus Torvalds 提交于
      Pull percpu updates from Tejun Heo:
       "These are the percpu changes for the v4.13-rc1 merge window. There are
        a couple visibility related changes - tracepoints and allocator stats
        through debugfs, along with __ro_after_init markings and a cosmetic
        rename in percpu_counter.
      
        Please note that the simple O(#elements_in_the_chunk) area allocator
        used by percpu allocator is again showing scalability issues,
        primarily with bpf allocating and freeing large number of counters.
        Dennis is working on the replacement allocator and the percpu
        allocator will be seeing increased churns in the coming cycles"
      
      * 'for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: fix static checker warnings in pcpu_destroy_chunk
        percpu: fix early calls for spinlock in pcpu_stats
        percpu: resolve err may not be initialized in pcpu_alloc
        percpu_counter: Rename __percpu_counter_add to percpu_counter_add_batch
        percpu: add tracepoint support for percpu memory
        percpu: expose statistics about percpu memory via debugfs
        percpu: migrate percpu data structures to internal header
        percpu: add missing lockdep_assert_held to func pcpu_free_area
        mark most percpu globals as __ro_after_init
      a4c20b9a
    • L
      Merge branch 'parisc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 9b51f044
      Linus Torvalds 提交于
      Pull another parisc update from Helge Deller:
       "Christoph Hellwig provided one patch for the parisc architecture to
        drop the DMA_ERROR_CODE define from the parisc architecture"
      
      * 'parisc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: ->mapping_error
      9b51f044
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 55a7b212
      Linus Torvalds 提交于
      Pull arm64 updates from Will Deacon:
      
       - RAS reporting via GHES/APEI (ACPI)
      
       - Indirect ftrace trampolines for modules
      
       - Improvements to kernel fault reporting
      
       - Page poisoning
      
       - Sigframe cleanups and preparation for SVE context
      
       - Core dump fixes
      
       - Sparse fixes (mainly relating to endianness)
      
       - xgene SoC PMU v3 driver
      
       - Misc cleanups and non-critical fixes
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (75 commits)
        arm64: fix endianness annotation for 'struct jit_ctx' and friends
        arm64: cpuinfo: constify attribute_group structures.
        arm64: ptrace: Fix incorrect get_user() use in compat_vfp_set()
        arm64: ptrace: Remove redundant overrun check from compat_vfp_set()
        arm64: ptrace: Avoid setting compat FP[SC]R to garbage if get_user fails
        arm64: fix endianness annotation for __apply_alternatives()/get_alt_insn()
        arm64: fix endianness annotation in get_kaslr_seed()
        arm64: add missing conversion to __wsum in ip_fast_csum()
        arm64: fix endianness annotation in acpi_parking_protocol.c
        arm64: use readq() instead of readl() to read 64bit entry_point
        arm64: fix endianness annotation for reloc_insn_movw() & reloc_insn_imm()
        arm64: fix endianness annotation for aarch64_insn_write()
        arm64: fix endianness annotation in aarch64_insn_read()
        arm64: fix endianness annotation in call_undef_hook()
        arm64: fix endianness annotation for debug-monitors.c
        ras: mark stub functions as 'inline'
        arm64: pass endianness info to sparse
        arm64: ftrace: fix !CONFIG_ARM64_MODULE_PLTS kernels
        arm64: signal: Allow expansion of the signal frame
        acpi: apei: check for pending errors when probing GHES entries
        ...
      55a7b212
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · e5f76a2e
      Linus Torvalds 提交于
      Pull mnt namespace updates from Eric Biederman:
       "A big break-through came during this development cycle as a way was
        found to maintain the existing umount -l semantics while allowing for
        optimizations that improve the performance. That is represented by the
        first change in this series moving the reparenting of mounts into
        their own pass. This has allowed addressing the horrific performance
        of umount -l on a carefully crafted tree of mounts with locks held
        (0.06s vs 60s in my testing). What allowed this was not changing where
        umounts propagate to while propgating umounts.
      
        The next change fixes the case where the order of the mount whose
        umount are being progated visits a tree where the mounts are stacked
        upon each other in another order. This is weird but not hard to
        implement.
      
        The final change takes advantage of the unchanging mount propgation
        tree to skip parts of the mount propgation tree that have already been
        visited. Yielding a very nice speed up in the worst case.
      
        There remains one outstanding question about the semantics of umount -l
        that I am still discussiong with Ram Pai. In practice that area of the
        semantics was changed by 1064f874 ("mnt: Tuck mounts under others
        instead of creating shadow/side mounts.") and no regressions have been
        reported. Still I intend to finish talking that out with him to ensure
        there is not something a more intense use of mount propagation in the
        future will not cause to become significant"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        mnt: Make propagate_umount less slow for overlapping mount propagation trees
        mnt: In propgate_umount handle visiting mounts in any order
        mnt: In umount propagation reparent in a separate pass
      e5f76a2e
    • L
      Merge tag 'gfs2-4.13.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · c96e6dab
      Linus Torvalds 提交于
      Pull GFS2 updates from Bob Peterson:
       "We've got eight GFS2 patches for this merge window:
      
         - Andreas Gruenbacher has four patches related to cleaning up the
           GFS2 inode evict process. This is about half of his patches
           designed to fix a long-standing GFS2 hang related to the inode
           shrinker: Shrinker calls gfs2 evict, evict calls DLM, DLM requires
           memory and blocks on the shrinker.
      
           These four patches have been well tested. His second set of patches
           are still being tested, so I plan to hold them until the next merge
           window, after we have more weeks of testing. The first patch
           eliminates the flush_delayed_work, which can block.
      
         - Andreas's second patch protects setting of gl_object for rgrps with
           a spin_lock to prevent proven races.
      
         - His third patch introduces a centralized mechanism for queueing
           glock work with better reference counting, to prevent more races.
      
          -His fourth patch retains a reference to inode glocks when an error
           occurs while creating an inode. This keeps the subsequent evict
           from needing to reacquire the glock, which might call into DLM and
           block in low memory conditions.
      
         - Arvind Yadav has a patch to add const to attribute_group
           structures.
      
         - I have a patch to detect directory entry inconsistencies and
           withdraw the file system if any are found. Better that than silent
           corruption.
      
         - I have a patch to remove a vestigial variable from glock
           structures, saving some slab space.
      
         - I have another patch to remove a vestigial variable from the GFS2
           in-core superblock structure"
      
      * tag 'gfs2-4.13.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        GFS2: constify attribute_group structures.
        gfs2: gfs2_create_inode: Keep glock across iput
        gfs2: Clean up glock work enqueuing
        gfs2: Protect gl->gl_object by spin lock
        gfs2: Get rid of flush_delayed_work in gfs2_evict_inode
        GFS2: Eliminate vestigial sd_log_flush_wrapped
        GFS2: Remove gl_list from glock structure
        GFS2: Withdraw when directory entry inconsistencies are detected
      c96e6dab
    • L
      Merge branch 'for-4.13-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 8c27cb35
      Linus Torvalds 提交于
      Pull btrfs updates from David Sterba:
       "The core updates improve error handling (mostly related to bios), with
        the usual incremental work on the GFP_NOFS (mis)use removal,
        refactoring or cleanups. Except the two top patches, all have been in
        for-next for an extensive amount of time.
      
        User visible changes:
      
         - statx support
      
         - quota override tunable
      
         - improved compression thresholds
      
         - obsoleted mount option alloc_start
      
        Core updates:
      
         - bio-related updates:
             - faster bio cloning
             - no allocation failures
             - preallocated flush bios
      
         - more kvzalloc use, memalloc_nofs protections, GFP_NOFS updates
      
         - prep work for btree_inode removal
      
         - dir-item validation
      
         - qgoup fixes and updates
      
         - cleanups:
             - removed unused struct members, unused code, refactoring
             - argument refactoring (fs_info/root, caller -> callee sink)
             - SEARCH_TREE ioctl docs"
      
      * 'for-4.13-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (115 commits)
        btrfs: Remove false alert when fiemap range is smaller than on-disk extent
        btrfs: Don't clear SGID when inheriting ACLs
        btrfs: fix integer overflow in calc_reclaim_items_nr
        btrfs: scrub: fix target device intialization while setting up scrub context
        btrfs: qgroup: Fix qgroup reserved space underflow by only freeing reserved ranges
        btrfs: qgroup: Introduce extent changeset for qgroup reserve functions
        btrfs: qgroup: Fix qgroup reserved space underflow caused by buffered write and quotas being enabled
        btrfs: qgroup: Return actually freed bytes for qgroup release or free data
        btrfs: qgroup: Cleanup btrfs_qgroup_prepare_account_extents function
        btrfs: qgroup: Add quick exit for non-fs extents
        Btrfs: rework delayed ref total_bytes_pinned accounting
        Btrfs: return old and new total ref mods when adding delayed refs
        Btrfs: always account pinned bytes when dropping a tree block ref
        Btrfs: update total_bytes_pinned when pinning down extents
        Btrfs: make BUG_ON() in add_pinned_bytes() an ASSERT()
        Btrfs: make add_pinned_bytes() take an s64 num_bytes instead of u64
        btrfs: fix validation of XATTR_ITEM dir items
        btrfs: Verify dir_item in iterate_object_props
        btrfs: Check name_len before in btrfs_del_root_ref
        btrfs: Check name_len before reading btrfs_get_name
        ...
      8c27cb35