Skip to content

Commit 6b2b0d8

Browse files
pmladekpmladek
committed
Merge branch 'rework/console-list-lock' into for-linus
2 parents 7365df1 + 5074ffb commit 6b2b0d8

File tree

2,944 files changed

+142228
-36098
lines changed

Some content is hidden

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

2,944 files changed

+142228
-36098
lines changed

‎.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ ForEachMacros:
222222
- 'for_each_component_dais'
223223
- 'for_each_component_dais_safe'
224224
- 'for_each_console'
225+
- 'for_each_console_srcu'
225226
- 'for_each_cpu'
226227
- 'for_each_cpu_and'
227228
- 'for_each_cpu_not'

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ Filipe Lautert <[email protected]>
137137
Finn Thain <[email protected]> <[email protected]>
138138
Franck Bui-Huu <[email protected]>
139139
Frank Rowand <[email protected]> <[email protected]>
140+
Frank Rowand <[email protected]> <[email protected]>
140141
Frank Rowand <[email protected]> <[email protected]>
141142
Frank Rowand <[email protected]> <[email protected]>
142143
Frank Zago <[email protected]>

‎Documentation/ABI/testing/sysfs-bus-pci

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,3 +457,36 @@ Description:
457457

458458
The file is writable if the PF is bound to a driver that
459459
implements ->sriov_set_msix_vec_count().
460+
461+
What: /sys/bus/pci/devices/.../resourceN_resize
462+
Date: September 2022
463+
Contact: Alex Williamson <[email protected]>
464+
Description:
465+
These files provide an interface to PCIe Resizable BAR support.
466+
A file is created for each BAR resource (N) supported by the
467+
PCIe Resizable BAR extended capability of the device. Reading
468+
each file exposes the bitmap of available resource sizes:
469+
470+
# cat resource1_resize
471+
00000000000001c0
472+
473+
The bitmap represents supported resource sizes for the BAR,
474+
where bit0 = 1MB, bit1 = 2MB, bit2 = 4MB, etc. In the above
475+
example the device supports 64MB, 128MB, and 256MB BAR sizes.
476+
477+
When writing the file, the user provides the bit position of
478+
the desired resource size, for example:
479+
480+
# echo 7 > resource1_resize
481+
482+
This indicates to set the size value corresponding to bit 7,
483+
128MB. The resulting size is 2 ^ (bit# + 20). This definition
484+
matches the PCIe specification of this capability.
485+
486+
In order to make use of resource resizing, all PCI drivers must
487+
be unbound from the device and peer devices under the same
488+
parent bridge may need to be soft removed. In the case of
489+
VGA devices, writing a resize value will remove low level
490+
console drivers from the device. Raw users of pci-sysfs
491+
resourceN attributes must be terminated prior to resizing.
492+
Success of the resizing operation is not guaranteed.

‎Documentation/ABI/testing/sysfs-devices-vfio-dev

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /sys/.../<device>/vfio-dev/vfioX/
2+
Date: September 2022
3+
Contact: Yi Liu <[email protected]>
4+
Description:
5+
This directory is created when the device is bound to a
6+
vfio driver. The layout under this directory matches what
7+
exists for a standard 'struct device'. 'X' is a unique
8+
index marking this device in vfio.

‎Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,30 @@ Description: Show status of f2fs superblock in real time.
466466
0x4000 SBI_IS_FREEZING freefs is in process
467467
====== ===================== =================================
468468

469+
What: /sys/fs/f2fs/<disk>/stat/cp_status
470+
Date: September 2022
471+
Contact: "Chao Yu" <[email protected]>
472+
Description: Show status of f2fs checkpoint in real time.
473+
474+
=============================== ==============================
475+
cp flag value
476+
CP_UMOUNT_FLAG 0x00000001
477+
CP_ORPHAN_PRESENT_FLAG 0x00000002
478+
CP_COMPACT_SUM_FLAG 0x00000004
479+
CP_ERROR_FLAG 0x00000008
480+
CP_FSCK_FLAG 0x00000010
481+
CP_FASTBOOT_FLAG 0x00000020
482+
CP_CRC_RECOVERY_FLAG 0x00000040
483+
CP_NAT_BITS_FLAG 0x00000080
484+
CP_TRIMMED_FLAG 0x00000100
485+
CP_NOCRC_RECOVERY_FLAG 0x00000200
486+
CP_LARGE_NAT_BITMAP_FLAG 0x00000400
487+
CP_QUOTA_NEED_FSCK_FLAG 0x00000800
488+
CP_DISABLED_FLAG 0x00001000
489+
CP_DISABLED_QUICK_FLAG 0x00002000
490+
CP_RESIZEFS_FLAG 0x00004000
491+
=============================== ==============================
492+
469493
What: /sys/fs/f2fs/<disk>/ckpt_thread_ioprio
470494
Date: January 2021
471495
Contact: "Daeho Jeong" <[email protected]>

‎Documentation/ABI/testing/sysfs-kernel-livepatch

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ Description:
5555
The object directory contains subdirectories for each function
5656
that is patched within the object.
5757

58+
What: /sys/kernel/livepatch/<patch>/<object>/patched
59+
Date: August 2022
60+
KernelVersion: 6.1.0
61+
Contact: [email protected]
62+
Description:
63+
An attribute which indicates whether the object is currently
64+
patched.
65+
5866
What: /sys/kernel/livepatch/<patch>/<object>/<function,sympos>
5967
Date: Nov 2014
6068
KernelVersion: 3.19.0

‎Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/devices/virtual/memory_tiering/
2+
Date: August 2022
3+
Contact: Linux memory management mailing list <[email protected]>
4+
Description: A collection of all the memory tiers allocated.
5+
6+
Individual memory tier details are contained in subdirectories
7+
named by the abstract distance of the memory tier.
8+
9+
/sys/devices/virtual/memory_tiering/memory_tierN/
10+
11+
12+
What: /sys/devices/virtual/memory_tiering/memory_tierN/
13+
/sys/devices/virtual/memory_tiering/memory_tierN/nodes
14+
Date: August 2022
15+
Contact: Linux memory management mailing list <[email protected]>
16+
Description: Directory with details of a specific memory tier
17+
18+
This is the directory containing information about a particular
19+
memory tier, memtierN, where N is derived based on abstract distance.
20+
21+
A smaller value of N implies a higher (faster) memory tier in the
22+
hierarchy.
23+
24+
nodes: NUMA nodes that are part of this memory tier.
25+

‎Documentation/accounting/delay-accounting.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ a) waiting for a CPU (while being runnable)
1313
b) completion of synchronous block I/O initiated by the task
1414
c) swapping in pages
1515
d) memory reclaim
16-
e) thrashing page cache
16+
e) thrashing
1717
f) direct compact
1818
g) write-protect copy
1919

