From: Linus Torvalds Date: Sat, 6 Dec 2025 22:01:20 +0000 (-0800) Subject: Merge tag 'mm-nonmm-stable-2025-12-06-11-14' of git://git.kernel.org/pub/scm/linux... X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=509d3f45847627f4c5cdce004c3ec79262b5239c;p=thirdparty%2Fkernel%2Fstable.git Merge tag 'mm-nonmm-stable-2025-12-06-11-14' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Pull non-MM updates from Andrew Morton: - "panic: sys_info: Refactor and fix a potential issue" (Andy Shevchenko) fixes a build issue and does some cleanup in ib/sys_info.c - "Implement mul_u64_u64_div_u64_roundup()" (David Laight) enhances the 64-bit math code on behalf of a PWM driver and beefs up the test module for these library functions - "scripts/gdb/symbols: make BPF debug info available to GDB" (Ilya Leoshkevich) makes BPF symbol names, sizes, and line numbers available to the GDB debugger - "Enable hung_task and lockup cases to dump system info on demand" (Feng Tang) adds a sysctl which can be used to cause additional info dumping when the hung-task and lockup detectors fire - "lib/base64: add generic encoder/decoder, migrate users" (Kuan-Wei Chiu) adds a general base64 encoder/decoder to lib/ and migrates several users away from their private implementations - "rbree: inline rb_first() and rb_last()" (Eric Dumazet) makes TCP a little faster - "liveupdate: Rework KHO for in-kernel users" (Pasha Tatashin) reworks the KEXEC Handover interfaces in preparation for Live Update Orchestrator (LUO), and possibly for other future clients - "kho: simplify state machine and enable dynamic updates" (Pasha Tatashin) increases the flexibility of KEXEC Handover. Also preparation for LUO - "Live Update Orchestrator" (Pasha Tatashin) is a major new feature targeted at cloud environments. Quoting the cover letter: This series introduces the Live Update Orchestrator, a kernel subsystem designed to facilitate live kernel updates using a kexec-based reboot. This capability is critical for cloud environments, allowing hypervisors to be updated with minimal downtime for running virtual machines. LUO achieves this by preserving the state of selected resources, such as memory, devices and their dependencies, across the kernel transition. As a key feature, this series includes support for preserving memfd file descriptors, which allows critical in-memory data, such as guest RAM or any other large memory region, to be maintained in RAM across the kexec reboot. Mike Rappaport merits a mention here, for his extensive review and testing work. - "kexec: reorganize kexec and kdump sysfs" (Sourabh Jain) moves the kexec and kdump sysfs entries from /sys/kernel/ to /sys/kernel/kexec/ and adds back-compatibility symlinks which can hopefully be removed one day - "kho: fixes for vmalloc restoration" (Mike Rapoport) fixes a BUG which was being hit during KHO restoration of vmalloc() regions * tag 'mm-nonmm-stable-2025-12-06-11-14' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (139 commits) calibrate: update header inclusion Reinstate "resource: avoid unnecessary lookups in find_next_iomem_res()" vmcoreinfo: track and log recoverable hardware errors kho: fix restoring of contiguous ranges of order-0 pages kho: kho_restore_vmalloc: fix initialization of pages array MAINTAINERS: TPM DEVICE DRIVER: update the W-tag init: replace simple_strtoul with kstrtoul to improve lpj_setup KHO: fix boot failure due to kmemleak access to non-PRESENT pages Documentation/ABI: new kexec and kdump sysfs interface Documentation/ABI: mark old kexec sysfs deprecated kexec: move sysfs entries to /sys/kernel/kexec test_kho: always print restore status kho: free chunks using free_page() instead of kfree() selftests/liveupdate: add kexec test for multiple and empty sessions selftests/liveupdate: add simple kexec-based selftest for LUO selftests/liveupdate: add userspace API selftests docs: add documentation for memfd preservation via LUO mm: memfd_luo: allow preserving memfd liveupdate: luo_file: add private argument to store runtime state mm: shmem: export some functions to internal.h ... --- 509d3f45847627f4c5cdce004c3ec79262b5239c diff --cc MAINTAINERS index 78b32a60849a9,656e29624d4fd..9a3657a400007 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -14564,9 -14464,24 +14566,25 @@@ F: include/linux/livepatch*. F: kernel/livepatch/ F: kernel/module/livepatch.c F: samples/livepatch/ +F: scripts/livepatch/ F: tools/testing/selftests/livepatch/ + LIVE UPDATE + M: Pasha Tatashin + M: Mike Rapoport + R: Pratyush Yadav + L: linux-kernel@vger.kernel.org + S: Maintained + F: Documentation/core-api/liveupdate.rst + F: Documentation/mm/memfd_preservation.rst + F: Documentation/userspace-api/liveupdate.rst + F: include/linux/liveupdate.h + F: include/linux/liveupdate/ + F: include/uapi/linux/liveupdate.h + F: kernel/liveupdate/ + F: mm/memfd_luo.c + F: tools/testing/selftests/liveupdate/ + LLC (802.2) L: netdev@vger.kernel.org S: Odd fixes @@@ -15668,10 -15572,8 +15686,10 @@@ F: include/media/imx. MEDIA DRIVERS FOR FREESCALE IMX7/8 M: Rui Miguel Silva M: Laurent Pinchart - M: Martin Kepplinger + M: Martin Kepplinger-Novakovic R: Purism Kernel Team +R: Frank Li +L: imx@lists.linux.dev L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media.git diff --cc kernel/exit.c index 4dc1918db67b4,f041f0c05ebbf..8a87021211ae7 --- a/kernel/exit.c +++ b/kernel/exit.c @@@ -251,13 -251,11 +251,11 @@@ repeat memset(&post, 0, sizeof(post)); /* don't need to get the RCU readlock here - the process is dead and - * can't be modifying its own credentials. But shut RCU-lockdep up */ - rcu_read_lock(); + * can't be modifying its own credentials. */ dec_rlimit_ucounts(task_ucounts(p), UCOUNT_RLIMIT_NPROC, 1); - rcu_read_unlock(); pidfs_exit(p); - cgroup_release(p); + cgroup_task_release(p); /* Retrieve @thread_pid before __unhash_process() may set it to NULL. */ thread_pid = task_pid(p); diff --cc tools/testing/selftests/drivers/net/gro.c index 995b492f5bcb0,76aa75469a8c0..e894037d2e3ea --- a/tools/testing/selftests/drivers/net/gro.c +++ b/tools/testing/selftests/drivers/net/gro.c @@@ -57,8 -57,7 +57,8 @@@ #include #include - #include "../../kselftest.h" + #include "kselftest.h" +#include "../../net/lib/ksft.h" #define DPORT 8000 #define SPORT 1500 diff --cc tools/testing/selftests/drivers/net/hw/toeplitz.c index a4d04438c3133,4b58152d5a491..d23b3b0c20a36 --- a/tools/testing/selftests/drivers/net/hw/toeplitz.c +++ b/tools/testing/selftests/drivers/net/hw/toeplitz.c @@@ -52,11 -52,7 +52,11 @@@ #include #include +#include +#include "ethtool-user.h" + - #include "../../../kselftest.h" + #include "kselftest.h" +#include "../../../net/lib/ksft.h" #define TOEPLITZ_KEY_MIN_LEN 40 #define TOEPLITZ_KEY_MAX_LEN 60 diff --cc tools/testing/selftests/namespaces/nsid_test.c index 527ade0a8673a,bf02e68e46007..b4a14c6693a54 --- a/tools/testing/selftests/namespaces/nsid_test.c +++ b/tools/testing/selftests/namespaces/nsid_test.c @@@ -20,25 -18,8 +20,25 @@@ #include #include #include - #include "../kselftest_harness.h" + #include "kselftest_harness.h" +/* Fixture for tests that create child processes */ +FIXTURE(nsid) { + pid_t child_pid; +}; + +FIXTURE_SETUP(nsid) { + self->child_pid = 0; +} + +FIXTURE_TEARDOWN(nsid) { + /* Clean up any child process that may still be running */ + if (self->child_pid > 0) { + kill(self->child_pid, SIGKILL); + waitpid(self->child_pid, NULL, 0); + } +} + TEST(nsid_mntns_basic) { __u64 mnt_ns_id = 0; diff --cc tools/testing/selftests/riscv/hwprobe/cbo.c index 6d99726aceac1,f5208ca809054..f254b2edd6cee --- a/tools/testing/selftests/riscv/hwprobe/cbo.c +++ b/tools/testing/selftests/riscv/hwprobe/cbo.c @@@ -15,14 -15,11 +15,14 @@@ #include #include #include +#include #include "hwprobe.h" - #include "../../kselftest.h" + #include "kselftest.h" #define MK_CBO(fn) le32_bswap((uint32_t)(fn) << 20 | 10 << 15 | 2 << 12 | 0 << 7 | 15) +#define MK_PREFETCH(fn) \ + le32_bswap(0 << 25 | (uint32_t)(fn) << 20 | 10 << 15 | 6 << 12 | 0 << 7 | 19) static char mem[4096] __aligned(4096) = { [0 ... 4095] = 0xa5 }; diff --cc tools/testing/selftests/timers/posix_timers.c index a563c438ac79e,5cbb3e81f35dc..38512623622a5 --- a/tools/testing/selftests/timers/posix_timers.c +++ b/tools/testing/selftests/timers/posix_timers.c @@@ -18,9 -18,8 +18,9 @@@ #include #include #include +#include - #include "../kselftest.h" + #include "kselftest.h" #define DELAY 2 diff --cc tools/testing/selftests/vfio/lib/vfio_pci_device.c index 13fdb4b0b10f3,13e351f41c74a..8e34b9bfc96be --- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c +++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c @@@ -12,15 -12,14 +12,15 @@@ #include #include +#include #include #include +#include #include #include -#include - #include "../../../kselftest.h" + #include "kselftest.h" -#include +#include #define PCI_SYSFS_PATH "/sys/bus/pci/devices" diff --cc tools/testing/selftests/vfio/lib/vfio_pci_driver.c index ca0e25efbfa11,fb958d895c178..6827f4a6febe9 --- a/tools/testing/selftests/vfio/lib/vfio_pci_driver.c +++ b/tools/testing/selftests/vfio/lib/vfio_pci_driver.c @@@ -1,6 -1,8 +1,6 @@@ // SPDX-License-Identifier: GPL-2.0-only - #include "../../../kselftest.h" -#include - + #include "kselftest.h" -#include +#include #ifdef __x86_64__ extern struct vfio_pci_driver_ops dsa_ops; diff --cc tools/testing/selftests/vfio/vfio_dma_mapping_test.c index 5397822c3dd4b,b82f215aa1c23..16eba2ecca474 --- a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c +++ b/tools/testing/selftests/vfio/vfio_dma_mapping_test.c @@@ -10,9 -8,9 +10,9 @@@ #include #include -#include +#include - #include "../kselftest_harness.h" + #include "kselftest_harness.h" static const char *device_bdf; diff --cc tools/testing/selftests/vfio/vfio_iommufd_setup_test.c index caf1c6291f3d5,6854a9dedff3a..17017ed3beac5 --- a/tools/testing/selftests/vfio/vfio_iommufd_setup_test.c +++ b/tools/testing/selftests/vfio/vfio_iommufd_setup_test.c @@@ -10,8 -10,8 +10,8 @@@ #include #include -#include +#include - #include "../kselftest_harness.h" + #include "kselftest_harness.h" static const char iommu_dev_path[] = "/dev/iommu"; static const char *cdev_path; diff --cc tools/testing/selftests/vfio/vfio_pci_device_test.c index ecbb669b37651,164c5f4b39039..7c0fe8ce3a61f --- a/tools/testing/selftests/vfio/vfio_pci_device_test.c +++ b/tools/testing/selftests/vfio/vfio_pci_device_test.c @@@ -10,9 -10,9 +10,9 @@@ #include #include -#include +#include - #include "../kselftest_harness.h" + #include "kselftest_harness.h" static const char *device_bdf; diff --cc tools/testing/selftests/vfio/vfio_pci_driver_test.c index f0ca8310d6a8e,d962fd77987a0..afa0480ddd9b2 --- a/tools/testing/selftests/vfio/vfio_pci_driver_test.c +++ b/tools/testing/selftests/vfio/vfio_pci_driver_test.c @@@ -5,9 -5,9 +5,9 @@@ #include #include -#include +#include - #include "../kselftest_harness.h" + #include "kselftest_harness.h" static const char *device_bdf;