commit c2cbfe5f51227dfe6ef7be013f0d56a32c040faa
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Sat Sep 2 09:16:20 2023 +0200

    Linux 6.1.51
    
    Link: https://lore.kernel.org/r/20230831110831.079963475@linuxfoundation.org
    Tested-by: Florian Fainelli <florian.fainelli@broadcom.com>
    Tested-by: SeongJae Park <sj@kernel.org>
    Tested-by: Ron Economos <re@w6rz.net>
    Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
    Tested-by: Bagas Sanjaya <bagasdotme@gmail.com>
    Tested-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
    Tested-by: Shuah Khan <skhan@linuxfoundation.org>
    Tested-by: Takeshi Ogasawara <takeshi.ogasawara@futuring-girl.com>
    Tested-by: Jon Hunter <jonathanh@nvidia.com>
    Tested-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit ae0188f9c2a88a2f9e96e5a0ced48adc84982287
Author: Mario Limonciello <mario.limonciello@amd.com>
Date:   Thu Aug 31 06:34:21 2023 -0500

    thunderbolt: Fix a backport error for display flickering issue
    
    A mistake was made when backporting commit 583893a66d73 ("thunderbolt: Fix
    Thunderbolt 3 display flickering issue on 2nd hot plug onwards") in missing
    the `if` block.  Add it back in.
    
    Reported-by: Joakim.Tjernlund@infinera.com
    Closes: https://lore.kernel.org/stable/28b5d0accce90bedf2f75d65290c5a1302225f0f.camel@infinera.com/
    Fixes: 06614ca4f18e ("thunderbolt: Fix Thunderbolt 3 display flickering issue on 2nd hot plug onwards")
    Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 583a8426abb335030ebaa26081b4636828e66f4b
Author: Yonghong Song <yonghong.song@linux.dev>
Date:   Thu Aug 24 20:46:59 2023 -0700

    kallsyms: Fix kallsyms_selftest failure
    
    commit 33f0467fe06934d5e4ea6e24ce2b9c65ce618e26 upstream.
    
    Kernel test robot reported a kallsyms_test failure when clang lto is
    enabled (thin or full) and CONFIG_KALLSYMS_SELFTEST is also enabled.
    I can reproduce in my local environment with the following error message
    with thin lto:
      [    1.877897] kallsyms_selftest: Test for 1750th symbol failed: (tsc_cs_mark_unstable) addr=ffffffff81038090
      [    1.877901] kallsyms_selftest: abort
    
    It appears that commit 8cc32a9bbf29 ("kallsyms: strip LTO-only suffixes
    from promoted global functions") caused the failure. Commit 8cc32a9bbf29
    changed cleanup_symbol_name() based on ".llvm." instead of '.' where
    ".llvm." is appended to a before-lto-optimization local symbol name.
    We need to propagate such knowledge in kallsyms_selftest.c as well.
    
    Further more, compare_symbol_name() in kallsyms.c needs change as well.
    In scripts/kallsyms.c, kallsyms_names and kallsyms_seqs_of_names are used
    to record symbol names themselves and index to symbol names respectively.
    For example:
      kallsyms_names:
        ...
        __amd_smn_rw._entry       <== seq 1000
        __amd_smn_rw._entry.5     <== seq 1001
        __amd_smn_rw.llvm.<hash>  <== seq 1002
        ...
    
    kallsyms_seqs_of_names are sorted based on cleanup_symbol_name() through, so
    the order in kallsyms_seqs_of_names actually has
    
      index 1000:   seq 1002   <== __amd_smn_rw.llvm.<hash> (actual symbol comparison using '__amd_smn_rw')
      index 1001:   seq 1000   <== __amd_smn_rw._entry
      index 1002:   seq 1001   <== __amd_smn_rw._entry.5
    
    Let us say at a particular point, at index 1000, symbol '__amd_smn_rw.llvm.<hash>'
    is comparing to '__amd_smn_rw._entry' where '__amd_smn_rw._entry' is the one to
    search e.g., with function kallsyms_on_each_match_symbol(). The current implementation
    will find out '__amd_smn_rw._entry' is less than '__amd_smn_rw.llvm.<hash>' and
    then continue to search e.g., index 999 and never found a match although the actual
    index 1001 is a match.
    
    To fix this issue, let us do cleanup_symbol_name() first and then do comparison.
    In the above case, comparing '__amd_smn_rw' vs '__amd_smn_rw._entry' and
    '__amd_smn_rw._entry' being greater than '__amd_smn_rw', the next comparison will
    be > index 1000 and eventually index 1001 will be hit an a match is found.
    
    For any symbols not having '.llvm.' substr, there is no functionality change
    for compare_symbol_name().
    
    Fixes: 8cc32a9bbf29 ("kallsyms: strip LTO-only suffixes from promoted global functions")
    Reported-by: kernel test robot <oliver.sang@intel.com>
    Closes: https://lore.kernel.org/oe-lkp/202308232200.1c932a90-oliver.sang@intel.com
    Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
    Reviewed-by: Song Liu <song@kernel.org>
    Reviewed-by: Zhen Lei <thunder.leizhen@huawei.com>
    Link: https://lore.kernel.org/r/20230825034659.1037627-1-yonghong.song@linux.dev
    Cc: stable@vger.kernel.org
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 5d54040e9d578513ff5378a422882dbeaaf4886c
Author: Helge Deller <deller@gmx.de>
Date:   Mon Aug 28 23:55:55 2023 +0200

    io_uring/parisc: Adjust pgoff in io_uring mmap() for parisc
    
    Vidra Jonas reported issues on parisc with libuv which then triggers
    build errors with cmake. Debugging shows that those issues stem from
    io_uring().
    
    I was not able to easily pull in upstream commits directly, so here
    is IMHO the least invasive manual backport of the following upstream
    commits to fix the cache aliasing issues on parisc on kernel 6.1
    with io_uring:
    
    56675f8b9f9b ("io_uring/parisc: Adjust pgoff in io_uring mmap() for parisc")
    32832a407a71 ("io_uring: Fix io_uring mmap() by using architecture-provided get_unmapped_area()")
    d808459b2e31 ("io_uring: Adjust mapping wrt architecture aliasing requirements")
    
    With this patch kernel 6.1 has all relevant mmap changes and is
    identical to kernel 6.5 with regard to mmap() in io_uring.
    
    Signed-off-by: Helge Deller <deller@gmx.de>
    Reported-by: Vidra.Jonas@seznam.cz
    Link: https://lore.kernel.org/linux-parisc/520.NvTX.6mXZpmfh4Ju.1awpAS@seznam.cz/
    Cc: Sam James <sam@gentoo.org>
    Cc: John David Anglin <dave.anglin@bell.net>
    Cc: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit fff21bc26bbdd39c09e48828c548a1f1eb0cf530
Author: Helge Deller <deller@gmx.de>
Date:   Fri Jun 30 12:36:09 2023 +0200

    parisc: sys_parisc: parisc_personality() is called from asm code
    
    commit b5d89408b9fb21258f7c371d6d48a674f60f7181 upstream.
    
    Signed-off-by: Helge Deller <deller@gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit e8ac4be717015978636ada1e985e6cc15b8a65c8
Author: John David Anglin <dave@parisc-linux.org>
Date:   Sun Feb 26 18:03:33 2023 +0000

    parisc: Cleanup mmap implementation regarding color alignment
    
    commit 567b35159e76997e95b643b9a8a5d9d2198f2522 upstream.
    
    This change simplifies the randomization of file mapping regions. It
    reworks the code to remove duplication. The flow is now similar to
    that for mips. Finally, we consistently use the do_color_align variable
    to determine when color alignment is needed.
    
    Tested on rp3440.
    
    Signed-off-by: John David Anglin <dave.anglin@bell.net>
    Signed-off-by: Helge Deller <deller@gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit b3d099df68de4f62ade6f8bf59e80899ac463d3b
Author: Helge Deller <deller@gmx.de>
Date:   Tue Aug 15 00:31:09 2023 +0200

    lockdep: fix static memory detection even more
    
    commit 0a6b58c5cd0dfd7961e725212f0fc8dfc5d96195 upstream.
    
    On the parisc architecture, lockdep reports for all static objects which
    are in the __initdata section (e.g. "setup_done" in devtmpfs,
    "kthreadd_done" in init/main.c) this warning:
    
            INFO: trying to register non-static key.
    
    The warning itself is wrong, because those objects are in the __initdata
    section, but the section itself is on parisc outside of range from
    _stext to _end, which is why the static_obj() functions returns a wrong
    answer.
    
    While fixing this issue, I noticed that the whole existing check can
    be simplified a lot.
    Instead of checking against the _stext and _end symbols (which include
    code areas too) just check for the .data and .bss segments (since we check a
    data object). This can be done with the existing is_kernel_core_data()
    macro.
    
    In addition objects in the __initdata section can be checked with
    init_section_contains(), and is_kernel_rodata() allows keys to be in the
    _ro_after_init section.
    
    This partly reverts and simplifies commit bac59d18c701 ("x86/setup: Fix static
    memory detection").
    
    Link: https://lkml.kernel.org/r/ZNqrLRaOi/3wPAdp@p100
    Fixes: bac59d18c701 ("x86/setup: Fix static memory detection")
    Signed-off-by: Helge Deller <deller@gmx.de>
    Cc: Borislav Petkov <bp@suse.de>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Guenter Roeck <linux@roeck-us.net>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: "Rafael J. Wysocki" <rafael@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 1cb79e7e0572bf04365428f5b558114517c33ec2
Author: James Morse <james.morse@arm.com>
Date:   Tue Aug 1 14:54:09 2023 +0000

    ARM: module: Use module_init_layout_section() to spot init sections
    
    commit a6846234f45801441f0e31a8b37f901ef0abd2df upstream.
    
    Today module_frob_arch_sections() spots init sections from their
    'init' prefix, and uses this to keep the init PLTs separate from the rest.
    
    get_module_plt() uses within_module_init() to determine if a
    location is in the init text or not, but this depends on whether
    core code thought this was an init section.
    
    Naturally the logic is different.
    
    module_init_layout_section() groups the init and exit text together if
    module unloading is disabled, as the exit code will never run. The result
    is kernels with this configuration can't load all their modules because
    there are not enough PLTs for the combined init+exit section.
    
    A previous patch exposed module_init_layout_section(), use that so the
    logic is the same.
    
    Fixes: 055f23b74b20 ("module: check for exit sections in layout_sections() instead of module_init_section()")
    Cc: stable@vger.kernel.org
    Signed-off-by: James Morse <james.morse@arm.com>
    Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 8d99105d6a1068d2fcad812ceedf373cc829b7d8
Author: James Morse <james.morse@arm.com>
Date:   Tue Aug 1 14:54:08 2023 +0000

    arm64: module: Use module_init_layout_section() to spot init sections
    
    commit f928f8b1a2496e7af95b860f9acf553f20f68f16 upstream.
    
    Today module_frob_arch_sections() spots init sections from their
    'init' prefix, and uses this to keep the init PLTs separate from the rest.
    
    module_emit_plt_entry() uses within_module_init() to determine if a
    location is in the init text or not, but this depends on whether
    core code thought this was an init section.
    
    Naturally the logic is different.
    
    module_init_layout_section() groups the init and exit text together if
    module unloading is disabled, as the exit code will never run. The result
    is kernels with this configuration can't load all their modules because
    there are not enough PLTs for the combined init+exit section.
    
    This results in the following:
    | WARNING: CPU: 2 PID: 51 at arch/arm64/kernel/module-plts.c:99 module_emit_plt_entry+0x184/0x1cc
    | Modules linked in: crct10dif_common
    | CPU: 2 PID: 51 Comm: modprobe Not tainted 6.5.0-rc4-yocto-standard-dirty #15208
    | Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015
    | pstate: 20400005 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
    | pc : module_emit_plt_entry+0x184/0x1cc
    | lr : module_emit_plt_entry+0x94/0x1cc
    | sp : ffffffc0803bba60
    [...]
    | Call trace:
    |  module_emit_plt_entry+0x184/0x1cc
    |  apply_relocate_add+0x2bc/0x8e4
    |  load_module+0xe34/0x1bd4
    |  init_module_from_file+0x84/0xc0
    |  __arm64_sys_finit_module+0x1b8/0x27c
    |  invoke_syscall.constprop.0+0x5c/0x104
    |  do_el0_svc+0x58/0x160
    |  el0_svc+0x38/0x110
    |  el0t_64_sync_handler+0xc0/0xc4
    |  el0t_64_sync+0x190/0x194
    
    A previous patch exposed module_init_layout_section(), use that so the
    logic is the same.
    
    Reported-by: Adam Johnston <adam.johnston@arm.com>
    Tested-by: Adam Johnston <adam.johnston@arm.com>
    Fixes: 055f23b74b20 ("module: check for exit sections in layout_sections() instead of module_init_section()")
    Cc: <stable@vger.kernel.org> # 5.15.x: 60a0aab7463ee69 arm64: module-plts: inline linux/moduleloader.h
    Cc: <stable@vger.kernel.org> # 5.15.x
    Signed-off-by: James Morse <james.morse@arm.com>
    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
    Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 42efdb3531abdef03f915acc486ce687f574e05c
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Tue May 16 18:06:37 2023 +0200

    arm64: module-plts: inline linux/moduleloader.h
    
    commit 60a0aab7463ee69296692d980b96510ccce3934e upstream.
    
    module_frob_arch_sections() is declared in moduleloader.h, but
    that is not included before the definition:
    
    arch/arm64/kernel/module-plts.c:286:5: error: no previous prototype for 'module_frob_arch_sections' [-Werror=missing-prototypes]
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    Acked-by: Ard Biesheuvel <ardb@kernel.org>
    Link: https://lore.kernel.org/r/20230516160642.523862-11-arnd@kernel.org
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 207e228bf1f3b53e5b3eae2c336ea83225155792
Author: James Morse <james.morse@arm.com>
Date:   Tue Aug 1 14:54:07 2023 +0000

    module: Expose module_init_layout_section()
    
    commit 2abcc4b5a64a65a2d2287ba0be5c2871c1552416 upstream.
    
    module_init_layout_section() choses whether the core module loader
    considers a section as init or not. This affects the placement of the
    exit section when module unloading is disabled. This code will never run,
    so it can be free()d once the module has been initialised.
    
    arm and arm64 need to count the number of PLTs they need before applying
    relocations based on the section name. The init PLTs are stored separately
    so they can be free()d. arm and arm64 both use within_module_init() to
    decide which list of PLTs to use when applying the relocation.
    
    Because within_module_init()'s behaviour changes when module unloading
    is disabled, both architecture would need to take this into account when
    counting the PLTs.
    
    Today neither architecture does this, meaning when module unloading is
    disabled there are insufficient PLTs in the init section to load some
    modules, resulting in warnings:
    | WARNING: CPU: 2 PID: 51 at arch/arm64/kernel/module-plts.c:99 module_emit_plt_entry+0x184/0x1cc
    | Modules linked in: crct10dif_common
    | CPU: 2 PID: 51 Comm: modprobe Not tainted 6.5.0-rc4-yocto-standard-dirty #15208
    | Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015
    | pstate: 20400005 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
    | pc : module_emit_plt_entry+0x184/0x1cc
    | lr : module_emit_plt_entry+0x94/0x1cc
    | sp : ffffffc0803bba60
    [...]
    | Call trace:
    |  module_emit_plt_entry+0x184/0x1cc
    |  apply_relocate_add+0x2bc/0x8e4
    |  load_module+0xe34/0x1bd4
    |  init_module_from_file+0x84/0xc0
    |  __arm64_sys_finit_module+0x1b8/0x27c
    |  invoke_syscall.constprop.0+0x5c/0x104
    |  do_el0_svc+0x58/0x160
    |  el0_svc+0x38/0x110
    |  el0t_64_sync_handler+0xc0/0xc4
    |  el0t_64_sync+0x190/0x194
    
    Instead of duplicating module_init_layout_section()s logic, expose it.
    
    Reported-by: Adam Johnston <adam.johnston@arm.com>
    Fixes: 055f23b74b20 ("module: check for exit sections in layout_sections() instead of module_init_section()")
    Cc: stable@vger.kernel.org
    Signed-off-by: James Morse <james.morse@arm.com>
    Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit b0dc0aac2085db45b4dac7f0ed2917d7da4f266d
Author: Mario Limonciello <mario.limonciello@amd.com>
Date:   Wed Jul 12 12:24:59 2023 -0500

    ACPI: thermal: Drop nocrt parameter
    
    commit 5f641174a12b8a876a4101201a21ef4675ecc014 upstream.
    
    The `nocrt` module parameter has no code associated with it and does
    nothing.  As `crt=-1` has same functionality as what nocrt should be
    doing drop `nocrt` and associated documentation.
    
    This should fix a quirk for Gigabyte GA-7ZX that used `nocrt` and
    thus didn't function properly.
    
    Fixes: 8c99fdce3078 ("ACPI: thermal: set "thermal.nocrt" via DMI on Gigabyte GA-7ZX")
    Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
    Cc: All applicable <stable@vger.kernel.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>