1. 06 Mar, 2021 15 commits
    • Athira Rajeev's avatar
      perf bench numa: Fix the condition checks for max number of NUMA nodes · 394e4306
      Athira Rajeev authored
      In systems having higher node numbers available like node
      255, perf numa bench will fail with SIGABORT.
      
        <<>>
        perf: bench/numa.c:1416: init: Assertion `!(g->p.nr_nodes > 64 || g->p.nr_nodes < 0)' failed.
        Aborted (core dumped)
        <<>>
      
      Snippet from 'numactl -H' below on a powerpc system where the highest
      node number available is 255:
      
        available: 6 nodes (0,8,252-255)
        node 0 cpus: <cpu-list>
        node 0 size: 519587 MB
        node 0 free: 516659 MB
        node 8 cpus: <cpu-list>
        node 8 size: 523607 MB
        node 8 free: 486757 MB
        node 252 cpus:
        node 252 size: 0 MB
        node 252 free: 0 MB
        node 253 cpus:
        node 253 size: 0 MB
        node 253 free: 0 MB
        node 254 cpus:
        node 254 size: 0 MB
        node 254 free: 0 MB
        node 255 cpus:
        node 255 size: 0 MB
        node 255 free: 0 MB
        node distances:
        node   0   8  252  253  254  255
      
      Note: <cpu-list> expands to actual cpu list in the original output.
      These nodes 252-255 are to represent the memory on GPUs and are valid
      nodes.
      
      The perf numa bench init code has a condition check to see if the number
      of NUMA nodes (nr_nodes) exceeds MAX_NR_NODES. The value of MAX_NR_NODES
      defined in perf code is 64. And the 'nr_nodes' is the value from
      numa_max_node() which represents the highest node number available in the
      system. In some systems where we could have NUMA node 255, this condition
      check fails and results in SIGABORT.
      
      The numa benchmark uses static value of MAX_NR_NODES in the code to
      represent size of two NUMA node arrays and node bitmask used for setting
      memory policy. Patch adds a fix to dynamically allocate size for the
      two arrays and bitmask value based on the node numbers available in the
      system. With the fix, perf numa benchmark will work with node configuration
      on any system and thus removes the static MAX_NR_NODES value.
      Signed-off-by: default avatarAthira Jajeev <atrajeev@linux.vnet.ibm.com>
      Reviewed-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Jiri Olsa <jolsa@kernel.org>
      Cc: Kajol Jain <kjain@linux.ibm.com>
      Cc: Kan Liang <kan.liang@linux.intel.com>
      Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
      Cc: linuxppc-dev@lists.ozlabs.org
      Link: http://lore.kernel.org/lkml/1614271802-1503-1-git-send-email-atrajeev@linux.vnet.ibm.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      394e4306
    • Dmitry Safonov's avatar
      perf diff: Don't crash on freeing errno-session on the error path · ffc52b7a
      Dmitry Safonov authored
      __cmd_diff() sets result of perf_session__new() to d->session.
      
      In case of failure, it's errno and perf-diff may crash with:
      
        failed to open perf.data: Permission denied
        Failed to open perf.data
        Segmentation fault (core dumped)
      
      From the coredump:
      
      0  0x00005569a62b5955 in auxtrace__free (session=0xffffffffffffffff)
          at util/auxtrace.c:2681
      1  0x00005569a626b37d in perf_session__delete (session=0xffffffffffffffff)
          at util/session.c:295
      2  perf_session__delete (session=0xffffffffffffffff) at util/session.c:291
      3  0x00005569a618008a in __cmd_diff () at builtin-diff.c:1239
      4  cmd_diff (argc=<optimized out>, argv=<optimized out>) at builtin-diff.c:2011
      [..]
      
      Funny enough, it won't always crash. For me it crashes only if failed
      file is second in cmd-line: the reason is that cmd_diff() check files for
      branch-stacks [in check_file_brstack()] and if the first file doesn't
      have brstacks, it doesn't proceed to try open other files from cmd-line.
      
      Check d->session before calling perf_session__delete().
      
      Another solution would be assigning to temporary variable, checking it,
      but I find it easier to follow with IS_ERR() check in the same function.
      After some time it's still obvious why the check is needed, and with
      temp variable it's possible to make the same mistake.
      
      Committer testing:
      
        $ perf record sleep 1
        [ perf record: Woken up 1 times to write data ]
        [ perf record: Captured and wrote 0.001 MB perf.data (8 samples) ]
        $ perf diff
        failed to open perf.data.old: No such file or directory
        Failed to open perf.data.old
        $ perf record sleep 1
        [ perf record: Woken up 1 times to write data ]
        [ perf record: Captured and wrote 0.001 MB perf.data (8 samples) ]
        $ perf diff
        # Event 'cycles:u'
        #
        # Baseline  Delta Abs  Shared Object     Symbol
        # ........  .........  ................  ..........................
        #
             0.92%    +87.66%  [unknown]         [k] 0xffffffff8825de16
            11.39%     +0.04%  ld-2.32.so        [.] __GI___tunables_init
            87.70%             ld-2.32.so        [.] _dl_check_map_versions
        $ sudo chown root:root perf.data
        [sudo] password for acme:
        $ perf diff
        failed to open perf.data: Permission denied
        Failed to open perf.data
        Segmentation fault (core dumped)
        $
      
      After the patch:
      
        $ perf diff
        failed to open perf.data: Permission denied
        Failed to open perf.data
        $
      Signed-off-by: default avatarDmitry Safonov <dima@arista.com>
      Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Dmitry Safonov <0x7f454c46@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: dmitry safonov <dima@arista.com>
      Link: http://lore.kernel.org/lkml/20210302023533.1572231-1-dima@arista.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      ffc52b7a
    • Andreas Wendleder's avatar
      perf tools: Clean 'generated' directory used for creating the syscall table on x86 · 2b1919ec
      Andreas Wendleder authored
      Remove generated directory tools/perf/arch/x86/include/generated.
      Signed-off-by: default avatarAndreas Wendleder <andreas.wendleder@gmail.com>
      Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lore.kernel.org/lkml/20210301185642.163396-1-gonsolo@gmail.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      2b1919ec
    • Jiri Olsa's avatar
      perf build: Move feature cleanup under tools/build · 762323eb
      Jiri Olsa authored
      Arnaldo reported issue for following build command:
      
        $ rm -rf /tmp/krava; mkdir /tmp/krava; make O=/tmp/krava clean
          CLEAN    config
        /bin/sh: line 0: cd: /tmp/krava/feature/: No such file or directory
        ../../scripts/Makefile.include:17: *** output directory "/tmp/krava/feature/" does not exist.  Stop.
        make[1]: *** [Makefile.perf:1010: config-clean] Error 2
        make: *** [Makefile:90: clean] Error 2
      
      The problem is that now that we include scripts/Makefile.include
      in feature's Makefile (which is fine and needed), we need to ensure
      the OUTPUT directory exists, before executing (out of tree) clean
      command.
      
      Removing the feature's cleanup from perf Makefile and fixing
      feature's cleanup under build Makefile, so it now checks that
      there's existing OUTPUT directory before calling the clean.
      
      Fixes: 211a741c ("tools: Factor Clang, LLC and LLVM utils definitions")
      Reported-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
      Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Tested-by: Sedat Dilek <sedat.dilek@gmail.com> # LLVM/Clang v13-git
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Ian Rogers <irogers@google.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Michael Petlan <mpetlan@redhat.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lore.kernel.org/lkml/20210224150831.409639-1-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      762323eb
    • Pierre Gondois's avatar
      perf tools: Cast (struct timeval).tv_sec when printing · ded2e511
      Pierre Gondois authored
      The musl-libc [1] defines (struct timeval).tv_sec as a 'long long' for
      arm and other architectures. The default build having a '-Wformat' flag,
      not casting the field when printing prevents from building perf.
      
      This patch casts the (struct timeval).tv_sec fields to the expected
      format.
      
      [1] git://git.musl-libc.org/muslSigned-off-by: default avatarPierre Gondois <Pierre.Gondois@arm.com>
      Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Douglas.raillard@arm.com
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lore.kernel.org/lkml/20210224182410.5366-1-Pierre.Gondois@arm.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      ded2e511
    • Arnaldo Carvalho de Melo's avatar
      tools headers UAPI: Sync kvm.h headers with the kernel sources · 21b7e35b
      Arnaldo Carvalho de Melo authored
      To pick the changes in:
      
        d9a47eda ("KVM: PPC: Book3S HV: Introduce new capability for 2nd DAWR")
        8d4e7e80 ("KVM: x86: declare Xen HVM shared info capability and add test case")
        40da8ccd ("KVM: x86/xen: Add event channel interrupt vector upcall")
      
      These new IOCTLs are now supported on 'perf trace':
      
        $ tools/perf/trace/beauty/kvm_ioctl.sh > before
        $ cp include/uapi/linux/kvm.h tools/include/uapi/linux/kvm.h
        $ tools/perf/trace/beauty/kvm_ioctl.sh > after
        $ diff -u before after
        --- before	2021-02-23 09:55:46.229058308 -0300
        +++ after	2021-02-23 09:55:57.509308058 -0300
        @@ -91,6 +91,10 @@
         	[0xc1] = "GET_SUPPORTED_HV_CPUID",
         	[0xc6] = "X86_SET_MSR_FILTER",
         	[0xc7] = "RESET_DIRTY_RINGS",
        +	[0xc8] = "XEN_HVM_GET_ATTR",
        +	[0xc9] = "XEN_HVM_SET_ATTR",
        +	[0xca] = "XEN_VCPU_GET_ATTR",
        +	[0xcb] = "XEN_VCPU_SET_ATTR",
         	[0xe0] = "CREATE_DEVICE",
         	[0xe1] = "SET_DEVICE_ATTR",
         	[0xe2] = "GET_DEVICE_ATTR",
        $
      
      Addressing this perf build warning:
        Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from latest version at 'include/uapi/linux/kvm.h'
        diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h
      
      Cc: David Woodhouse <dwmw@amazon.co.uk>
      Cc: Paul Mackerras <paulus@ozlabs.org>
      Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      21b7e35b
    • Arnaldo Carvalho de Melo's avatar
      tools headers UAPI s390: Sync ptrace.h kernel headers · 303550a4
      Arnaldo Carvalho de Melo authored
      To pick up the changes from:
      
        56e62a73 ("s390: convert to generic entry")
      
      That only adds two new defines, so shouldn't cause problems when
      building the BPF selftests.
      
      Silencing this perf build warning:
      
        Warning: Kernel ABI header at 'tools/arch/s390/include/uapi/asm/ptrace.h' differs from latest version at 'arch/s390/include/uapi/asm/ptrace.h'
        diff -u tools/arch/s390/include/uapi/asm/ptrace.h arch/s390/include/uapi/asm/ptrace.h
      
      Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
      Cc: Sven Schnelle <svens@linux.ibm.com>
      Cc: Vasily Gorbik <gor@linux.ibm.com>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      303550a4
    • Arnaldo Carvalho de Melo's avatar
      perf arch powerpc: Sync powerpc syscall.tbl with the kernel sources · add76c01
      Arnaldo Carvalho de Melo authored
      To get the changes in:
      
        fbcee2eb ("powerpc/32: Always save non volatile GPRs at syscall entry")
      
      That shouldn't cause any change in tooling, just silences the following
      tools/perf/ build warning:
      
        Warning: Kernel ABI header at 'tools/perf/arch/powerpc/entry/syscalls/syscall.tbl' differs from latest version at 'arch/powerpc/kernel/syscalls/syscall.tbl'
      
      Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      add76c01
    • Arnaldo Carvalho de Melo's avatar
      tools headers UAPI: Sync openat2.h with the kernel sources · 1e61463c
      Arnaldo Carvalho de Melo authored
      To pick the changes in:
      
        99668f61 ("fs: expose LOOKUP_CACHED through openat2() RESOLVE_CACHED")
      
      That don't result in any change in tooling, only silences this perf
      build warning:
      
        Warning: Kernel ABI header at 'tools/include/uapi/linux/openat2.h' differs from latest version at 'include/uapi/linux/openat2.h'
        diff -u tools/include/uapi/linux/openat2.h include/uapi/linux/openat2.h
      
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Jens Axboe <axboe@kernel.dk>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      1e61463c
    • Arnaldo Carvalho de Melo's avatar
      tools headers UAPI: Sync drm/i915_drm.h with the kernel sources · c2446944
      Arnaldo Carvalho de Melo authored
      To pick the changes in:
      
        8c3b1ba0 ("drm/i915/gt: Track the overall awake/busy time")
        348fb0cb ("drm/i915/pmu: Deprecate I915_PMU_LAST and optimize state tracking")
      
      That don't result in any change in tooling:
      
        $ tools/perf/trace/beauty/drm_ioctl.sh > before
        $ cp include/uapi/drm/i915_drm.h tools/include/uapi/drm/i915_drm.h
        $ tools/perf/trace/beauty/drm_ioctl.sh > after
        $ diff -u before after
        $
      
      Only silences this perf build warning:
      
        Warning: Kernel ABI header at 'tools/include/uapi/drm/i915_drm.h' differs from latest version at 'include/uapi/drm/i915_drm.h'
        diff -u tools/include/uapi/drm/i915_drm.h include/uapi/drm/i915_drm.h
      
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      c2446944
    • Arnaldo Carvalho de Melo's avatar
      tools headers UAPI: Update tools's copy of drm.h headers · 3ae0415d
      Arnaldo Carvalho de Melo authored
      Picking the changes from:
      
        0e0dc448 ("drm/doc: demote old doc-comments in drm.h")
      
      Silencing these perf build warnings:
      
        Warning: Kernel ABI header at 'tools/include/uapi/drm/drm.h' differs from latest version at 'include/uapi/drm/drm.h'
        diff -u tools/include/uapi/drm/drm.h include/uapi/drm/drm.h
      
      No changes in tooling as these are just C comment documentation changes.
      
      Cc: Simon Ser <contact@emersion.fr>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      3ae0415d
    • 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
  2. 05 Mar, 2021 25 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