1. 09 Mar, 2021 2 commits
  2. 06 Mar, 2021 11 commits
    • J. Bruce Fields's avatar
      rpc: fix NULL dereference on kmalloc failure · 0ddc9423
      J. Bruce Fields authored
      I think this is unlikely but possible:
      
      svc_authenticate sets rq_authop and calls svcauth_gss_accept.  The
      kmalloc(sizeof(*svcdata), GFP_KERNEL) fails, leaving rq_auth_data NULL,
      and returning SVC_DENIED.
      
      This causes svc_process_common to go to err_bad_auth, and eventually
      call svc_authorise.  That calls ->release == svcauth_gss_release, which
      tries to dereference rq_auth_data.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      Link: https://lore.kernel.org/linux-nfs/3F1B347F-B809-478F-A1E9-0BE98E22B0F0@oracle.com/T/#tSigned-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      0ddc9423
    • Daniel Kobras's avatar
      sunrpc: fix refcount leak for rpc auth modules · f1442d63
      Daniel Kobras authored
      If an auth module's accept op returns SVC_CLOSE, svc_process_common()
      enters a call path that does not call svc_authorise() before leaving the
      function, and thus leaks a reference on the auth module's refcount. Hence,
      make sure calls to svc_authenticate() and svc_authorise() are paired for
      all call paths, to make sure rpc auth modules can be unloaded.
      Signed-off-by: default avatarDaniel Kobras <kobras@puzzle-itc.de>
      Fixes: 4d712ef1 ("svcauth_gss: Close connection when dropping an incoming message")
      Link: https://lore.kernel.org/linux-nfs/3F1B347F-B809-478F-A1E9-0BE98E22B0F0@oracle.com/T/#tSigned-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      f1442d63
    • Joe Korty's avatar
      NFSD: Repair misuse of sv_lock in 5.10.16-rt30. · c7de87ff
      Joe Korty authored
      [ This problem is in mainline, but only rt has the chops to be
      able to detect it. ]
      
      Lockdep reports a circular lock dependency between serv->sv_lock and
      softirq_ctl.lock on system shutdown, when using a kernel built with
      CONFIG_PREEMPT_RT=y, and a nfs mount exists.
      
      This is due to the definition of spin_lock_bh on rt:
      
      	local_bh_disable();
      	rt_spin_lock(lock);
      
      which forces a softirq_ctl.lock -> serv->sv_lock dependency.  This is
      not a problem as long as _every_ lock of serv->sv_lock is a:
      
      	spin_lock_bh(&serv->sv_lock);
      
      but there is one of the form:
      
      	spin_lock(&serv->sv_lock);
      
      This is what is causing the circular dependency splat.  The spin_lock()
      grabs the lock without first grabbing softirq_ctl.lock via local_bh_disable.
      If later on in the critical region,  someone does a local_bh_disable, we
      get a serv->sv_lock -> softirq_ctrl.lock dependency established.  Deadlock.
      
      Fix is to make serv->sv_lock be locked with spin_lock_bh everywhere, no
      exceptions.
      
      [  OK  ] Stopped target NFS client services.
               Stopping Logout off all iSCSI sessions on shutdown...
               Stopping NFS server and services...
      [  109.442380]
      [  109.442385] ======================================================
      [  109.442386] WARNING: possible circular locking dependency detected
      [  109.442387] 5.10.16-rt30 #1 Not tainted
      [  109.442389] ------------------------------------------------------
      [  109.442390] nfsd/1032 is trying to acquire lock:
      [  109.442392] ffff994237617f60 ((softirq_ctrl.lock).lock){+.+.}-{2:2}, at: __local_bh_disable_ip+0xd9/0x270
      [  109.442405]
      [  109.442405] but task is already holding lock:
      [  109.442406] ffff994245cb00b0 (&serv->sv_lock){+.+.}-{0:0}, at: svc_close_list+0x1f/0x90
      [  109.442415]
      [  109.442415] which lock already depends on the new lock.
      [  109.442415]
      [  109.442416]
      [  109.442416] the existing dependency chain (in reverse order) is:
      [  109.442417]
      [  109.442417] -> #1 (&serv->sv_lock){+.+.}-{0:0}:
      [  109.442421]        rt_spin_lock+0x2b/0xc0
      [  109.442428]        svc_add_new_perm_xprt+0x42/0xa0
      [  109.442430]        svc_addsock+0x135/0x220
      [  109.442434]        write_ports+0x4b3/0x620
      [  109.442438]        nfsctl_transaction_write+0x45/0x80
      [  109.442440]        vfs_write+0xff/0x420
      [  109.442444]        ksys_write+0x4f/0xc0
      [  109.442446]        do_syscall_64+0x33/0x40
      [  109.442450]        entry_SYSCALL_64_after_hwframe+0x44/0xa9
      [  109.442454]
      [  109.442454] -> #0 ((softirq_ctrl.lock).lock){+.+.}-{2:2}:
      [  109.442457]        __lock_acquire+0x1264/0x20b0
      [  109.442463]        lock_acquire+0xc2/0x400
      [  109.442466]        rt_spin_lock+0x2b/0xc0
      [  109.442469]        __local_bh_disable_ip+0xd9/0x270
      [  109.442471]        svc_xprt_do_enqueue+0xc0/0x4d0
      [  109.442474]        svc_close_list+0x60/0x90
      [  109.442476]        svc_close_net+0x49/0x1a0
      [  109.442478]        svc_shutdown_net+0x12/0x40
      [  109.442480]        nfsd_destroy+0xc5/0x180
      [  109.442482]        nfsd+0x1bc/0x270
      [  109.442483]        kthread+0x194/0x1b0
      [  109.442487]        ret_from_fork+0x22/0x30
      [  109.442492]
      [  109.442492] other info that might help us debug this:
      [  109.442492]
      [  109.442493]  Possible unsafe locking scenario:
      [  109.442493]
      [  109.442493]        CPU0                    CPU1
      [  109.442494]        ----                    ----
      [  109.442495]   lock(&serv->sv_lock);
      [  109.442496]                                lock((softirq_ctrl.lock).lock);
      [  109.442498]                                lock(&serv->sv_lock);
      [  109.442499]   lock((softirq_ctrl.lock).lock);
      [  109.442501]
      [  109.442501]  *** DEADLOCK ***
      [  109.442501]
      [  109.442501] 3 locks held by nfsd/1032:
      [  109.442503]  #0: ffffffff93b49258 (nfsd_mutex){+.+.}-{3:3}, at: nfsd+0x19a/0x270
      [  109.442508]  #1: ffff994245cb00b0 (&serv->sv_lock){+.+.}-{0:0}, at: svc_close_list+0x1f/0x90
      [  109.442512]  #2: ffffffff93a81b20 (rcu_read_lock){....}-{1:2}, at: rt_spin_lock+0x5/0xc0
      [  109.442518]
      [  109.442518] stack backtrace:
      [  109.442519] CPU: 0 PID: 1032 Comm: nfsd Not tainted 5.10.16-rt30 #1
      [  109.442522] Hardware name: Supermicro X9DRL-3F/iF/X9DRL-3F/iF, BIOS 3.2 09/22/2015
      [  109.442524] Call Trace:
      [  109.442527]  dump_stack+0x77/0x97
      [  109.442533]  check_noncircular+0xdc/0xf0
      [  109.442546]  __lock_acquire+0x1264/0x20b0
      [  109.442553]  lock_acquire+0xc2/0x400
      [  109.442564]  rt_spin_lock+0x2b/0xc0
      [  109.442570]  __local_bh_disable_ip+0xd9/0x270
      [  109.442573]  svc_xprt_do_enqueue+0xc0/0x4d0
      [  109.442577]  svc_close_list+0x60/0x90
      [  109.442581]  svc_close_net+0x49/0x1a0
      [  109.442585]  svc_shutdown_net+0x12/0x40
      [  109.442588]  nfsd_destroy+0xc5/0x180
      [  109.442590]  nfsd+0x1bc/0x270
      [  109.442595]  kthread+0x194/0x1b0
      [  109.442600]  ret_from_fork+0x22/0x30
      [  109.518225] nfsd: last server has exited, flushing export cache
      [  OK  ] Stopped NFSv4 ID-name mapping service.
      [  OK  ] Stopped GSSAPI Proxy Daemon.
      [  OK  ] Stopped NFS Mount Daemon.
      [  OK  ] Stopped NFS status monitor for NFSv2/3 locking..
      
      Fixes: 719f8bcc ("svcrpc: fix xpt_list traversal locking on shutdown")
      Signed-off-by: default avatarJoe Korty <joe.korty@concurrent-rt.com>
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      c7de87ff
    • J. Bruce Fields's avatar
      nfsd: don't abort copies early · bfdd89f2
      J. Bruce Fields authored
      The typical result of the backwards comparison here is that the source
      server in a server-to-server copy will return BAD_STATEID within a few
      seconds of the copy starting, instead of giving the copy a full lease
      period, so the copy_file_range() call will end up unnecessarily
      returning a short read.
      
      Fixes: 624322f1 "NFSD add COPY_NOTIFY operation"
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      bfdd89f2
    • Julian Braha's avatar
      fs: nfsd: fix kconfig dependency warning for NFSD_V4 · 70052273
      Julian Braha authored
      When NFSD_V4 is enabled and CRYPTO is disabled,
      Kbuild gives the following warning:
      
      WARNING: unmet direct dependencies detected for CRYPTO_SHA256
        Depends on [n]: CRYPTO [=n]
        Selected by [y]:
        - NFSD_V4 [=y] && NETWORK_FILESYSTEMS [=y] && NFSD [=y] && PROC_FS [=y]
      
      WARNING: unmet direct dependencies detected for CRYPTO_MD5
        Depends on [n]: CRYPTO [=n]
        Selected by [y]:
        - NFSD_V4 [=y] && NETWORK_FILESYSTEMS [=y] && NFSD [=y] && PROC_FS [=y]
      
      This is because NFSD_V4 selects CRYPTO_MD5 and CRYPTO_SHA256,
      without depending on or selecting CRYPTO, despite those config options
      being subordinate to CRYPTO.
      Signed-off-by: default avatarJulian Braha <julianbraha@gmail.com>
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      70052273
    • Timo Rothenpieler's avatar
      svcrdma: disable timeouts on rdma backchannel · 6820bf77
      Timo Rothenpieler authored
      This brings it in line with the regular tcp backchannel, which also has
      all those timeouts disabled.
      
      Prevents the backchannel from timing out, getting some async operations
      like server side copying getting stuck indefinitely on the client side.
      Signed-off-by: default avatarTimo Rothenpieler <timo@rothenpieler.org>
      Fixes: 5d252f90 ("svcrdma: Add class for RDMA backwards direction transport")
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      6820bf77
    • Trond Myklebust's avatar
      nfsd: Don't keep looking up unhashed files in the nfsd file cache · d30881f5
      Trond Myklebust authored
      If a file is unhashed, then we're going to reject it anyway and retry,
      so make sure we skip it when we're doing the RCU lockless lookup.
      This avoids a number of unnecessary nfserr_jukebox returns from
      nfsd_file_acquire()
      
      Fixes: 65294c1f ("nfsd: add a new struct file caching facility to nfsd")
      Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      d30881f5
    • Linus Torvalds's avatar
      Linux 5.12-rc2 · a38fd874
      Linus Torvalds authored
      a38fd874
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · f3ed4de6
      Linus Torvalds authored
      Pull rdma fixes from Jason Gunthorpe:
       "Nothing special here, though Bob's regression fixes for rxe would have
        made it before the rc cycle had there not been such strong winter
        weather!
      
         - Fix corner cases in the rxe reference counting cleanup that are
           causing regressions in blktests for SRP
      
         - Two kdoc fixes so W=1 is clean
      
         - Missing error return in error unwind for mlx5
      
         - Wrong lock type nesting in IB CM"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
        RDMA/rxe: Fix errant WARN_ONCE in rxe_completer()
        RDMA/rxe: Fix extra deref in rxe_rcv_mcast_pkt()
        RDMA/rxe: Fix missed IB reference counting in loopback
        RDMA/uverbs: Fix kernel-doc warning of _uverbs_alloc
        RDMA/mlx5: Set correct kernel-doc identifier
        IB/mlx5: Add missing error code
        RDMA/rxe: Fix missing kconfig dependency on CRYPTO
        RDMA/cm: Fix IRQ restore in ib_send_cm_sidr_rep
      f3ed4de6
    • Linus Torvalds's avatar
      Merge tag 'gcc-plugins-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · de5bd6c5
      Linus Torvalds authored
      Pull gcc-plugins fixes from Kees Cook:
       "Tiny gcc-plugin fixes for v5.12-rc2. These issues are small but have
        been reported a couple times now by static analyzers, so best to get
        them fixed to reduce the noise. :)
      
         - Fix coding style issues (Jason Yan)"
      
      * tag 'gcc-plugins-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: latent_entropy: remove unneeded semicolon
        gcc-plugins: structleak: remove unneeded variable 'ret'
      de5bd6c5
    • Linus Torvalds's avatar
      Merge tag 'pstore-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 8b24ef44
      Linus Torvalds authored
      Pull pstore fixes from Kees Cook:
      
       - Rate-limit ECC warnings (Dmitry Osipenko)
      
       - Fix error path check for NULL (Tetsuo Handa)
      
      * tag 'pstore-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        pstore/ram: Rate-limit "uncorrectable error in header" message
        pstore: Fix warning in pstore_kill_sb()
      8b24ef44
  3. 05 Mar, 2021 27 commits
    • Linus Torvalds's avatar
      Merge tag 'for-5.12/dm-fixes' of... · 63dcd69d
      Linus Torvalds authored
      Merge tag 'for-5.12/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
      
      Pull device mapper fixes from Mike Snitzer:
       "Fix DM verity target's optional Forward Error Correction (FEC) for
        Reed-Solomon roots that are unaligned to block size"
      
      * tag 'for-5.12/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm verity: fix FEC for RS roots unaligned to block size
        dm bufio: subtract the number of initial sectors in dm_bufio_get_device_size
      63dcd69d
    • Linus Torvalds's avatar
      Merge tag 'block-5.12-2021-03-05' of git://git.kernel.dk/linux-block · 47454caf
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
      
       - NVMe fixes:
            - more device quirks (Julian Einwag, Zoltán Böszörményi, Pascal
              Terjan)
            - fix a hwmon error return (Daniel Wagner)
            - fix the keep alive timeout initialization (Martin George)
            - ensure the model_number can't be changed on a used subsystem
              (Max Gurtovoy)
      
       - rsxx missing -EFAULT on copy_to_user() failure (Dan)
      
       - rsxx remove unused linux.h include (Tian)
      
       - kill unused RQF_SORTED (Jean)
      
       - updated outdated BFQ comments (Joseph)
      
       - revert work-around commit for bd_size_lock, since we removed the
         offending user in this merge window (Damien)
      
      * tag 'block-5.12-2021-03-05' of git://git.kernel.dk/linux-block:
        nvmet: model_number must be immutable once set
        nvme-fabrics: fix kato initialization
        nvme-hwmon: Return error code when registration fails
        nvme-pci: add quirks for Lexar 256GB SSD
        nvme-pci: mark Kingston SKC2000 as not supporting the deepest power state
        nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST.
        rsxx: Return -EFAULT if copy_to_user() fails
        block/bfq: update comments and default value in docs for fifo_expire
        rsxx: remove unused including <linux/version.h>
        block: Drop leftover references to RQF_SORTED
        block: revert "block: fix bd_size_lock use"
      47454caf
    • Linus Torvalds's avatar
      Merge tag 'io_uring-5.12-2021-03-05' of git://git.kernel.dk/linux-block · f292e873
      Linus Torvalds authored
      Pull io_uring fixes from Jens Axboe:
       "A bit of a mix between fallout from the worker change, cleanups and
        reductions now possible from that change, and fixes in general. In
        detail:
      
         - Fully serialize manager and worker creation, fixing races due to
           that.
      
         - Clean up some naming that had gone stale.
      
         - SQPOLL fixes.
      
         - Fix race condition around task_work rework that went into this
           merge window.
      
         - Implement unshare. Used for when the original task does unshare(2)
           or setuid/seteuid and friends, drops the original workers and forks
           new ones.
      
         - Drop the only remaining piece of state shuffling we had left, which
           was cred. Move it into issue instead, and we can drop all of that
           code too.
      
         - Kill f_op->flush() usage. That was such a nasty hack that we had
           out of necessity, we no longer need it.
      
         - Following from ->flush() removal, we can also drop various bits of
           ctx state related to SQPOLL and cancelations.
      
         - Fix an issue with IOPOLL retry, which originally was fallout from a
           filemap change (removing iov_iter_revert()), but uncovered an issue
           with iovec re-import too late.
      
         - Fix an issue with system suspend.
      
         - Use xchg() for fallback work, instead of cmpxchg().
      
         - Properly destroy io-wq on exec.
      
         - Add create_io_thread() core helper, and use that in io-wq and
           io_uring. This allows us to remove various silly completion events
           related to thread setup.
      
         - A few error handling fixes.
      
        This should be the grunt of fixes necessary for the new workers, next
        week should be quieter. We've got a pending series from Pavel on
        cancelations, and how tasks and rings are indexed. Outside of that,
        should just be minor fixes. Even with these fixes, we're still killing
        a net ~80 lines"
      
      * tag 'io_uring-5.12-2021-03-05' of git://git.kernel.dk/linux-block: (41 commits)
        io_uring: don't restrict issue_flags for io_openat
        io_uring: make SQPOLL thread parking saner
        io-wq: kill hashed waitqueue before manager exits
        io_uring: clear IOCB_WAITQ for non -EIOCBQUEUED return
        io_uring: don't keep looping for more events if we can't flush overflow
        io_uring: move to using create_io_thread()
        kernel: provide create_io_thread() helper
        io_uring: reliably cancel linked timeouts
        io_uring: cancel-match based on flags
        io-wq: ensure all pending work is canceled on exit
        io_uring: ensure that threads freeze on suspend
        io_uring: remove extra in_idle wake up
        io_uring: inline __io_queue_async_work()
        io_uring: inline io_req_clean_work()
        io_uring: choose right tctx->io_wq for try cancel
        io_uring: fix -EAGAIN retry with IOPOLL
        io-wq: fix error path leak of buffered write hash map
        io_uring: remove sqo_task
        io_uring: kill sqo_dead and sqo submission halting
        io_uring: ignore double poll add on the same waitqueue head
        ...
      f292e873
    • Linus Torvalds's avatar
      Merge tag 'pm-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 6d47254c
      Linus Torvalds authored
      Pull power management fixes from Rafael Wysocki:
       "These fix the usage of device links in the runtime PM core code and
        update the DTPM (Dynamic Thermal Power Management) feature added
        recently.
      
        Specifics:
      
         - Make the runtime PM core code avoid attempting to suspend supplier
           devices before updating the PM-runtime status of a consumer to
           'suspended' (Rafael Wysocki).
      
         - Fix DTPM (Dynamic Thermal Power Management) root node
           initialization and label that feature as EXPERIMENTAL in Kconfig
           (Daniel Lezcano)"
      
      * tag 'pm-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        powercap/drivers/dtpm: Add the experimental label to the option description
        powercap/drivers/dtpm: Fix root node initialization
        PM: runtime: Update device status before letting suppliers suspend
      6d47254c
    • Linus Torvalds's avatar
      Merge tag 'acpi-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · ea6be461
      Linus Torvalds authored
      Pull ACPI fix from Rafael Wysocki:
       "Make the empty stubs of some helper functions used when CONFIG_ACPI is
        not set actually match those functions (Andy Shevchenko)"
      
      * tag 'acpi-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: bus: Constify is_acpi_node() and friends (part 2)
      ea6be461
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · fc2c8d0a
      Linus Torvalds authored
      Pull iommu fixes from Joerg Roedel:
      
       - Fix a sleeping-while-atomic issue in the AMD IOMMU code
      
       - Disable lazy IOTLB flush for untrusted devices in the Intel VT-d
         driver
      
       - Fix status code definitions for Intel VT-d
      
       - Fix IO Page Fault issue in Tegra IOMMU driver
      
      * tag 'iommu-fixes-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/vt-d: Fix status code for Allocate/Free PASID command
        iommu: Don't use lazy flush for untrusted device
        iommu/tegra-smmu: Fix mc errors on tegra124-nyan
        iommu/amd: Fix sleeping in atomic in increase_address_space()
      fc2c8d0a
    • Linus Torvalds's avatar
      Merge tag 'for-5.12-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · f09b04cc
      Linus Torvalds authored
      Pull btrfs fixes from David Sterba:
       "More regression fixes and stabilization.
      
        Regressions:
      
         - zoned mode
            - count zone sizes in wider int types
            - fix space accounting for read-only block groups
      
         - subpage: fix page tail zeroing
      
        Fixes:
      
         - fix spurious warning when remounting with free space tree
      
         - fix warning when creating a directory with smack enabled
      
         - ioctl checks for qgroup inheritance when creating a snapshot
      
         - qgroup
            - fix missing unlock on error path in zero range
            - fix amount of released reservation on error
            - fix flushing from unsafe context with open transaction,
              potentially deadlocking
      
         - minor build warning fixes"
      
      * tag 'for-5.12-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: zoned: do not account freed region of read-only block group as zone_unusable
        btrfs: zoned: use sector_t for zone sectors
        btrfs: subpage: fix the false data csum mismatch error
        btrfs: fix warning when creating a directory with smack enabled
        btrfs: don't flush from btrfs_delayed_inode_reserve_metadata
        btrfs: export and rename qgroup_reserve_meta
        btrfs: free correct amount of space in btrfs_delayed_inode_reserve_metadata
        btrfs: fix spurious free_space_tree remount warning
        btrfs: validate qgroup inherit for SNAP_CREATE_V2 ioctl
        btrfs: unlock extents in btrfs_zero_range in case of quota reservation errors
        btrfs: ref-verify: use 'inline void' keyword ordering
      f09b04cc
    • Linus Torvalds's avatar
      Merge tag 'devicetree-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 6bf331d5
      Linus Torvalds authored
      Pull devicetree fixes from Rob Herring:
      
       - Another batch of graph and video-interfaces schema conversions
      
       - Drop DT header symlink for dropped C6X arch
      
       - Fix bcm2711-hdmi schema error
      
      * tag 'devicetree-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        dt-bindings: media: Use graph and video-interfaces schemas, round 2
        dts: drop dangling c6x symlink
        dt-bindings: bcm2711-hdmi: Fix broken schema
      6bf331d5
    • Linus Torvalds's avatar
      Merge tag 'trace-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 54663cf3
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
       "Functional fixes:
      
         - Fix big endian conversion for arm64 in recordmcount processing
      
         - Fix timestamp corruption in ring buffer on discarding events
      
         - Fix memory leak in __create_synth_event()
      
         - Skip selftests if tracing is disabled as it will cause them to
           fail.
      
        Non-functional fixes:
      
         - Fix help text in Kconfig
      
         - Remove duplicate prototype for trace_empty()
      
         - Fix stale comment about the trace_event_call flags.
      
        Self test update:
      
         - Add more information to the validation output of when a corrupt
           timestamp is found in the ring buffer, and also trigger a warning
           to make sure that tests catch it"
      
      * tag 'trace-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix comment about the trace_event_call flags
        tracing: Skip selftests if tracing is disabled
        tracing: Fix memory leak in __create_synth_event()
        ring-buffer: Add a little more information and a WARN when time stamp going backwards is detected
        ring-buffer: Force before_stamp and write_stamp to be different on discard
        tracing: Fix help text of TRACEPOINT_BENCHMARK in Kconfig
        tracing: Remove duplicate declaration from trace.h
        ftrace: Have recordmcount use w8 to read relp->r_info in arm64_is_fake_mcount
      54663cf3
    • Bob Pearson's avatar
      RDMA/rxe: Fix errant WARN_ONCE in rxe_completer() · 545c4ab4
      Bob Pearson authored
      In rxe_comp.c in rxe_completer() the function free_pkt() did not clear skb
      which triggered a warning at 'done:' and could possibly at 'exit:'. The
      WARN_ONCE() calls are not actually needed.  The call to free_pkt() is
      moved to the end to clearly show that all skbs are freed.
      
      Fixes: 899aba89 ("RDMA/rxe: Fix FIXME in rxe_udp_encap_recv()")
      Link: https://lore.kernel.org/r/20210304192048.2958-1-rpearson@hpe.comSigned-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
      Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
      545c4ab4
    • Bob Pearson's avatar
      RDMA/rxe: Fix extra deref in rxe_rcv_mcast_pkt() · 5e4a7ccc
      Bob Pearson authored
      rxe_rcv_mcast_pkt() dropped a reference to ib_device when no error
      occurred causing an underflow on the reference counter.  This code is
      cleaned up to be clearer and easier to read.
      
      Fixes: 899aba89 ("RDMA/rxe: Fix FIXME in rxe_udp_encap_recv()")
      Link: https://lore.kernel.org/r/20210304192048.2958-1-rpearson@hpe.comSigned-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
      Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
      5e4a7ccc
    • Bob Pearson's avatar
      RDMA/rxe: Fix missed IB reference counting in loopback · 21e27ac8
      Bob Pearson authored
      When the noted patch below extending the reference taken by
      rxe_get_dev_from_net() in rxe_udp_encap_recv() until each skb is freed it
      was not matched by a reference in the loopback path resulting in
      underflows.
      
      Fixes: 899aba89 ("RDMA/rxe: Fix FIXME in rxe_udp_encap_recv()")
      Link: https://lore.kernel.org/r/20210304192048.2958-1-rpearson@hpe.comSigned-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
      Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
      21e27ac8
    • Pavel Begunkov's avatar
      io_uring: don't restrict issue_flags for io_openat · e45cff58
      Pavel Begunkov authored
      45d189c6 ("io_uring: replace force_nonblock with flags") did
      something strange for io_openat() slicing all issue_flags but
      IO_URING_F_NONBLOCK. Not a bug for now, but better to just forward the
      flags.
      Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      e45cff58
    • Jens Axboe's avatar
      Merge tag 'nvme-5.12-2021-03-05' of git://git.infradead.org/nvme into block-5.12 · a2b658e4
      Jens Axboe authored
      Pull NVMe fixes from Christoph:
      
      "nvme fixes for 5.12:
      
       - more device quirks (Julian Einwag, Zoltán Böszörményi, Pascal Terjan)
       - fix a hwmon error return (Daniel Wagner)
       - fix the keep alive timeout initialization (Martin George)
       - ensure the model_number can't be changed on a used subsystem
         (Max Gurtovoy)"
      
      * tag 'nvme-5.12-2021-03-05' of git://git.infradead.org/nvme:
        nvmet: model_number must be immutable once set
        nvme-fabrics: fix kato initialization
        nvme-hwmon: Return error code when registration fails
        nvme-pci: add quirks for Lexar 256GB SSD
        nvme-pci: mark Kingston SKC2000 as not supporting the deepest power state
        nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST.
      a2b658e4
    • Jens Axboe's avatar
      io_uring: make SQPOLL thread parking saner · 86e0d676
      Jens Axboe authored
      We have this weird true/false return from parking, and then some of the
      callers decide to look at that. It can lead to unbalanced parks and
      sqd locking. Have the callers check the thread status once it's parked.
      We know we have the lock at that point, so it's either valid or it's NULL.
      
      Fix race with parking on thread exit. We need to be careful here with
      ordering of the sdq->lock and the IO_SQ_THREAD_SHOULD_PARK bit.
      
      Rename sqd->completion to sqd->parked to reflect that this is the only
      thing this completion event doesn.
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      86e0d676
    • Jens Axboe's avatar
      io-wq: kill hashed waitqueue before manager exits · 09ca6c40
      Jens Axboe authored
      If we race with shutting down the io-wq context and someone queueing
      a hashed entry, then we can exit the manager with it armed. If it then
      triggers after the manager has exited, we can have a use-after-free where
      io_wqe_hash_wake() attempts to wake a now gone manager process.
      
      Move the killing of the hashed write queue into the manager itself, so
      that we know we've killed it before the task exits.
      
      Fixes: e941894e ("io-wq: make buffered file write hashed work map per-ctx")
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      09ca6c40
    • Jens Axboe's avatar
      io_uring: clear IOCB_WAITQ for non -EIOCBQUEUED return · b5b0ecb7
      Jens Axboe authored
      The callback can only be armed, if we get -EIOCBQUEUED returned. It's
      important that we clear the WAITQ bit for other cases, otherwise we can
      queue for async retry and filemap will assume that we're armed and
      return -EAGAIN instead of just blocking for the IO.
      
      Cc: stable@vger.kernel.org # 5.9+
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      b5b0ecb7
    • Jens Axboe's avatar
      io_uring: don't keep looping for more events if we can't flush overflow · ca0a2651
      Jens Axboe authored
      It doesn't make sense to wait for more events to come in, if we can't
      even flush the overflow we already have to the ring. Return -EBUSY for
      that condition, just like we do for attempts to submit with overflow
      pending.
      
      Cc: stable@vger.kernel.org # 5.11
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      ca0a2651
    • Jens Axboe's avatar
      io_uring: move to using create_io_thread() · 46fe18b1
      Jens Axboe authored
      This allows us to do task creation and setup without needing to use
      completions to try and synchronize with the starting thread. Get rid of
      the old io_wq_fork_thread() wrapper, and the 'wq' and 'worker' startup
      completion events - we can now do setup before the task is running.
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      46fe18b1
    • Rafael J. Wysocki's avatar
      Merge branch 'powercap' · 7bff4c26
      Rafael J. Wysocki authored
      * powercap:
        powercap/drivers/dtpm: Add the experimental label to the option description
        powercap/drivers/dtpm: Fix root node initialization
      7bff4c26
    • Max Gurtovoy's avatar
      nvmet: model_number must be immutable once set · d9f273b7
      Max Gurtovoy authored
      In case we have already established connection to nvmf target, it
      shouldn't be allowed to change the model_number. E.g. if someone will
      identify ctrl and get model_number of "my_model" later on will change
      the model_numbel via configfs to "my_new_model" this will break the NVMe
      specification for "Get Log Page – Persistent Event Log" that refers to
      Model Number as: "This field contains the same value as reported in the
      Model Number field of the Identify Controller data structure, bytes
      63:24."
      
      Although it doesn't mentioned explicitly that this field can't be
      changed, we can assume it.
      
      So allow setting this field only once: using configfs or in the first
      identify ctrl operation.
      Signed-off-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      d9f273b7
    • Martin George's avatar
      nvme-fabrics: fix kato initialization · 32feb6de
      Martin George authored
      Currently kato is initialized to NVME_DEFAULT_KATO for both
      discovery & i/o controllers. This is a problem specifically
      for non-persistent discovery controllers since it always ends
      up with a non-zero kato value. Fix this by initializing kato
      to zero instead, and ensuring various controllers are assigned
      appropriate kato values as follows:
      
      non-persistent controllers  - kato set to zero
      persistent controllers      - kato set to NVMF_DEV_DISC_TMO
                                    (or any positive int via nvme-cli)
      i/o controllers             - kato set to NVME_DEFAULT_KATO
                                    (or any positive int via nvme-cli)
      Signed-off-by: default avatarMartin George <marting@netapp.com>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      32feb6de
    • Daniel Wagner's avatar
      nvme-hwmon: Return error code when registration fails · 78570f88
      Daniel Wagner authored
      The hwmon pointer wont be NULL if the registration fails. Though the
      exit code path will assign it to ctrl->hwmon_device. Later
      nvme_hwmon_exit() will try to free the invalid pointer. Avoid this by
      returning the error code from hwmon_device_register_with_info().
      
      Fixes: ed7770f6 ("nvme/hwmon: rework to avoid devm allocation")
      Signed-off-by: default avatarDaniel Wagner <dwagner@suse.de>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      78570f88
    • Pascal Terjan's avatar
      nvme-pci: add quirks for Lexar 256GB SSD · 6e6a6828
      Pascal Terjan authored
      Add the NVME_QUIRK_NO_NS_DESC_LIST and NVME_QUIRK_IGNORE_DEV_SUBNQN
      quirks for this buggy device.
      
      Reported and tested in https://bugs.mageia.org/show_bug.cgi?id=28417Signed-off-by: default avatarPascal Terjan <pterjan@google.com>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      6e6a6828
    • Zoltán Böszörményi's avatar
      nvme-pci: mark Kingston SKC2000 as not supporting the deepest power state · dc22c1c0
      Zoltán Böszörményi authored
      My 2TB SKC2000 showed the exact same symptoms that were provided
      in 538e4a8c ("nvme-pci: avoid the deepest sleep state on
      Kingston A2000 SSDs"), i.e. a complete NVME lockup that needed
      cold boot to get it back.
      
      According to some sources, the A2000 is simply a rebadged
      SKC2000 with a slightly optimized firmware.
      
      Adding the SKC2000 PCI ID to the quirk list with the same workaround
      as the A2000 made my laptop survive a 5 hours long Yocto bootstrap
      buildfest which reliably triggered the SSD lockup previously.
      Signed-off-by: default avatarZoltán Böszörményi <zboszor@gmail.com>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      dc22c1c0
    • Julian Einwag's avatar
      nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST. · 5e112d3f
      Julian Einwag authored
      The kernel fails to fully detect these SSDs, only the character devices
      are present:
      
      [   10.785605] nvme nvme0: pci function 0000:04:00.0
      [   10.876787] nvme nvme1: pci function 0000:81:00.0
      [   13.198614] nvme nvme0: missing or invalid SUBNQN field.
      [   13.198658] nvme nvme1: missing or invalid SUBNQN field.
      [   13.206896] nvme nvme0: Shutdown timeout set to 20 seconds
      [   13.215035] nvme nvme1: Shutdown timeout set to 20 seconds
      [   13.225407] nvme nvme0: 16/0/0 default/read/poll queues
      [   13.233602] nvme nvme1: 16/0/0 default/read/poll queues
      [   13.239627] nvme nvme0: Identify Descriptors failed (8194)
      [   13.246315] nvme nvme1: Identify Descriptors failed (8194)
      
      Adding the NVME_QUIRK_NO_NS_DESC_LIST fixes this problem.
      
      BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=205679Signed-off-by: default avatarJulian Einwag <jeinwag-nvme@marcapo.com>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
      5e112d3f
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-2021-03-05' of git://anongit.freedesktop.org/drm/drm · 280d542f
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "More may show up but this is what I have at this stage: just a single
        nouveau regression fix, and a bunch of amdgpu fixes.
      
        amdgpu:
         - S0ix fix
         - Handle new NV12 SKU
         - Misc power fixes
         - Display uninitialized value fix
         - PCIE debugfs register access fix
      
        nouveau:
         - regression fix for gk104"
      
      * tag 'drm-fixes-2021-03-05' of git://anongit.freedesktop.org/drm/drm:
        drm/amdgpu: fix parameter error of RREG32_PCIE() in amdgpu_regs_pcie
        drm/amd/display: fix the return of the uninitialized value in ret
        drm/amdgpu: enable BACO runpm by default on sienna cichlid and navy flounder
        drm/amd/pm: correct Arcturus mmTHM_BACO_CNTL register address
        drm/amdgpu/swsmu/vangogh: Only use RLCPowerNotify msg for disable
        drm/amdgpu/pm: make unsupported power profile messages debug
        drm/amdgpu:disable VCN for Navi12 SKU
        drm/amdgpu: Only check for S0ix if AMD_PMC is configured
        drm/nouveau/fifo/gk104-gp1xx: fix creation of sw class
      280d542f