Skip to content

Commit 7d4e49a

Browse files
committed
Merge tag 'mm-nonmm-stable-2025-05-31-15-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull non-MM updates from Andrew Morton: - "hung_task: extend blocking task stacktrace dump to semaphore" from Lance Yang enhances the hung task detector. The detector presently dumps the blocking tasks's stack when it is blocked on a mutex. Lance's series extends this to semaphores - "nilfs2: improve sanity checks in dirty state propagation" from Wentao Liang addresses a couple of minor flaws in nilfs2 - "scripts/gdb: Fixes related to lx_per_cpu()" from Illia Ostapyshyn fixes a couple of issues in the gdb scripts - "Support kdump with LUKS encryption by reusing LUKS volume keys" from Coiby Xu addresses a usability problem with kdump. When the dump device is LUKS-encrypted, the kdump kernel may not have the keys to the encrypted filesystem. A full writeup of this is in the series [0/N] cover letter - "sysfs: add counters for lockups and stalls" from Max Kellermann adds /sys/kernel/hardlockup_count and /sys/kernel/hardlockup_count and /sys/kernel/rcu_stall_count - "fork: Page operation cleanups in the fork code" from Pasha Tatashin implements a number of code cleanups in fork.c - "scripts/gdb/symbols: determine KASLR offset on s390 during early boot" from Ilya Leoshkevich fixes some s390 issues in the gdb scripts * tag 'mm-nonmm-stable-2025-05-31-15-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (67 commits) llist: make llist_add_batch() a static inline delayacct: remove redundant code and adjust indentation squashfs: add optional full compressed block caching crash_dump, nvme: select CONFIGFS_FS as built-in scripts/gdb/symbols: determine KASLR offset on s390 during early boot scripts/gdb/symbols: factor out pagination_off() scripts/gdb/symbols: factor out get_vmlinux() kernel/panic.c: format kernel-doc comments mailmap: update and consolidate Casey Connolly's name and email nilfs2: remove wbc->for_reclaim handling fork: define a local GFP_VMAP_STACK fork: check charging success before zeroing stack fork: clean-up naming of vm_stack/vm_struct variables in vmap stacks code fork: clean-up ifdef logic around stack allocation kernel/rcu/tree_stall: add /sys/kernel/rcu_stall_count kernel/watchdog: add /sys/kernel/{hard,soft}lockup_count x86/crash: make the page that stores the dm crypt keys inaccessible x86/crash: pass dm crypt keys to kdump kernel Revert "x86/mm: Remove unused __set_memory_prot()" crash_dump: retrieve dm crypt keys in kdump kernel ...
2 parents 00c010e + 375700b commit 7d4e49a

File tree

110 files changed

+1568
-814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1568
-814
lines changed

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ Brian King <[email protected]>
155155
156156
157157
158+
159+
160+
158161
159162
160163
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/kernel/hardlockup_count
2+
Date: May 2025
3+
KernelVersion: 6.16
4+
Contact: Linux kernel mailing list <[email protected]>
5+
Description:
6+
Shows how many times the system has detected a hard lockup since last boot.
7+
Available only if CONFIG_HARDLOCKUP_DETECTOR is enabled.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
What: /sys/kernel/rcu_stall_count
2+
Date: May 2025
3+
KernelVersion: 6.16
4+
Contact: Linux kernel mailing list <[email protected]>
5+
Description:
6+
Shows how many times the system has detected an RCU stall since last boot.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/kernel/softlockup_count
2+
Date: May 2025
3+
KernelVersion: 6.16
4+
Contact: Linux kernel mailing list <[email protected]>
5+
Description:
6+
Shows how many times the system has detected a soft lockup since last boot.
7+
Available only if CONFIG_SOFTLOCKUP_DETECTOR is enabled.

Documentation/admin-guide/kdump/kdump.rst

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,38 @@ from within add_taint() whenever the value set in this bitmask matches with the
547547
bit flag being set by add_taint().
548548
This will cause a kdump to occur at the add_taint()->panic() call.
549549

