1. 16 Feb, 2015 1 commit
  2. 11 Feb, 2015 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 1d9c5d79
      Linus Torvalds authored
      Pull live patching infrastructure from Jiri Kosina:
       "Let me provide a bit of history first, before describing what is in
        this pile.
      
        Originally, there was kSplice as a standalone project that implemented
        stop_machine()-based patching for the linux kernel.  This project got
        later acquired, and the current owner is providing live patching as a
        proprietary service, without any intentions to have their
        implementation merged.
      
        Then, due to rising user/customer demand, both Red Hat and SUSE
        started working on their own implementation (not knowing about each
        other), and announced first versions roughly at the same time [1] [2].
      
        The principle difference between the two solutions is how they are
        making sure that the patching is performed in a consistent way when it
        comes to different execution threads with respect to the semantic
        nature of the change that is being introduced.
      
        In a nutshell, kPatch is issuing stop_machine(), then looking at
        stacks of all existing processess, and if it decides that the system
        is in a state that can be patched safely, it proceeds insterting code
        redirection machinery to the patched functions.
      
        On the other hand, kGraft provides a per-thread consistency during one
        single pass of a process through the kernel and performs a lazy
        contignuous migration of threads from "unpatched" universe to the
        "patched" one at safe checkpoints.
      
        If interested in a more detailed discussion about the consistency
        models and its possible combinations, please see the thread that
        evolved around [3].
      
        It pretty quickly became obvious to the interested parties that it's
        absolutely impractical in this case to have several isolated solutions
        for one task to co-exist in the kernel.  During a dedicated Live
        Kernel Patching track at LPC in Dusseldorf, all the interested parties
        sat together and came up with a joint aproach that would work for both
        distro vendors.  Steven Rostedt took notes [4] from this meeting.
      
        And the foundation for that aproach is what's present in this pull
        request.
      
        It provides a basic infrastructure for function "live patching" (i.e.
        code redirection), including API for kernel modules containing the
        actual patches, and API/ABI for userspace to be able to operate on the
        patches (look up what patches are applied, enable/disable them, etc).
      
        It's relatively simple and minimalistic, as it's making use of
        existing kernel infrastructure (namely ftrace) as much as possible.
        It's also self-contained, in a sense that it doesn't hook itself in
        any other kernel subsystem (it doesn't even touch any other code).
        It's now implemented for x86 only as a reference architecture, but
        support for powerpc, s390 and arm is already in the works (adding
        arch-specific support basically boils down to teaching ftrace about
        regs-saving).
      
        Once this common infrastructure gets merged, both Red Hat and SUSE
        have agreed to immediately start porting their current solutions on
        top of this, abandoning their out-of-tree code.  The plan basically is
        that each patch will be marked by flag(s) that would indicate which
        consistency model it is willing to use (again, the details have been
        sketched out already in the thread at [3]).
      
        Before this happens, the current codebase can be used to patch a large
        group of secruity/stability problems the patches for which are not too
        complex (in a sense that they don't introduce non-trivial change of
        function's return value semantics, they don't change layout of data
        structures, etc) -- this corresponds to LEAVE_FUNCTION &&
        SWITCH_FUNCTION semantics described at [3].
      
        This tree has been in linux-next since December.
      
          [1] https://lkml.org/lkml/2014/4/30/477
          [2] https://lkml.org/lkml/2014/7/14/857
          [3] https://lkml.org/lkml/2014/11/7/354
          [4] http://linuxplumbersconf.org/2014/wp-content/uploads/2014/10/LPC2014_LivePatching.txt
      
        [ The core code is introduced by the three commits authored by Seth
          Jennings, which got a lot of changes incorporated during numerous
          respins and reviews of the initial implementation.  All the followup
          commits have materialized only after public tree has been created,
          so they were not folded into initial three commits so that the
          public tree doesn't get rebased ]"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: add missing newline to error message
        livepatch: rename config to CONFIG_LIVEPATCH
        livepatch: fix uninitialized return value
        livepatch: support for repatching a function
        livepatch: enforce patch stacking semantics
        livepatch: change ARCH_HAVE_LIVE_PATCHING to HAVE_LIVE_PATCHING
        livepatch: fix deferred module patching order
        livepatch: handle ancient compilers with more grace
        livepatch: kconfig: use bool instead of boolean
        livepatch: samples: fix usage example comments
        livepatch: MAINTAINERS: add git tree location
        livepatch: use FTRACE_OPS_FL_IPMODIFY
        livepatch: move x86 specific ftrace handler code to arch/x86
        livepatch: samples: add sample live patching module
        livepatch: kernel: add support for live patching
        livepatch: kernel: add TAINT_LIVEPATCH
      1d9c5d79
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 870fd0f5
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       "Updates for HID code
      
         - improveements of Logitech HID++ procotol implementation, from
           Benjamin Tissoires
      
         - support for composite RMI devices, from Andrew Duggan
      
         - new driver for BETOP controller, from Huang Bo
      
         - fixup for conflicting mapping in HID core between PC-101/103/104
           and PC-102/105 keyboards from David Herrmann
      
         - new hardware support and fixes in Wacom driver, from Ping Cheng
      
         - assorted small fixes and device ID additions all over the place"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (33 commits)
        HID: wacom: add support for Cintiq 27QHD and 27QHD touch
        HID: wacom: consolidate input capability settings for pen and touch
        HID: wacom: make sure touch arbitration is applied consistently
        HID: pidff: Fix initialisation forMicrosoft Sidewinder FF Pro 2
        HID: hyperv: match wait_for_completion_timeout return type
        HID: wacom: Report ABS_MISC event for Cintiq Companion Hybrid
        HID: Use Kbuild idiom in Makefiles
        HID: do not bind to Microchip Pick16F1454
        HID: hid-lg4ff: use DEVICE_ATTR_RW macro
        HID: hid-lg4ff: fix sysfs attribute permission
        HID: wacom: peport In Range event according to the spec
        HID: wacom: process invalid Cintiq and Intuos data in wacom_intuos_inout()
        HID: rmi: Add support for the touchpad in the Razer Blade 14 laptop
        HID: rmi: Support touchpads with external buttons
        HID: rmi: Use hid_report_len to compute the size of reports
        HID: logitech-hidpp: store the name of the device in struct hidpp
        HID: microsoft: add support for Japanese Surface Type Cover 3
        HID: fixup the conflicting keyboard mappings quirk
        HID: apple: fix battery support for the 2009 ANSI wireless keyboard
        HID: fix Kconfig text
        ...
      870fd0f5
    • Linus Torvalds's avatar
      sata_dwc_460ex: disable COMPILE_TEST again · 06cc01a0
      Linus Torvalds authored
      Commit 84683a7e ("sata_dwc_460ex: enable COMPILE_TEST for the
      driver") enabled this driver for non-ppc460-ex platforms, but it was
      then disabled for ARM and ARM64 by commit 2de5a9c0 ("sata_dwc_460ex:
      disable compilation on ARM and ARM64") because it's too noisy and
      broken.
      
      This disabled is entirely, because it's too noisy on x86-64 too, and
      there's no point in disabling architectures one by one.  At a minimum,
      the code isn't 64-bit clean, and even on 32-bit it is questionable
      whether it makes sense.
      
      Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
      Cc: Tejun Heo <tj@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      06cc01a0
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 992de5a8
      Linus Torvalds authored
      Merge misc updates from Andrew Morton:
       "Bite-sized chunks this time, to avoid the MTA ratelimiting woes.
      
         - fs/notify updates
      
         - ocfs2
      
         - some of MM"
      
      That laconic "some MM" is mainly the removal of remap_file_pages(),
      which is a big simplification of the VM, and which gets rid of a *lot*
      of random cruft and special cases because we no longer support the
      non-linear mappings that it used.
      
      From a user interface perspective, nothing has changed, because the
      remap_file_pages() syscall still exists, it's just done by emulating the
      old behavior by creating a lot of individual small mappings instead of
      one non-linear one.
      
      The emulation is slower than the old "native" non-linear mappings, but
      nobody really uses or cares about remap_file_pages(), and simplifying
      the VM is a big advantage.
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (78 commits)
        memcg: zap memcg_slab_caches and memcg_slab_mutex
        memcg: zap memcg_name argument of memcg_create_kmem_cache
        memcg: zap __memcg_{charge,uncharge}_slab
        mm/page_alloc.c: place zone_id check before VM_BUG_ON_PAGE check
        mm: hugetlb: fix type of hugetlb_treat_as_movable variable
        mm, hugetlb: remove unnecessary lower bound on sysctl handlers"?
        mm: memory: merge shared-writable dirtying branches in do_wp_page()
        mm: memory: remove ->vm_file check on shared writable vmas
        xtensa: drop _PAGE_FILE and pte_file()-related helpers
        x86: drop _PAGE_FILE and pte_file()-related helpers
        unicore32: drop pte_file()-related helpers
        um: drop _PAGE_FILE and pte_file()-related helpers
        tile: drop pte_file()-related helpers
        sparc: drop pte_file()-related helpers
        sh: drop _PAGE_FILE and pte_file()-related helpers
        score: drop _PAGE_FILE and pte_file()-related helpers
        s390: drop pte_file()-related helpers
        parisc: drop _PAGE_FILE and pte_file()-related helpers
        openrisc: drop _PAGE_FILE and pte_file()-related helpers
        nios2: drop _PAGE_FILE and pte_file()-related helpers
        ...
      992de5a8
    • Linus Torvalds's avatar
      Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · b2718bff
      Linus Torvalds authored
      Pull gfs2 updates from Steven Whitehouse:
       "This time we have mostly clean ups.  There is a bug fix for a NULL
        dereference relating to ACLs, and another which improves (but does not
        fix entirely) an allocation fall-back code path.  The other three
        patches are small clean ups"
      
      * tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()
        GFS2: use __vmalloc GFP_NOFS for fs-related allocations.
        GFS2: Eliminate a nonsense goto
        GFS2: fix sprintf format specifier
        GFS2: Eliminate __gfs2_glock_remove_from_lru
      b2718bff
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · ae90fb14
      Linus Torvalds authored
      Pull xfs update from Dave Chinner:
       "This update contains:
      
         - RENAME_EXCHANGE support
      
         - Rework of the superblock logging infrastructure
      
         - Rework of the XFS_IOCTL_SETXATTR implementation
             * enables use inside user namespaces
             * fixes inconsistencies setting extent size hints
      
         - fixes for missing buffer type annotations used in log recovery
      
         - more consolidation of libxfs headers
      
         - preparation patches for block based PNFS support
      
         - miscellaneous bug fixes and cleanups"
      
      * tag 'xfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (37 commits)
        xfs: only trace buffer items if they exist
        xfs: report proper f_files in statfs if we overshoot imaxpct
        xfs: fix panic_mask documentation
        xfs: xfs_ioctl_setattr_check_projid can be static
        xfs: growfs should use synchronous transactions
        xfs: fix behaviour of XFS_IOC_FSSETXATTR on directories
        xfs: factor projid hint checking out of xfs_ioctl_setattr
        xfs: factor extsize hint checking out of xfs_ioctl_setattr
        xfs: XFS_IOCTL_SETXATTR can run in user namespaces
        xfs: kill xfs_ioctl_setattr behaviour mask
        xfs: disaggregate xfs_ioctl_setattr
        xfs: factor out xfs_ioctl_setattr transaciton preamble
        xfs: separate xflags from xfs_ioctl_setattr
        xfs: FSX_NONBLOCK is not used
        xfs: don't allocate an ioend for direct I/O completions
        xfs: change kmem_free to use generic kvfree()
        xfs: factor out a xfs_update_prealloc_flags() helper
        xfs: remove incorrect error negation in attr_multi ioctl
        xfs: set superblock buffer type correctly
        xfs: set buf types when converting extent formats
        ...
      ae90fb14
  3. 10 Feb, 2015 33 commits