1. 07 Sep, 2021 1 commit
    • Linus Torvalds's avatar
      Revert "mm/gup: remove try_get_page(), call try_get_compound_head() directly" · cd1adf1b
      Linus Torvalds authored
      This reverts commit 9857a17f.
      
      That commit was completely broken, and I should have caught on to it
      earlier.  But happily, the kernel test robot noticed the breakage fairly
      quickly.
      
      The breakage is because "try_get_page()" is about avoiding the page
      reference count overflow case, but is otherwise the exact same as a
      plain "get_page()".
      
      In contrast, "try_get_compound_head()" is an entirely different beast,
      and uses __page_cache_add_speculative() because it's not just about the
      page reference count, but also about possibly racing with the underlying
      page going away.
      
      So all the commentary about how
      
       "try_get_page() has fallen a little behind in terms of maintenance,
        try_get_compound_head() handles speculative page references more
        thoroughly"
      
      was just completely wrong: yes, try_get_compound_head() handles
      speculative page references, but the point is that try_get_page() does
      not, and must not.
      
      So there's no lack of maintainance - there are fundamentally different
      semantics.
      
      A speculative page reference would be entirely wrong in "get_page()",
      and it's entirely wrong in "try_get_page()".  It's not about
      speculation, it's purely about "uhhuh, you can't get this page because
      you've tried to increment the reference count too much already".
      
      The reason the kernel test robot noticed this bug was that it hit the
      VM_BUG_ON() in __page_cache_add_speculative(), which is all about
      verifying that the context of any speculative page access is correct.
      But since that isn't what try_get_page() is all about, the VM_BUG_ON()
      tests things that are not correct to test for try_get_page().
      Reported-by: default avatarkernel test robot <oliver.sang@intel.com>
      Cc: John Hubbard <jhubbard@nvidia.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cd1adf1b
  2. 06 Sep, 2021 8 commits
    • Linus Torvalds's avatar
      thunderbolt: test: split up test cases in tb_test_credit_alloc_all · 4b93c544
      Linus Torvalds authored
      The tb_test_credit_alloc_all() function had a huge number of
      KUNIT_ASSERT() statements, all of which (though the magic of many many
      layers of inscrutable macros) ended up allocating and initializing
      various test assertion structures on the stack.
      
      Don't do that.  The kernel stack isn't infinite, and we have compiler
      warnings (now errors) for the case where a stack frame grows too large.
      
      Like it did here, by not an inconsiderable margin:
      
         drivers/thunderbolt/test.c: In function ‘tb_test_credit_alloc_all’:
         drivers/thunderbolt/test.c:2367:1: error: the frame size of 4500 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
          2367 | }
               | ^
      
      Solve this similarly to the lib/test_scanf case: split out the tests
      into several smaller functions, each just testing one particular tunnel
      credit allocation.
      
      This makes the i386 allyesconfig build work for me again.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4b93c544
    • Linus Torvalds's avatar
      lib/test_scanf: split up number parsing test routines · ba7b1f86
      Linus Torvalds authored
      It turns out that gcc has real trouble merging all the temporary
      on-stack buffer allocation.  So despite the fact that their lifetimes do
      not overlap, gcc will allocate stack for all of them when they have
      different types.  Which they do in the number scanning test routines.
      
      This is unfortunate in general, but with lots of test-cases in one
      function, it becomes a real problem.  gcc will allocate a huge stack
      frame for no actual good reason.
      
      We have tried to counteract this tendency of gcc not merging stack slots
      (see "-fconserve-stack"), but that has limited effect (and should be on
      by default these days, iirc).
      
      So with all the debug options enabled on an i386 allmodconfig build, we
      end up with overly big stack frames, and the resulting stack frame size
      warnings (now errors):
      
         lib/test_scanf.c: In function ‘numbers_list_field_width_val_width’:
         lib/test_scanf.c:530:1: error: the frame size of 2088 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
           530 | }
               | ^
         lib/test_scanf.c: In function ‘numbers_list_field_width_typemax’:
         lib/test_scanf.c:488:1: error: the frame size of 2568 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
           488 | }
               | ^
         lib/test_scanf.c: In function ‘numbers_list’:
         lib/test_scanf.c:437:1: error: the frame size of 2088 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
           437 | }
               | ^
      
      In this particular case, the reasonably straightforward solution is to
      just split out the test routines into multiple more targeted versions.
      That way we don't have one huge stack, but several smaller ones, and
      they aren't active all at the same time.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ba7b1f86
    • Linus Torvalds's avatar
      iwl: fix debug printf format strings · 1476ff21
      Linus Torvalds authored
      The variable 'package_size' is an unsigned long, and should be printed
      out using '%lu', not '%zd' (that would be for a size_t).
      
      Yes, on many architectures (including x86-64), 'size_t' is in fact the
      same type as 'long', but that's a fairly random architecture definition,
      and on some platforms 'size_t' is in fact 'int' rather than 'long'.
      
      That is the case on traditional 32-bit x86.  Yes, both types are the
      exact same 32-bit size, and it would all print out perfectly correctly,
      but '%zd' ends up still being wrong.
      
      And we can't make 'package_size' be a 'size_t', because we get the
      actual value using efivar_entry_get() that takes a pointer to an
      'unsigned long'.  So '%lu' it is.
      
      This fixes two of the i386 allmodconfig build warnings (that is now an
      error due to -Werror).
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1476ff21
    • Linus Torvalds's avatar
      Merge tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block · 1dbe7e38
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "Was going to send this one in later this week, but given that -Werror
        is now enabled (or at least available), the mq-deadline fix really
        should go in for the folks hitting that.
      
         - Ensure dd_queued() is only there if needed (Geert)
      
         - Fix a kerneldoc warning for bio_alloc_kiocb()
      
         - BFQ fix for queue merging
      
         - loop locking fix (Tetsuo)"
      
      * tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block:
        loop: reduce the loop_ctl_mutex scope
        bio: fix kerneldoc documentation for bio_alloc_kiocb()
        block, bfq: honor already-setup queue merges
        block/mq-deadline: Move dd_queued() to fix defined but not used warning
      1dbe7e38
    • Linus Torvalds's avatar
      Merge tag 'misc-5.15-2021-09-05' of git://git.kernel.dk/linux-block · 03085b3d
      Linus Torvalds authored
      Pull CDROM maintainer update from Jens Axboe:
       "It's been about 22 years since I originally started maintaining the
        CDROM code, and I just haven't been able to even get reviews done in a
        timely fashion the last handful of years.
      
        Time to pass it on, and Phillip has volunteered take over these
        duties. I'll be helping as needed for the foreseeable future"
      
      * tag 'misc-5.15-2021-09-05' of git://git.kernel.dk/linux-block:
        cdrom: update uniform CD-ROM maintainership in MAINTAINERS file
      03085b3d
    • Linus Torvalds's avatar
      Merge tag 'libata-5.15-2021-09-05' of git://git.kernel.dk/linux-block · eebb4159
      Linus Torvalds authored
      Pull libata fixes from Jens Axboe:
       "Fixes for queued trim on certain Samsung SSDs, in conjunction with
        certain ATI controllers"
      
      * tag 'libata-5.15-2021-09-05' of git://git.kernel.dk/linux-block:
        libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
        libata: add ATA_HORKAGE_NO_NCQ_TRIM for Samsung 860 and 870 SSDs
      eebb4159
    • Linus Torvalds's avatar
      Merge tag 'for-5.15/io_uring-2021-09-04' of git://git.kernel.dk/linux-block · 60f8fbaa
      Linus Torvalds authored
      Pull io_uring fixes from Jens Axboe:
       "As sometimes happens, two reports came in around the merge window open
        that led to some fixes. Hence this one is a bit bigger than usual
        followup fixes, but most of it will be going towards stable, outside
        of the fixes that are addressing regressions from this merge window.
      
        In detail:
      
         - postgres is a heavy user of signals between tasks, and if we're
           unlucky this can interfere with io-wq worker creation. Make sure
           we're resilient against unrelated signal handling. This set of
           changes also includes hardening against allocation failures, which
           could previously had led to stalls.
      
         - Some use cases that end up having a mix of bounded and unbounded
           work would have starvation issues related to that. Split the
           pending work lists to handle that better.
      
         - Completion trace int -> unsigned -> long fix
      
         - Fix issue with REGISTER_IOWQ_MAX_WORKERS and SQPOLL
      
         - Fix regression with hash wait lock in this merge window
      
         - Fix retry issued on block devices (Ming)
      
         - Fix regression with links in this merge window (Pavel)
      
         - Fix race with multi-shot poll and completions (Xiaoguang)
      
         - Ensure regular file IO doesn't inadvertently skip completion
           batching (Pavel)
      
         - Ensure submissions are flushed after running task_work (Pavel)"
      
      * tag 'for-5.15/io_uring-2021-09-04' of git://git.kernel.dk/linux-block:
        io_uring: io_uring_complete() trace should take an integer
        io_uring: fix possible poll event lost in multi shot mode
        io_uring: prolong tctx_task_work() with flushing
        io_uring: don't disable kiocb_done() CQE batching
        io_uring: ensure IORING_REGISTER_IOWQ_MAX_WORKERS works with SQPOLL
        io-wq: make worker creation resilient against signals
        io-wq: get rid of FIXED worker flag
        io-wq: only exit on fatal signals
        io-wq: split bounded and unbounded work into separate lists
        io-wq: fix queue stalling race
        io_uring: don't submit half-prepared drain request
        io_uring: fix queueing half-created requests
        io-wq: ensure that hash wait lock is IRQ disabling
        io_uring: retry in case of short read on block device
        io_uring: IORING_OP_WRITE needs hash_reg_file set
        io-wq: fix race between adding work and activating a free worker
      60f8fbaa
    • Stephen Rothwell's avatar
  3. 05 Sep, 2021 8 commits
    • Linus Torvalds's avatar
      Merge tag 'perf-tools-for-v5.15-2021-09-04' of... · 27151f17
      Linus Torvalds authored
      Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
      
      Pull perf tool updates from Arnaldo Carvalho de Melo:
       "New features:
      
         - Improvements for the flamegraph python script, including:
             - Display perf.data header
             - Display PIDs of user stacks
             - Added option to change color scheme
             - Default to blue/green color scheme to improve accessibility
             - Correctly identify kernel stacks when debuginfo is available
      
         - Improvements for 'perf bench futex':
             - Add --mlockall parameter
             - Add --broadcast and --pi to the 'requeue' sub benchmark
      
         - Add support for PMU aliases.
      
         - Introduce an ARM Coresight ETE decoder.
      
         - Add a 'perf bench' entry for evlist open/close operations, to help
           quantify improvements with multithreading 'perf record'.
      
         - Allow reporting the [un]throttle PERF_RECORD_ meta event in 'perf
           script's python scripting.
      
         - Add a 'perf test' entry for PMU aliases.
      
         - Add a 'perf test' entry for 'perf record/perf report/perf script'
           pipe mode.
      
        Fixes:
      
         - perf script dlfilter (API for filtering via dynamically loaded
           shared object introduced in v5.14) fixes and a 'perf test' entry
           for it.
      
         - Fix get_current_dir_name() compilation on Android.
      
         - Fix issues with asciidoc and double dashes uses.
      
         - Fix memory leaks in the BTF handling code.
      
         - Fix leftover problems in the Documentation from the infrastructure
           originally lifted from the git codebase.
      
         - Fix *probe_vfs_getname.sh 'perf test' failures.
      
         - Handle fd gaps in 'perf test's test__dso_data_reopen().
      
         - Make sure to show disasembly warnings for 'perf annotate --stdio'.
      
         - Fix output from pipe to file and vice-versa in 'perf
           record/report/script'.
      
         - Correct 'perf data -h' output.
      
         - Fix wrong comm in system-wide mode with 'perf record --delay'.
      
         - Do not allow --for-each-cgroup without cpu in 'perf stat'
      
         - Make 'perf test --skip' work on shell tests.
      
         - Fix libperf's verbose printing.
      
        Misc improvements:
      
         - Preparatory patches for multithreading various 'perf record' phases
           (synthesizing, opening, recording, etc).
      
         - Add sparse context/locking annotations in compiler-types.h, also to
           help with the multithreading effort.
      
         - Optimize the generation of the arch specific erno tables used in
           'perf trace'.
      
         - Optimize libperf's perf_cpu_map__max().
      
         - Improve ARM's CoreSight warnings.
      
         - Report collisions in AUX records.
      
         - Improve warnings for the LLVM 'perf test' entry.
      
         - Improve the PMU events 'perf test' codebase.
      
         - perf test: Do not compare overheads in the zstd comp test
      
         - Better support annotation on ARM.
      
         - Update 'perf trace's cmd string table to decode sys_bpf() first
           arg.
      
        Vendor events:
      
         - Add JSON events and metrics for Intel's Ice Lake, Tiger Lake and
           Elhart Lake.
      
         - Update JSON eventsand metrics for Intel's Cascade Lake and Sky Lake
           servers.
      
        Hardware tracing:
      
         - Improvements for the ARM hardware tracing auxtrace support"
      
      * tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (130 commits)
        perf tests: Add test for PMU aliases
        perf pmu: Add PMU alias support
        perf session: Report collisions in AUX records
        perf script python: Allow reporting the [un]throttle PERF_RECORD_ meta event
        perf build: Report failure for testing feature libopencsd
        perf cs-etm: Show a warning for an unknown magic number
        perf cs-etm: Print the decoder name
        perf cs-etm: Create ETE decoder
        perf cs-etm: Update OpenCSD decoder for ETE
        perf cs-etm: Fix typo
        perf cs-etm: Save TRCDEVARCH register
        perf cs-etm: Refactor out ETMv4 header saving
        perf cs-etm: Initialise architecture based on TRCIDR1
        perf cs-etm: Refactor initialisation of decoder params.
        tools build: Fix feature detect clean for out of source builds
        perf evlist: Add evlist__for_each_entry_from() macro
        perf evsel: Handle precise_ip fallback in evsel__open_cpu()
        perf evsel: Move bpf_counter__install_pe() to success path in evsel__open_cpu()
        perf evsel: Move test_attr__open() to success path in evsel__open_cpu()
        perf evsel: Move ignore_missing_thread() to fallback code
        ...
      27151f17
    • Linus Torvalds's avatar
      Merge tag 'trace-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 58ca2415
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
      
       - simplify the Kconfig use of FTRACE and TRACE_IRQFLAGS_SUPPORT
      
       - bootconfig can now start histograms
      
       - bootconfig supports group/all enabling
      
       - histograms now can put values in linear size buckets
      
       - execnames can be passed to synthetic events
      
       - introduce "event probes" that attach to other events and can retrieve
         data from pointers of fields, or record fields as different types (a
         pointer to a string as a string instead of just a hex number)
      
       - various fixes and clean ups
      
      * tag 'trace-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (35 commits)
        tracing/doc: Fix table format in histogram code
        selftests/ftrace: Add selftest for testing duplicate eprobes and kprobes
        selftests/ftrace: Add selftest for testing eprobe events on synthetic events
        selftests/ftrace: Add test case to test adding and removing of event probe
        selftests/ftrace: Fix requirement check of README file
        selftests/ftrace: Add clear_dynamic_events() to test cases
        tracing: Add a probe that attaches to trace events
        tracing/probes: Reject events which have the same name of existing one
        tracing/probes: Have process_fetch_insn() take a void * instead of pt_regs
        tracing/probe: Change traceprobe_set_print_fmt() to take a type
        tracing/probes: Use struct_size() instead of defining custom macros
        tracing/probes: Allow for dot delimiter as well as slash for system names
        tracing/probe: Have traceprobe_parse_probe_arg() take a const arg
        tracing: Have dynamic events have a ref counter
        tracing: Add DYNAMIC flag for dynamic events
        tracing: Replace deprecated CPU-hotplug functions.
        MAINTAINERS: Add an entry for os noise/latency
        tracepoint: Fix kerneldoc comments
        bootconfig/tracing/ktest: Update ktest example for boot-time tracing
        tools/bootconfig: Use per-group/all enable option in ftrace2bconf script
        ...
      58ca2415
    • Linus Torvalds's avatar
      Merge tag 'arc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · e07af262
      Linus Torvalds authored
      Pull ARC updates from Vineet Gupta:
       "Finally a big pile of changes for ARC (atomics/mm). These are from our
        internal arc64 tree, preparing mainline for eventual arc64 support.
        I'm spreading them out to avoid tsunami of patches in one release.
      
         - MM rework:
             - Implement up to 4 paging levels
             - Enable STRICT_MM_TYPECHECK
             - switch pgtable_t back to 'struct page *'
      
         - Atomics rework / implement relaxed accessors
      
         - Retire legacy MMUv1,v2; ARC750 cores
      
         - A few other build errors, typos"
      
      * tag 'arc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (33 commits)
        ARC: mm: vmalloc sync from kernel to user table to update PMD ...
        ARC: mm: support 4 levels of page tables
        ARC: mm: support 3 levels of page tables
        ARC: mm: switch to asm-generic/pgalloc.h
        ARC: mm: switch pgtable_t back to struct page *
        ARC: mm: hack to allow 2 level build with 4 level code
        ARC: mm: disintegrate pgtable.h into levels and flags
        ARC: mm: disintegrate mmu.h (arcv2 bits out)
        ARC: mm: move MMU specific bits out of entry code ...
        ARC: mm: move MMU specific bits out of ASID allocator
        ARC: mm: non-functional code movement/cleanup
        ARC: mm: pmd_populate* to use the canonical set_pmd (and drop pmd_set)
        ARC: ioremap: use more commonly used PAGE_KERNEL based uncached flag
        ARC: mm: Enable STRICT_MM_TYPECHECKS
        ARC: mm: Fixes to allow STRICT_MM_TYPECHECKS
        ARC: mm: move mmu/cache externs out to setup.h
        ARC: mm: remove tlb paranoid code
        ARC: mm: use SCRATCH_DATA0 register for caching pgdir in ARCv2 only
        ARC: retire MMUv1 and MMUv2 support
        ARC: retire ARC750 support
        ...
      e07af262
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-5.15-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · 063df71a
      Linus Torvalds authored
      Pull RISC-V updates from Palmer Dabbelt:
      
       - support PC-relative instructions (auipc and branches) in kprobes
      
       - support for forced IRQ threading
      
       - support for the hlt/nohlt kernel command line options, via the
         generic idle loop
      
       - show the edge/level triggered behavior of interrupts
         in /proc/interrupts
      
       - a handful of cleanups to our address mapping mechanisms
      
       - support for allocating gigantic hugepages via CMA
      
       - support for the undefined behavior sanitizer (UBSAN)
      
       - a handful of cleanups to the VDSO that allow the kernel to build with
         LLD.
      
       - support for hugepage migration
      
      * tag 'riscv-for-linus-5.15-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (21 commits)
        riscv: add support for hugepage migration
        RISC-V: Fix VDSO build for !MMU
        riscv: use strscpy to replace strlcpy
        riscv: explicitly use symbol offsets for VDSO
        riscv: Enable Undefined Behavior Sanitizer UBSAN
        riscv: Keep the riscv Kconfig selects sorted
        riscv: Support allocating gigantic hugepages using CMA
        riscv: fix the global name pfn_base confliction error
        riscv: Move early fdt mapping creation in its own function
        riscv: Simplify BUILTIN_DTB device tree mapping handling
        riscv: Use __maybe_unused instead of #ifdefs around variable declarations
        riscv: Get rid of map_size parameter to create_kernel_page_table
        riscv: Introduce va_kernel_pa_offset for 32-bit kernel
        riscv: Optimize kernel virtual address conversion macro
        dt-bindings: riscv: add starfive jh7100 bindings
        riscv: Enable GENERIC_IRQ_SHOW_LEVEL
        riscv: Enable idle generic idle loop
        riscv: Allow forced irq threading
        riscv: Implement thread_struct whitelist for hardened usercopy
        riscv: kprobes: implement the branch instructions
        ...
      063df71a
    • Linus Torvalds's avatar
      Enable '-Werror' by default for all kernel builds · 3fe617cc
      Linus Torvalds authored
      ... but make it a config option so that broken environments can disable
      it when required.
      
      We really should always have a clean build, and will disable specific
      over-eager warnings as required, if we can't fix them.  But while I
      fairly religiously enforce that in my own tree, it doesn't get enforced
      by various build robots that don't necessarily report warnings.
      
      So this just makes '-Werror' a default compiler flag, but allows people
      to disable it for their configuration if they have some particular
      issues.
      
      Occasionally, new compiler versions end up enabling new warnings, and it
      can take a while before we have them fixed (or the warnings disabled if
      that is what it takes), so the config option allows for that situation.
      
      Hopefully this will mean that I get fewer pull requests that have new
      warnings that were not noticed by various automation we have in place.
      
      Knock wood.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3fe617cc
    • Linus Torvalds's avatar
      Merge tag 'usb-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · fd47ff55
      Linus Torvalds authored
      Pull more USB updates from Greg KH:
       "Here are some straggler USB-serial changes for 5.15-rc1.
      
        These were not included in the first pull request as they came in
        "late" from Johan and I had missed them in my pull request earlier
        this week.
      
        Nothing big in here, just some USB to serial driver updates and fixes.
        All of these were in linux-next before I pulled them into my tree, and
        have been in linux-next all this week from my tree with no reported
        problems"
      
      * tag 'usb-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: serial: pl2303: fix GL type detection
        USB: serial: replace symbolic permissions by octal permissions
        USB: serial: cp210x: determine fw version for CP2105 and CP2108
        USB: serial: cp210x: clean up type detection
        USB: serial: cp210x: clean up set-chars request
        USB: serial: cp210x: clean up control-request timeout
        USB: serial: cp210x: fix flow-control error handling
        USB: serial: cp210x: fix control-characters error handling
        USB: serial: io_edgeport: drop unused descriptor helper
      fd47ff55
    • Linus Torvalds's avatar
      Merge tag 'mtd/for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux · 6b6dc4f4
      Linus Torvalds authored
      Pull MTD updates from Miquel Raynal:
       "MTD changes:
         - blkdevs:
             - Simplify the refcounting in blktrans_{open, release}
             - Simplify blktrans_getgeo
             - Remove blktrans_ref_mutex
             - Simplify blktrans_dev_get
             - Use lockdep_assert_held
             - Don't hold del_mtd_blktrans_dev in blktrans_{open, release}
         - ftl:
             - Don't cast away the type when calling add_mtd_blktrans_dev
             - Don't cast away the type when calling add_mtd_blktrans_dev
             - Use container_of() rather than cast
             - Fix use-after-free
             - Add discard support
             - Allow use of MTD_RAM for testing purposes
         - concat:
             - Check _read, _write callbacks existence before assignment
             - Judge callback existence based on the master
         - maps:
             - Maps: remove dead MTD map driver for PMC-Sierra MSP boards
         - mtdblock:
             - Warn if added for a NAND device
             - Add comment about UBI block devices
             - Update old JFFS2 mention in Kconfig
         - partitions:
             - Redboot: convert to YAML
      
        NAND core changes:
         - Repair Miquel Raynal's email address in MAINTAINERS
         - Fix a couple of spelling mistakes in Kconfig
         - bbt: Skip bad blocks when searching for the BBT in NAND
         - Remove never changed ret variable
      
        Raw NAND changes:
         - cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()'
         - intel: Fix error handling in probe
         - omap: Fix kernel doc warning on 'calcuate' typo
         - gpmc: Fix the ECC bytes vs. OOB bytes equation
      
        SPI-NAND core changes:
         - Properly fill the OOB area.
         - Fix comment
      
        SPI-NAND drivers changes:
         - macronix: Add Quad support for serial NAND flash"
      
      * tag 'mtd/for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (30 commits)
        mtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()'
        mtd_blkdevs: simplify the refcounting in blktrans_{open, release}
        mtd_blkdevs: simplify blktrans_getgeo
        mtd_blkdevs: remove blktrans_ref_mutex
        mtd_blkdevs: simplify blktrans_dev_get
        mtd/rfd_ftl: don't cast away the type when calling add_mtd_blktrans_dev
        mtd/ftl: don't cast away the type when calling add_mtd_blktrans_dev
        mtd_blkdevs: use lockdep_assert_held
        mtd_blkdevs: don't hold del_mtd_blktrans_dev in blktrans_{open, release}
        mtd: rawnand: intel: Fix error handling in probe
        mtd: mtdconcat: Check _read, _write callbacks existence before assignment
        mtd: mtdconcat: Judge callback existence based on the master
        mtd: maps: remove dead MTD map driver for PMC-Sierra MSP boards
        mtd: rfd_ftl: use container_of() rather than cast
        mtd: rfd_ftl: fix use-after-free
        mtd: rfd_ftl: add discard support
        mtd: rfd_ftl: allow use of MTD_RAM for testing purposes
        mtdblock: Warn if added for a NAND device
        mtd: spinand: macronix: Add Quad support for serial NAND flash
        mtdblock: Add comment about UBI block devices
        ...
      6b6dc4f4
    • Geert Uytterhoeven's avatar
      binfmt: a.out: Fix bogus semicolon · 0319b848
      Geert Uytterhoeven authored
          fs/binfmt_aout.c: In function ‘load_aout_library’:
          fs/binfmt_aout.c:311:27: error: expected ‘)’ before ‘;’ token
            311 |    MAP_FIXED | MAP_PRIVATE;
      	  |                           ^
          fs/binfmt_aout.c:309:10: error: too few arguments to function ‘vm_mmap’
            309 |  error = vm_mmap(file, start_addr, ex.a_text + ex.a_data,
      	  |          ^~~~~~~
          In file included from fs/binfmt_aout.c:12:
          include/linux/mm.h:2626:35: note: declared here
           2626 | extern unsigned long __must_check vm_mmap(struct file *, unsigned long,
      	  |                                   ^~~~~~~
      
      Fix this by reverting the accidental replacement of a comma by a
      semicolon.
      
      Fixes: 42be8b42 ("binfmt: don't use MAP_DENYWRITE when loading shared libraries via uselib()")
      Reported-by: noreply@ellerman.id.au
      Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0319b848
  4. 04 Sep, 2021 6 commits
    • Linus Torvalds's avatar
      Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux · 49624efa
      Linus Torvalds authored
      Pull MAP_DENYWRITE removal from David Hildenbrand:
       "Remove all in-tree usage of MAP_DENYWRITE from the kernel and remove
        VM_DENYWRITE.
      
        There are some (minor) user-visible changes:
      
         - We no longer deny write access to shared libaries loaded via legacy
           uselib(); this behavior matches modern user space e.g. dlopen().
      
         - We no longer deny write access to the elf interpreter after exec
           completed, treating it just like shared libraries (which it often
           is).
      
         - We always deny write access to the file linked via /proc/pid/exe:
           sys_prctl(PR_SET_MM_MAP/EXE_FILE) will fail if write access to the
           file cannot be denied, and write access to the file will remain
           denied until the link is effectivel gone (exec, termination,
           sys_prctl(PR_SET_MM_MAP/EXE_FILE)) -- just as if exec'ing the file.
      
        Cross-compiled for a bunch of architectures (alpha, microblaze, i386,
        s390x, ...) and verified via ltp that especially the relevant tests
        (i.e., creat07 and execve04) continue working as expected"
      
      * tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux:
        fs: update documentation of get_write_access() and friends
        mm: ignore MAP_DENYWRITE in ksys_mmap_pgoff()
        mm: remove VM_DENYWRITE
        binfmt: remove in-tree usage of MAP_DENYWRITE
        kernel/fork: always deny write access to current MM exe_file
        kernel/fork: factor out replacing the current MM exe_file
        binfmt: don't use MAP_DENYWRITE when loading shared libraries via uselib()
      49624efa
    • Linus Torvalds's avatar
      Merge git://github.com/Paragon-Software-Group/linux-ntfs3 · f7464060
      Linus Torvalds authored
      Merge NTFSv3 filesystem from Konstantin Komarov:
       "This patch adds NTFS Read-Write driver to fs/ntfs3.
      
        Having decades of expertise in commercial file systems development and
        huge test coverage, we at Paragon Software GmbH want to make our
        contribution to the Open Source Community by providing implementation
        of NTFS Read-Write driver for the Linux Kernel.
      
        This is fully functional NTFS Read-Write driver. Current version works
        with NTFS (including v3.1) and normal/compressed/sparse files and
        supports journal replaying.
      
        We plan to support this version after the codebase once merged, and
        add new features and fix bugs. For example, full journaling support
        over JBD will be added in later updates"
      
      Link: https://lore.kernel.org/lkml/20210729134943.778917-1-almaz.alexandrovich@paragon-software.com/
      Link: https://lore.kernel.org/lkml/aa4aa155-b9b2-9099-b7a2-349d8d9d8fbd@paragon-software.com/
      
      * git://github.com/Paragon-Software-Group/linux-ntfs3: (35 commits)
        fs/ntfs3: Change how module init/info messages are displayed
        fs/ntfs3: Remove GPL boilerplates from decompress lib files
        fs/ntfs3: Remove unnecessary condition checking from ntfs_file_read_iter
        fs/ntfs3: Fix integer overflow in ni_fiemap with fiemap_prep()
        fs/ntfs3: Restyle comments to better align with kernel-doc
        fs/ntfs3: Rework file operations
        fs/ntfs3: Remove fat ioctl's from ntfs3 driver for now
        fs/ntfs3: Restyle comments to better align with kernel-doc
        fs/ntfs3: Fix error handling in indx_insert_into_root()
        fs/ntfs3: Potential NULL dereference in hdr_find_split()
        fs/ntfs3: Fix error code in indx_add_allocate()
        fs/ntfs3: fix an error code in ntfs_get_acl_ex()
        fs/ntfs3: add checks for allocation failure
        fs/ntfs3: Use kcalloc/kmalloc_array over kzalloc/kmalloc
        fs/ntfs3: Do not use driver own alloc wrappers
        fs/ntfs3: Use kernel ALIGN macros over driver specific
        fs/ntfs3: Restyle comment block in ni_parse_reparse()
        fs/ntfs3: Remove unused including <linux/version.h>
        fs/ntfs3: Fix fall-through warnings for Clang
        fs/ntfs3: Fix one none utf8 char in source file
        ...
      f7464060
    • Linus Torvalds's avatar
      Merge tag 'f2fs-for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 6abaa83c
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "In this cycle, we've addressed some performance issues such as lock
        contention, misbehaving compress_cache, allowing extent_cache for
        compressed files, and new sysfs to adjust ra_size for fadvise.
      
        In order to diagnose the performance issues quickly, we also added an
        iostat which shows the IO latencies periodically.
      
        On the stability side, we've found two memory leakage cases in the
        error path in compression flow. And, we've also fixed various corner
        cases in fiemap, quota, checkpoint=disable, zstd, and so on.
      
        Enhancements:
         - avoid long checkpoint latency by releasing nat_tree_lock
         - collect and show iostats periodically
         - support extent_cache for compressed files
         - add a sysfs entry to manage ra_size given fadvise(POSIX_FADV_SEQUENTIAL)
         - report f2fs GC status via sysfs
         - add discard_unit=%s in mount option to handle zoned device
      
        Bug fixes:
         - fix two memory leakages when an error happens in the compressed IO flow
         - fix commpress_cache to get the right LBA
         - fix fiemap to deal with compressed case correctly
         - fix wrong EIO returns due to SBI_NEED_FSCK
         - fix missing writes when enabling checkpoint back
         - fix quota deadlock
         - fix zstd level mount option
      
        In addition to the above major updates, we've cleaned up several code
        paths such as dio, unnecessary operations, debugfs/f2fs/status, sanity
        check, and typos"
      
      * tag 'f2fs-for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (46 commits)
        f2fs: should put a page beyond EOF when preparing a write
        f2fs: deallocate compressed pages when error happens
        f2fs: enable realtime discard iff device supports discard
        f2fs: guarantee to write dirty data when enabling checkpoint back
        f2fs: fix to unmap pages from userspace process in punch_hole()
        f2fs: fix unexpected ENOENT comes from f2fs_map_blocks()
        f2fs: fix to account missing .skipped_gc_rwsem
        f2fs: adjust unlock order for cleanup
        f2fs: Don't create discard thread when device doesn't support realtime discard
        f2fs: rebuild nat_bits during umount
        f2fs: introduce periodic iostat io latency traces
        f2fs: separate out iostat feature
        f2fs: compress: do sanity check on cluster
        f2fs: fix description about main_blkaddr node
        f2fs: convert S_IRUGO to 0444
        f2fs: fix to keep compatibility of fault injection interface
        f2fs: support fault injection for f2fs_kmem_cache_alloc()
        f2fs: compress: allow write compress released file after truncate to zero
        f2fs: correct comment in segment.h
        f2fs: improve sbi status info in debugfs/f2fs/status
        ...
      6abaa83c
    • Phillip Potter's avatar
      cdrom: update uniform CD-ROM maintainership in MAINTAINERS file · 55d1308b
      Phillip Potter authored
      Update maintainership for the uniform CD-ROM driver from Jens Axboe to
      Phillip Potter in MAINTAINERS file, to reflect the attempt to pass on
      maintainership of this driver to a different individual. Also remove
      URL to site which is no longer active.
      Suggested-by: default avatarJens Axboe <axboe@kernel.dk>
      Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
      Link: https://lore.kernel.org/r/20210904174030.1103-1-phil@philpotter.co.ukSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
      55d1308b
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-5.15-1' of git://git.linux-nfs.org/projects/anna/linux-nfs · 0961f0c0
      Linus Torvalds authored
      Pull NFS client updates from Anna Schumaker:
       "New Features:
         - Better client responsiveness when server isn't replying
         - Use refcount_t in sunrpc rpc_client refcount tracking
         - Add srcaddr and dst_port to the sunrpc sysfs info files
         - Add basic support for connection sharing between servers with multiple NICs`
      
        Bugfixes and Cleanups:
         - Sunrpc tracepoint cleanups
         - Disconnect after ib_post_send() errors to avoid deadlocks
         - Fix for tearing down rpcrdma_reps
         - Fix a potential pNFS layoutget livelock loop
         - pNFS layout barrier fixes
         - Fix a potential memory corruption in rpc_wake_up_queued_task_set_status()
         - Fix reconnection locking
         - Fix return value of get_srcport()
         - Remove rpcrdma_post_sends()
         - Remove pNFS dead code
         - Remove copy size restriction for inter-server copies
         - Overhaul the NFS callback service
         - Clean up sunrpc TCP socket shutdowns
         - Always provide aligned buffers to RPC read layers"
      
      * tag 'nfs-for-5.15-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (39 commits)
        NFS: Always provide aligned buffers to the RPC read layers
        NFSv4.1 add network transport when session trunking is detected
        SUNRPC enforce creation of no more than max_connect xprts
        NFSv4 introduce max_connect mount options
        SUNRPC add xps_nunique_destaddr_xprts to xprt_switch_info in sysfs
        SUNRPC keep track of number of transports to unique addresses
        NFSv3: Delete duplicate judgement in nfs3_async_handle_jukebox
        SUNRPC: Tweak TCP socket shutdown in the RPC client
        SUNRPC: Simplify socket shutdown when not reusing TCP ports
        NFSv4.2: remove restriction of copy size for inter-server copy.
        NFS: Clean up the synopsis of callback process_op()
        NFS: Extract the xdr_init_encode/decode() calls from decode_compound
        NFS: Remove unused callback void decoder
        NFS: Add a private local dispatcher for NFSv4 callback operations
        SUNRPC: Eliminate the RQ_AUTHERR flag
        SUNRPC: Set rq_auth_stat in the pg_authenticate() callout
        SUNRPC: Add svc_rqst::rq_auth_stat
        SUNRPC: Add dst_port to the sysfs xprt info file
        SUNRPC: Add srcaddr as a file in sysfs
        sunrpc: Fix return value of get_srcport()
        ...
      0961f0c0
    • Tetsuo Handa's avatar
      loop: reduce the loop_ctl_mutex scope · 1c500ad7
      Tetsuo Handa authored
      syzbot is reporting circular locking problem at __loop_clr_fd() [1], for
      commit a160c615 ("block: add an optional probe callback to
      major_names") is calling the module's probe function with major_names_lock
      held.
      
      Fortunately, since commit 990e7811 ("block: loop: fix deadlock
      between open and remove") stopped holding loop_ctl_mutex in lo_open(),
      current role of loop_ctl_mutex is to serialize access to loop_index_idr
      and loop_add()/loop_remove(); in other words, management of id for IDR.
      To avoid holding loop_ctl_mutex during whole add/remove operation, use
      a bool flag to indicate whether the loop device is ready for use.
      
      loop_unregister_transfer() which is called from cleanup_cryptoloop()
      currently has possibility of use-after-free problem due to lack of
      serialization between kfree() from loop_remove() from loop_control_remove()
      and mutex_lock() from unregister_transfer_cb(). But since lo->lo_encryption
      should be already NULL when this function is called due to module unload,
      and commit 222013f9 ("cryptoloop: add a deprecation warning")
      indicates that we will remove this function shortly, this patch updates
      this function to emit warning instead of checking lo->lo_encryption.
      
      Holding loop_ctl_mutex in loop_exit() is pointless, for all users must
      close /dev/loop-control and /dev/loop$num (in order to drop module's
      refcount to 0) before loop_exit() starts, and nobody can open
      /dev/loop-control or /dev/loop$num afterwards.
      
      Link: https://syzkaller.appspot.com/bug?id=7bb10e8b62f83e4d445cdf4c13d69e407e629558 [1]
      Reported-by: default avatarsyzbot <syzbot+f61766d5763f9e7a118f@syzkaller.appspotmail.com>
      Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Link: https://lore.kernel.org/r/adb1e792-fc0e-ee81-7ea0-0906fc36419d@i-love.sakura.ne.jpSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
      1c500ad7
  5. 03 Sep, 2021 17 commits
    • Jens Axboe's avatar
      io_uring: io_uring_complete() trace should take an integer · 2fc2a7a6
      Jens Axboe authored
      It currently takes a long, and while that's normally OK, the io_uring
      limit is an int. Internally in io_uring it's an int, but sometimes it's
      passed as a long. That can yield confusing results where a completions
      seems to generate a huge result:
      
      ou-sqp-1297-1298    [001] ...1   788.056371: io_uring_complete: ring 000000000e98e046, user_data 0x0, result 4294967171, cflags 0
      
      which is due to -ECANCELED being stored in an unsigned, and then passed
      in as a long. Using the right int type, the trace looks correct:
      
      iou-sqp-338-339     [002] ...1    15.633098: io_uring_complete: ring 00000000e0ac60cf, user_data 0x0, result -125, cflags 0
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      2fc2a7a6
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-next-5.15-rc1' of... · f1583cb1
      Linus Torvalds authored
      Merge tag 'linux-kselftest-next-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull Kselftest updates from Shuah Khan:
       "Fixes to build and test failures:
      
         - openat2 test failure for O_LARGEFILE flag on ARM64
      
         - x86 test build failures related to glibc 2.34 adding support for
           variable sized MINSIGSTKSZ and SIGSTKSZ
      
         - removing obsolete configs in sync and cpufreq config files
      
         - minor spelling and duplicate header include cleanups"
      
      * tag 'linux-kselftest-next-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests/cpufreq: Rename DEBUG_PI_LIST to DEBUG_PLIST
        selftests/sync: Remove the deprecated config SYNC
        selftests: safesetid: Fix spelling mistake "cant" -> "can't"
        selftests/x86: Fix error: variably modified 'altstack_data' at file scope
        kselftest:sched: remove duplicate include in cs_prctl_test.c
        selftests: openat2: Fix testing failure for O_LARGEFILE flag
      f1583cb1
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · b250e6d1
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
      
       - Add -s option (strict mode) to merge_config.sh to make it fail when
         any symbol is redefined.
      
       - Show a warning if a different compiler is used for building external
         modules.
      
       - Infer --target from ARCH for CC=clang to let you cross-compile the
         kernel without CROSS_COMPILE.
      
       - Make the integrated assembler default (LLVM_IAS=1) for CC=clang.
      
       - Add <linux/stdarg.h> to the kernel source instead of borrowing
         <stdarg.h> from the compiler.
      
       - Add Nick Desaulniers as a Kbuild reviewer.
      
       - Drop stale cc-option tests.
      
       - Fix the combination of CONFIG_TRIM_UNUSED_KSYMS and CONFIG_LTO_CLANG
         to handle symbols in inline assembly.
      
       - Show a warning if 'FORCE' is missing for if_changed rules.
      
       - Various cleanups
      
      * tag 'kbuild-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (39 commits)
        kbuild: redo fake deps at include/ksym/*.h
        kbuild: clean up objtool_args slightly
        modpost: get the *.mod file path more simply
        checkkconfigsymbols.py: Fix the '--ignore' option
        kbuild: merge vmlinux_link() between ARCH=um and other architectures
        kbuild: do not remove 'linux' link in scripts/link-vmlinux.sh
        kbuild: merge vmlinux_link() between the ordinary link and Clang LTO
        kbuild: remove stale *.symversions
        kbuild: remove unused quiet_cmd_update_lto_symversions
        gen_compile_commands: extract compiler command from a series of commands
        x86: remove cc-option-yn test for -mtune=
        arc: replace cc-option-yn uses with cc-option
        s390: replace cc-option-yn uses with cc-option
        ia64: move core-y in arch/ia64/Makefile to arch/ia64/Kbuild
        sparc: move the install rule to arch/sparc/Makefile
        security: remove unneeded subdir-$(CONFIG_...)
        kbuild: sh: remove unused install script
        kbuild: Fix 'no symbols' warning when CONFIG_TRIM_UNUSD_KSYMS=y
        kbuild: Switch to 'f' variants of integrated assembler flag
        kbuild: Shuffle blank line to improve comment meaning
        ...
      b250e6d1
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-5.15-rc0' of... · 4e71add0
      Linus Torvalds authored
      Merge branch 'stable/for-linus-5.15-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft
      
      Pull ibft fix from Konrad Rzeszutek Wilk:
       "An arm64 compile fix for the new code that fixed the iBFT KASLR
        handling. I missed the original 0-day build email report"
      
      * 'stable/for-linus-5.15-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
        iscsi_ibft: Fix isa_bus_to_virt not working under ARM
      4e71add0
    • Linus Torvalds's avatar
      Merge tag 'powerpc-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 7cca308c
      Linus Torvalds authored
      Pull powerpc updates from Michael Ellerman:
      
       - Convert pseries & powernv to use MSI IRQ domains.
      
       - Rework the pseries CPU numbering so that CPUs that are removed, and
         later re-added, are given a CPU number on the same node as
         previously, when possible.
      
       - Add support for a new more flexible device-tree format for specifying
         NUMA distances.
      
       - Convert powerpc to GENERIC_PTDUMP.
      
       - Retire sbc8548 and sbc8641d board support.
      
       - Various other small features and fixes.
      
      Thanks to Alexey Kardashevskiy, Aneesh Kumar K.V, Anton Blanchard,
      Cédric Le Goater, Christophe Leroy, Emmanuel Gil Peyrot, Fabiano Rosas,
      Fangrui Song, Finn Thain, Gautham R.  Shenoy, Hari Bathini, Joel
      Stanley, Jordan Niethe, Kajol Jain, Laurent Dufour, Leonardo Bras, Lukas
      Bulwahn, Marc Zyngier, Masahiro Yamada, Michal Suchanek, Nathan
      Chancellor, Nicholas Piggin, Parth Shah, Paul Gortmaker, Pratik R.
      Sampat, Randy Dunlap, Sebastian Andrzej Siewior, Srikar Dronamraju, Wan
      Jiabing, Xiongwei Song, and Zheng Yongjun.
      
      * tag 'powerpc-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (154 commits)
        powerpc/bug: Cast to unsigned long before passing to inline asm
        powerpc/ptdump: Fix generic ptdump for 64-bit
        KVM: PPC: Fix clearing never mapped TCEs in realmode
        powerpc/pseries/iommu: Rename "direct window" to "dma window"
        powerpc/pseries/iommu: Make use of DDW for indirect mapping
        powerpc/pseries/iommu: Find existing DDW with given property name
        powerpc/pseries/iommu: Update remove_dma_window() to accept property name
        powerpc/pseries/iommu: Reorganize iommu_table_setparms*() with new helper
        powerpc/pseries/iommu: Add ddw_property_create() and refactor enable_ddw()
        powerpc/pseries/iommu: Allow DDW windows starting at 0x00
        powerpc/pseries/iommu: Add ddw_list_new_entry() helper
        powerpc/pseries/iommu: Add iommu_pseries_alloc_table() helper
        powerpc/kernel/iommu: Add new iommu_table_in_use() helper
        powerpc/pseries/iommu: Replace hard-coded page shift
        powerpc/numa: Update cpu_cpu_map on CPU online/offline
        powerpc/numa: Print debug statements only when required
        powerpc/numa: convert printk to pr_xxx
        powerpc/numa: Drop dbg in favour of pr_debug
        powerpc/smp: Enable CACHE domain for shared processor
        powerpc/smp: Update cpu_core_map on all PowerPc systems
        ...
      7cca308c
    • Linus Torvalds's avatar
      Merge tag 'for-5.15/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 11d55768
      Linus Torvalds authored
      Pull parisc architecture fixes from Helge Deller:
       "Fix an unaligned-access crash in the bootloader and drop asm/swab.h"
      
      * tag 'for-5.15/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Fix unaligned-access crash in bootloader
        parisc: Drop __arch_swab16(), arch_swab24(), _arch_swab32() and __arch_swab64() functions
      11d55768
    • Linus Torvalds's avatar
      Merge tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux · d6742212
      Linus Torvalds authored
      Pull MIPS updates from Thomas Bogendoerfer:
      
       - converted Pistachio platform to use MIPS generic kernel
      
       - fixes and cleanups
      
      * tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (29 commits)
        MIPS: Malta: fix alignment of the devicetree buffer
        MIPS: ingenic: Unconditionally enable clock of CPU #0
        MIPS: mscc: ocelot: mark the phy-mode for internal PHY ports
        MIPS: mscc: ocelot: disable all switch ports by default
        MAINTAINERS: adjust PISTACHIO SOC SUPPORT after its retirement
        MIPS: Return true/false (not 1/0) from bool functions
        MIPS: generic: Return true/false (not 1/0) from bool functions
        MIPS: Make a alias for pistachio_defconfig
        MIPS: Retire MACH_PISTACHIO
        MIPS: config: generic: Add config for Marduk board
        pinctrl: pistachio: Make it as an option
        phy: pistachio-usb: Depend on MIPS || COMPILE_TEST
        clocksource/drivers/pistachio: Make it selectable for MIPS
        clk: pistachio: Make it selectable for generic MIPS kernel
        MIPS: DTS: Pistachio add missing cpc and cdmm
        MIPS: generic: Allow generating FIT image for Marduk board
        MIPS: locking/atomic: Fix atomic{_64,}_sub_if_positive
        MIPS: loongson2ef: don't build serial.o unconditionally
        MIPS: Replace deprecated CPU-hotplug functions.
        MIPS: Alchemy: Fix spelling contraction "cant" -> "can't"
        ...
      d6742212
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://github.com/openrisc/linux · 603eefda
      Linus Torvalds authored
      Pull OpenRISC updates from Stafford Horne:
       "A few cleanups and compiler warning fixes for OpenRISC.
      
        Also, this includes dts and defconfig updates to enable Ethernet on
        OpenRISC/Litex FPGA SoC's now that the LiteEth driver has gone
        upstream"
      
      * tag 'for-linus' of git://github.com/openrisc/linux:
        openrisc/litex: Update defconfig
        openrisc/litex: Add ethernet device
        openrisc/litex: Update uart address
        openrisc: Fix compiler warnings in setup
        openrisc: rename or32 code & comments to or1k
        openrisc: don't printk() unconditionally
      603eefda
    • Linus Torvalds's avatar
      Merge tag 'livepatching-for-5.15' of... · 50ddcdb2
      Linus Torvalds authored
      Merge tag 'livepatching-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
      
      Pull livepatching update from Petr Mladek.
      
      * tag 'livepatching-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
        livepatch: Replace deprecated CPU-hotplug functions.
      50ddcdb2
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 69a5c49a
      Linus Torvalds authored
      Pull iommu updates from Joerg Roedel:
      
       - New DART IOMMU driver for Apple Silicon M1 chips
      
       - Optimizations for iommu_[map/unmap] performance
      
       - Selective TLB flush support for the AMD IOMMU driver to make it more
         efficient on emulated IOMMUs
      
       - Rework IOVA setup and default domain type setting to move more code
         out of IOMMU drivers and to support runtime switching between certain
         types of default domains
      
       - VT-d Updates from Lu Baolu:
            - Update the virtual command related registers
            - Enable Intel IOMMU scalable mode by default
            - Preset A/D bits for user space DMA usage
            - Allow devices to have more than 32 outstanding PRs
            - Various cleanups
      
       - ARM SMMU Updates from Will Deacon:
            SMMUv3:
             - Minor optimisation to avoid zeroing struct members on CMD submission
             - Increased use of batched commands to reduce submission latency
             - Refactoring in preparation for ECMDQ support
            SMMUv2:
             - Fix races when probing devices with identical StreamIDs
             - Optimise walk cache flushing for Qualcomm implementations
             - Allow deep sleep states for some Qualcomm SoCs with shared clocks
      
       - Various smaller optimizations, cleanups, and fixes
      
      * tag 'iommu-updates-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (85 commits)
        iommu/io-pgtable: Abstract iommu_iotlb_gather access
        iommu/arm-smmu: Fix missing unlock on error in arm_smmu_device_group()
        iommu/vt-d: Add present bit check in pasid entry setup helpers
        iommu/vt-d: Use pasid_pte_is_present() helper function
        iommu/vt-d: Drop the kernel doc annotation
        iommu/vt-d: Allow devices to have more than 32 outstanding PRs
        iommu/vt-d: Preset A/D bits for user space DMA usage
        iommu/vt-d: Enable Intel IOMMU scalable mode by default
        iommu/vt-d: Refactor Kconfig a bit
        iommu/vt-d: Remove unnecessary oom message
        iommu/vt-d: Update the virtual command related registers
        iommu: Allow enabling non-strict mode dynamically
        iommu: Merge strictness and domain type configs
        iommu: Only log strictness for DMA domains
        iommu: Expose DMA domain strictness via sysfs
        iommu: Express DMA strictness via the domain type
        iommu/vt-d: Prepare for multiple DMA domain types
        iommu/arm-smmu: Prepare for multiple DMA domain types
        iommu/amd: Prepare for multiple DMA domain types
        iommu: Introduce explicit type for non-strict DMA domains
        ...
      69a5c49a
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-5.15' of... · 3de18c86
      Linus Torvalds authored
      Merge branch 'stable/for-linus-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
      
      Pull swiotlb updates from Konrad Rzeszutek Wilk:
       "A new feature called restricted DMA pools. It allows SWIOTLB to
        utilize per-device (or per-platform) allocated memory pools instead of
        using the global one.
      
        The first big user of this is ARM Confidential Computing where the
        memory for DMA operations can be set per platform"
      
      * 'stable/for-linus-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: (23 commits)
        swiotlb: use depends on for DMA_RESTRICTED_POOL
        of: restricted dma: Don't fail device probe on rmem init failure
        of: Move of_dma_set_restricted_buffer() into device.c
        powerpc/svm: Don't issue ultracalls if !mem_encrypt_active()
        s390/pv: fix the forcing of the swiotlb
        swiotlb: Free tbl memory in swiotlb_exit()
        swiotlb: Emit diagnostic in swiotlb_exit()
        swiotlb: Convert io_default_tlb_mem to static allocation
        of: Return success from of_dma_set_restricted_buffer() when !OF_ADDRESS
        swiotlb: add overflow checks to swiotlb_bounce
        swiotlb: fix implicit debugfs declarations
        of: Add plumbing for restricted DMA pool
        dt-bindings: of: Add restricted DMA pool
        swiotlb: Add restricted DMA pool initialization
        swiotlb: Add restricted DMA alloc/free support
        swiotlb: Refactor swiotlb_tbl_unmap_single
        swiotlb: Move alloc_size to swiotlb_find_slots
        swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing
        swiotlb: Update is_swiotlb_active to add a struct device argument
        swiotlb: Update is_swiotlb_buffer to add a struct device argument
        ...
      3de18c86
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 14726903
      Linus Torvalds authored
      Merge misc updates from Andrew Morton:
       "173 patches.
      
        Subsystems affected by this series: ia64, ocfs2, block, and mm (debug,
        pagecache, gup, swap, shmem, memcg, selftests, pagemap, mremap,
        bootmem, sparsemem, vmalloc, kasan, pagealloc, memory-failure,
        hugetlb, userfaultfd, vmscan, compaction, mempolicy, memblock,
        oom-kill, migration, ksm, percpu, vmstat, and madvise)"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (173 commits)
        mm/madvise: add MADV_WILLNEED to process_madvise()
        mm/vmstat: remove unneeded return value
        mm/vmstat: simplify the array size calculation
        mm/vmstat: correct some wrong comments
        mm/percpu,c: remove obsolete comments of pcpu_chunk_populated()
        selftests: vm: add COW time test for KSM pages
        selftests: vm: add KSM merging time test
        mm: KSM: fix data type
        selftests: vm: add KSM merging across nodes test
        selftests: vm: add KSM zero page merging test
        selftests: vm: add KSM unmerge test
        selftests: vm: add KSM merge test
        mm/migrate: correct kernel-doc notation
        mm: wire up syscall process_mrelease
        mm: introduce process_mrelease system call
        memblock: make memblock_find_in_range method private
        mm/mempolicy.c: use in_task() in mempolicy_slab_node()
        mm/mempolicy: unify the create() func for bind/interleave/prefer-many policies
        mm/mempolicy: advertise new MPOL_PREFERRED_MANY
        mm/hugetlb: add support for mempolicy MPOL_PREFERRED_MANY
        ...
      14726903
    • zhangkui's avatar
      mm/madvise: add MADV_WILLNEED to process_madvise() · d5fffc5a
      zhangkui authored
      There is a usecase in Android that an app process's memory is swapped out
      by process_madvise() with MADV_PAGEOUT, such as the memory is swapped to
      zram or a backing device.  When the process is scheduled to running, like
      switch to foreground, multiple page faults may cause the app dropped
      frames.
      
      To reduce the problem, System Management Software can read-ahead memory
      of the process immediately when the app switches to forground.  Calling
      process_madvise() with MADV_WILLNEED can meet this need.
      
      Link: https://lkml.kernel.org/r/20210804082010.12482-1-zhangkui@oppo.comSigned-off-by: default avatarzhangkui <zhangkui@oppo.com>
      Cc: David Hildenbrand <david@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d5fffc5a
    • Miaohe Lin's avatar
      mm/vmstat: remove unneeded return value · 33090af9
      Miaohe Lin authored
      The return value of pagetypeinfo_showfree and pagetypeinfo_showblockcount
      are unused now.  Remove them.
      
      Link: https://lkml.kernel.org/r/20210715122911.15700-4-linmiaohe@huawei.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
      Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      33090af9
    • Miaohe Lin's avatar
      mm/vmstat: simplify the array size calculation · 64632fd3
      Miaohe Lin authored
      We can replace the array_num * sizeof(array[0]) with sizeof(array) to
      simplify the code.
      
      Link: https://lkml.kernel.org/r/20210715122911.15700-3-linmiaohe@huawei.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
      Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      64632fd3
    • Miaohe Lin's avatar
      mm/vmstat: correct some wrong comments · ea15ba17
      Miaohe Lin authored
      Patch series "Cleanup for vmstat".
      
      This series contains cleanups to remove unneeded return value, correct
      wrong comment and simplify the array size calculation.  More details can
      be found in the respective changelogs.
      
      This patch (of 3):
      
      Correct wrong fls(mem+1) to fls(mem)+1 and remove the duplicated comment
      with quiet_vmstat().
      
      Link: https://lkml.kernel.org/r/20210715122911.15700-1-linmiaohe@huawei.com
      Link: https://lkml.kernel.org/r/20210715122911.15700-2-linmiaohe@huawei.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ea15ba17
    • Jing Xiangfeng's avatar
      mm/percpu,c: remove obsolete comments of pcpu_chunk_populated() · 31981450
      Jing Xiangfeng authored
      Commit b239f7da ("percpu: set PCPU_BITMAP_BLOCK_SIZE to PAGE_SIZE")
      removed the parameter 'for_alloc', so remove this comment.
      
      Link: https://lkml.kernel.org/r/1630576043-21367-1-git-send-email-jingxiangfeng@huawei.comSigned-off-by: default avatarJing Xiangfeng <jingxiangfeng@huawei.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      31981450