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
  ...
This commit is contained in:
Linus Torvalds
2025-12-06 14:01:20 -08:00
439 changed files with 8050 additions and 1820 deletions

View File

@@ -1519,6 +1519,24 @@ config BOOT_CONFIG_EMBED_FILE
This bootconfig will be used if there is no initrd or no other
bootconfig in the initrd.
config CMDLINE_LOG_WRAP_IDEAL_LEN
int "Length to try to wrap the cmdline when logged at boot"
default 1021
range 0 1021
help
At boot time, the kernel command line is logged to the console.
The log message will start with the prefix "Kernel command line: ".
The log message will attempt to be wrapped (split into multiple log
messages) at spaces based on CMDLINE_LOG_WRAP_IDEAL_LEN characters.
If wrapping happens, each log message will start with the prefix and
all but the last message will end with " \". Messages may exceed the
ideal length if a place to wrap isn't found before the specified
number of characters.
A value of 0 disables wrapping, though be warned that the maximum
length of a log message (1021 characters) may cause the cmdline to
be truncated.
config INITRAMFS_PRESERVE_MTIME
bool "Preserve cpio archive mtimes in initramfs"
depends on BLK_DEV_INITRD
@@ -2171,6 +2189,8 @@ config TRACEPOINTS
source "kernel/Kconfig.kexec"
source "kernel/liveupdate/Kconfig"
endmenu # General setup
source "arch/Kconfig"

View File

@@ -5,19 +5,22 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
#include <linux/jiffies.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/timex.h>
#include <linux/smp.h>
#include <linux/jiffies.h>
#include <linux/kstrtox.h>
#include <linux/percpu.h>
#include <linux/printk.h>
#include <linux/smp.h>
#include <linux/stddef.h>
#include <linux/timex.h>
unsigned long lpj_fine;
unsigned long preset_lpj;
static int __init lpj_setup(char *str)
{
preset_lpj = simple_strtoul(str,NULL,0);
return 1;
return kstrtoul(str, 0, &preset_lpj) == 0;
}
__setup("lpj=", lpj_setup);

View File

@@ -906,6 +906,101 @@ static void __init early_numa_node_init(void)
#endif
}
#define KERNEL_CMDLINE_PREFIX "Kernel command line: "
#define KERNEL_CMDLINE_PREFIX_LEN (sizeof(KERNEL_CMDLINE_PREFIX) - 1)
#define KERNEL_CMDLINE_CONTINUATION " \\"
#define KERNEL_CMDLINE_CONTINUATION_LEN (sizeof(KERNEL_CMDLINE_CONTINUATION) - 1)
#define MIN_CMDLINE_LOG_WRAP_IDEAL_LEN (KERNEL_CMDLINE_PREFIX_LEN + \
KERNEL_CMDLINE_CONTINUATION_LEN)
#define CMDLINE_LOG_WRAP_IDEAL_LEN (CONFIG_CMDLINE_LOG_WRAP_IDEAL_LEN > \
MIN_CMDLINE_LOG_WRAP_IDEAL_LEN ? \
CONFIG_CMDLINE_LOG_WRAP_IDEAL_LEN : \
MIN_CMDLINE_LOG_WRAP_IDEAL_LEN)
#define IDEAL_CMDLINE_LEN (CMDLINE_LOG_WRAP_IDEAL_LEN - KERNEL_CMDLINE_PREFIX_LEN)
#define IDEAL_CMDLINE_SPLIT_LEN (IDEAL_CMDLINE_LEN - KERNEL_CMDLINE_CONTINUATION_LEN)
/**
* print_kernel_cmdline() - Print the kernel cmdline with wrapping.
* @cmdline: The cmdline to print.
*
* Print the kernel command line, trying to wrap based on the Kconfig knob
* CONFIG_CMDLINE_LOG_WRAP_IDEAL_LEN.
*
* Wrapping is based on spaces, ignoring quotes. All lines are prefixed
* with "Kernel command line: " and lines that are not the last line have
* a " \" suffix added to them. The prefix and suffix count towards the
* line length for wrapping purposes. The ideal length will be exceeded
* if no appropriate place to wrap is found.
*
* Example output if CONFIG_CMDLINE_LOG_WRAP_IDEAL_LEN is 40:
* Kernel command line: loglevel=7 \
* Kernel command line: init=/sbin/init \
* Kernel command line: root=PARTUUID=8c3efc1a-768b-6642-8d0c-89eb782f19f0/PARTNROFF=1 \
* Kernel command line: rootwait ro \
* Kernel command line: my_quoted_arg="The \
* Kernel command line: quick brown fox \
* Kernel command line: jumps over the \
* Kernel command line: lazy dog."
*/
static void __init print_kernel_cmdline(const char *cmdline)
{
size_t len;
/* Config option of 0 or anything longer than the max disables wrapping */
if (CONFIG_CMDLINE_LOG_WRAP_IDEAL_LEN == 0 ||
IDEAL_CMDLINE_LEN >= COMMAND_LINE_SIZE - 1) {
pr_notice("%s%s\n", KERNEL_CMDLINE_PREFIX, cmdline);
return;
}
len = strlen(cmdline);
while (len > IDEAL_CMDLINE_LEN) {
const char *first_space;
const char *prev_cutoff;
const char *cutoff;
int to_print;
size_t used;
/* Find the last ' ' that wouldn't make the line too long */
prev_cutoff = NULL;
cutoff = cmdline;
while (true) {
cutoff = strchr(cutoff + 1, ' ');
if (!cutoff || cutoff - cmdline > IDEAL_CMDLINE_SPLIT_LEN)
break;
prev_cutoff = cutoff;
}
if (prev_cutoff)
cutoff = prev_cutoff;
else if (!cutoff)
break;
/* Find the beginning and end of the string of spaces */
first_space = cutoff;
while (first_space > cmdline && first_space[-1] == ' ')
first_space--;
to_print = first_space - cmdline;
while (*cutoff == ' ')
cutoff++;
used = cutoff - cmdline;
/* If the whole string is used, break and do the final printout */
if (len == used)
break;
if (to_print)
pr_notice("%s%.*s%s\n", KERNEL_CMDLINE_PREFIX,
to_print, cmdline, KERNEL_CMDLINE_CONTINUATION);
len -= used;
cmdline += used;
}
if (len)
pr_notice("%s%s\n", KERNEL_CMDLINE_PREFIX, cmdline);
}
asmlinkage __visible __init __no_sanitize_address __noreturn __no_stack_protector
void start_kernel(void)
{
@@ -942,7 +1037,7 @@ void start_kernel(void)
early_numa_node_init();
boot_cpu_hotplug_init();
pr_notice("Kernel command line: %s\n", saved_command_line);
print_kernel_cmdline(saved_command_line);
/* parameters may set static keys */
parse_early_param();
after_dashes = parse_args("Booting kernel",