550+
Write the dump file to encrypted disk volume
551+
============================================
552+
553+
CONFIG_CRASH_DM_CRYPT can be enabled to support saving the dump file to an
554+
encrypted disk volume (only x86_64 supported for now). User space can interact
555+
with /sys/kernel/config/crash_dm_crypt_keys for setup,
556+
557+
1. Tell the first kernel what logon keys are needed to unlock the disk volumes,
558+
# Add key #1
559+
mkdir /sys/kernel/config/crash_dm_crypt_keys/7d26b7b4-e342-4d2d-b660-7426b0996720
560+
# Add key #1's description
561+
echo cryptsetup:7d26b7b4-e342-4d2d-b660-7426b0996720 > /sys/kernel/config/crash_dm_crypt_keys/description
562+
563+
# how many keys do we have now?
564+
cat /sys/kernel/config/crash_dm_crypt_keys/count
565+
1
566+
567+
# Add key #2 in the same way
568+
569+
# how many keys do we have now?
570+
cat /sys/kernel/config/crash_dm_crypt_keys/count
571+
2
572+
573+
# To support CPU/memory hot-plugging, re-use keys already saved to reserved
574+
# memory
575+
echo true > /sys/kernel/config/crash_dm_crypt_key/reuse
576+
577+
2. Load the dump-capture kernel
578+
579+
3. After the dump-capture kerne get booted, restore the keys to user keyring
580+
echo yes > /sys/kernel/crash_dm_crypt_keys/restore
581+
550582
Contact
551583
=======
552584

Documentation/admin-guide/kdump/vmcoreinfo.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ PG_lru|PG_private|PG_swapcache|PG_swapbacked|PG_slab|PG_hwpoision|PG_head_mask|P
331331
Page attributes. These flags are used to filter various unnecessary for
332332
dumping pages.
333333

334-
PAGE_BUDDY_MAPCOUNT_VALUE(~PG_buddy)|PAGE_OFFLINE_MAPCOUNT_VALUE(~PG_offline)
335-
-----------------------------------------------------------------------------
334+
PAGE_BUDDY_MAPCOUNT_VALUE(~PG_buddy)|PAGE_OFFLINE_MAPCOUNT_VALUE(~PG_offline)|PAGE_OFFLINE_MAPCOUNT_VALUE(~PG_unaccepted)
335+
-------------------------------------------------------------------------------------------------------------------------
336336

337337
More page attributes. These flags are used to filter various unnecessary for
338338
dumping pages.

Documentation/devicetree/bindings/display/panel/lg,sw43408.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: LG SW43408 1080x2160 DSI panel
88

99
maintainers:
10-
- Caleb Connolly <caleb[email protected]>
10+
- Casey Connolly <casey[email protected]>
1111

1212
description:
1313
This panel is used on the Pixel 3, it is a 60hz OLED panel which

Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm's SPMI PMIC Round Robin ADC
88

99
maintainers:
10-
- Caleb Connolly <caleb[email protected]>
10+
- Casey Connolly <casey[email protected]>
1111

1212
description: |
1313
The Qualcomm SPMI Round Robin ADC (RRADC) provides interface to clients to

Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm PMI8998/PM660 Switch-Mode Battery Charger "2"
88

99
maintainers:
10-
- Caleb Connolly <caleb[email protected]>
10+
- Casey Connolly <casey[email protected]>
1111

1212
properties:
1313
compatible:

Documentation/filesystems/relay.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,16 +301,6 @@ user-defined data with a channel, and is immediately available
301301
(including in create_buf_file()) via chan->private_data or
302302
buf->chan->private_data.
303303

304-
Buffer-only channels
305-
--------------------
306-
307-
These channels have no files associated and can be created with
308-
relay_open(NULL, NULL, ...). Such channels are useful in scenarios such
309-
as when doing early tracing in the kernel, before the VFS is up. In these
310-
cases, one may open a buffer-only channel and then call
311-
relay_late_setup_files() when the kernel is ready to handle files,
312-
to expose the buffered data to the userspace.
313-
314304
Channel 'modes'
315305
---------------
316306

0 commit comments

Comments
 (0)