1. 02 Apr, 2021 14 commits
    • Fenghua Yu's avatar
      selftests/resctrl: Fix MBA/MBM results reporting format · 06bd03a5
      Fenghua Yu authored
      MBM unit test starts fill_buf (default built-in benchmark) in a new con_mon
      group (c1, m1) and records resctrl reported mbm values and iMC (Integrated
      Memory Controller) values every second. It does this for five seconds
      (randomly chosen value) in total. It then calculates average of resctrl_mbm
      values and imc_mbm values and if the difference is greater than 300 MB/sec
      (randomly chosen value), the test treats it as a failure. MBA unit test is
      similar to MBM but after every run it changes schemata.
      
      Checking for a difference of 300 MB/sec doesn't look very meaningful when
      the mbm values are changing over a wide range. For example, below are the
      values running MBA test on SKL with different allocations
      
      1. With 10% as schemata both iMC and resctrl mbm_values are around 2000
         MB/sec
      2. With 100% as schemata both iMC and resctrl mbm_values are around 10000
         MB/sec
      
      A 300 MB/sec difference between resctrl_mbm and imc_mbm values is
      acceptable at 100% schemata but it isn't acceptable at 10% schemata because
      that's a huge difference.
      
      So, fix this by checking for percentage difference instead of absolute
      difference i.e. check if the difference between resctrl_mbm value and
      imc_mbm value is within 5% (randomly chosen value) of imc_mbm value. If the
      difference is greater than 5% of imc_mbm value, treat it is a failure.
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      06bd03a5
    • Fenghua Yu's avatar
      selftests/resctrl: Use resctrl/info for feature detection · ee041568
      Fenghua Yu authored
      Resctrl test suite before running any unit test (like cmt, cat, mbm and
      mba) should first check if the feature is enabled (by kernel and not just
      supported by H/W) on the platform or not.
      validate_resctrl_feature_request() is supposed to do that. This function
      intends to grep for relevant flags in /proc/cpuinfo but there are several
      issues here
      
      1. validate_resctrl_feature_request() calls fgrep() to get flags from
         /proc/cpuinfo. But, fgrep() can only return a string with maximum of 255
         characters and hence the complete cpu flags are never returned.
      2. The substring search logic is also busted. If strstr() finds requested
         resctrl feature in the cpu flags, it returns pointer to the first
         occurrence. But, the logic negates the return value of strstr() and
         hence validate_resctrl_feature_request() returns false if the feature is
         present in the cpu flags and returns true if the feature is not present.
      3. validate_resctrl_feature_request() checks if a resctrl feature is
         reported in /proc/cpuinfo flags or not. Having a cpu flag means that the
         H/W supports the feature, but it doesn't mean that the kernel enabled
         it. A user could selectively enable only a subset of resctrl features
         using kernel command line arguments. Hence, /proc/cpuinfo isn't a
         reliable source to check if a feature is enabled or not.
      
      The 3rd issue being the major one and fixing it requires changing the way
      validate_resctrl_feature_request() works. Since, /proc/cpuinfo isn't the
      right place to check if a resctrl feature is enabled or not, a more
      appropriate place is /sys/fs/resctrl/info directory. Change
      validate_resctrl_feature_request() such that,
      
      1. For cat, check if /sys/fs/resctrl/info/L3 directory is present or not
      2. For mba, check if /sys/fs/resctrl/info/MB directory is present or not
      3. For cmt, check if /sys/fs/resctrl/info/L3_MON directory is present and
         check if /sys/fs/resctrl/info/L3_MON/mon_features has llc_occupancy
      4. For mbm, check if /sys/fs/resctrl/info/L3_MON directory is present and
         check if /sys/fs/resctrl/info/L3_MON/mon_features has
         mbm_<total/local>_bytes
      
      Please note that only L3_CAT, L3_CMT, MBA and MBM are supported. CDP and L2
      variants can be added later.
      Reported-by: default avatarReinette Chatre <reinette.chatre@intel.com>
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      ee041568
    • Fenghua Yu's avatar
      selftests/resctrl: Check for resctrl mount point only if resctrl FS is supported · a3611fbc
      Fenghua Yu authored
      check_resctrlfs_support() does the following
      1. Checks if the platform supports resctrl file system or not by looking
         for resctrl in /proc/filesystems
      2. Calls opendir() on default resctrl file system path
         (i.e. /sys/fs/resctrl)
      3. Checks if resctrl file system is mounted or not by looking at
         /proc/mounts
      
      Steps 2 and 3 will fail if the platform does not support resctrl file
      system. So, there is no need to check for them if step 1 fails.
      
      Fix this by returning immediately if the platform does not support
      resctrl file system.
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      a3611fbc
    • Fenghua Yu's avatar
      selftests/resctrl: Add config dependencies · b67a7665
      Fenghua Yu authored
      Add the config file for test dependencies.
      Suggested-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      b67a7665
    • Reinette Chatre's avatar
      selftests/resctrl: Fix a printed message · f29838e6
      Reinette Chatre authored
      Add a missing newline to the printed help text to improve readability.
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      f29838e6
    • Fenghua Yu's avatar
      selftests/resctrl: Share show_cache_info() by CAT and CMT tests · 03216ed7
      Fenghua Yu authored
      show_cache_info() functions are defined separately in CAT and CMT
      tests. But the functions are same for the tests and unnecessary
      to be defined separately. Share the function by the tests.
      Suggested-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      03216ed7
    • Fenghua Yu's avatar
      selftests/resctrl: Call kselftest APIs to log test results · ca2f4214
      Fenghua Yu authored
      Call kselftest APIs instead of using printf() to log test results
      for cleaner code and better future extension.
      Suggested-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      ca2f4214
    • Fenghua Yu's avatar
      selftests/resctrl: Rename CQM test as CMT test · 2f320911
      Fenghua Yu authored
      CMT (Cache Monitoring Technology) [1] is a H/W feature that reports cache
      occupancy of a process. resctrl selftest suite has a unit test to test CMT
      for LLC but the test is named as CQM (Cache Quality Monitoring).
      Furthermore, the unit test source file is named as cqm_test.c and several
      functions, variables, comments, preprocessors and statements widely use
      "cqm" as either suffix or prefix. This rampant misusage of CQM for CMT
      might confuse someone who is newly looking at resctrl selftests because
      this feature is named CMT in the Intel Software Developer's Manual.
      
      Hence, rename all the occurrences (unit test source file name, functions,
      variables, comments and preprocessors) of cqm with cmt.
      
      [1] Please see Intel SDM, Volume 3, chapter 17 and section 18 for more
          information on CMT: https://software.intel.com/content/www/us/en/develop/articles/intel-sdm.htmlSuggested-by: default avatarReinette Chatre <reinette.chatre@intel.com>
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      2f320911
    • Fenghua Yu's avatar
      selftests/resctrl: Fix missing options "-n" and "-p" · d7af3d0d
      Fenghua Yu authored
      resctrl test suite accepts command line arguments (like -b, -t, -n and -p)
      as documented in the help. But passing -n and -p throws an invalid option
      error. This happens because -n and -p are missing in the list of
      characters that getopt() recognizes as valid arguments. Hence, they are
      treated as invalid options.
      
      Fix this by adding them to the list of characters that getopt() recognizes
      as valid arguments. Please note that the main() function already has the
      logic to deal with the values passed as part of these arguments and hence
      no changes are needed there.
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      d7af3d0d
    • Reinette Chatre's avatar
      selftests/resctrl: Ensure sibling CPU is not same as original CPU · f5f16ae4
      Reinette Chatre authored
      The resctrl tests can accept a CPU on which the tests are run and use
      default of CPU #1 if it is not provided. In the CAT test a "sibling CPU"
      is determined that is from the same package where another thread will be
      run.
      
      The current algorithm with which a "sibling CPU" is determined does not
      take the provided/default CPU into account and when that CPU is the
      first CPU in a package then the "sibling CPU" will be selected to be the
      same CPU since it starts by picking the first CPU from core_siblings_list.
      
      Fix the "sibling CPU" selection by taking the provided/default CPU into
      account and ensuring a sibling that is a different CPU is selected.
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      f5f16ae4
    • Fenghua Yu's avatar
      selftests/resctrl: Clean up resctrl features check · 24286736
      Fenghua Yu authored
      Checking resctrl features call strcmp() to compare feature strings
      (e.g. "mba", "cat" etc). The checkings are error prone and don't have
      good coding style. Define the constant strings in macros and call
      strncmp() to solve the potential issues.
      Suggested-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      24286736
    • Fenghua Yu's avatar
      selftests/resctrl: Fix compilation issues for other global variables · 896016d2
      Fenghua Yu authored
      Reinette reported following compilation issue on Fedora 32, gcc version
      10.1.1
      
      /usr/bin/ld: resctrl_tests.o:<src_dir>/resctrl.h:65: multiple definition
      of `bm_pid'; cache.o:<src_dir>/resctrl.h:65: first defined here
      
      Other variables are ppid, tests_run, llc_occup_path, is_amd. Compiler
      isn't happy because these variables are defined globally in two .c files
      but are not declared as extern.
      
      To fix issues for the global variables, declare them as extern.
      
      Chang Log:
      - Split this patch from v4's patch 1 (Shuah).
      Reported-by: default avatarReinette Chatre <reinette.chatre@intel.com>
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      896016d2
    • Fenghua Yu's avatar
      selftests/resctrl: Fix compilation issues for global variables · 8236c51d
      Fenghua Yu authored
      Reinette reported following compilation issue on Fedora 32, gcc version
      10.1.1
      
      /usr/bin/ld: cqm_test.o:<src_dir>/cqm_test.c:22: multiple definition of
      `cache_size'; cat_test.o:<src_dir>/cat_test.c:23: first defined here
      
      The same issue is reported for long_mask, cbm_mask, count_of_bits etc
      variables as well. Compiler isn't happy because these variables are
      defined globally in two .c files namely cqm_test.c and cat_test.c and
      the compiler during compilation finds that the variable is already
      defined (multiple definition error).
      
      Taking a closer look at the usage of these variables reveals that these
      variables are used only locally in functions such as cqm_resctrl_val()
      (defined in cqm_test.c) and cat_perf_miss_val() (defined in cat_test.c).
      These variables are not shared between those functions. So, there is no
      need for these variables to be global. Hence, fix this issue by making
      them static variables.
      Reported-by: default avatarReinette Chatre <reinette.chatre@intel.com>
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      8236c51d
    • Fenghua Yu's avatar
      selftests/resctrl: Enable gcc checks to detect buffer overflows · a9d26a30
      Fenghua Yu authored
      David reported a buffer overflow error in the check_results() function of
      the cmt unit test and he suggested enabling _FORTIFY_SOURCE gcc compiler
      option to automatically detect any such errors.
      
      Feature Test Macros man page describes_FORTIFY_SOURCE as below
      
      "Defining this macro causes some lightweight checks to be performed to
      detect some buffer overflow errors when employing various string and memory
      manipulation functions (for example, memcpy, memset, stpcpy, strcpy,
      strncpy, strcat, strncat, sprintf, snprintf, vsprintf, vsnprintf, gets, and
      wide character variants thereof). For some functions, argument consistency
      is checked; for example, a check is made that open has been supplied with a
      mode argument when the specified flags include O_CREAT. Not all problems
      are detected, just some common cases.
      
      If _FORTIFY_SOURCE is set to 1, with compiler optimization level 1 (gcc
      -O1) and above, checks that shouldn't change the behavior of conforming
      programs are performed.
      
      With _FORTIFY_SOURCE set to 2, some more checking is added, but some
      conforming programs might fail.
      
      Some of the checks can be performed at compile time (via macros logic
      implemented in header files), and result in compiler warnings; other checks
      take place at run time, and result in a run-time error if the check fails.
      
      Use of this macro requires compiler support, available with gcc since
      version 4.0."
      
      Fix the buffer overflow error in the check_results() function of the cmt
      unit test and enable _FORTIFY_SOURCE gcc check to catch any future buffer
      overflow errors.
      Reported-by: default avatarDavid Binderman <dcb314@hotmail.com>
      Suggested-by: default avatarDavid Binderman <dcb314@hotmail.com>
      Tested-by: default avatarBabu Moger <babu.moger@amd.com>
      Signed-off-by: default avatarFenghua Yu <fenghua.yu@intel.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      a9d26a30
  2. 26 Mar, 2021 2 commits
    • Colin Ian King's avatar
      selftests/timers: Fix spelling mistake "clocksourc" -> "clocksource" · ea2c679e
      Colin Ian King authored
      There is a spelling mistake in a comment. Fix it.
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      ea2c679e
    • Ilya Leoshkevich's avatar
      selftests: fix prepending $(OUTPUT) to $(TEST_PROGS) · cb4969e6
      Ilya Leoshkevich authored
      Currently the following command produces an error message:
      
          linux# make kselftest TARGETS=bpf O=/mnt/linux-build
          # selftests: bpf: test_libbpf.sh
          # ./test_libbpf.sh: line 23: ./test_libbpf_open: No such file or directory
          # test_libbpf: failed at file test_l4lb.o
          # selftests: test_libbpf [FAILED]
      
      The error message might not affect the return code of make, therefore
      one needs to grep make output in order to detect it.
      
      This is not the only instance of the same underlying problem; any test
      with more than one element in $(TEST_PROGS) fails the same way. Another
      example:
      
          linux# make O=/mnt/linux-build TARGETS=splice kselftest
          [...]
          # ./short_splice_read.sh: 15: ./splice_read: not found
          # FAIL: /sys/module/test_module/sections/.init.text 2
          not ok 2 selftests: splice: short_splice_read.sh # exit=1
      
      The current logic prepends $(OUTPUT) only to the first member of
      $(TEST_PROGS). After that, run_one() does
      
         cd `dirname $TEST`
      
      For all tests except the first one, `dirname $TEST` is ., which means
      they cannot access the files generated in $(OUTPUT).
      
      Fix by using $(addprefix) to prepend $(OUTPUT)/ to each member of
      $(TEST_PROGS).
      
      Fixes: 1a940687 ("selftests: lib.mk: copy test scripts and test files for make O=dir run")
      Signed-off-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
      Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      cb4969e6
  3. 06 Mar, 2021 4 commits
  4. 05 Mar, 2021 20 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