‎Documentation/admin-guide/cgroup-v1/memory.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Per-node-per-memcgroup LRU (cgroup's private LRU) is guarded by
299299
lruvec->lru_lock; PG_lru bit of page->flags is cleared before
300300
isolating a page from its LRU under lruvec->lru_lock.
301301

302-
2.7 Kernel Memory Extension (CONFIG_MEMCG_KMEM)
302+
2.7 Kernel Memory Extension
303303
-----------------------------------------------
304304

305305
With the Kernel memory extension, the Memory Controller is able to limit
@@ -386,8 +386,6 @@ U != 0, K >= U:
386386

387387
a. Enable CONFIG_CGROUPS
388388
b. Enable CONFIG_MEMCG
389-
c. Enable CONFIG_MEMCG_SWAP (to use swap extension)
390-
d. Enable CONFIG_MEMCG_KMEM (to use kmem extension)
391389

392390
3.1. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?)
393391
-------------------------------------------------------------------

‎Documentation/admin-guide/cgroup-v2.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,29 @@ All cgroup core files are prefixed with "cgroup."
976976
killing cgroups is a process directed operation, i.e. it affects
977977
the whole thread-group.
978978

979+
cgroup.pressure
980+
A read-write single value file that allowed values are "0" and "1".
981+
The default is "1".
982+
983+
Writing "0" to the file will disable the cgroup PSI accounting.
984+
Writing "1" to the file will re-enable the cgroup PSI accounting.
985+
986+
This control attribute is not hierarchical, so disable or enable PSI
987+
accounting in a cgroup does not affect PSI accounting in descendants
988+
and doesn't need pass enablement via ancestors from root.
989+
990+
The reason this control attribute exists is that PSI accounts stalls for
991+
each cgroup separately and aggregates it at each level of the hierarchy.
992+
This may cause non-negligible overhead for some workloads when under
993+
deep level of the hierarchy, in which case this control attribute can
994+
be used to disable PSI accounting in the non-leaf cgroups.
995+
996+
irq.pressure
997+
A read-write nested-keyed file.
998+
999+
Shows pressure stall information for IRQ/SOFTIRQ. See
1000+
:ref:`Documentation/accounting/psi.rst <psi>` for details.
1001+
9791002
Controllers
9801003
===========
9811004

0 commit comments

Comments
 (0)