1. 27 4月, 2018 12 次提交
    • H
      vfio: ccw: fix cleanup if cp_prefetch fails · d66a7355
      Halil Pasic 提交于
      If the translation of a channel program fails, we may end up attempting
      to clean up (free, unpin) stuff that never got translated (and allocated,
      pinned) in the first place.
      
      By adjusting the lengths of the chains accordingly (so the element that
      failed, and all subsequent elements are excluded) cleanup activities
      based on false assumptions can be avoided.
      
      Let's make sure cp_free works properly after cp_prefetch returns with an
      error by setting ch_len of a ccw chain to the number of the translated
      CCWs on that chain.
      
      Cc: stable@vger.kernel.org #v4.12+
      Acked-by: NPierre Morel <pmorel@linux.vnet.ibm.com>
      Reviewed-by: NDong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
      Signed-off-by: NHalil Pasic <pasic@linux.vnet.ibm.com>
      Signed-off-by: NDong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
      Message-Id: <20180423110113.59385-2-bjsdjshi@linux.vnet.ibm.com>
      [CH: fixed typos]
      Signed-off-by: NCornelia Huck <cohuck@redhat.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      d66a7355
    • S
      s390/kexec_file: add declaration of purgatory related globals · 598d7656
      Sebastian Ott 提交于
      Fix the following sparse complaints:
      
      arch/s390/purgatory/purgatory.c:18:5: warning: symbol 'kernel_entry' was not declared. Should it be static?
      arch/s390/purgatory/purgatory.c:19:5: warning: symbol 'kernel_type' was not declared. Should it be static?
      arch/s390/purgatory/purgatory.c:21:5: warning: symbol 'crash_start' was not declared. Should it be static?
      arch/s390/purgatory/purgatory.c:22:5: warning: symbol 'crash_size' was not declared. Should it be static?
      Signed-off-by: NSebastian Ott <sebott@linux.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      598d7656
    • S
      s390: update defconfigs · d14be68f
      Sebastian Ott 提交于
      Change the following to y:
      
      arch/s390/configs/performance_defconfig:262:warning: symbol value 'm' invalid for NF_TABLES_IPV4
      arch/s390/configs/performance_defconfig:264:warning: symbol value 'm' invalid for NF_TABLES_ARP
      arch/s390/configs/performance_defconfig:285:warning: symbol value 'm' invalid for NF_TABLES_IPV6
      arch/s390/configs/performance_defconfig:306:warning: symbol value 'm' invalid for NF_TABLES_BRIDGE
      Signed-off-by: NSebastian Ott <sebott@linux.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      d14be68f
    • H
    • L
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 0644f186
      Linus Torvalds 提交于
      Pull virtio fixups from Michael Tsirkin:
      
       - Latest header update will break QEMU (if it's rebuilt with the new
         header) - and it seems that the code there is so fragile that any
         change in this header will break it. Add a better interface so users
         do not need to change their code every time that header changes.
      
       - Fix virtio console for spec compliance.
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        virtio_console: reset on out of memory
        virtio_console: move removal code
        virtio_console: drop custom control queue cleanup
        virtio_console: free buffers after reset
        virtio: add ability to iterate over vqs
        virtio_console: don't tie bufs to a vq
        virtio_balloon: add array of stat names
      0644f186
    • L
      Merge tag 'hwmon-for-linus-v4.17-rc3' of... · 0871062b
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
      
       - Add support for new Ryzen chips to k10temp driver
         ... making Phoronix happy
      
       - Fix inconsistent chip access in nct6683 driver
      
       - Handle absence of few types of sensors in scmi driver
      
      * tag 'hwmon-for-linus-v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (k10temp) Add support for AMD Ryzen w/ Vega graphics
        hwmon: (k10temp) Add temperature offset for Ryzen 2700X
        hwmon: (nct6683) Enable EC access if disabled at boot
        hwmon: (scmi) handle absence of few types of sensors
      0871062b
    • L
      Merge tag 'pci-v4.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 7f5d1573
      Linus Torvalds 提交于
      Pull PCI fixes from Bjorn Helgaas:
      
       - fix Aardvark MRRS setting (Evan Wang)
      
       - clarify "bandwidth available" link status message (Jakub Kicinski)
      
       - update Kirin GPIO name to fix probe failure (Loic Poulain)
      
       - fix Aardvark IRQ usage (Victor Gu)
      
       - fix Aardvark config accessor issues (Victor Gu)
      
      * tag 'pci-v4.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Add "PCIe" to pcie_print_link_status() messages
        PCI: kirin: Fix reset gpio name
        PCI: aardvark: Fix PCIe Max Read Request Size setting
        PCI: aardvark: Use ISR1 instead of ISR0 interrupt in legacy irq mode
        PCI: aardvark: Set PIO_ADDR_LS correctly in advk_pcie_rd_conf()
        PCI: aardvark: Fix logic in advk_pcie_{rd,wr}_conf()
      7f5d1573
    • L
      Merge tag 'trace-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 47b5ece9
      Linus Torvalds 提交于
      Pull tracing fixes from Steven Rostedt:
      
       - Add workqueue forward declaration (for new work, but a nice clean up)
      
       - seftest fixes for the new histogram code
      
       - Print output fix for hwlat tracer
      
       - Fix missing system call events - due to change in x86 syscall naming
      
       - Fix kprobe address being used by perf being hashed
      
      * tag 'trace-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix missing tab for hwlat_detector print format
        selftests: ftrace: Add a testcase for multiple actions on trigger
        selftests: ftrace: Fix trigger extended error testcase
        kprobes: Fix random address output of blacklist file
        tracing: Fix kernel crash while using empty filter with perf
        tracing/x86: Update syscall trace events to handle new prefixed syscall func names
        tracing: Add missing forward declaration
      47b5ece9
    • L
      Merge tag 'acpi-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · fe03a759
      Linus Torvalds 提交于
      Pull ACPI fixes from Rafael Wysocki:
       "These are two watchdog-related fixes, fix for a backlight regression
        from the 4.16 cycle that unfortunately was propagated to -stable and a
        button module modification to prevent graphics driver modules from
        failing to load due to unmet dependencies if ACPI is disabled from the
        kernel command line.
      
        Specifics:
      
         - Change the ACPI subsystem initialization ordering to initialize the
           WDAT watchodg before reserving PNP motherboard resources so as to
           allow the watchdog to allocate its resources before the PNP code
           gets to them and prevents it from working correctly (Mika
           Westerberg).
      
         - Add a quirk for Lenovo Z50-70 to use the iTCO watchdog instead of
           the WDAT one which conflicts with the RTC on that platform (Mika
           Westerberg).
      
         - Avoid breaking backlight handling on Dell XPS 13 2013 model by
           allowing laptops to use the ACPI backlight by default even if they
           are Windows 8-ready in principle (Hans de Goede)"
      
      * tag 'acpi-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
        ACPI / button: make module loadable when booted in non-ACPI mode
        ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
        ACPI / scan: Initialize watchdog before PNP
      fe03a759
    • L
      Merge tag 'pm-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · e58d911f
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "These are a Low Power S0 Idle quirk, a hibernation handling fix for
        the PCI bus type and a brcmstb-avs-cpufreq driver fixup removing
        development debug code from it.
      
        Specifics:
      
         - Blacklist the Low Power S0 Idle _DSM on ThinkPad X1 Tablet(2016)
           where it causes issues and make it use ACPI S3 which works instead
           of the non-working suspend-to-idle by default (Chen Yu).
      
         - Fix the handling of hibernation in the PCI core for devices with
           the DPM_FLAG_SMART_SUSPEND flag set to fix a regression affecting
           intel-lpss I2C devices (Mika Westerberg).
      
         - Drop development debug code from the brcmstb-avs-cpufreq driver
           (Markus Mayer)"
      
      * tag 'pm-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: brcmstb-avs-cpufreq: remove development debug support
        PCI / PM: Do not clear state_saved in pci_pm_freeze() when smart suspend is set
        ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016)
      e58d911f
    • L
      Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 665fa000
      Linus Torvalds 提交于
      Pull /dev/random fixes from Ted Ts'o:
       "Fix a regression on NUMA kernels and suppress excess unseeded entropy
        pool warnings"
      
      * tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: rate limit unseeded randomness warnings
        random: fix possible sleeping allocation from irq context
      665fa000
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 1334ac11
      Linus Torvalds 提交于
      Pull s390 fixes from Martin Schwidefsky:
       "A couple of bug fixes:
      
         - correct some CPU-MF counter names for z13 and z14
      
         - correct locking in the vfio-ccw fsm_io_helper function
      
         - provide arch_uretprobe_is_alive to avoid sigsegv with uretprobes
      
         - fix a corner case with CPU-MF sampling in regard to execve
      
         - fix expoline code revert for loadable modules
      
         - update chpid descriptor for resource accessibility events
      
         - fix dasd I/O errors due to outdated device alias infomation"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: correct module section names for expoline code revert
        vfio: ccw: process ssch with interrupts disabled
        s390: update sampling tag after task pid change
        s390/cpum_cf: rename IBM z13/z14 counter names
        s390/dasd: fix IO error for newly defined devices
        s390/uprobes: implement arch_uretprobe_is_alive()
        s390/cio: update chpid descriptor after resource accessibility event
      1334ac11
  2. 26 4月, 2018 13 次提交
    • R
      Merge branches 'acpi-watchdog', 'acpi-button' and 'acpi-video' · bd6dff55
      Rafael J. Wysocki 提交于
      * acpi-watchdog:
        ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
      
      * acpi-button:
        ACPI / button: make module loadable when booted in non-ACPI mode
      
      * acpi-video:
        ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
      bd6dff55
    • R
      Merge branches 'acpi-pm' and 'pm-cpufreq' · e140c4af
      Rafael J. Wysocki 提交于
      * acpi-pm:
        ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016)
      
      * pm-cpufreq:
        cpufreq: brcmstb-avs-cpufreq: remove development debug support
      e140c4af
    • L
      Merge tag 'for_v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 69bfd470
      Linus Torvalds 提交于
      Pull fsnotify fix from Jan Kara:
       "A fix of a fsnotify race causing panics / softlockups"
      
      * tag 'for_v4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fsnotify: Fix fsnotify_mark_connector race
      69bfd470
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 3442097b
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "Eight bug fixes, one spelling update and one tracepoint addition.
      
        The most serious is probably the mptsas write same fix because it
        means anyone using these controllers sees errors when modern
        filesystems try to issue discards"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: target: fix crash with iscsi target and dvd
        scsi: sd_zbc: Avoid that resetting a zone fails sporadically
        scsi: sd: Defer spinning up drive while SANITIZE is in progress
        scsi: megaraid_sas: Do not log an error if FW successfully initializes.
        scsi: ufs: add trace event for ufs upiu
        scsi: core: remove reference to scsi_show_extd_sense()
        scsi: mptsas: Disable WRITE SAME
        scsi: fnic: fix spelling mistake in fnic stats "Abord" -> "Abort"
        scsi: scsi_debug: IMMED related delay adjustments
        scsi: iscsi: respond to netlink with unicast when appropriate
      3442097b
    • L
      Merge tag 'for-linus-20180425' of git://git.kernel.dk/linux-block · 8fba70b0
      Linus Torvalds 提交于
      Pull block updates from Jens Axboe:
       "I ended up sitting on this about a week longer than I wanted to, since
        we were hashing out details with a timeout change. I've now killed
        that patch, so we can flush the existing queue in due time.
      
        This contains:
      
         - Fix for an old regression, where entering the queue can be
           disturbed by a signal to the process. This can cause spurious EIO.
           Fix from Alan Jenkins.
      
         - cdrom information leak fix from Dan.
      
         - Trivial helper for testing queue FUA from Dave Chinner, part of his
           O_DIRECT FUA series.
      
         - Series of swim fixes from Finn that actually makes it work again.
      
         - Loop O_DIRECT corruption fix, which caused data corruption in
           production for us. From me.
      
         - BFQ crash fix from me.
      
         - bcache maintainer update. Michael no longer has the time to do it,
           Coly has stepped up to serve as the new maintainer.
      
         - blkcg locking fixes from Jiang Biao.
      
         - Revert of a change from this merge window from Ming, that causes an
           issue on some hardware.
      
         - Minor clarification doc addition from Linus Walleij"
      
      * tag 'for-linus-20180425' of git://git.kernel.dk/linux-block: (22 commits)
        Revert "blk-mq: remove code for dealing with remapping queue"
        block: mq: Add some minor doc for core structs
        bcache: mark Coly Li as bcache maintainer
        MAINTAINERS: Remove me as maintainer of bcache
        blkcg: init root blkcg_gq under lock
        blkcg: small fix on comment in blkcg_init_queue
        blkcg: don't hold blkcg lock when deactivating policy
        block: add blk_queue_fua() helper function
        cdrom: information leak in cdrom_ioctl_media_changed()
        bfq-iosched: ensure to clear bic/bfqq pointers when preparing request
        blk-mq: start request gstate with gen 1
        block/swim: Select appropriate drive on device open
        block/swim: Fix IO error at end of medium
        block/swim: Check drive type
        block/swim: Rename macros to avoid inconsistent inverted logic
        block/swim: Don't log an error message for an invalid ioctl
        block/swim: Remove extra put_disk() call from error path
        block/swim: Fix array bounds check
        m68k/mac: Don't remap SWIM MMIO region
        loop: handle short DIO reads
        ...
      8fba70b0
    • L
      Merge tag 'riscv-for-linus-4.17-rc3' of... · c6dc3e71
      Linus Torvalds 提交于
      Merge tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
      
      Pull RISC-V fixes from Palmer Dabbelt:
       "This contains three small fixes related to the RISC-V port that I'd
        like to target for 4.17-rc3:
      
         - a Kconfig cleanup to select DMA_DIRECT_OPS instead of redefining it
           in arch/riscv
      
         - the removal of asm/handle_irq.h, which doesn't exist, from our arch
           header list
      
         - the addition of "-no-pie" the link rules for our VDSO-related
           files, which fixes the build on systems where PIE is enabled by
           default"
      
      * tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
        RISC-V: build vdso-dummy.o with -no-pie
        riscv: there is no <asm/handle_irq.h>
        riscv: select DMA_DIRECT_OPS instead of redefining it
      c6dc3e71
    • L
      Merge tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping · 26ed24e4
      Linus Torvalds 提交于
      Pull dma-mapping fixes from Christoph Hellwig:
       "A few small dma-mapping fixes for Linux 4.17-rc3:
      
         - don't loop to try GFP_DMA allocations if ZONE_DMA is not actually
           enabled (regression in 4.16)
      
         - don't try to do virt_to_page before we know we actuall have a valid
           page in dma_common_mmap
      
         - a comment fixup related to the above fix"
      
      * tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping:
        dma-mapping: postpone cpu addr translation on mmap
        dma-coherent: clarify dma_mmap_from_dev_coherent documentation
        dma-direct: don't retry allocation for no-op GFP_DMA
      26ed24e4
    • M
      virtio_console: reset on out of memory · 5c60300d
      Michael S. Tsirkin 提交于
      When out of memory and we can't add ctrl vq buffers,
      probe fails. Unfortunately the error handling is
      out of spec: it calls del_vqs without bothering
      to reset the device first.
      
      To fix, call the full cleanup function in this case.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      5c60300d
    • M
      virtio_console: move removal code · aa44ec86
      Michael S. Tsirkin 提交于
      Will make it reusable for error handling.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      aa44ec86
    • M
      virtio_console: drop custom control queue cleanup · 61a8950c
      Michael S. Tsirkin 提交于
      We now cleanup all VQs on device removal - no need
      to handle the control VQ specially.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      61a8950c
    • M
      virtio_console: free buffers after reset · a7a69ec0
      Michael S. Tsirkin 提交于
      Console driver is out of spec. The spec says:
      	A driver MUST NOT decrement the available idx on a live
      	virtqueue (ie. there is no way to “unexpose” buffers).
      and it does exactly that by trying to detach unused buffers
      without doing a device reset first.
      
      Defer detaching the buffers until device unplug.
      
      Of course this means we might get an interrupt for
      a vq without an attached port now. Handle that by
      discarding the consumed buffer.
      Reported-by: NTiwei Bie <tiwei.bie@intel.com>
      Fixes: b3258ff1 ("virtio: Decrement avail idx on buffer detach")
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      a7a69ec0
    • M
      virtio: add ability to iterate over vqs · 24a7e4d2
      Michael S. Tsirkin 提交于
      For cleanup it's helpful to be able to simply scan all vqs and discard
      all data. Add an iterator to do that.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      24a7e4d2
    • M
      virtio_console: don't tie bufs to a vq · 2855b335
      Michael S. Tsirkin 提交于
      an allocated buffer doesn't need to be tied to a vq -
      only vq->vdev is ever used. Pass the function the
      just what it needs - the vdev.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      2855b335
  3. 25 4月, 2018 15 次提交