1. 16 Sep, 2019 8 commits
    • Linus Torvalds's avatar
      Merge tag 'spi-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · aa62325d
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "The big theme for this release has been performance, we've had a
        series of unrelated overhauls of a few drivers all with a big
        peformance component.
      
        Otherwise it's been relatively quiet, highlights include:
      
         - A big overhaul of the spi-fsl-dspi driver improving the code
           quality, performance and stability from Vladimir Oltean.
      
         - A big performance enhancement for the bc2835 (Raspberry Pi) driver
           for unidirectional transfers from Lukas Wunner.
      
         - Improved performance on small transfers for the uniphier driver
           from Keiji Hayashibara.
      
         - Lots of coccinelle generated cleanups from Yue Haibing.
      
         - New device support for Freescale ls2080a and Nuvoton NPCM FIU"
      
      * tag 'spi-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (102 commits)
        spi: mediatek: support large PA
        spi: mediatek: add spi support for mt6765 IC
        dt-bindings: spi: update bindings for MT6765 SoC
        spi: bcm2835: Speed up RX-only DMA transfers by zero-filling TX FIFO
        spi: bcm2835: Speed up TX-only DMA transfers by clearing RX FIFO
        dmaengine: bcm2835: Avoid accessing memory when copying zeroes
        spi: bcm2835: Cache CS register value for ->prepare_message()
        dmaengine: bcm2835: Document struct bcm2835_dmadev
        spi: Guarantee cacheline alignment of driver-private data
        dmaengine: bcm2835: Allow reusable descriptors
        dmaengine: bcm2835: Allow cyclic transactions without interrupt
        spi: bcm2835: Drop dma_pending flag
        spi: bcm2835: Work around DONE bit erratum
        spi-gpio: Use PTR_ERR_OR_ZERO() in spi_gpio_request()
        spi: Use an abbreviated pointer to ctlr->cur_msg in __spi_pump_messages
        spi: npcm-fiu: remove set but not used variable 'retlen'
        spi: fsl-spi: use devm_platform_ioremap_resource() to simplify code
        spi: zynq-qspi: use devm_platform_ioremap_resource() to simplify code
        spi: zynqmp: use devm_platform_ioremap_resource() to simplify code
        spi: xlp: use devm_platform_ioremap_resource() to simplify code
        ...
      aa62325d
    • Linus Torvalds's avatar
      Merge tag 'regulator-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · c4d11ccb
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "A small update for the regualtor API for this cycle, some small fixes
        and a bunch of new devices but none of them very big.
      
        The most stand out thing is the regulator-fixed-clock driver which is
        for regulators where the enable control is done by using a clock
        instead of a GPIO or register write, a novel hardware design that had
        not previously come up.
      
        Summary:
      
         - Added a keyword pattern for regulator_get_optional() since usage of
           that API generally needs extra review.
      
         - Operating mode and suspend state support for act8865.
      
         - New device support for Active Semiconductor ACT8600 chargers,
           Mediatek MT6358, Qualcomm SM8150, regulator-fixed-clock, and
           Synoptics SY20276, SY20278 and SY8824E"
      
      * tag 'regulator-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (52 commits)
        regulator: core: Fix error return for /sys access
        regulator: da9211: fix obtaining "enable" GPIO
        regulator: max77686: fix obtaining "maxim,ena" GPIO
        regulator: uniphier: Add Pro5 USB3 VBUS support
        dt-bindings: regulator: add regulator-fixed-clock binding
        regulator: fixed: add possibility to enable by clock
        regulator: s2mps11: Consistently use local variable
        regulator: lp87565: Simplify lp87565_buck_set_ramp_delay
        regulator: slg51000: use devm_gpiod_get_optional() in probe
        regulator: lp8788-ldo: make array en_mask static const, makes object smaller
        regulator: tps65132: Stop parsing DT when gpio is not found
        regulator: Defer init completion for a while after late_initcall
        regulator: add missing 'static inline' to a helper's stub
        regulator: provide regulator_bulk_set_supply_names()
        MAINTAINERS: Add keyword pattern on regulator_get_optional()
        regulator: sy8824x: add prefixes to BUCK_EN and MODE macros
        regulator: sy8824x: use c++style for the comment block near SPDX
        regulator: mt6358: Add BROKEN dependency while waiting for MFD to merge
        regulator: mt6358: Add support for MT6358 regulator
        regulator: Add document for MT6358 regulator
        ...
      c4d11ccb
    • Linus Torvalds's avatar
      Merge tag 'regmap-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 0372fd1a
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "Only two changes for this release, one fix for error handling with
        runtime PM and a change from Greg removing error handling from debugfs
        API calls now that they implement user visible error reporting"
      
      * tag 'regmap-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap-irq: Correct error paths in regmap_irq_thread for pm_runtime
        regmap: no need to check return value of debugfs_create functions
      0372fd1a
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 6729fb66
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "New drivers:
         - Inspur Power System power supply driver
         - Synaptics AS370 PVT sensor driver
      
        Chip support:
         - support SHTC3 in shtc1 driver
         - support NCT6116 in nct6775 driver
         - support AMD family 17h, model 70h CPUs in k10temp driver
         - support PCT2075 in lm75 driver
      
        Removed drivers:
         - ads1015 driver (now supported in iio)
      
        Other changes:
         - Convert drivers to use devm_i2c_new_dummy_device
         - Substantial structural improvements in lm75 driver adding support
           for writing sample interval for supported chips
         - Add support for PSU version 2 to ibm-cffps driver
         - Add support for power attribute to iio_hwmon bridge
         - Add support for additional fan, voltage and temperature attributes
           to nct7904 driver
         - Convert adt7475 driver to use hwmon_device_register_with_groups()
         - Convert k8temp driver to use hwmon_device_register_with_info()
         - Various other improvements and minor fixes"
      
      * tag 'hwmon-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (48 commits)
        hwmon: submitting-patches: Add note on comment style
        hwmon: submitting-patches: Point to with_info API
        hwmon: (nct7904) Fix incorrect SMI status register setting of LTD temperature and fan.
        hwmon: (shtc1) add support for the SHTC3 sensor
        hwmon: (shtc1) fix shtc1 and shtw1 id mask
        hwmon: (lm75) Aproximate sample times to data-sheet values
        hwmon: (w83793d) convert to use devm_i2c_new_dummy_device
        hwmon: (w83792d) convert to use devm_i2c_new_dummy_device
        hwmon: (w83791d) convert to use devm_i2c_new_dummy_device
        hwmon: (as370-hwmon) fix devm_platform_ioremap_resource.cocci warnings
        hwmon: (lm75) Add support for writing sampling period on PCT2075
        hwmon: (lm75) Add support for writing conversion time for TMP112
        hwmon: (lm75) Move updating the sample interval to its own function
        hwmon: (lm75) Support configuring the sample time for various chips
        hwmon: (nct7904) Fix incorrect temperature limitation register setting of LTD.
        hwmon: (as370-hwmon) Add DT bindings for Synaptics AS370 PVT
        hwmon: Add Synaptics AS370 PVT sensor driver
        pmbus: (ibm-cffps) Add support for version 2 of the PSU
        dt-bindings: hwmon: Document ibm,cffps2 compatible string
        hwmon: (iio_hwmon) Enable power exporting from IIO
        ...
      6729fb66
    • Linus Torvalds's avatar
      Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8e97be2a
      Linus Torvalds authored
      Pull RAS updates from Borislav Petkov:
       "The latest meager RAS updates:
      
         - Enable processing of action-optional MCEs which have the Overflow
           bit set (Tony Luck)
      
         - -Wmissing-prototypes warning fix and a build fix (Valdis
           Klētnieks)"
      
      * 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        RAS: Build debugfs.o only when enabled in Kconfig
        RAS: Fix prototype warnings
        x86/mce: Don't check for the overflow bit on action optional machine checks
      8e97be2a
    • Linus Torvalds's avatar
      Merge tag 'edac_for_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras · ff881842
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       "The new thing this time around is that we have three maintainers now
        and a new, old repo. New because it is new for the EDAC tree which is
        hosted there from now on and old because it is Tony's and mine's old
        RAS repo which we still use occasionally when the stuff isn't in tip.
      
        Summary:
      
         -  EDAC tree has three maintainers and one new designated reviewer
            now, so that the work can scale better.
      
         -  New driver for Mellanox' BlueField SoC DDR controller (Shravan
            Kumar Ramani)
      
         -  AMD Rome support in amd64_edac (Yazen Ghannam and Isaac Vaughn)
      
         -  Misc fixes, cleanups and code improvements"
      
      * tag 'edac_for_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
        EDAC/amd64: Add PCI device IDs for family 17h, model 70h
        MAINTAINERS: Add Robert as a EDAC reviewer
        EDAC/mc_sysfs: Make debug messages consistent
        EDAC/mc_sysfs: Remove pointless gotos
        EDAC: Prefer 'unsigned int' to bare use of 'unsigned'
        EDAC/amd64: Support asymmetric dual-rank DIMMs
        EDAC/amd64: Cache secondary Chip Select registers
        EDAC/amd64: Decode syndrome before translating address
        EDAC/amd64: Find Chip Select memory size using Address Mask
        EDAC/amd64: Initialize DIMM info for systems with more than two channels
        EDAC/amd64: Recognize DRAM device type ECC capability
        EDAC/amd64: Support more than two controllers for chip selects handling
        EDAC/mc: Cleanup _edac_mc_free() code
        EDAC, pnd2: Fix ioremap() size in dnv_rd_reg()
        EDAC, mellanox: Add ECC support for BlueField DDR4
        EDAC/altera: Use the proper type for the IRQ status bits
        EDAC/mc: Fix grain_bits calculation
        edac: altera: Move Stratix10 SDRAM ECC to peripheral
        MAINTAINERS: update EDAC entry to reflect current tree and maintainers
      ff881842
    • Linus Torvalds's avatar
      Merge tag 'tpmdd-next-20190902' of git://git.infradead.org/users/jjs/linux-tpmdd · a7bd4bcf
      Linus Torvalds authored
      Pull tpm updates from Jarkko Sakkinen:
       "A new driver for fTPM living inside ARM TEE was added this round.
      
        In addition to that, there are three bug fixes and one clean up"
      
      * tag 'tpmdd-next-20190902' of git://git.infradead.org/users/jjs/linux-tpmdd:
        tpm/tpm_ftpm_tee: Document fTPM TEE driver
        tpm/tpm_ftpm_tee: A driver for firmware TPM running inside TEE
        tpm: Remove a deprecated comments about implicit sysfs locking
        tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts
        tpm_tis_core: Turn on the TPM before probing IRQ's
        MAINTAINERS: fix style in KEYS-TRUSTED entry
      a7bd4bcf
    • Linus Torvalds's avatar
      Merge tag 'core-process-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux · c17112a5
      Linus Torvalds authored
      Pull pidfd/waitid updates from Christian Brauner:
       "This contains two features and various tests.
      
        First, it adds support for waiting on process through pidfds by adding
        the P_PIDFD type to the waitid() syscall. This completes the basic
        functionality of the pidfd api (cf. [1]). In the meantime we also have
        a new adition to the userspace projects that make use of the pidfd
        api. The qt project was nice enough to send a mail pointing out that
        they have a pr up to switch to the pidfd api (cf. [2]).
      
        Second, this tag contains an extension to the waitid() syscall to make
        it possible to wait on the current process group in a race free manner
        (even though the actual problem is very unlikely) by specifing 0
        together with the P_PGID type. This extension traces back to a
        discussion on the glibc development mailing list.
      
        There are also a range of tests for the features above. Additionally,
        the test-suite which detected the pidfd-polling race we fixed in [3]
        is included in this tag"
      
      [1] https://lwn.net/Articles/794707/
      [2] https://codereview.qt-project.org/c/qt/qtbase/+/108456
      [3] commit b191d649 ("pidfd: fix a poll race when setting exit_state")
      
      * tag 'core-process-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
        waitid: Add support for waiting for the current process group
        tests: add pidfd poll tests
        tests: move common definitions and functions into pidfd.h
        pidfd: add pidfd_wait tests
        pidfd: add P_PIDFD to waitid()
      c17112a5
  2. 15 Sep, 2019 4 commits
    • Linus Torvalds's avatar
      Linux 5.3 · 4d856f72
      Linus Torvalds authored
      4d856f72
    • Linus Torvalds's avatar
      Revert "ext4: make __ext4_get_inode_loc plug" · 72dbcf72
      Linus Torvalds authored
      This reverts commit b03755ad.
      
      This is sad, and done for all the wrong reasons.  Because that commit is
      good, and does exactly what it says: avoids a lot of small disk requests
      for the inode table read-ahead.
      
      However, it turns out that it causes an entirely unrelated problem: the
      getrandom() system call was introduced back in 2014 by commit
      c6e9d6f3
      
       ("random: introduce getrandom(2) system call"), and people
      use it as a convenient source of good random numbers.
      
      But part of the current semantics for getrandom() is that it waits for
      the entropy pool to fill at least partially (unlike /dev/urandom).  And
      at least ArchLinux apparently has a systemd that uses getrandom() at
      boot time, and the improvements in IO patterns means that existing
      installations suddenly start hanging, waiting for entropy that will
      never happen.
      
      It seems to be an unlucky combination of not _quite_ enough entropy,
      together with a particular systemd version and configuration.  Lennart
      says that the systemd-random-seed process (which is what does this early
      access) is supposed to not block any other boot activity, but sadly that
      doesn't actually seem to be the case (possibly due bogus dependencies on
      cryptsetup for encrypted swapspace).
      
      The correct fix is to fix getrandom() to not block when it's not
      appropriate, but that fix is going to take a lot more discussion.  Do we
      just make it act like /dev/urandom by default, and add a new flag for
      "wait for entropy"? Do we add a boot-time option? Or do we just limit
      the amount of time it will wait for entropy?
      
      So in the meantime, we do the revert to give us time to discuss the
      eventual fix for the fundamental problem, at which point we can re-apply
      the ext4 inode table access optimization.
      Reported-by: default avatarAhmed S. Darwish <darwish.07@gmail.com>
      Cc: Ted Ts'o <tytso@mit.edu>
      Cc: Willy Tarreau <w@1wt.eu>
      Cc: Alexander E. Patrakov <patrakov@gmail.com>
      Cc: Lennart Poettering <mzxreary@0pointer.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      72dbcf72
    • Mark Brown's avatar
      Merge branch 'spi-5.4' into spi-next · b769c5ba
      Mark Brown authored
      b769c5ba
    • Mark Brown's avatar
      Merge branch 'spi-5.3' into spi-linus · 262a2f33
      Mark Brown authored
      262a2f33
  3. 14 Sep, 2019 12 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 1609d760
      Linus Torvalds authored
      Pull kvm fixes from Paolo Bonzini:
       "The main change here is a revert of reverts. We recently simplified
        some code that was thought unnecessary; however, since then KVM has
        grown quite a few cond_resched()s and for that reason the simplified
        code is prone to livelocks---one CPUs tries to empty a list of guest
        page tables while the others keep adding to them. This adds back the
        generation-based zapping of guest page tables, which was not
        unnecessary after all.
      
        On top of this, there is a fix for a kernel memory leak and a couple
        of s390 fixlets as well"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: x86/mmu: Reintroduce fast invalidate/zap for flushing memslot
        KVM: x86: work around leak of uninitialized stack contents
        KVM: nVMX: handle page fault in vmread
        KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl
        KVM: s390: kvm_s390_vm_start_migration: check dirty_bitmap before using it as target for memset()
      1609d760
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 1f9c632c
      Linus Torvalds authored
      Pull virtio fix from Michael Tsirkin:
       "A last minute revert
      
        The 32-bit build got broken by the latest defence in depth patch.
        Revert and we'll try again in the next cycle"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        Revert "vhost: block speculation of translated descriptors"
      1f9c632c
    • Linus Torvalds's avatar
      Merge tag 'riscv/for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · b03c036e
      Linus Torvalds authored
      Pull RISC-V fix from Paul Walmsley:
       "Last week, Palmer and I learned that there was an error in the RISC-V
        kernel image header format that could make it less compatible with the
        ARM64 kernel image header format. I had missed this error during my
        original reviews of the patch.
      
        The kernel image header format is an interface that impacts
        bootloaders, QEMU, and other user tools. Those packages must be
        updated to align with whatever is merged in the kernel. We would like
        to avoid proliferating these image formats by keeping the RISC-V
        header as close as possible to the existing ARM64 header. Since the
        arch/riscv patch that adds support for the image header was merged
        with our v5.3-rc1 pull request as commit 0f327f2a ("RISC-V: Add
        an Image header that boot loader can parse."), we think it wise to try
        to fix this error before v5.3 is released.
      
        The fix itself should be backwards-compatible with any project that
        has already merged support for premature versions of this interface.
        It primarily involves ensuring that the RISC-V image header has
        something useful in the same field as the ARM64 image header"
      
      * tag 'riscv/for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        riscv: modify the Image header to improve compatibility with the ARM64 header
      b03c036e
    • Michael S. Tsirkin's avatar
      Revert "vhost: block speculation of translated descriptors" · 0d4a3f2a
      Michael S. Tsirkin authored
      This reverts commit a89db445
      
      .
      
      I was hasty to include this patch, and it breaks the build on 32 bit.
      Defence in depth is good but let's do it properly.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      0d4a3f2a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 36024fcf
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Don't corrupt xfrm_interface parms before validation, from Nicolas
          Dichtel.
      
       2) Revert use of usb-wakeup in btusb, from Mario Limonciello.
      
       3) Block ipv6 packets in bridge netfilter if ipv6 is disabled, from
          Leonardo Bras.
      
       4) IPS_OFFLOAD not honored in ctnetlink, from Pablo Neira Ayuso.
      
       5) Missing ULP check in sock_map, from John Fastabend.
      
       6) Fix receive statistic handling in forcedeth, from Zhu Yanjun.
      
       7) Fix length of SKB allocated in 6pack driver, from Christophe
          JAILLET.
      
       8) ip6_route_info_create() returns an error pointer, not NULL. From
          Maciej Żenczykowski.
      
       9) Only add RDS sock to the hashes after rs_transport is set, from
          Ka-Cheong Poon.
      
      10) Don't double clean TX descriptors in ixgbe, from Ilya Maximets.
      
      11) Presence of transmit IPSEC offload in an SKB is not tested for
          correctly in ixgbe and ixgbevf. From Steffen Klassert and Jeff
          Kirsher.
      
      12) Need rcu_barrier() when register_netdevice() takes one of the
          notifier based failure paths, from Subash Abhinov Kasiviswanathan.
      
      13) Fix leak in sctp_do_bind(), from Mao Wenan.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (72 commits)
        cdc_ether: fix rndis support for Mediatek based smartphones
        sctp: destroy bucket if failed to bind addr
        sctp: remove redundant assignment when call sctp_get_port_local
        sctp: change return type of sctp_get_port_local
        ixgbevf: Fix secpath usage for IPsec Tx offload
        sctp: Fix the link time qualifier of 'sctp_ctrlsock_exit()'
        ixgbe: Fix secpath usage for IPsec TX offload.
        net: qrtr: fix memort leak in qrtr_tun_write_iter
        net: Fix null de-reference of device refcount
        ipv6: Fix the link time qualifier of 'ping_v6_proc_exit_net()'
        tun: fix use-after-free when register netdev failed
        tcp: fix tcp_ecn_withdraw_cwr() to clear TCP_ECN_QUEUE_CWR
        ixgbe: fix double clean of Tx descriptors with xdp
        ixgbe: Prevent u8 wrapping of ITR value to something less than 10us
        mlx4: fix spelling mistake "veify" -> "verify"
        net: hns3: fix spelling mistake "undeflow" -> "underflow"
        net: lmc: fix spelling mistake "runnin" -> "running"
        NFC: st95hf: fix spelling mistake "receieve" -> "receive"
        net/rds: An rds_sock is added too early to the hash table
        mac80211: Do not send Layer 2 Update frame before authorization
        ...
      36024fcf
    • Linus Torvalds's avatar
      Merge tag 'mmc-v5.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · 1c4c5e25
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
      
       - tmio: Fixup runtime PM management during probe and remove
      
       - sdhci-pci-o2micro: Fix eMMC initialization for an AMD SoC
      
       - bcm2835: Prevent lockups when terminating work
      
      * tag 'mmc-v5.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
        mmc: tmio: Fixup runtime PM management during remove
        mmc: tmio: Fixup runtime PM management during probe
        Revert "mmc: tmio: move runtime PM enablement to the driver implementations"
        Revert "mmc: sdhci: Remove unneeded quirk2 flag of O2 SD host controller"
        Revert "mmc: bcm2835: Terminate timeout work synchronously"
      1c4c5e25
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-2019-09-13' of git://anongit.freedesktop.org/drm/drm · 592b8d87
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "From the maintainer summit, just some last minute fixes for final:
      
        lima:
         - fix gem_wait ioctl
      
        core:
         - constify modes list
      
        i915:
         - DP MST high color depth regression
         - GPU hangs on vulkan compute workloads"
      
      * tag 'drm-fixes-2019-09-13' of git://anongit.freedesktop.org/drm/drm:
        drm/lima: fix lima_gem_wait() return value
        drm/i915: Restore relaxed padding (OCL_OOB_SUPPRES_ENABLE) for skl+
        drm/i915: Limit MST to <= 8bpc once again
        drm/modes: Make the whitelist more const
      592b8d87
    • Paolo Bonzini's avatar
      Merge tag 'kvm-s390-master-5.3-1' of... · a9c20bb0
      Paolo Bonzini authored
      Merge tag 'kvm-s390-master-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
      
      KVM: s390: Fixes for 5.3
      
      - prevent a user triggerable oops in the migration code
      - do not leak kernel stack content
      a9c20bb0
    • Sean Christopherson's avatar
      KVM: x86/mmu: Reintroduce fast invalidate/zap for flushing memslot · 002c5f73
      Sean Christopherson authored
      James Harvey reported a livelock that was introduced by commit
      d012a06a ("Revert "KVM: x86/mmu: Zap only the relevant pages when
      removing a memslot"").
      
      The livelock occurs because kvm_mmu_zap_all() as it exists today will
      voluntarily reschedule and drop KVM's mmu_lock, which allows other vCPUs
      to add shadow pages.  With enough vCPUs, kvm_mmu_zap_all() can get stuck
      in an infinite loop as it can never zap all pages before observing lock
      contention or the need to reschedule.  The equivalent of kvm_mmu_zap_all()
      that was in use at the time of the reverted commit (4e103134, "KVM:
      x86/mmu: Zap only the relevant pages when removing a memslot") employed
      a fast invalidate mechanism and was not susceptible to the above livelock.
      
      There are three ways to fix the livelock:
      
      - Reverting the revert (commit d012a06a) is not a viable option as
        the revert is needed to fix a regression that occurs when the guest has
        one or more assigned devices.  It's unlikely we'll root cause the device
        assignment regression soon enough to fix the regression timely.
      
      - Remove the conditional reschedule from kvm_mmu_zap_all().  However, although
        removing the reschedule would be a smaller code change, it's less safe
        in the sense that the resulting kvm_mmu_zap_all() hasn't been used in
        the wild for flushing memslots since the fast invalidate mechanism was
        introduced by commit 6ca18b69 ("KVM: x86: use the fast way to
        invalidate all pages"), back in 2013.
      
      - Reintroduce the fast invalidate mechanism and use it when zapping shadow
        pages in response to a memslot being deleted/moved, which is what this
        patch does.
      
      For all intents and purposes, this is a revert of commit ea145aac
      ("Revert "KVM: MMU: fast invalidate all pages"") and a partial revert of
      commit 7390de1e ("Revert "KVM: x86: use the fast way to invalidate
      all pages""), i.e. restores the behavior of commit 5304b8d3 ("KVM:
      MMU: fast invalidate all pages") and commit 6ca18b69 ("KVM: x86:
      use the fast way to invalidate all pages") respectively.
      
      Fixes: d012a06a
      
       ("Revert "KVM: x86/mmu: Zap only the relevant pages when removing a memslot"")
      Reported-by: default avatarJames Harvey <jamespharvey20@gmail.com>
      Cc: Alex Willamson <alex.williamson@redhat.com>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      002c5f73
    • Fuqian Huang's avatar
      KVM: x86: work around leak of uninitialized stack contents · 541ab2ae
      Fuqian Huang authored
      
      
      Emulation of VMPTRST can incorrectly inject a page fault
      when passed an operand that points to an MMIO address.
      The page fault will use uninitialized kernel stack memory
      as the CR2 and error code.
      
      The right behavior would be to abort the VM with a KVM_EXIT_INTERNAL_ERROR
      exit to userspace; however, it is not an easy fix, so for now just ensure
      that the error code and CR2 are zero.
      Signed-off-by: default avatarFuqian Huang <huangfq.daxian@gmail.com>
      Cc: stable@vger.kernel.org
      [add comment]
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      541ab2ae
    • Paolo Bonzini's avatar
      KVM: nVMX: handle page fault in vmread · f7eea636
      Paolo Bonzini authored
      
      
      The implementation of vmread to memory is still incomplete, as it
      lacks the ability to do vmread to I/O memory just like vmptrst.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      f7eea636
    • Paul Walmsley's avatar
      riscv: modify the Image header to improve compatibility with the ARM64 header · 474efecb
      Paul Walmsley authored
      
      
      Part of the intention during the definition of the RISC-V kernel image
      header was to lay the groundwork for a future merge with the ARM64
      image header.  One error during my original review was not noticing
      that the RISC-V header's "magic" field was at a different size and
      position than the ARM64's "magic" field.  If the existing ARM64 Image
      header parsing code were to attempt to parse an existing RISC-V kernel
      image header format, it would see a magic number 0.  This is
      undesirable, since it's our intention to align as closely as possible
      with the ARM64 header format.  Another problem was that the original
      "res3" field was not being initialized correctly to zero.
      
      Address these issues by creating a 32-bit "magic2" field in the RISC-V
      header which matches the ARM64 "magic" field.  RISC-V binaries will
      store "RSC\x05" in this field.  The intention is that the use of the
      existing 64-bit "magic" field in the RISC-V header will be deprecated
      over time.  Increment the minor version number of the file format to
      indicate this change, and update the documentation accordingly.  Fix
      the assembler directives in head.S to ensure that reserved fields are
      properly zero-initialized.
      Signed-off-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
      Reported-by: default avatarPalmer Dabbelt <palmer@sifive.com>
      Reviewed-by: default avatarPalmer Dabbelt <palmer@sifive.com>
      Cc: Atish Patra <atish.patra@wdc.com>
      Cc: Karsten Merker <merker@debian.org>
      Link: https://lore.kernel.org/linux-riscv/194c2f10c9806720623430dbf0cc59a965e50448.camel@wdc.com/T/#u
      Link: https://lore.kernel.org/linux-riscv/mhng-755b14c4-8f35-4079-a7ff-e421fd1b02bc@palmer-si-x1e/T/#t
      474efecb
  4. 13 Sep, 2019 16 commits