1. 14 9月, 2014 6 次提交
    • L
      Merge branches 'locking-urgent-for-linus' and 'timers-urgent-for-linus' of... · 1536340e
      Linus Torvalds 提交于
      Merge branches 'locking-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull futex and timer fixes from Thomas Gleixner:
       "A oneliner bugfix for the jinxed futex code:
      
         - Drop hash bucket lock in the error exit path.  I really could slap
           myself for intruducing that bug while fixing all the other horror
           in that code three month ago ...
      
        and the timer department is not too proud about the following fixes:
      
         - Deal with a long standing rounding bug in the timeval to jiffies
           conversion.  It's a real issue and this fix fell through the cracks
           for quite some time.
      
         - Another round of alarmtimer fixes.  Finally this code gets used
           more widely and the subtle issues hidden for quite some time are
           noticed and fixed.  Nothing really exciting, just the itty bitty
           details which bite the serious users here and there"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        futex: Unlock hb->lock in futex_wait_requeue_pi() error path
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        alarmtimer: Lock k_itimer during timer callback
        alarmtimer: Do not signal SIGEV_NONE timers
        alarmtimer: Return relative times in timer_gettime
        jiffies: Fix timeval conversion to jiffies
      1536340e
    • L
      vfs: fix bad hashing of dentries · 99d263d4
      Linus Torvalds 提交于
      Josef Bacik found a performance regression between 3.2 and 3.10 and
      narrowed it down to commit bfcfaa77 ("vfs: use 'unsigned long'
      accesses for dcache name comparison and hashing"). He reports:
      
       "The test case is essentially
      
            for (i = 0; i < 1000000; i++)
                    mkdir("a$i");
      
        On xfs on a fio card this goes at about 20k dir/sec with 3.2, and 12k
        dir/sec with 3.10.  This is because we spend waaaaay more time in
        __d_lookup on 3.10 than in 3.2.
      
        The new hashing function for strings is suboptimal for <
        sizeof(unsigned long) string names (and hell even > sizeof(unsigned
        long) string names that I've tested).  I broke out the old hashing
        function and the new one into a userspace helper to get real numbers
        and this is what I'm getting:
      
            Old hash table had 1000000 entries, 0 dupes, 0 max dupes
            New hash table had 12628 entries, 987372 dupes, 900 max dupes
            We had 11400 buckets with a p50 of 30 dupes, p90 of 240 dupes, p99 of 567 dupes for the new hash
      
        My test does the hash, and then does the d_hash into a integer pointer
        array the same size as the dentry hash table on my system, and then
        just increments the value at the address we got to see how many
        entries we overlap with.
      
        As you can see the old hash function ended up with all 1 million
        entries in their own bucket, whereas the new one they are only
        distributed among ~12.5k buckets, which is why we're using so much
        more CPU in __d_lookup".
      
      The reason for this hash regression is two-fold:
      
       - On 64-bit architectures the down-mixing of the original 64-bit
         word-at-a-time hash into the final 32-bit hash value is very
         simplistic and suboptimal, and just adds the two 32-bit parts
         together.
      
         In particular, because there is no bit shuffling and the mixing
         boundary is also a byte boundary, similar character patterns in the
         low and high word easily end up just canceling each other out.
      
       - the old byte-at-a-time hash mixed each byte into the final hash as it
         hashed the path component name, resulting in the low bits of the hash
         generally being a good source of hash data.  That is not true for the
         word-at-a-time case, and the hash data is distributed among all the
         bits.
      
      The fix is the same in both cases: do a better job of mixing the bits up
      and using as much of the hash data as possible.  We already have the
      "hash_32|64()" functions to do that.
      Reported-by: NJosef Bacik <jbacik@fb.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Chris Mason <clm@fb.com>
      Cc: linux-fsdevel@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      99d263d4
    • L
      Make hash_64() use a 64-bit multiply when appropriate · 23d0db76
      Linus Torvalds 提交于
      The hash_64() function historically does the multiply by the
      GOLDEN_RATIO_PRIME_64 number with explicit shifts and adds, because
      unlike the 32-bit case, gcc seems unable to turn the constant multiply
      into the more appropriate shift and adds when required.
      
      However, that means that we generate those shifts and adds even when the
      architecture has a fast multiplier, and could just do it better in
      hardware.
      
      Use the now-cleaned-up CONFIG_ARCH_HAS_FAST_MULTIPLIER (together with
      "is it a 64-bit architecture") to decide whether to use an integer
      multiply or the explicit sequence of shift/add instructions.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      23d0db76
    • L
      Make ARCH_HAS_FAST_MULTIPLIER a real config variable · 72d93104
      Linus Torvalds 提交于
      It used to be an ad-hoc hack defined by the x86 version of
      <asm/bitops.h> that enabled a couple of library routines to know whether
      an integer multiply is faster than repeated shifts and additions.
      
      This just makes it use the real Kconfig system instead, and makes x86
      (which was the only architecture that did this) select the option.
      
      NOTE! Even for x86, this really is kind of wrong.  If we cared, we would
      probably not enable this for builds optimized for netburst (P4), where
      shifts-and-adds are generally faster than multiplies.  This patch does
      *not* change that kind of logic, though, it is purely a syntactic change
      with no code changes.
      
      This was triggered by the fact that we have other places that really
      want to know "do I want to expand multiples by constants by hand or
      not", particularly the hash generation code.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      72d93104
    • L
      Merge tag 'dm-3.17-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 186cec31
      Linus Torvalds 提交于
      Pull device mapper fix from Mike Snitzer:
       "Fix a race in the DM cache target that caused dirty blocks to be
        marked as clean.  This could cause no writeback to occur or spurious
        dirty block counts"
      
      * tag 'dm-3.17-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm cache: fix race causing dirty blocks to be marked as clean
      186cec31
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 645cc093
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "A small collection of fixes for the current rc series.  This contains:
      
         - Two small blk-mq patches from Rob Elliott, cleaning up error case
           at init time.
      
         - A fix from Ming Lei, fixing SG merging for blk-mq where
           QUEUE_FLAG_SG_NO_MERGE is the default.
      
         - A dev_t minor lifetime fix from Keith, fixing an issue where a
           minor might be reused before all references to it were gone.
      
         - Fix from Alan Stern where an unbalanced queue bypass caused SCSI
           some headaches when it does a series of add/del on devices without
           fully registrering the queue.
      
         - A fix from me for improving the scaling of tag depth in blk-mq if
           we are short on memory"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: scale depth and rq map appropriate if low on memory
        Block: fix unbalanced bypass-disable in blk_register_queue
        block: Fix dev_t minor allocation lifetime
        blk-mq: cleanup after blk_mq_init_rq_map failures
        blk-mq: pass along blk_mq_alloc_tag_set return values
        blk-merge: fix blk_recount_segments
      645cc093
  2. 13 9月, 2014 16 次提交
    • L
      Merge tag 'stable/for-linus-3.17-b-rc4-arm-tag' of... · fc486b03
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
      
      Pull Xen ARM bugfix from Stefano Stabellini:
       "The patches fix the "xen_add_mach_to_phys_entry: cannot add" bug that
        has been affecting xen on arm and arm64 guests since 3.16.  They
        require a few hypervisor side changes that just went in xen-unstable.
      
        A couple of days ago David sent out a pull request with a few other
        Xen fixes (it is already in master).  Sorry we didn't synchronized
        better among us"
      
      * tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/arm: remove mach_to_phys rbtree
        xen/arm: reimplement xen_dma_unmap_page & friends
        xen/arm: introduce XENFEAT_grant_map_identity
      fc486b03
    • R
      alarmtimer: Lock k_itimer during timer callback · 474e941b
      Richard Larocque 提交于
      Locks the k_itimer's it_lock member when handling the alarm timer's
      expiry callback.
      
      The regular posix timers defined in posix-timers.c have this lock held
      during timout processing because their callbacks are routed through
      posix_timer_fn().  The alarm timers follow a different path, so they
      ought to grab the lock somewhere else.
      
      Cc: stable@vger.kernel.org
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Richard Cochran <richardcochran@gmail.com>
      Cc: Prarit Bhargava <prarit@redhat.com>
      Cc: Sharvil Nanavati <sharvil@google.com>
      Signed-off-by: NRichard Larocque <rlarocque@google.com>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      474e941b
    • R
      alarmtimer: Do not signal SIGEV_NONE timers · 265b81d2
      Richard Larocque 提交于
      Avoids sending a signal to alarm timers created with sigev_notify set to
      SIGEV_NONE by checking for that special case in the timeout callback.
      
      The regular posix timers avoid sending signals to SIGEV_NONE timers by
      not scheduling any callbacks for them in the first place.  Although it
      would be possible to do something similar for alarm timers, it's simpler
      to handle this as a special case in the timeout.
      
      Prior to this patch, the alarm timer would ignore the sigev_notify value
      and try to deliver signals to the process anyway.  Even worse, the
      sanity check for the value of sigev_signo is skipped when SIGEV_NONE was
      specified, so the signal number could be bogus.  If sigev_signo was an
      unitialized value (as it often would be if SIGEV_NONE is used), then
      it's hard to predict which signal will be sent.
      
      Cc: stable@vger.kernel.org
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Richard Cochran <richardcochran@gmail.com>
      Cc: Prarit Bhargava <prarit@redhat.com>
      Cc: Sharvil Nanavati <sharvil@google.com>
      Signed-off-by: NRichard Larocque <rlarocque@google.com>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      265b81d2
    • R
      alarmtimer: Return relative times in timer_gettime · e86fea76
      Richard Larocque 提交于
      Returns the time remaining for an alarm timer, rather than the time at
      which it is scheduled to expire.  If the timer has already expired or it
      is not currently scheduled, the it_value's members are set to zero.
      
      This new behavior matches that of the other posix-timers and the POSIX
      specifications.
      
      This is a change in user-visible behavior, and may break existing
      applications.  Hopefully, few users rely on the old incorrect behavior.
      
      Cc: stable@vger.kernel.org
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Richard Cochran <richardcochran@gmail.com>
      Cc: Prarit Bhargava <prarit@redhat.com>
      Cc: Sharvil Nanavati <sharvil@google.com>
      Signed-off-by: NRichard Larocque <rlarocque@google.com>
      [jstultz: minor style tweak]
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      e86fea76
    • A
      jiffies: Fix timeval conversion to jiffies · d78c9300
      Andrew Hunter 提交于
      timeval_to_jiffies tried to round a timeval up to an integral number
      of jiffies, but the logic for doing so was incorrect: intervals
      corresponding to exactly N jiffies would become N+1. This manifested
      itself particularly repeatedly stopping/starting an itimer:
      
      setitimer(ITIMER_PROF, &val, NULL);
      setitimer(ITIMER_PROF, NULL, &val);
      
      would add a full tick to val, _even if it was exactly representable in
      terms of jiffies_ (say, the result of a previous rounding.)  Doing
      this repeatedly would cause unbounded growth in val.  So fix the math.
      
      Here's what was wrong with the conversion: we essentially computed
      (eliding seconds)
      
      jiffies = usec  * (NSEC_PER_USEC/TICK_NSEC)
      
      by using scaling arithmetic, which took the best approximation of
      NSEC_PER_USEC/TICK_NSEC with denominator of 2^USEC_JIFFIE_SC =
      x/(2^USEC_JIFFIE_SC), and computed:
      
      jiffies = (usec * x) >> USEC_JIFFIE_SC
      
      and rounded this calculation up in the intermediate form (since we
      can't necessarily exactly represent TICK_NSEC in usec.) But the
      scaling arithmetic is a (very slight) *over*approximation of the true
      value; that is, instead of dividing by (1 usec/ 1 jiffie), we
      effectively divided by (1 usec/1 jiffie)-epsilon (rounding
      down). This would normally be fine, but we want to round timeouts up,
      and we did so by adding 2^USEC_JIFFIE_SC - 1 before the shift; this
      would be fine if our division was exact, but dividing this by the
      slightly smaller factor was equivalent to adding just _over_ 1 to the
      final result (instead of just _under_ 1, as desired.)
      
      In particular, with HZ=1000, we consistently computed that 10000 usec
      was 11 jiffies; the same was true for any exact multiple of
      TICK_NSEC.
      
      We could possibly still round in the intermediate form, adding
      something less than 2^USEC_JIFFIE_SC - 1, but easier still is to
      convert usec->nsec, round in nanoseconds, and then convert using
      time*spec*_to_jiffies.  This adds one constant multiplication, and is
      not observably slower in microbenchmarks on recent x86 hardware.
      
      Tested: the following program:
      
      int main() {
        struct itimerval zero = {{0, 0}, {0, 0}};
        /* Initially set to 10 ms. */
        struct itimerval initial = zero;
        initial.it_interval.tv_usec = 10000;
        setitimer(ITIMER_PROF, &initial, NULL);
        /* Save and restore several times. */
        for (size_t i = 0; i < 10; ++i) {
          struct itimerval prev;
          setitimer(ITIMER_PROF, &zero, &prev);
          /* on old kernels, this goes up by TICK_USEC every iteration */
          printf("previous value: %ld %ld %ld %ld\n",
                 prev.it_interval.tv_sec, prev.it_interval.tv_usec,
                 prev.it_value.tv_sec, prev.it_value.tv_usec);
          setitimer(ITIMER_PROF, &prev, NULL);
        }
          return 0;
      }
      
      Cc: stable@vger.kernel.org
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Paul Turner <pjt@google.com>
      Cc: Richard Cochran <richardcochran@gmail.com>
      Cc: Prarit Bhargava <prarit@redhat.com>
      Reviewed-by: NPaul Turner <pjt@google.com>
      Reported-by: NAaron Jacobs <jacobsa@google.com>
      Signed-off-by: NAndrew Hunter <ahh@google.com>
      [jstultz: Tweaked to apply to 3.17-rc]
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      d78c9300
    • T
      futex: Unlock hb->lock in futex_wait_requeue_pi() error path · 13c42c2f
      Thomas Gleixner 提交于
      futex_wait_requeue_pi() calls futex_wait_setup(). If
      futex_wait_setup() succeeds it returns with hb->lock held and
      preemption disabled. Now the sanity check after this does:
      
              if (match_futex(&q.key, &key2)) {
      	   	ret = -EINVAL;
      		goto out_put_keys;
      	}
      
      which releases the keys but does not release hb->lock.
      
      So we happily return to user space with hb->lock held and therefor
      preemption disabled.
      
      Unlock hb->lock before taking the exit route.
      Reported-by: NDave "Trinity" Jones <davej@redhat.com>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Reviewed-by: NDarren Hart <dvhart@linux.intel.com>
      Reviewed-by: NDavidlohr Bueso <dave@stgolabs.net>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: stable@vger.kernel.org
      Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1409112318500.4178@nanosSigned-off-by: NThomas Gleixner <tglx@linutronix.de>
      13c42c2f
    • L
      Merge tag 'char-misc-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 471cff7c
      Linus Torvalds 提交于
      Pull char/misc driver fix from Greg KH:
       "Here is one misc driver fix for 3.17-rc5.  It resolves a kernel oops
        that can happen in the lattice FPGA driver if the firmware isn't
        present on the system.
      
        It's been in the linux-next tree for a while now"
      
      * tag 'char-misc-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        Lattice ECP3 FPGA: Check firmware pointer
      471cff7c
    • L
      Merge tag 'staging-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · a6988b33
      Linus Torvalds 提交于
      Pull staging driver fixes from Greg KH:
       "Here are 3 tiny staging driver fixes for 3.17-rc5.
      
        Two are fixes for the imx-drm driver, resolving issues that have been
        reported.  The other is a memory leak fix for the Android sync driver,
        due to changes that went into 3.17-rc1.
      
        All have been in linux-next for a while"
      
      * tag 'staging-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        android: fix reference leak in sync_fence_create
        imx-drm: imx-ldb: fix NULL pointer in imx_ldb_unbind()
        imx-drm: ipuv3-plane: fix ipu_plane_dpms()
      a6988b33
    • L
      Merge tag 'tty-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 09db9d63
      Linus Torvalds 提交于
      Pull tty/serial fixes from Greg KH:
       "Here are 3 patches for 3.17-rc5.  Two serial driver fixes that resolve
        some reported issues, and one new device id.
      
        All have been in linux-next just fine"
      
      * tag 'tty-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: xuartps: Fix tx_emtpy() callback
        tty/serial: at91: BUG: disable interrupts when !UART_ENABLE_MS()
        serial: 8250_dw: Add ACPI ID for Intel Braswell
      09db9d63
    • L
      Merge tag 'usb-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 90a3c48f
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here are some USB and PHY fixes for 3.17-rc5.
      
        Nothing major here, just a number of tiny fixes for reported issues,
        and some new device ids as well.
      
        All have been tested in linux-next"
      
      * tag 'usb-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (46 commits)
        xhci: fix oops when xhci resumes from hibernate with hw lpm capable devices
        usb: xhci: Fix OOPS in xhci error handling code
        xhci: Fix null pointer dereference if xhci initialization fails
        storage: Add single-LUN quirk for Jaz USB Adapter
        uas: Add missing le16_to_cpu calls to asm1051 / asm1053 usb-id check
        usb: chipidea: msm: Initialize PHY on reset event
        usb: chipidea: msm: Use USB PHY API to control PHY state
        usb: hub: take hub->hdev reference when processing from eventlist
        uas: Disable uas on ASM1051 devices
        usb: dwc2/gadget: avoid disabling ep0
        usb: dwc2/gadget: delay enabling irq once hardware is configured properly
        usb: dwc2/gadget: do not call disconnect method in pullup
        usb: dwc2/gadget: break infinite loop in endpoint disable code
        usb: dwc2/gadget: fix phy initialization sequence
        usb: dwc2/gadget: fix phy disable sequence
        uwb: init beacon cache entry before registering uwb device
        USB: ftdi_sio: Add support for GE Healthcare Nemo Tracker device
        USB: document the 'u' flag for usb-storage quirks parameter
        usb: host: xhci: fix compliance mode workaround
        usb: dwc3: fix TRB completion when multiple TRBs are started
        ...
      90a3c48f
    • L
      Merge tag 'nfs-for-3.17-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 602b5366
      Linus Torvalds 提交于
      Pull NFS client fixes from Trond Myklebust:
       "Highlights:
         - fix a kernel warning when removing /proc/net/nfsfs
         - revert commit 49a4bda2 due to Oopses
         - fix a typo in the pNFS file layout commit code"
      
      * tag 'nfs-for-3.17-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        pnfs: fix filelayout_retry_commit when idx > 0
        nfs: revert "nfs4: queue free_lock_state job submission to nfsiod"
        nfs: fix kernel warning when removing proc entry
      602b5366
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 7ed641be
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "Filipe is doing a careful pass through fsync problems, and these are
        the fixes so far.  I'll have one more for rc6 that we're still
        testing.
      
        My big commit is fixing up some inode hash races that Al Viro found
        (thanks Al)"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: use insert_inode_locked4 for inode creation
        Btrfs: fix fsync data loss after a ranged fsync
        Btrfs: kfree()ing ERR_PTRs
        Btrfs: fix crash while doing a ranged fsync
        Btrfs: fix corruption after write/fsync failure + fsync + log recovery
        Btrfs: fix autodefrag with compression
      7ed641be
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 9925cc13
      Linus Torvalds 提交于
      Pull arm64 fixes from Will Deacon:
       "Just a couple of stragglers here:
      
         - fix an issue migrating interrupts on CPU hotplug
         - fix a potential information leak of TLS registers across an exec
           (Nathan has sent a corresponding patch for arch/arm/ to rmk)"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: flush TLS registers during exec
        arm64: use irq_set_affinity with force=false when migrating irqs
      9925cc13
    • L
      Merge tag 'iommu-fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 753a6cb7
      Linus Torvalds 提交于
      Pull iommu fixes from Joerg Roedel:
       - two fixes for issues found by Coverity
       - various fixes for the ARM SMMU driver
       - a warning fix for the FSL PAMU driver
      
      * tag 'iommu-fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/fsl: Fix warning resulting from adding PCI device twice
        iommu/arm-smmu: fix corner cases in address size calculations
        iommu/arm-smmu: fix decimal printf format specifiers prefixed with 0x
        iommu/arm-smmu: Do not access non-existing S2CR registers
        iommu/arm-smmu: fix s2cr and smr teardown on device detach from domain
        iommu/arm-smmu: remove pgtable_page_{c,d}tor()
        iommu/arm-smmu: fix programming of SMMU_CBn_TCR for stage 1
        iommu/arm-smmu: avoid calling request_irq in atomic context
        iommu/vt-d: Check return value of acpi_bus_get_device()
        iommu/core: Make iommu_group_get_for_dev() more robust
      753a6cb7
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 96ea975b
      Linus Torvalds 提交于
      Pull assoc array garbage collection fix from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        KEYS: Fix termination condition in assoc array garbage collection
      96ea975b
    • L
      Merge tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 5874cfed
      Linus Torvalds 提交于
      Pull fbdev fixes from Tomi Valkeinen:
       "Minor fixes for amba-clcd and video DT bindings"
      
      * tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        video: ARM CLCD: Fix color model capabilities for DT platforms
        video: fix composite video connector compatible string
      5874cfed
  3. 12 9月, 2014 18 次提交
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 850ebc0c
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "AST, i915, radeon and msm fixes, all over the place.
      
        All fixing build issues, regressions, oopses or failure to detect
        cards"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/ast: AST2000 cannot be detected correctly
        drm/ast: open key before detect chips
        drm/msm: don't crash if no msm.vram param
        drm/msm/hdmi: fix build break on non-CCF platforms
        drm/msm: Change nested function to static function
        drm/radeon/dpm: set the thermal type properly for special configs
        drm/radeon: reduce memory footprint for debugging
        drm/radeon: add connector quirk for fujitsu board
        drm/radeon: fix semaphore value init
        drm/radeon: only use me/pfp sync on evergreen+
        drm/i915: Wait for vblank before enabling the TV encoder
        drm/i915: Evict CS TLBs between batches
        drm/i915: Fix irq enable tracking in driver load
        drm/i915: Fix EIO/wedged handling in gem fault handler
        drm/i915: Prevent recursive deadlock on releasing a busy userptr
      850ebc0c
    • D
      KEYS: Fix termination condition in assoc array garbage collection · 95389b08
      David Howells 提交于
      This fixes CVE-2014-3631.
      
      It is possible for an associative array to end up with a shortcut node at the
      root of the tree if there are more than fan-out leaves in the tree, but they
      all crowd into the same slot in the lowest level (ie. they all have the same
      first nibble of their index keys).
      
      When assoc_array_gc() returns back up the tree after scanning some leaves, it
      can fall off of the root and crash because it assumes that the back pointer
      from a shortcut (after label ascend_old_tree) must point to a normal node -
      which isn't true of a shortcut node at the root.
      
      Should we find we're ascending rootwards over a shortcut, we should check to
      see if the backpointer is zero - and if it is, we have completed the scan.
      
      This particular bug cannot occur if the root node is not a shortcut - ie. if
      you have fewer than 17 keys in a keyring or if you have at least two keys that
      sit into separate slots (eg. a keyring and a non keyring).
      
      This can be reproduced by:
      
      	ring=`keyctl newring bar @s`
      	for ((i=1; i<=18; i++)); do last_key=`keyctl newring foo$i $ring`; done
      	keyctl timeout $last_key 2
      
      Doing this:
      
      	echo 3 >/proc/sys/kernel/keys/gc_delay
      
      first will speed things up.
      
      If we do fall off of the top of the tree, we get the following oops:
      
      BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
      IP: [<ffffffff8136cea7>] assoc_array_gc+0x2f7/0x540
      PGD dae15067 PUD cfc24067 PMD 0
      Oops: 0000 [#1] SMP
      Modules linked in: xt_nat xt_mark nf_conntrack_netbios_ns nf_conntrack_broadcast ip6t_rpfilter ip6t_REJECT xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_ni
      CPU: 0 PID: 26011 Comm: kworker/0:1 Not tainted 3.14.9-200.fc20.x86_64 #1
      Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      Workqueue: events key_garbage_collector
      task: ffff8800918bd580 ti: ffff8800aac14000 task.ti: ffff8800aac14000
      RIP: 0010:[<ffffffff8136cea7>] [<ffffffff8136cea7>] assoc_array_gc+0x2f7/0x540
      RSP: 0018:ffff8800aac15d40  EFLAGS: 00010206
      RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff8800aaecacc0
      RDX: ffff8800daecf440 RSI: 0000000000000001 RDI: ffff8800aadc2bc0
      RBP: ffff8800aac15da8 R08: 0000000000000001 R09: 0000000000000003
      R10: ffffffff8136ccc7 R11: 0000000000000000 R12: 0000000000000000
      R13: 0000000000000000 R14: 0000000000000070 R15: 0000000000000001
      FS:  0000000000000000(0000) GS:ffff88011fc00000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
      CR2: 0000000000000018 CR3: 00000000db10d000 CR4: 00000000000006f0
      Stack:
       ffff8800aac15d50 0000000000000011 ffff8800aac15db8 ffffffff812e2a70
       ffff880091a00600 0000000000000000 ffff8800aadc2bc3 00000000cd42c987
       ffff88003702df20 ffff88003702dfa0 0000000053b65c09 ffff8800aac15fd8
      Call Trace:
       [<ffffffff812e2a70>] ? keyring_detect_cycle_iterator+0x30/0x30
       [<ffffffff812e3e75>] keyring_gc+0x75/0x80
       [<ffffffff812e1424>] key_garbage_collector+0x154/0x3c0
       [<ffffffff810a67b6>] process_one_work+0x176/0x430
       [<ffffffff810a744b>] worker_thread+0x11b/0x3a0
       [<ffffffff810a7330>] ? rescuer_thread+0x3b0/0x3b0
       [<ffffffff810ae1a8>] kthread+0xd8/0xf0
       [<ffffffff810ae0d0>] ? insert_kthread_work+0x40/0x40
       [<ffffffff816ffb7c>] ret_from_fork+0x7c/0xb0
       [<ffffffff810ae0d0>] ? insert_kthread_work+0x40/0x40
      Code: 08 4c 8b 22 0f 84 bf 00 00 00 41 83 c7 01 49 83 e4 fc 41 83 ff 0f 4c 89 65 c0 0f 8f 5a fe ff ff 48 8b 45 c0 4d 63 cf 49 83 c1 02 <4e> 8b 34 c8 4d 85 f6 0f 84 be 00 00 00 41 f6 c6 01 0f 84 92
      RIP  [<ffffffff8136cea7>] assoc_array_gc+0x2f7/0x540
       RSP <ffff8800aac15d40>
      CR2: 0000000000000018
      ---[ end trace 1129028a088c0cbd ]---
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Acked-by: NDon Zickus <dzickus@redhat.com>
      Signed-off-by: NJames Morris <james.l.morris@oracle.com>
      95389b08
    • P
      video: ARM CLCD: Fix color model capabilities for DT platforms · e4cf39ea
      Pawel Moll 提交于
      The DT-based panel capabilities selection was picking up
      a subset of available modes based on hardware configuration.
      This was wrong, as the capabilities describe available
      memory models and adapt the display controller to them
      that the RGB output is wired up correctly (as in: R and
      B components are not swapped).
      
      This patch fixes it by removing the unnecessary limitation.
      Signed-off-by: NPawel Moll <pawel.moll@arm.com>
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      e4cf39ea
    • Y
      drm/ast: AST2000 cannot be detected correctly · 83502a5d
      Y.C. Chen 提交于
      Type error and cause AST2000 cannot be detected correctly
      Signed-off-by: NY.C. Chen <yc_chen@aspeedtech.com>
      Reviewed-by: NEgbert Eich <eich@suse.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      83502a5d
    • Y
      drm/ast: open key before detect chips · 8f372e25
      Y.C. Chen 提交于
      Some config settings like 3rd TX chips will not get correctly
      if the extended reg is protected
      Signed-off-by: NY.C. Chen <yc_chen@aspeedtech.com>
      Reviewed-by: NEgbert Eich <eich@suse.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      8f372e25
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · c73f6fdf
      Linus Torvalds 提交于
      Pull Ceph fixes from Sage Weil:
       "The main thing here is a set of three patches that fix a buffer
        overrun for large authentication tickets (sigh).
      
        There is also a trivial warning fix and an error path fix that are
        both regressions"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        libceph: do not hard code max auth ticket len
        libceph: add process_one_ticket() helper
        libceph: gracefully handle large reply messages from the mon
        rbd: fix error return code in rbd_dev_device_setup()
        rbd: avoid format-security warning inside alloc_workqueue()
      c73f6fdf
    • L
      Merge tag 'stable/for-linus-3.17-b-rc4-tag' of... · 7ee2d2d6
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
      
      Pull Xen bug fixes from David Vrabel:
       - fix for PVHVM suspend/resume and migration
       - don't pointlessly retry certain ballooning ops
       - fix gntalloc when grefs have run out.
       - fix PV boot if KSALR is enable or very large modules are used.
      
      * tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        x86/xen: don't copy bogus duplicate entries into kernel page tables
        xen/gntalloc: safely delete grefs in add_grefs() undo path
        xen/gntalloc: fix oops after runnning out of grant refs
        xen/balloon: cancel ballooning if adding new memory failed
        xen/manage: Always freeze/thaw processes when suspend/resuming
      7ee2d2d6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 018cace2
      Linus Torvalds 提交于
      Pull powerpc fixes from Michael Ellerman:
       "Ben's travelling so this is my first attempt at a pull request.
      
        There's nothing too exciting.  The CONFIG_FHANDLE one is annoying, I
        know you love defconfig changes.  But we've had a couple of developers
        waste time debugging boxes that wouldn't boot, only to realise it's
        just that systemd needs CONFIG_FHANDLE and our defconfigs don't have
        it.
      
        The new syscalls seem to be working, I've run the selftests that
        exist, and also let trinity bash on them for a while"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create()
        powerpc: Make CONFIG_FHANDLE=y for all 64 bit powerpc defconfigs
        powerpc: use machine_subsys_initcall() for opal_hmi_handler_init()
        powerpc/perf: Fix ABIv2 kernel backtraces
        powerpc/pseries: Fix endian issues in memory hotplug
      018cace2
    • G
      Merge tag 'fixes-for-v3.17-rc4' of... · e2c60989
      Greg Kroah-Hartman 提交于
      Merge tag 'fixes-for-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
      
      Felipe writes:
      
      usb: fixes for v3.17-rc4
      
      Some late fixes for dwc3 so we have something more stable
      on v3.17-final.
      
      Most bugs have been there for quite a while and nobody
      noticed, except for TRB completion when multiple TRBs
      are started.
      
      Patches were tested on AM437x SK and J6 EVM and are passing
      my tests.
      Signed-of-by: NFelipe Balbi <balbi@ti.com>
      e2c60989
    • M
      xhci: fix oops when xhci resumes from hibernate with hw lpm capable devices · 96044694
      Mathias Nyman 提交于
      Resuming from hibernate (S4) will restart and re-initialize xHC.
      The device contexts are freed and will be re-allocated later during device reset.
      
      Usb core will disable link pm in device resume before device reset, which will
      try to change the max exit latency, accessing the device contexts before they are re-allocated.
      
      There is no need to zero (disable) the max exit latency when disabling hw lpm
      for a freshly re-initialized xHC. So check that device context exists before
      doing anything. The max exit latency will be set again after device reset when usb core
      enables the link pm.
      Reported-by: NImre Deak <imre.deak@intel.com>
      Tested-by: NImre Deak <imre.deak@intel.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NMathias Nyman <mathias.nyman@linux.intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      96044694
    • A
      usb: xhci: Fix OOPS in xhci error handling code · 0eda06c7
      Al Cooper 提交于
      The xhci driver will OOPS on resume from S2/S3 if dma_alloc_coherent()
      is out of memory. This is a result of two things:
      1. xhci_mem_cleanup() in xhci-mem.c free's xhci->lpm_command if
      it's not NULL, but doesn't set it to NULL after the free.
      2. xhci_mem_cleanup() is called twice on resume, once for normal
      restart and once from xhci_mem_init() if dma_alloc_coherent() fails,
      resulting in a free of xhci->lpm_command that has already been freed.
      The fix is to set xhci->lpm_command to NULL after freeing it.
      Signed-off-by: NAl Cooper <alcooperx@gmail.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NMathias Nyman <mathias.nyman@linux.intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      0eda06c7
    • M
      xhci: Fix null pointer dereference if xhci initialization fails · c207e7c5
      Mathias Nyman 提交于
      If xhci initialization fails before the roothub bandwidth
      domains (xhci->rh_bw[i]) are allocated it will oops when
      trying to access rh_bw members in xhci_mem_cleanup().
      Reported-by: NManuel Reimer <manuel.reimer@gmx.de>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NMathias Nyman <mathias.nyman@linux.intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      c207e7c5
    • M
      storage: Add single-LUN quirk for Jaz USB Adapter · c66f1c62
      Mark 提交于
      The Iomega Jaz USB Adapter is a SCSI-USB converter cable. The hardware
      seems to be identical to e.g. the Microtech XpressSCSI, using a Shuttle/
      SCM chip set. However its firmware restricts it to only work with Jaz
      drives.
      
      On connecting the cable a message like this appears four times in the log:
       reset full speed USB device number 4 using uhci_hcd
      
      That's non-fatal but the US_FL_SINGLE_LUN quirk fixes it.
      Signed-off-by: NMark Knibbs <markk@clara.co.uk>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      c66f1c62
    • H
      a79e5bc5
    • L
      Merge tag 'pm+acpi-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 8381e57a
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These are regression fixes (cpufreq, ACPI battery) and fixes for stuff
        that never worked correctly (ACPI RTC operation region handler and PM
        domain implementation in the ACPI LPSS driver).
      
        Specifics:
      
         - Fix for the cpufreq Operation Performance Points (OPP) code where a
           recent commit added a kcalloc() call with an incorrect ordering of
           arguments.  From Anand Moon.
      
         - Reverts of two ACPI battery commits that caused incorrect
           diagnostic information to be printed to dmesg in some cases from
           Bjørn Mork.
      
         - Fix for the ACPI RTC operation region handler that applied the &
           operator to an argument already representing an address and that
           caused it to overwrite its own argument instead of writing to the
           address contained in it as expected.  From Chun-Yi Lee.
      
         - Fix for the PM domain implementation in the ACPI LPSS (Low-Power
           Subsystem) driver where one callback pointer pointed to a wrong
           routine and one was NULL, but it shouldn't.  From Fu Zhonghui"
      
      * tag 'pm+acpi-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / LPSS: complete PM entries for LPSS power domain
        Revert "ACPI / battery: fix wrong value of capacity_now reported when fully charged"
        Revert "ACPI / battery: Fix warning message in acpi_battery_get_state()"
        ACPI / RTC: Fix CMOS RTC opregion handler accesses to wrong addresses
        cpufreq / OPP: Fix the order of arguments for kcalloc()
      8381e57a
    • S
      xen/arm: remove mach_to_phys rbtree · d50582e0
      Stefano Stabellini 提交于
      Remove the rbtree used to keep track of machine to physical mappings:
      the frontend can grant the same page multiple times, leading to errors
      inserting or removing entries from the mach_to_phys tree.
      
      Linux only needed to know the physical address corresponding to a given
      machine address in swiotlb-xen. Now that swiotlb-xen can call the
      xen_dma_* functions passing the machine address directly, we can remove
      it.
      Signed-off-by: NStefano Stabellini <stefano.stabellini@eu.citrix.com>
      Tested-by: NDenis Schneider <v1ne2go@gmail.com>
      d50582e0
    • S
      xen/arm: reimplement xen_dma_unmap_page & friends · 340720be
      Stefano Stabellini 提交于
      xen_dma_unmap_page, xen_dma_sync_single_for_cpu and
      xen_dma_sync_single_for_device are currently implemented by calling into
      the corresponding generic ARM implementation of these functions. In
      order to do this, firstly the dma_addr_t handle, that on Xen is a
      machine address, needs to be translated into a physical address.  The
      operation is expensive and inaccurate, given that a single machine
      address can correspond to multiple physical addresses in one domain,
      because the same page can be granted multiple times by the frontend.
      
      To avoid this problem, we introduce a Xen specific implementation of
      xen_dma_unmap_page, xen_dma_sync_single_for_cpu and
      xen_dma_sync_single_for_device, that can operate on machine addresses
      directly.
      
      The new implementation relies on the fact that the hypervisor creates a
      second p2m mapping of any grant pages at physical address == machine
      address of the page for dom0. Therefore we can access memory at physical
      address == dma_addr_r handle and perform the cache flushing there. Some
      cache maintenance operations require a virtual address. Instead of using
      ioremap_cache, that is not safe in interrupt context, we allocate a
      per-cpu PAGE_KERNEL scratch page and we manually update the pte for it.
      
      arm64 doesn't need cache maintenance operations on unmap for now.
      Signed-off-by: NStefano Stabellini <stefano.stabellini@eu.citrix.com>
      Tested-by: NDenis Schneider <v1ne2go@gmail.com>
      340720be
    • S
      xen/arm: introduce XENFEAT_grant_map_identity · 5ebc77de
      Stefano Stabellini 提交于
      The flag tells us that the hypervisor maps a grant page to guest
      physical address == machine address of the page in addition to the
      normal grant mapping address. It is needed to properly issue cache
      maintenance operation at the completion of a DMA operation involving a
      foreign grant.
      Signed-off-by: NStefano Stabellini <stefano.stabellini@eu.citrix.com>
      Tested-by: NDenis Schneider <v1ne2go@gmail.com>
      5ebc77de