1. 24 10月, 2015 2 次提交
    • I
      rbd: prevent kernel stack blow up on rbd map · 6d69bb53
      Ilya Dryomov 提交于
      Mapping an image with a long parent chain (e.g. image foo, whose parent
      is bar, whose parent is baz, etc) currently leads to a kernel stack
      overflow, due to the following recursion in the reply path:
      
        rbd_osd_req_callback()
          rbd_obj_request_complete()
            rbd_img_obj_callback()
              rbd_img_parent_read_callback()
                rbd_obj_request_complete()
                  ...
      
      Limit the parent chain to 16 images, which is ~5K worth of stack.  When
      the above recursion is eliminated, this limit can be lifted.
      
      Fixes: http://tracker.ceph.com/issues/12538
      
      Cc: stable@vger.kernel.org # 3.10+, needs backporting for < 4.2
      Signed-off-by: NIlya Dryomov <idryomov@gmail.com>
      Reviewed-by: NJosh Durgin <jdurgin@redhat.com>
      6d69bb53
    • I
      rbd: don't leak parent_spec in rbd_dev_probe_parent() · 1f2c6651
      Ilya Dryomov 提交于
      Currently we leak parent_spec and trigger a "parent reference
      underflow" warning if rbd_dev_create() in rbd_dev_probe_parent() fails.
      The problem is we take the !parent out_err branch and that only drops
      refcounts; parent_spec that would've been freed had we called
      rbd_dev_unparent() remains and triggers rbd_warn() in
      rbd_dev_parent_put() - at that point we have parent_spec != NULL and
      parent_ref == 0, so counter ends up being -1 after the decrement.
      
      Redo rbd_dev_probe_parent() to fix this.
      
      Cc: stable@vger.kernel.org # 3.10+, needs backporting for < 4.2
      Signed-off-by: NIlya Dryomov <idryomov@gmail.com>
      Reviewed-by: NAlex Elder <elder@linaro.org>
      1f2c6651
  2. 19 10月, 2015 2 次提交
    • L
      Linux 4.3-rc6 · 7379047d
      Linus Torvalds 提交于
      7379047d
    • L
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · c44b3255
      Linus Torvalds 提交于
      Pull i2c fixes from Wolfram Sang:
       "Here are some bugfixes for the I2C subsystem.
      
        Kieran found a flaw in the recently renewed wake irq handling.  Mika
        handled a user bug report where the ACPI info turned out to be
        unusable.  I updated MAINTAINERS so that such bug reports will sooner
        get to the right people.  Geert pointed me to a problem of some i2c
        drivers regarding PM which I fixed"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: designware: Do not use parameters from ACPI on Dell Inspiron 7348
        MAINTAINERS: add maintainers for Synopsis Designware I2C drivers
        i2c: designware-platdrv: enable RuntimePM before registering to the core
        i2c: s3c2410: enable RuntimePM before registering to the core
        i2c: rcar: enable RuntimePM before registering to the core
        i2c: return probe deferred status on dev_pm_domain_attach
      c44b3255
  3. 18 10月, 2015 1 次提交
    • M
      i2c: designware: Do not use parameters from ACPI on Dell Inspiron 7348 · 56d4b8a2
      Mika Westerberg 提交于
      ACPI SSCN/FMCN methods were originally added because then the platform can
      provide the most accurate HCNT/LCNT values to the driver. However, this
      seems not to be true for Dell Inspiron 7348 where using these causes the
      touchpad to fail in boot:
      
        i2c_hid i2c-DLL0675:00: failed to retrieve report from device.
        i2c_designware INT3433:00: i2c_dw_handle_tx_abort: lost arbitration
        i2c_hid i2c-DLL0675:00: failed to retrieve report from device.
        i2c_designware INT3433:00: controller timed out
      
      The values received from ACPI are (in fast mode):
      
        HCNT: 72
        LCNT: 160
      
      this translates to following timings (input clock is 100MHz on Broadwell):
      
        tHIGH: 720 ns (spec min 600 ns)
        tLOW: 1600 ns (spec min 1300 ns)
        Bus period: 2920 ns (assuming 300 ns tf and tr)
        Bus speed: 342.5 kHz
      
      Both tHIGH and tLOW are within the I2C specification.
      
      The calculated values when ACPI parameters are not used are (in fast mode):
      
        HCNT: 87
        LCNT: 159
      
      which translates to:
      
        tHIGH: 870 ns (spec min 600 ns)
        tLOW: 1590 ns (spec min 1300 ns)
        Bus period 3060 ns (assuming 300 ns tf and tr)
        Bus speed 326.8 kHz
      
      These values are also within the I2C specification.
      
      Since both ACPI and calculated values meet the I2C specification timing
      requirements it is hard to say why the touchpad does not function properly
      with the ACPI values except that the bus speed is higher in this case (but
      still well below the max 400kHz).
      
      Solve this by adding DMI quirk to the driver that disables using ACPI
      parameters on this particulare machine.
      Reported-by: NPavel Roskin <plroskin@gmail.com>
      Signed-off-by: NMika Westerberg <mika.westerberg@linux.intel.com>
      Tested-by: NPavel Roskin <plroskin@gmail.com>
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      Cc: stable@kernel.org
      56d4b8a2
  4. 17 10月, 2015 16 次提交
    • L
      Merge branches 'irq-urgent-for-linus' and 'timers-urgent-for-linus' of... · 81429a6d
      Linus Torvalds 提交于
      Merge branches 'irq-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull irq/timer fixes from Thomas Gleixner:
       "irq: a fix for the new hierarchical MSI interrupt handling which
        unbreaks PCI=n configurations.
      
        timers: a fix for the new hrtimer clock offset update mechanism to
        ensure that the boot time offset is respected"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq/msi: Do not use pci_msi_[un]mask_irq as default methods
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        timekeeping: Increment clock_was_set_seq in timekeeping_init()
      81429a6d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 16c8b9cb
      Linus Torvalds 提交于
      Pull input fixes from Dmitry Torokhov:
       "Just two small fixups to ads7846 touchscreen controller driver and
        Cypress touchpad driver"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: cyapa - fix the copy paste error on electrodes_rx value
        Input: ads7846 - correct the value got from SPI
      16c8b9cb
    • L
      Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 4f3f9573
      Linus Torvalds 提交于
      Pull clk fix from Stephen Boyd:
       "Just one revert for Armada XP devices: the conversion to
        of_clk_get_parent_name() wasn't a direct translation, so we
        revert back to of_clk_get() + __clk_get_name().
      
        We could make of_clk_get_parent_name() more robust, but that
        may have unintended side-effects, so we'll do that in the
        next version"
      
      * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
        Partially revert "clk: mvebu: Convert to clk_hw based provider APIs"
      4f3f9573
    • L
      Merge tag 'dm-4.3-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 045ce743
      Linus Torvalds 提交于
      Pull device mapper fixes from Mike Snitzer:
       "Two DM target error path cleanup fixes (one for stable in DM thinp and
        one for a v4.3-rc5 thinko in DM snapshot)"
      
      * tag 'dm-4.3-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm thin: fix missing pool reference count decrement in pool_ctr error path
        dm snapshot persistent: fix missing cleanup in persistent_ctr error path
      045ce743
    • L
      Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 6aa8ca4d
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "I have two more bug fixes for btrfs.
      
        My commit fixes a bug we hit last week at FB, a combination of lots of
        hard links and an admin command to resolve inode numbers.
      
        Dave is adding checks to make sure balance on current kernels ignores
        filters it doesn't understand.  The penalty for being wrong is just
        doing more work (not crashing etc), but it's a good fix"
      
      * 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs: fix use after free iterating extrefs
        btrfs: check unsupported filters in balance arguments
      6aa8ca4d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 59bcce12
      Linus Torvalds 提交于
      Pull Ceph fixes from Sage Weil:
       "Just two small items from Ilya:
      
        The first patch fixes the RBD readahead to grab full objects.  The
        second fixes the write ops to prevent undue promotion when a cache
        tier is configured on the server side"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        rbd: use writefull op for object size writes
        rbd: set max_sectors explicitly
      59bcce12
    • L
      Merge tag 'pm+acpi-4.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · a4c4c49a
      Linus Torvalds 提交于
      Pull power management and ACPI fixes from Rafael Wysocki:
       "These fix two recent regressions (ACPICA, the generic power domains
        framework) and one crash that may happen on specific hardware
        supported since 4.1 (intel_pstate).
      
        Specifics:
      
         - Fix a regression introduced by a recent ACPICA cleanup that
           uncovered a latent bug (Lv Zheng).
      
         - Fix a recent regression in the generic power domains framework that
           may cause it to violate PM QoS latency constraints in some cases
           (Ulf Hansson).
      
         - Fix an intel_pstate driver crash on the Knights Landing chips that
           do not update the MPERF counter as often as expected by the driver
           which may result in a divide by 0 (Srinivas Pandruvada)"
      
      * tag 'pm+acpi-4.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: intel_pstate: Fix divide by zero on Knights Landing (KNL)
        ACPICA: Tables: Fix FADT dependency regression
        PM / Domains: Fix validation of latency constraints in genpd governor
      a4c4c49a
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 8b7b56f3
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Nothing too crazy or exciting:
      
         - two MAINTAINERS entries that I didn't see the point in delaying.
         - one drm mst fix to stop sending uninitialised data to monitors
         - two amdgpu fixes
         - one radeon mst tiling fix
         - one vmwgfx regression fix
         - one virtio warning fix.
      
        I have found one locking problem that needs a bit of reorg to fix, but
        I'm not sure it's worth putting in -fixes as I don't think we've seen
        it hit in the real world ever, I just found it using the virtio-gpu
        driver when working on it.  I'll possibly send it next week once I've
        time to discuss with Daniel"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/virtio: use %llu format string form atomic64_t
        MAINTAINERS: Add myself as maintainer for the gma500 driver
        MAINTAINERS: add a maintainer for the atmel-hlcdc DRM driver
        drm/amdgpu: Keep the pflip interrupts always enabled v7
        drm/amdgpu: adjust default dispclk (v2)
        drm/dp/mst: make mst i2c transfer code more robust.
        drm/radeon: attach tile property to mst connector
        drm/vmwgfx: Fix kernel NULL pointer dereference on older hardware
      8b7b56f3
    • L
      Merge tag 'powerpc-4.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · ebb65c81
      Linus Torvalds 提交于
      Pull powerpc fixes from Michael Ellerman:
       - Re-enable CONFIG_SCSI_DH in our defconfigs
       - Remove unused os_area_db_id_video_mode
       - cxl: fix leak of IRQ names in cxl_free_afu_irqs() from Andrew
       - cxl: fix leak of ctx->irq_bitmap when releasing context via kernel API from Andrew
       - cxl: fix leak of ctx->mapping when releasing kernel API contexts from Andrew
       - cxl: Workaround malformed pcie packets on some cards from Philippe
       - cxl: Fix number of allocated pages in SPA from Christophe Lombard
       - Fix checkstop in native_hpte_clear() with lockdep from Cyril
       - Panic on unhandled Machine Check on powernv from Daniel
       - selftests/powerpc: Fix build failure of load_unaligned_zeropad test
      
      * tag 'powerpc-4.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        selftests/powerpc: Fix build failure of load_unaligned_zeropad test
        powerpc/powernv: Panic on unhandled Machine Check
        powerpc: Fix checkstop in native_hpte_clear() with lockdep
        cxl: Fix number of allocated pages in SPA
        cxl: Workaround malformed pcie packets on some cards
        cxl: fix leak of ctx->mapping when releasing kernel API contexts
        cxl: fix leak of ctx->irq_bitmap when releasing context via kernel API
        cxl: fix leak of IRQ names in cxl_free_afu_irqs()
        powerpc/ps3: Remove unused os_area_db_id_video_mode
        powerpc/configs: Re-enable CONFIG_SCSI_DH
      ebb65c81
    • L
      Merge branch 'akpm' (patches from Andrew) · 3d875182
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "6 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        sh: add copy_user_page() alias for __copy_user()
        lib/Kconfig: ZLIB_DEFLATE must select BITREVERSE
        mm, dax: fix DAX deadlocks
        memcg: convert threshold to bytes
        builddeb: remove debian/files before build
        mm, fs: obey gfp_mapping for add_to_page_cache()
      3d875182
    • R
      sh: add copy_user_page() alias for __copy_user() · 934ed25e
      Ross Zwisler 提交于
      copy_user_page() is needed by DAX.  Without this we get a compile error
      for DAX on SH:
      
        fs/dax.c:280:2: error: implicit declaration of function `copy_user_page' [-Werror=implicit-function-declaration]
          copy_user_page(vto, (void __force *)vfrom, vaddr, to);
            ^
      
      This was done with a random config that happened to include DAX support.
      
      This patch has only been compile tested.
      Signed-off-by: NRoss Zwisler <ross.zwisler@linux.intel.com>
      Reported-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
      Cc: Matthew Wilcox <willy@linux.intel.com>
      Cc: Matt Fleming <matt@codeblueprint.co.uk>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      934ed25e
    • A
      lib/Kconfig: ZLIB_DEFLATE must select BITREVERSE · 1fd4e5c3
      Andrew Morton 提交于
      lib/built-in.o: In function `__bitrev32':
      deftree.c:(.text+0x1e799): undefined reference to `byte_rev_table'
      deftree.c:(.text+0x1e7a0): undefined reference to `byte_rev_table'
      deftree.c:(.text+0x1e7b4): undefined reference to `byte_rev_table'
      deftree.c:(.text+0x1e7c1): undefined reference to `byte_rev_table'
      
      Anything which uses bitrevX() has to select BITREVERSE, to grab
      lib/bitrev.o.
      Reported-by: NJim Davis <jim.epost@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1fd4e5c3
    • R
      mm, dax: fix DAX deadlocks · 0f90cc66
      Ross Zwisler 提交于
      The following two locking commits in the DAX code:
      
      commit 84317297 ("dax: fix race between simultaneous faults")
      commit 46c043ed ("mm: take i_mmap_lock in unmap_mapping_range() for DAX")
      
      introduced a number of deadlocks and other issues which need to be fixed
      for the v4.3 kernel.  The list of issues in DAX after these commits
      (some newly introduced by the commits, some preexisting) can be found
      here:
      
        https://lkml.org/lkml/2015/9/25/602 (Subject: "Re: [PATCH] dax: fix deadlock in __dax_fault").
      
      This undoes most of the changes introduced by those two commits,
      essentially returning us to the DAX locking scheme that was used in
      v4.2.
      Signed-off-by: NRoss Zwisler <ross.zwisler@linux.intel.com>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Cc: Dan Williams <dan.j.williams@intel.com>
      Tested-by: NDave Chinner <dchinner@redhat.com>
      Cc: Jan Kara <jack@suse.com>
      Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
      Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0f90cc66
    • S
      memcg: convert threshold to bytes · 424cdc14
      Shaohua Li 提交于
      page_counter_memparse() returns pages for the threshold, while
      mem_cgroup_usage() returns bytes for memory usage.  Convert the
      threshold to bytes.
      
      Fixes: 3e32cb2e ("memcg: rename cgroup_event to mem_cgroup_event").
      Signed-off-by: NShaohua Li <shli@fb.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Acked-by: NMichal Hocko <mhocko@suse.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      424cdc14
    • R
      builddeb: remove debian/files before build · 8d740a37
      Riku Voipio 提交于
      Commit 3716001b ("deb-pkg: add source package") added the ability to
      create a debian changelog file.  This exposed that previously the
      builddeb script hasn't cleared debian/files between builds.
      
      As debian/files keeps accumulating entries, the changes file will end up
      growing indefinelty.  With outdated entries in debian/files, builddeb
      script will exit with failure.  This regression impacts those who use
      "make deb-pkg" target to build kernel into a .deb package and never use
      "make mrproper" or other means to clean kernel tree from generated
      directories.
      
      To fix the regression, remove debian/files before starting build and in
      the generated clean rule.
      
      Fixes: 3716001b ("deb-pkg: add source package")
      Signed-off-by: NRiku Voipio <riku.voipio@linaro.org>
      Reported-by: NDoug Smythies <dsmythies@telus.net>
      Tested-by: NDoug Smythies <dsmythies@telus.net>
      Tested-by: NKalle Valo <kvalo@codeaurora.org>
      Acked-by: NBen Hutchings <ben@decadent.org.uk>
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: maximilian attems <maks@stro.at>
      Cc: Chris J Arges <chris.j.arges@canonical.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8d740a37
    • M
      mm, fs: obey gfp_mapping for add_to_page_cache() · 063d99b4
      Michal Hocko 提交于
      Commit 6afdb859 ("mm: do not ignore mapping_gfp_mask in page cache
      allocation paths") has caught some users of hardcoded GFP_KERNEL used in
      the page cache allocation paths.  This, however, wasn't complete and
      there were others which went unnoticed.
      
      Dave Chinner has reported the following deadlock for xfs on loop device:
      : With the recent merge of the loop device changes, I'm now seeing
      : XFS deadlock on my single CPU, 1GB RAM VM running xfs/073.
      :
      : The deadlocked is as follows:
      :
      : kloopd1: loop_queue_read_work
      :       xfs_file_iter_read
      :       lock XFS inode XFS_IOLOCK_SHARED (on image file)
      :       page cache read (GFP_KERNEL)
      :       radix tree alloc
      :       memory reclaim
      :       reclaim XFS inodes
      :       log force to unpin inodes
      :       <wait for log IO completion>
      :
      : xfs-cil/loop1: <does log force IO work>
      :       xlog_cil_push
      :       xlog_write
      :       <loop issuing log writes>
      :               xlog_state_get_iclog_space()
      :               <blocks due to all log buffers under write io>
      :               <waits for IO completion>
      :
      : kloopd1: loop_queue_write_work
      :       xfs_file_write_iter
      :       lock XFS inode XFS_IOLOCK_EXCL (on image file)
      :       <wait for inode to be unlocked>
      :
      : i.e. the kloopd, with it's split read and write work queues, has
      : introduced a dependency through memory reclaim. i.e. that writes
      : need to be able to progress for reads make progress.
      :
      : The problem, fundamentally, is that mpage_readpages() does a
      : GFP_KERNEL allocation, rather than paying attention to the inode's
      : mapping gfp mask, which is set to GFP_NOFS.
      :
      : The didn't used to happen, because the loop device used to issue
      : reads through the splice path and that does:
      :
      :       error = add_to_page_cache_lru(page, mapping, index,
      :                       GFP_KERNEL & mapping_gfp_mask(mapping));
      
      This has changed by commit aa4d8616 ("block: loop: switch to VFS
      ITER_BVEC").
      
      This patch changes mpage_readpage{s} to follow gfp mask set for the
      mapping.  There are, however, other places which are doing basically the
      same.
      
      lustre:ll_dir_filler is doing GFP_KERNEL from the function which
      apparently uses GFP_NOFS for other allocations so let's make this
      consistent.
      
      cifs:readpages_get_pages is called from cifs_readpages and
      __cifs_readpages_from_fscache called from the same path obeys mapping
      gfp.
      
      ramfs_nommu_expand_for_mapping is hardcoding GFP_KERNEL as well
      regardless it uses mapping_gfp_mask for the page allocation.
      
      ext4_mpage_readpages is the called from the page cache allocation path
      same as read_pages and read_cache_pages
      
      As I've noticed in my previous post I cannot say I would be happy about
      sprinkling mapping_gfp_mask all over the place and it sounds like we
      should drop gfp_mask argument altogether and use it internally in
      __add_to_page_cache_locked that would require all the filesystems to use
      mapping gfp consistently which I am not sure is the case here.  From a
      quick glance it seems that some file system use it all the time while
      others are selective.
      Signed-off-by: NMichal Hocko <mhocko@suse.com>
      Reported-by: NDave Chinner <david@fromorbit.com>
      Cc: "Theodore Ts'o" <tytso@mit.edu>
      Cc: Ming Lei <ming.lei@canonical.com>
      Cc: Andreas Dilger <andreas.dilger@intel.com>
      Cc: Oleg Drokin <oleg.drokin@intel.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      063d99b4
  5. 16 10月, 2015 18 次提交
  6. 15 10月, 2015 1 次提交