1. 02 Oct, 2020 1 commit
  2. 25 Sep, 2020 19 commits
    • J. Bruce Fields's avatar
      nfsd: rq_lease_breaker cleanup · 13956160
      J. Bruce Fields authored
      Since only the v4 code cares about it, maybe it's better to leave
      rq_lease_breaker out of the common dispatch code?
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      13956160
    • J. Bruce Fields's avatar
      nfsd4: remove check_conflicting_opens warning · 50747dd5
      J. Bruce Fields authored
      There are actually rare races where this is possible (e.g. if a new open
      intervenes between the read of i_writecount and the fi_fds).
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      50747dd5
    • J. Bruce Fields's avatar
      nfsd: Cache R, RW, and W opens separately · ae3c57b5
      J. Bruce Fields authored
      The nfsd open code has always kept separate read-only, read-write, and
      write-only opens as necessary to ensure that when a client closes or
      downgrades, we don't retain more access than necessary.
      
      Also, I didn't realize the cache behaved this way when I wrote
      94415b06 "nfsd4: a client's own opens needn't prevent delegations".
      There I assumed fi_fds[O_WRONLY] and fi_fds[O_RDWR] would always be
      distinct.  The violation of that assumption is triggering a
      WARN_ON_ONCE() and could also cause the server to give out a delegation
      when it shouldn't.
      
      Fixes: 94415b06 ("nfsd4: a client's own opens needn't prevent delegations")
      Tested-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      ae3c57b5
    • J. Bruce Fields's avatar
      sunrpc: simplify do_cache_clean · 0aa99c4d
      J. Bruce Fields authored
      Is it just me, or is the logic written in a slightly convoluted way?
      
      I find it a little easier to read this way.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      0aa99c4d
    • Xu Wang's avatar
      sunrpc: cache : Replace seq_printf with seq_puts · 9dbc1f45
      Xu Wang authored
      seq_puts is a lot cheaper than seq_printf, so use that to print
      literal strings.
      Signed-off-by: default avatarXu Wang <vulab@iscas.ac.cn>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      9dbc1f45
    • Rik van Riel's avatar
      silence nfscache allocation warnings with kvzalloc · 8c38b705
      Rik van Riel authored
      silence nfscache allocation warnings with kvzalloc
      
      Currently nfsd_reply_cache_init attempts hash table allocation through
      kmalloc, and manually falls back to vzalloc if that fails. This makes
      the code a little larger than needed, and creates a significant amount
      of serial console spam if you have enough systems.
      
      Switching to kvzalloc gets rid of the allocation warnings, and makes
      the code a little cleaner too as a side effect.
      
      Freeing of nn->drc_hashtbl is already done using kvfree currently.
      Signed-off-by: default avatarRik van Riel <riel@surriel.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      8c38b705
    • Zheng Bin's avatar
      nfsd: fix comparison to bool warning · 44b49aa6
      Zheng Bin authored
      Fixes coccicheck warning:
      
      fs/nfsd/nfs4proc.c:3234:5-29: WARNING: Comparison to bool
      Signed-off-by: default avatarZheng Bin <zhengbin13@huawei.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      44b49aa6
    • Chuck Lever's avatar
      NFSD: Correct type annotations in COPY XDR functions · 5aff7d08
      Chuck Lever authored
      Squelch some sparse warnings:
      
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1860:16: warning: incorrect type in assignment (different base types)
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1860:16:    expected int status
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1860:16:    got restricted __be32
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1862:24: warning: incorrect type in return expression (different base types)
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1862:24:    expected restricted __be32
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:1862:24:    got int status
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      5aff7d08
    • Chuck Lever's avatar
      NFSD: Correct type annotations in user xattr XDR functions · b9a49237
      Chuck Lever authored
      Squelch some sparse warnings:
      
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4692:24: warning: incorrect type in return expression (different base types)
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4692:24:    expected int
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4692:24:    got restricted __be32 [usertype]
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4702:32: warning: incorrect type in return expression (different base types)
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4702:32:    expected int
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4702:32:    got restricted __be32 [usertype]
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4739:13: warning: incorrect type in assignment (different base types)
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4739:13:    expected restricted __be32 [usertype] err
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4739:13:    got int
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4891:15: warning: incorrect type in assignment (different base types)
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4891:15:    expected unsigned int [assigned] [usertype] count
      /home/cel/src/linux/linux/fs/nfsd/nfs4xdr.c:4891:15:    got restricted __be32 [usertype]
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      b9a49237
    • Chuck Lever's avatar
      NFSD: Correct type annotations in user xattr helpers · 8237284a
      Chuck Lever authored
      Squelch some sparse warnings:
      
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2264:13: warning: incorrect type in assignment (different base types)
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2264:13:    expected int err
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2264:13:    got restricted __be32
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2266:24: warning: incorrect type in return expression (different base types)
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2266:24:    expected restricted __be32
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2266:24:    got int err
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2288:13: warning: incorrect type in assignment (different base types)
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2288:13:    expected int err
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2288:13:    got restricted __be32
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2290:24: warning: incorrect type in return expression (different base types)
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2290:24:    expected restricted __be32
      /home/cel/src/linux/linux/fs/nfsd/vfs.c:2290:24:    got int err
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      8237284a
    • Anna Schumaker's avatar
      SUNRPC/NFSD: Implement xdr_reserve_space_vec() · 403217f3
      Anna Schumaker authored
      Reserving space for a large READ payload requires special handling when
      reserving space in the xdr buffer pages. One problem we can have is use
      of the scratch buffer, which is used to get a pointer to a contiguous
      region of data up to PAGE_SIZE. When using the scratch buffer, calls to
      xdr_commit_encode() shift the data to it's proper alignment in the xdr
      buffer. If we've reserved several pages in a vector, then this could
      potentially invalidate earlier pointers and result in incorrect READ
      data being sent to the client.
      
      I get around this by looking at the amount of space left in the current
      page, and never reserve more than that for each entry in the read
      vector. This lets us place data directly where it needs to go in the
      buffer pages.
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      403217f3
    • Hou Tao's avatar
      nfsd: rename delegation related tracepoints to make them less confusing · 3caf9175
      Hou Tao authored
      Now when a read delegation is given, two delegation related traces
      will be printed:
      
          nfsd_deleg_open: client 5f45b854:e6058001 stateid 00000030:00000001
          nfsd_deleg_none: client 5f45b854:e6058001 stateid 0000002f:00000001
      
      Although the intention is to let developers know two stateid are
      returned, the traces are confusing about whether or not a read delegation
      is handled out. So renaming trace_nfsd_deleg_none() to trace_nfsd_open()
      and trace_nfsd_deleg_open() to trace_nfsd_deleg_read() to make
      the intension clearer.
      
      The patched traces will be:
      
          nfsd_deleg_read: client 5f48a967:b55b21cd stateid 00000003:00000001
          nfsd_open: client 5f48a967:b55b21cd stateid 00000002:00000001
      Suggested-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      3caf9175
    • J. Bruce Fields's avatar
      Documentation: update RPCSEC_GSSv3 RFC link · ade3dbad
      J. Bruce Fields authored
      This draft is an official RFC now.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      ade3dbad
    • J. Bruce Fields's avatar
      MAINTAINERS: Note NFS docs under Documentation/ · ff7e11f3
      J. Bruce Fields authored
      It struck me while watching Jon Corbet ask how to keep kernel
      Documentation up to date, that it might help if we were actually cc'd on
      Documentation/filesystems/nfs/ changes.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      ff7e11f3
    • Alex Dewar's avatar
      nfsd: Remove unnecessary assignment in nfs4xdr.c · e2a1840e
      Alex Dewar authored
      In nfsd4_encode_listxattrs(), the variable p is assigned to at one point
      but this value is never used before p is reassigned. Fix this.
      
      Addresses-Coverity: ("Unused value")
      Signed-off-by: default avatarAlex Dewar <alex.dewar90@gmail.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      e2a1840e
    • Randy Dunlap's avatar
      net: sunrpc: delete repeated words · 1cc5213b
      Randy Dunlap authored
      Drop duplicate words in net/sunrpc/.
      Also fix "Anyone" to be "Any one".
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc: "J. Bruce Fields" <bfields@fieldses.org>
      Cc: Chuck Lever <chuck.lever@oracle.com>
      Cc: linux-nfs@vger.kernel.org
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      1cc5213b
    • Alex Dewar's avatar
      nfsd: Fix typo in comment · 4cce11fa
      Alex Dewar authored
      Missing "is".
      Signed-off-by: default avatarAlex Dewar <alex.dewar90@gmail.com>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      4cce11fa
    • J. Bruce Fields's avatar
      nfsd: give up callbacks on revoked delegations · 12ed22f3
      J. Bruce Fields authored
      The delegation is no longer returnable, so I don't think there's much
      point retrying the recall.
      
      (I think it's worth asking why we even need separate CLOSED_DELEG and
      REVOKED_DELEG states.  But treating them the same would currently cause
      nfsd4_free_stateid to call list_del_init(&dp->dl_recall_lru) on a
      delegation that the laundromat had unhashed but not revoked, incorrectly
      removing it from the laundromat's reaplist or a client's dl_recall_lru.)
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      12ed22f3
    • J. Bruce Fields's avatar
      nfsd: remove fault injection code · e56dc9e2
      J. Bruce Fields authored
      It was an interesting idea but nobody seems to be using it, it's buggy
      at this point, and nfs4state.c is already complicated enough without it.
      The new nfsd/clients/ code provides some of the same functionality, and
      could probably do more if desired.
      
      This feature has been deprecated since 9d60d931 ("Deprecate nfsd
      fault injection").
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      e56dc9e2
  3. 13 Sep, 2020 10 commits
    • Linus Torvalds's avatar
      Linux 5.9-rc5 · 856deb86
      Linus Torvalds authored
      856deb86
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · 5712c3ed
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A collection of fixes I've been accruing over the last few weeks, none
        of them have been severe enough to warrant flushing the queue but it's
        been long enough now that it's a good idea to send them in.
      
        A handful of them are fixups for QSPI DT/bindings/compatibles, some
        smaller fixes for system DMA clock control and TMU interrupts on i.MX,
        a handful of fixes for OMAP, including a fix for DSI (display) on
        omap5"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (27 commits)
        arm64: dts: ns2: Fixed QSPI compatible string
        ARM: dts: BCM5301X: Fixed QSPI compatible string
        ARM: dts: NSP: Fixed QSPI compatible string
        ARM: dts: bcm: HR2: Fixed QSPI compatible string
        dt-bindings: spi: Fix spi-bcm-qspi compatible ordering
        ARM: dts: imx6sx: fix the pad QSPI1B_SCLK mux mode for uart3
        arm64: dts: imx8mp: correct sdma1 clk setting
        arm64: dts: imx8mq: Fix TMU interrupt property
        ARM: dts: imx7d-zii-rmu2: fix rgmii phy-mode for ksz9031 phy
        ARM: dts: vfxxx: Add syscon compatible with OCOTP
        ARM: dts: imx6q-logicpd: Fix broken PWM
        arm64: dts: imx: Add missing imx8mm-beacon-kit.dtb to build
        ARM: dts: imx6q-prtwd2: Remove unneeded i2c unit name
        ARM: dts: imx6qdl-gw51xx: Remove unneeded #address-cells/#size-cells
        ARM: dts: imx7ulp: Correct gpio ranges
        ARM: dts: ls1021a: fix QuadSPI-memory reg range
        arm64: defconfig: Enable ptn5150 extcon driver
        arm64: defconfig: Enable USB gadget with configfs
        ARM: configs: Update Integrator defconfig
        ARM: dts: omap5: Fix DSI base address and clocks
        ...
      5712c3ed
    • Linus Torvalds's avatar
      Merge tag 'usb-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · e4c26faa
      Linus Torvalds authored
      Pull USB/Thunderbolt fixes from Greg KH:
       "Here are some small USB and Thunderbolt driver fixes for 5.9-rc5.
      
        Nothing huge, just a number of bugfixes and new device ids for
        problems reported:
      
         - new USB serial driver ids
      
         - bug fixes for syzbot reported problems
      
         - typec driver fixes
      
         - thunderbolt driver fixes
      
         - revert of reported broken commit
      
        All of these have been in linux-next with no reported issues"
      
      * tag 'usb-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb: typec: intel_pmc_mux: Do not configure SBU and HSL Orientation in Alternate modes
        usb: typec: intel_pmc_mux: Do not configure Altmode HPD High
        usb: core: fix slab-out-of-bounds Read in read_descriptors
        Revert "usb: dwc3: meson-g12a: fix shared reset control use"
        usb: typec: ucsi: acpi: Check the _DEP dependencies
        usb: typec: intel_pmc_mux: Un-register the USB role switch
        usb: Fix out of sync data toggle if a configured device is reconfigured
        USB: serial: option: support dynamic Quectel USB compositions
        USB: serial: option: add support for SIM7070/SIM7080/SIM7090 modules
        thunderbolt: Use maximum USB3 link rate when reclaiming if link is not up
        thunderbolt: Disable ports that are not implemented
        USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter
      e4c26faa
    • Linus Torvalds's avatar
      Merge tag 'staging-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 6c7247f6
      Linus Torvalds authored
      Pull staging/IIO driver fixes from Greg KH:
       "Here are a number of staging and IIO driver fixes for 5.9-rc5.
      
        The majority of these are IIO driver fixes, to resolve a timestamp
        issue that was recently found to affect a bunch of IIO drivers.
      
        The other fixes in here are:
      
         - small IIO driver fixes
      
         - greybus driver fix
      
         - counter driver fix (came in through the IIO fixes tree)
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'staging-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (23 commits)
        iio: adc: mcp3422: fix locking on error path
        iio: adc: mcp3422: fix locking scope
        iio: adc: meson-saradc: Use the parent device to look up the calib data
        iio:adc:max1118 Fix alignment of timestamp and data leak issues
        iio:adc:ina2xx Fix timestamp alignment issue.
        iio:adc:ti-adc084s021 Fix alignment and data leak issues.
        iio:adc:ti-adc081c Fix alignment and data leak issues
        iio:magnetometer:ak8975 Fix alignment and data leak issues.
        iio:light:ltr501 Fix timestamp alignment issue.
        iio:light:max44000 Fix timestamp alignment and prevent data leak.
        iio:chemical:ccs811: Fix timestamp alignment and prevent data leak.
        iio:proximity:mb1232: Fix timestamp alignment and prevent data leak.
        iio:accel:mma7455: Fix timestamp alignment and prevent data leak.
        iio:accel:bmc150-accel: Fix timestamp alignment and prevent data leak.
        iio:accel:mma8452: Fix timestamp alignment and prevent data leak.
        iio: accel: kxsd9: Fix alignment of local buffer.
        iio: adc: rockchip_saradc: select IIO_TRIGGERED_BUFFER
        iio: adc: ti-ads1015: fix conversion when CONFIG_PM is not set
        counter: microchip-tcb-capture: check the correct variable
        iio: cros_ec: Set Gyroscope default frequency to 25Hz
        ...
      6c7247f6
    • Linus Torvalds's avatar
      Merge tag 'driver-core-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 20a7b6be
      Linus Torvalds authored
      Pull driver core fixes from Greg KH:
       "Here are some small driver core and debugfs fixes for 5.9-rc5
      
        Included in here are:
      
         - firmware loader memory leak fix
      
         - firmware loader testing fixes for non-EFI systems
      
         - device link locking fixes found by lockdep
      
         - kobject_del() bugfix that has been affecting some callers
      
         - debugfs minor fix
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'driver-core-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        test_firmware: Test platform fw loading on non-EFI systems
        PM: <linux/device.h>: fix @em_pd kernel-doc warning
        kobject: Drop unneeded conditional in __kobject_del()
        driver core: Fix device_pm_lock() locking for device links
        MAINTAINERS: Add the security document to SECURITY CONTACT
        driver code: print symbolic error code
        debugfs: Fix module state check condition
        kobject: Restore old behaviour of kobject_del(NULL)
        firmware_loader: fix memory leak for paged buffer
      20a7b6be
    • Olof Johansson's avatar
      Merge tag 'arm-soc/for-5.9/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes · a4da411e
      Olof Johansson authored
      This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
      5.9, please pull the following:
      
      - Florian fixes the Broadcom QSPI controller binding such that the most
        specific compatible string is the left most one, and all existing
        in-tree users are updated as well.
      
      * tag 'arm-soc/for-5.9/devicetree-fixes' of https://github.com/Broadcom/stblinux:
        arm64: dts: ns2: Fixed QSPI compatible string
        ARM: dts: BCM5301X: Fixed QSPI compatible string
        ARM: dts: NSP: Fixed QSPI compatible string
        ARM: dts: bcm: HR2: Fixed QSPI compatible string
        dt-bindings: spi: Fix spi-bcm-qspi compatible ordering
      
      Link: https://lore.kernel.org/r/20200909211857.4144718-1-f.fainelli@gmail.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
      a4da411e
    • Olof Johansson's avatar
      Merge tag 'imx-fixes-5.9-2' of... · 2aedcb04
      Olof Johansson authored
      Merge tag 'imx-fixes-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
      
      i.MX fixes for 5.9, round 2:
      
      - Fix the misspelling of 'interrupts' property in i.MX8MQ TMU DT node.
      - Correct 'ahb' clock for i.MX8MP SDMA1 in device tree.
      - Fix pad QSPI1B_SCLK mux mode for UART3 on i.MX6SX.
      
      * tag 'imx-fixes-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: dts: imx6sx: fix the pad QSPI1B_SCLK mux mode for uart3
        arm64: dts: imx8mp: correct sdma1 clk setting
        arm64: dts: imx8mq: Fix TMU interrupt property
      
      Link: https://lore.kernel.org/r/20200909143844.GA25109@dragonSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
      2aedcb04
    • Olof Johansson's avatar
      Merge tag 'omap-for-v5.9/fixes-rc3' of... · 0e384029
      Olof Johansson authored
      Merge tag 'omap-for-v5.9/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes
      
      Fixes for omaps for v5.9-rc cycle
      
      Few fixes for omap based devices:
      
      - Fix of_clk_get() error handling for omap-iommu
      
      - Fix missing audio pinctrl entries for logicpd boards
      
      - Fix video for logicpd-som-lv after switch to generic panels
      
      - Fix omap5 DSI clocks base
      
      * tag 'omap-for-v5.9/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: omap5: Fix DSI base address and clocks
        ARM: dts: logicpd-som-lv-baseboard: Fix missing video
        ARM: dts: logicpd-som-lv-baseboard: Fix broken audio
        ARM: dts: logicpd-torpedo-baseboard: Fix broken audio
        ARM: OMAP2+: Fix an IS_ERR() vs NULL check in _get_pwrdm()
      
      Link: https://lore.kernel.org/r/pull-1599132064-54898@atomide.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
      0e384029
    • Linus Torvalds's avatar
      Merge tag 'char-misc-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 2a1a4bee
      Linus Torvalds authored
      Pull char / misc driver fixes from Greg KH:
       "Here are a number of small driver fixes for 5.9-rc5
      
        Included in here are:
      
         - habanalabs driver fixes
      
         - interconnect driver fixes
      
         - soundwire driver fixes
      
         - dyndbg fixes for reported issues, and then reverts to fix it all up
           to a sane state.
      
         - phy driver fixes
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'char-misc-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        Revert "dyndbg: accept query terms like file=bar and module=foo"
        Revert "dyndbg: fix problem parsing format="foo bar""
        scripts/tags.sh: exclude tools directory from tags generation
        video: fbdev: fix OOB read in vga_8planes_imageblit()
        dyndbg: fix problem parsing format="foo bar"
        dyndbg: refine export, rename to dynamic_debug_exec_queries()
        dyndbg: give %3u width in pr-format, cosmetic only
        interconnect: qcom: Fix small BW votes being truncated to zero
        soundwire: fix double free of dangling pointer
        interconnect: Show bandwidth for disabled paths as zero in debugfs
        habanalabs: fix report of RAZWI initiator coordinates
        habanalabs: prevent user buff overflow
        phy: omap-usb2-phy: disable PHY charger detect
        phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init
        soundwire: bus: fix typo in comment on INTSTAT registers
        phy: qualcomm: fix return value check in qcom_ipq806x_usb_phy_probe()
        phy: qualcomm: fix platform_no_drv_owner.cocci warnings
      2a1a4bee
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 84b13499
      Linus Torvalds authored
      Pull kvm fixes from Paolo Bonzini:
       "A bit on the bigger side, mostly due to me being on vacation, then
        busy, then on parental leave, but there's nothing worrisome.
      
        ARM:
         - Multiple stolen time fixes, with a new capability to match x86
         - Fix for hugetlbfs mappings when PUD and PMD are the same level
         - Fix for hugetlbfs mappings when PTE mappings are enforced (dirty
           logging, for example)
         - Fix tracing output of 64bit values
      
        x86:
         - nSVM state restore fixes
         - Async page fault fixes
         - Lots of small fixes everywhere"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (25 commits)
        KVM: emulator: more strict rsm checks.
        KVM: nSVM: more strict SMM checks when returning to nested guest
        SVM: nSVM: setup nested msr permission bitmap on nested state load
        SVM: nSVM: correctly restore GIF on vmexit from nesting after migration
        x86/kvm: don't forget to ACK async PF IRQ
        x86/kvm: properly use DEFINE_IDTENTRY_SYSVEC() macro
        KVM: VMX: Don't freeze guest when event delivery causes an APIC-access exit
        KVM: SVM: avoid emulation with stale next_rip
        KVM: x86: always allow writing '0' to MSR_KVM_ASYNC_PF_EN
        KVM: SVM: Periodically schedule when unregistering regions on destroy
        KVM: MIPS: Change the definition of kvm type
        kvm x86/mmu: use KVM_REQ_MMU_SYNC to sync when needed
        KVM: nVMX: Fix the update value of nested load IA32_PERF_GLOBAL_CTRL control
        KVM: fix memory leak in kvm_io_bus_unregister_dev()
        KVM: Check the allocation of pv cpu mask
        KVM: nVMX: Update VMCS02 when L2 PAE PDPTE updates detected
        KVM: arm64: Update page shift if stage 2 block mapping not supported
        KVM: arm64: Fix address truncation in traces
        KVM: arm64: Do not try to map PUDs when they are folded into PMD
        arm64/x86: KVM: Introduce steal-time cap
        ...
      84b13499
  4. 12 Sep, 2020 10 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://github.com/openrisc/linux · b952e974
      Linus Torvalds authored
      Pull OpenRISC fixes from Stafford Horne:
       "Fixes for compile issues pointed out by kbuild and one bug I found in
        initrd with the 5.9 patches"
      
      * tag 'for-linus' of git://github.com/openrisc/linux:
        openrisc: Fix issue with get_user for 64-bit values
        openrisc: Fix cache API compile issue when not inlining
        openrisc: Reserve memblock for initrd
      b952e974
    • Linus Torvalds's avatar
      Merge tag 'seccomp-v5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · ef2e9a56
      Linus Torvalds authored
      Pull seccomp fixes from Kees Cook:
       "This fixes a rare race condition in seccomp when using TSYNC and
        USER_NOTIF together where a memory allocation would not get freed
        (found by syzkaller, fixed by Tycho).
      
        Additionally updates Tycho's MAINTAINERS and .mailmap entries for his
        new address"
      
      * tag 'seccomp-v5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        seccomp: don't leave dangling ->notif if file allocation fails
        mailmap, MAINTAINERS: move to tycho.pizza
        seccomp: don't leak memory when filter install races
      ef2e9a56
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-fix-v5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 4f8b0a5b
      Linus Torvalds authored
      Pull libnvdimm fix from Vishal Verma:
       "Fix detection of dax support for block devices.
      
        Previous fixes in this area, which only affected printing of debug
        messages, had an incorrect condition for detection of dax. This fix
        should finally do the right thing"
      
      * tag 'libnvdimm-fix-v5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        dax: fix detection of dax support for non-persistent memory block devices
      4f8b0a5b
    • Linus Torvalds's avatar
      Merge tag 'for-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · edf6b0e1
      Linus Torvalds authored
      Pull btrfs fixes from David Sterba:
       "A few more fixes:
      
         - regression fix for a crash after failed snapshot creation
      
         - one more lockep fix: use nofs allocation when allocating missing
           device
      
         - fix reloc tree leak on degraded mount
      
         - make some extent buffer alignment checks less strict to mount
           filesystems created by btrfs-convert"
      
      * tag 'for-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: fix NULL pointer dereference after failure to create snapshot
        btrfs: free data reloc tree on failed mount
        btrfs: require only sector size alignment for parent eb bytenr
        btrfs: fix lockdep splat in add_missing_dev
      edf6b0e1
    • Linus Torvalds's avatar
      Merge tag '5.9-rc4-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6 · 5a3c558a
      Linus Torvalds authored
      Pull cifs fix from Steve French:
       "A fix for lookup on DFS link when cifsacl or modefromsid is used"
      
      * tag '5.9-rc4-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: fix DFS mount with cifsacl/modefromsid
      5a3c558a
    • Maxim Levitsky's avatar
      KVM: emulator: more strict rsm checks. · 37f66bbe
      Maxim Levitsky authored
      Don't ignore return values in rsm_load_state_64/32 to avoid
      loading invalid state from SMM state area if it was tampered with
      by the guest.
      
      This is primarly intended to avoid letting guest set bits in EFER
      (like EFER.SVME when nesting is disabled) by manipulating SMM save area.
      Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
      Message-Id: <20200827171145.374620-8-mlevitsk@redhat.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      37f66bbe
    • Maxim Levitsky's avatar
      KVM: nSVM: more strict SMM checks when returning to nested guest · 3ebb5d26
      Maxim Levitsky authored
      * check that guest is 64 bit guest, otherwise the SVM related fields
        in the smm state area are not defined
      
      * If the SMM area indicates that SMM interrupted a running guest,
        check that EFER.SVME which is also saved in this area is set, otherwise
        the guest might have tampered with SMM save area, and so indicate
        emulation failure which should triple fault the guest.
      
      * Check that that guest CPUID supports SVM (due to the same issue as above)
      Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
      Message-Id: <20200827162720.278690-4-mlevitsk@redhat.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      3ebb5d26
    • Maxim Levitsky's avatar
      SVM: nSVM: setup nested msr permission bitmap on nested state load · 772b81bb
      Maxim Levitsky authored
      This code was missing and was forcing the L2 run with L1's msr
      permission bitmap
      Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
      Message-Id: <20200827162720.278690-3-mlevitsk@redhat.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      772b81bb
    • Maxim Levitsky's avatar
      SVM: nSVM: correctly restore GIF on vmexit from nesting after migration · 9883764a
      Maxim Levitsky authored
      Currently code in svm_set_nested_state copies the current vmcb control
      area to L1 control area (hsave->control), under assumption that
      it mostly reflects the defaults that kvm choose, and later qemu
      overrides  these defaults with L2 state using standard KVM interfaces,
      like KVM_SET_REGS.
      
      However nested GIF (which is AMD specific thing) is by default is true,
      and it is copied to hsave area as such.
      
      This alone is not a big deal since on VMexit, GIF is always set to false,
      regardless of what it was on VM entry.  However in nested_svm_vmexit we
      were first were setting GIF to false, but then we overwrite the control
      fields with value from the hsave area.  (including the nested GIF field
      itself if GIF virtualization is enabled).
      
      Now on normal vm entry this is not a problem, since GIF is usually false
      prior to normal vm entry, and this is the value that copied to hsave,
      and then restored, but this is not always the case when the nested state
      is loaded as explained above.
      
      To fix this issue, move svm_set_gif after we restore the L1 control
      state in nested_svm_vmexit, so that even with wrong GIF in the
      saved L1 control area, we still clear GIF as the spec says.
      Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
      Message-Id: <20200827162720.278690-2-mlevitsk@redhat.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      9883764a
    • Stafford Horne's avatar
      openrisc: Fix issue with get_user for 64-bit values · d877322b
      Stafford Horne authored
      A build failure was raised by kbuild with the following error.
      
          drivers/android/binder.c: Assembler messages:
          drivers/android/binder.c:3861: Error: unrecognized keyword/register name `l.lwz ?ap,4(r24)'
          drivers/android/binder.c:3866: Error: unrecognized keyword/register name `l.addi ?ap,r0,0'
      
      The issue is with 64-bit get_user() calls on openrisc.  I traced this to
      a problem where in the internally in the get_user macros there is a cast
      to long __gu_val this causes GCC to think the get_user call is 32-bit.
      This binder code is really long and GCC allocates register r30, which
      triggers the issue. The 64-bit get_user asm tries to get the 64-bit pair
      register, which for r30 overflows the general register names and returns
      the dummy register ?ap.
      
      The fix here is to move the temporary variables into the asm macros.  We
      use a 32-bit __gu_tmp for 32-bit and smaller macro and a 64-bit tmp in
      the 64-bit macro.  The cast in the 64-bit macro has a trick of casting
      through __typeof__((x)-(x)) which avoids the below warning.  This was
      barrowed from riscv.
      
          arch/openrisc/include/asm/uaccess.h:240:8: warning: cast to pointer from integer of different size
      
      I tested this in a small unit test to check reading between 64-bit and
      32-bit pointers to 64-bit and 32-bit values in all combinations.  Also I
      ran make C=1 to confirm no new sparse warnings came up.  It all looks
      clean to me.
      
      Link: https://lore.kernel.org/lkml/202008200453.ohnhqkjQ%25lkp@intel.com/Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
      Reviewed-by: default avatarLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
      d877322b