1. 22 1月, 2015 2 次提交
  2. 15 1月, 2015 3 次提交
  3. 08 1月, 2015 13 次提交
  4. 07 1月, 2015 1 次提交
    • C
      s390/timex: fix get_tod_clock_ext() inline assembly · e38f9781
      Chen Gang 提交于
      For C language, it treats array parameter as a pointer, so sizeof for an
      array parameter is equal to sizeof for a pointer, which causes compiler
      warning (with allmodconfig by gcc 5):
      
        ./arch/s390/include/asm/timex.h: In function 'get_tod_clock_ext':
        ./arch/s390/include/asm/timex.h:76:32: warning: 'sizeof' on array function parameter 'clk' will return size of 'char *' [-Wsizeof-array-argument]
          typedef struct { char _[sizeof(clk)]; } addrtype;
                                        ^
      Can use macro CLOCK_STORE_SIZE instead of all related hard code numbers,
      which also can avoid this warning. And also add a tab to CLOCK_TICK_RATE
      definition to match coding styles.
      
      [heiko.carstens@de.ibm.com]:
      Chen's patch actually fixes a bug within the get_tod_clock_ext() inline assembly
      where we incorrectly tell the compiler that only 8 bytes of memory get changed
      instead of 16 bytes.
      This would allow gcc to generate incorrect code. Right now this doesn't seem to
      be the case.
      Also slightly changed the patch a bit.
      - renamed CLOCK_STORE_SIZE to STORE_CLOCK_EXT_SIZE
      - changed get_tod_clock_ext() to receive a char pointer parameter
      Signed-off-by: NChen Gang <gang.chen.5i5j@gmail.com>
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      e38f9781
  5. 18 12月, 2014 21 次提交
    • H
      98590460
    • C
      s390/kernel: use stnsm 255 instead of stosm 0 · 81fc77fb
      Christian Borntraeger 提交于
      On some models, stnsm 255 might be slightly faster than stosm 0.
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      81fc77fb
    • C
      s390/vtime: Get rid of redundant WARN_ON · 032014bc
      Christian Borntraeger 提交于
      in the cpu time accounting function vtime_account_irq_enter
      (vtime_account_system) we use a WARN_ON_ONCE(!irqs_disabled()).
      This is redundant as the function virt_timer_forward is always
      called and has a BUG_ON(!irqs_disabled()).
      
      This saves several nanoseconds in my specific testcase (KVM entry/exit)
      and probably all other callers like (soft)irq entry/exit.
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Reviewed-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      032014bc
    • H
      s390/zcrypt: kernel oops at insmod of the z90crypt device driver · 099eae11
      Harald Freudenberger 提交于
      Kernel oops caused by invalid parameter at TAPQ instruction:
      On older systems where the QCI instruction is not available
      all possible domains are probed via TAPQ instruction. The
      range for the probe has been extended with the > 16 domain
      support now leading to a possible specification exception
      when this instruction is called for probing higher values
      within the new range. This may happen during insmod and/or
      ap bus reset only on machines without a QCI instruction (z10,
      z196, z114), zEC12 and newer systems are not affected.
      The fix modifies the domain checking function to limit the
      allowed range if no QCI info is available.
      Signed-off-by: NHarald Freudenberger <freude@linux.vnet.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      099eae11
    • L
      Ceph: remove left-over reject file · 44e8967d
      Linus Torvalds 提交于
      Neither Sage nor I noticed that Zheng Yan had mistakenly committed
      fs/ceph/super.h.rej as part of commit 31c542a1 ("ceph: add inline
      data to pagecache").
      
      Remove it.
      Requested-by: NYan, Zheng <ukernel@gmail.com>
      Cc: Sage Weil <sweil@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      44e8967d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 57666509
      Linus Torvalds 提交于
      Pull ceph updates from Sage Weil:
       "The big item here is support for inline data for CephFS and for
        message signatures from Zheng.  There are also several bug fixes,
        including interrupted flock request handling, 0-length xattrs, mksnap,
        cached readdir results, and a message version compat field.  Finally
        there are several cleanups from Ilya, Dan, and Markus.
      
        Note that there is another series coming soon that fixes some bugs in
        the RBD 'lingering' requests, but it isn't quite ready yet"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (27 commits)
        ceph: fix setting empty extended attribute
        ceph: fix mksnap crash
        ceph: do_sync is never initialized
        libceph: fixup includes in pagelist.h
        ceph: support inline data feature
        ceph: flush inline version
        ceph: convert inline data to normal data before data write
        ceph: sync read inline data
        ceph: fetch inline data when getting Fcr cap refs
        ceph: use getattr request to fetch inline data
        ceph: add inline data to pagecache
        ceph: parse inline data in MClientReply and MClientCaps
        libceph: specify position of extent operation
        libceph: add CREATE osd operation support
        libceph: add SETXATTR/CMPXATTR osd operations support
        rbd: don't treat CEPH_OSD_OP_DELETE as extent op
        ceph: remove unused stringification macros
        libceph: require cephx message signature by default
        ceph: introduce global empty snap context
        ceph: message versioning fixes
        ...
      57666509
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 87c31b39
      Linus Torvalds 提交于
      Pull user namespace related fixes from Eric Biederman:
       "As these are bug fixes almost all of thes changes are marked for
        backporting to stable.
      
        The first change (implicitly adding MNT_NODEV on remount) addresses a
        regression that was created when security issues with unprivileged
        remount were closed.  I go on to update the remount test to make it
        easy to detect if this issue reoccurs.
      
        Then there are a handful of mount and umount related fixes.
      
        Then half of the changes deal with the a recently discovered design
        bug in the permission checks of gid_map.  Unix since the beginning has
        allowed setting group permissions on files to less than the user and
        other permissions (aka ---rwx---rwx).  As the unix permission checks
        stop as soon as a group matches, and setgroups allows setting groups
        that can not later be dropped, results in a situtation where it is
        possible to legitimately use a group to assign fewer privileges to a
        process.  Which means dropping a group can increase a processes
        privileges.
      
        The fix I have adopted is that gid_map is now no longer writable
        without privilege unless the new file /proc/self/setgroups has been
        set to permanently disable setgroups.
      
        The bulk of user namespace using applications even the applications
        using applications using user namespaces without privilege remain
        unaffected by this change.  Unfortunately this ix breaks a couple user
        space applications, that were relying on the problematic behavior (one
        of which was tools/selftests/mount/unprivileged-remount-test.c).
      
        To hopefully prevent needing a regression fix on top of my security
        fix I rounded folks who work with the container implementations mostly
        like to be affected and encouraged them to test the changes.
      
          > So far nothing broke on my libvirt-lxc test bed. :-)
          > Tested with openSUSE 13.2 and libvirt 1.2.9.
          > Tested-by: Richard Weinberger <richard@nod.at>
      
          > Tested on Fedora20 with libvirt 1.2.11, works fine.
          > Tested-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
      
          > Ok, thanks - yes, unprivileged lxc is working fine with your kernels.
          > Just to be sure I was testing the right thing I also tested using
          > my unprivileged nsexec testcases, and they failed on setgroup/setgid
          > as now expected, and succeeded there without your patches.
          > Tested-by: Serge Hallyn <serge.hallyn@ubuntu.com>
      
          > I tested this with Sandstorm.  It breaks as is and it works if I add
          > the setgroups thing.
          > Tested-by: Andy Lutomirski <luto@amacapital.net> # breaks things as designed :("
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        userns: Unbreak the unprivileged remount tests
        userns; Correct the comment in map_write
        userns: Allow setting gid_maps without privilege when setgroups is disabled
        userns: Add a knob to disable setgroups on a per user namespace basis
        userns: Rename id_map_mutex to userns_state_mutex
        userns: Only allow the creator of the userns unprivileged mappings
        userns: Check euid no fsuid when establishing an unprivileged uid mapping
        userns: Don't allow unprivileged creation of gid mappings
        userns: Don't allow setgroups until a gid mapping has been setablished
        userns: Document what the invariant required for safe unprivileged mappings.
        groups: Consolidate the setgroups permission checks
        mnt: Clear mnt_expire during pivot_root
        mnt: Carefully set CL_UNPRIVILEGED in clone_mnt
        mnt: Move the clear of MNT_LOCKED from copy_tree to it's callers.
        umount: Do not allow unmounting rootfs.
        umount: Disallow unprivileged mount force
        mnt: Update unprivileged remount test
        mnt: Implicitly add MNT_NODEV on remount when it was implicitly added by mount
      87c31b39
    • L
      mmu_gather: fix over-eager tlb_flush_mmu_free() calling · f045bbb9
      Linus Torvalds 提交于
      Dave Hansen reports that commit fb7332a9 ("mmu_gather: move minimal
      range calculations into generic code") caused a performance problem:
      
        "tlb_finish_mmu() goes up about 9x in the profiles (~0.4%->3.6%) and
         tlb_flush_mmu_free() takes about 3.1% of CPU time with the patch
         applied, but does not show up at all on the commit before"
      
      and the reason is that Will moved the test for whether we need to flush
      from tlb_flush_mmu() into tlb_flush_mmu_tlbonly().  But that meant that
      tlb_flush_mmu_free() basically lost that check.
      
      Move it back into tlb_flush_mmu() where it belongs, so that it covers
      both tlb_flush_mmu_tlbonly() _and_ tlb_flush_mmu_free().
      Reported-and-tested-by: NDave Hansen <dave@sr71.net>
      Acked-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f045bbb9
    • L
      x86: mm: fix VM_FAULT_RETRY handling · cf3c0a15
      Linus Torvalds 提交于
      My commit 26178ec1 ("x86: mm: consolidate VM_FAULT_RETRY handling")
      had a really stupid typo: the FAULT_FLAG_USER bit is in the 'flags'
      variable, not the 'fault' variable. Duh,
      
      The one silver lining in this is that Dave finding this at least
      confirms that trinity actually triggers this special path easily, in a
      way normal use does not.
      Reported-by: NDave Jones <davej@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cf3c0a15
    • L
      Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio · cc669743
      Linus Torvalds 提交于
      Pull VFIO updates from Alex Williamson:
       - s390 support (Frank Blaschka)
       - Enable iommu-type1 for ARM SMMU (Will Deacon)
      
      * tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio:
        drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU
        vfio: make vfio run on s390
      cc669743
    • L
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 9f3e1512
      Linus Torvalds 提交于
      Pull virtio updates from Rusty Russell:
       "A balloon enhancement, and a minor race-on-module-unload theoretical
        bug which doesn't merit cc: stable.
      
        All the exciting stuff went via MST this cycle"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        virtio_balloon: free some memory from balloon on OOM
        virtio_balloon: return the amount of freed memory from leak_balloon()
        virtio_blk: fix race at module removal
        virtio: Fix comment typo 'CONFIG_S_FAILED'
      9f3e1512
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 2efda904
      Linus Torvalds 提交于
      Pull thermal management update from Zhang Rui:
       "Summary:
      
         - of-thermal extension to allow drivers to register and use its
           functionality in a better way, without exploiting thermal core.
           From Lukasz Majewski.
      
         - Fix a bug in intel_soc_dts_thermal driver which calls a sleep
           function in interrupt handler.  From Maurice Petallo.
      
         - add a thermal UAPI header file for exporting the thermal generic
           netlink information to user-space.  From Florian Fainelli.
      
         - First round of refactoring in Exynos driver.  Bartlomiej and Lukasz
           are attempting to make it lean and easier to understand.
      
         - New thermal driver for Rockchip (rk3288), with support for DT
           thermal.  From Caesar Wang.
      
         - New thermal driver for Nvidia, Tegra124 SOCTHERM driver, with
           support for DT thermal.  From Mikko Perttunen.
      
         - New cooling device, based on common clock framework.  From Eduardo
           Valentin.
      
         - a couple of small fixes in thermal core framework.  From Srinivas
           Pandruvada, Javi Merino, Luis Henriques.
      
         - Dropping Armada A375-Z1 SoC thermal support as the chip is not in
           the market, armada folks decided to drop its support.
      
         - a couple of small fixes and cleanups in int340x thermal driver"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (58 commits)
        thermal: provide an UAPI header file
        Thermal/int340x: Clear the error value of the last acpi_bus_get_device() call
        thermal/powerclamp: add id for braswell cpu
        thermal: Intel SoC DTS: Don't do thermal zone update inside spin_lock
        Thermal: fix platform_no_drv_owner.cocci warnings
        Thermal/int340x: avoid unnecessary pointer casting
        thermal: int3403: Delete a check before thermal_zone_device_unregister()
        thermal/int3400: export uuids
        thermal: of: Extend current of-thermal.c code to allow setting emulated temp
        thermal: of: Extend of-thermal to export table of trip points
        thermal: of: Rename struct __thermal_trip to struct thermal_trip
        thermal: of: Extend of-thermal.c to provide check if trip point is valid
        thermal: of: Extend of-thermal.c to provide number of trip points
        thermal: Fix error path in thermal_init()
        thermal: lock the thermal zone when switching governors
        thermal: core: ignore invalid trip temperature
        thermal: armada: Remove support for A375-Z1 SoC
        thermal: rockchip: add driver for thermal
        dt-bindings: document Rockchip thermal
        thermal: exynos: remove exynos_tmu_data.h include
        ...
      2efda904
    • L
      Merge tag 'pwm/for-3.19-rc1' of... · 0b4954c4
      Linus Torvalds 提交于
      Merge tag 'pwm/for-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "There are two new drivers, one for the BCM2835 (Raspberry Pi) and one
        used in conjunction with the LCD controller on various Atmel SoCs.
        The Samsung PWM driver can now be built for 64-bit ARM (Exynos7).
      
        A couple of fixes have been applied to the FTM PWM driver and system
        sleep support was added"
      
      * tag 'pwm/for-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: atmel-hlcdc: add at91sam9x5 and sama5d3 errata handling
        pwm: ftm: Add Power Management support for FTM PWM
        pwm: ftm: Add regmap rbtree type cache support
        pwm: ftm: Correctly track usage count
        pwm: samsung: Allow Samsung PWM driver to be enabled on Exynos7
        pwm: add DT bindings documentation for atmel-hlcdc-pwm driver
        pwm: add support for atmel-hlcdc-pwm device
        pwm: Add BCM2835 PWM driver
      0b4954c4
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · d797da41
      Linus Torvalds 提交于
      Pull input subsystem updates from Dmitry Torokhov:
       "Two new drivers for Elan hardware (for I2C touchpad and touchscreen
        found in several Chromebooks and other devices), a driver for Goodix
        touch panel, and small fixes to Cypress I2C trackpad and other input
        drivers.
      
        Also we switched to use __maybe_unused instead of gating suspend/
        resume code with #ifdef guards to get better compile coverage"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (27 commits)
        Input: gpio_keys - fix warning regarding uninitialized 'button' variable
        Input: add support for Elan eKTH I2C touchscreens
        Input: gpio_keys - fix warning regarding uninitialized  'irq' variable
        Input: cyapa - use 'error' for error codes
        Input: cyapa - fix resuming the device
        Input: gpio_keys - add device tree support for interrupt only keys
        Input: amikbd - allocate temporary keymap buffer on the stack
        Input: amikbd - fix build if !CONFIG_HW_CONSOLE
        Input: lm8323 - missing error check in lm8323_set_disable()
        Input: initialize device counter variables with -1
        Input: initialize input_no to -1 to avoid subtraction
        Input: i8042 - do not try to load on Intel NUC D54250WYK
        Input: atkbd - correct MSC_SCAN events for force_release keys
        Input: cyapa - switch to using managed resources
        Input: lifebook - use "static inline" instead of "inline" in lifebook.h
        Input: touchscreen - use __maybe_unused instead of ifdef around suspend/resume
        Input: mouse - use __maybe_unused instead of ifdef around suspend/resume
        Input: misc - use __maybe_unused instead of ifdef around suspend/resume
        Input: cap11xx - support for irq-active-high option
        Input: cap11xx - add support for various cap11xx devices
        ...
      d797da41
    • L
      Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd · d6666be6
      Linus Torvalds 提交于
      Pull MTD updates from Brian Norris:
       "Summary:
         - Add device tree support for DoC3
      
         - SPI NOR:
              Refactoring, for better layering between spi-nor.c and its
              driver users (e.g., m25p80.c)
      
              New flash device support
      
              Support 6-byte ID strings
      
         - NAND:
              New NAND driver for Allwinner SoC's (sunxi)
      
              GPMI NAND: add support for raw (no ECC) access, for testing
              purposes
      
              Add ATO manufacturer ID
      
              A few odd driver fixes
      
         - MTD tests:
              Allow testers to compensate for OOB bitflips in oobtest
      
              Fix a torturetest regression
      
         - nandsim: Support longer ID byte strings
      
        And more"
      
      * tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd: (63 commits)
        mtd: tests: abort torturetest on erase errors
        mtd: physmap_of: fix potential NULL dereference
        mtd: spi-nor: allow NULL as chip name and try to auto detect it
        mtd: nand: gpmi: add raw oob access functions
        mtd: nand: gpmi: add proper raw access support
        mtd: nand: gpmi: add gpmi_copy_bits function
        mtd: spi-nor: factor out write_enable() for erase commands
        mtd: spi-nor: add support for s25fl128s
        mtd: spi-nor: remove the jedec_id/ext_id
        mtd: spi-nor: add id/id_len for flash_info{}
        mtd: nand: correct the comment of function nand_block_isreserved()
        jffs2: Drop bogus if in comment
        mtd: atmel_nand: replace memcpy32_toio/memcpy32_fromio with memcpy
        mtd: cafe_nand: drop duplicate .write_page implementation
        mtd: m25p80: Add support for serial flash Spansion S25FL132K
        MTD: m25p80: fix inconsistency in m25p_ids compared to spi_nor_ids
        mtd: spi-nor: improve wait-till-ready timeout loop
        mtd: delete unnecessary checks before two function calls
        mtd: nand: omap: Fix NAND enumeration on 3430 LDP
        mtd: nand: add ATO manufacturer info
        ...
      d6666be6
    • L
      Merge tag 'microblaze-3.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze · 0ea90b9e
      Linus Torvalds 提交于
      Pull Microblaze fix from Michal Simek:
       "Fix mmap for cache coherent memory"
      
      * tag 'microblaze-3.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Fix mmap for cache coherent memory
      0ea90b9e
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 5f5425ef
      Linus Torvalds 提交于
      Pull security subsystem fixes from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        KEYS: remove a bogus NULL check
        ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met
        KEYS: Fix stale key registration at error path
      5f5425ef
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · c103b21c
      Linus Torvalds 提交于
      Pull fuse update from Miklos Szeredi:
       "The first part makes sure we don't hold up umount with pending async
        requests.  In addition to being a cleanup, this is a small behavioral
        change (for the better) and unlikely to break anything.
      
        The second part prepares for a cleanup of the fuse device I/O code by
        adding a helper for simple request submission, with some savings in
        line numbers already realized"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: use file_inode() in fuse_file_fallocate()
        fuse: introduce fuse_simple_request() helper
        fuse: reduce max out args
        fuse: hold inode instead of path after release
        fuse: flush requests on umount
        fuse: don't wake up reserved req in fuse_conn_kill()
      c103b21c
    • Y
      ceph: fix setting empty extended attribute · 0aeff37a
      Yan, Zheng 提交于
      make sure 'value' is not null. otherwise __ceph_setxattr will remove
      the extended attribute.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      Reviewed-by: NSage Weil <sage@redhat.com>
      0aeff37a
    • Y
      ceph: fix mksnap crash · 275dd19e
      Yan, Zheng 提交于
      mksnap reply only contain 'target', does not contain 'dentry'. So
      it's wrong to use req->r_reply_info.head->is_dentry to detect traceless
      reply.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      Reviewed-by: NSage Weil <sage@redhat.com>
      275dd19e
    • D
      ceph: do_sync is never initialized · 021b77be
      Dan Carpenter 提交于
      Probably this code was syncing a lot more often then intended because
      the do_sync variable wasn't set to zero.
      
      Cc: stable@vger.kernel.org # v3.11+
      Fixes: c62988ec ('ceph: avoid meaningless calling ceph_caps_revoking if sync_mode == WB_SYNC_ALL.')
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NIlya Dryomov <idryomov@redhat.com>
      021b77be