Skip to content

Commit 9346394

Browse files
committed
Merge remote-tracking branch 'regmap/for-7.3' into regmap-next
2 parents c5c95b4 + aba0c1a commit 9346394

2,850 files changed

Lines changed: 17943 additions & 9188 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@opinsys.com>
373373
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
374374
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
375375
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
376+
Jason Wang <jasowangio@gmail.com> <jasowang@redhat.com>
376377
Jason Xing <kerneljasonxing@gmail.com> <kernelxing@tencent.com>
377378
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
378379
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
@@ -398,6 +399,7 @@ Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
398399
Jens Axboe <axboe@kernel.dk> <axboe@fb.com>
399400
Jens Axboe <axboe@kernel.dk> <axboe@meta.com>
400401
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
402+
Jens Wiklander <jenswi@kernel.org> <jens.wiklander@linaro.org>
401403
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
402404
Jesper Dangaard Brouer <hawk@kernel.org> <brouer@redhat.com>
403405
Jesper Dangaard Brouer <hawk@kernel.org> <hawk@comx.dk>
@@ -641,7 +643,6 @@ Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
641643
Nicholas Piggin <npiggin@gmail.com> <npiggin@suse.de>
642644
Nicholas Piggin <npiggin@gmail.com> <nickpiggin@yahoo.com.au>
643645
Nicholas Piggin <npiggin@gmail.com> <piggin@cyberone.com.au>
644-
Nick Desaulniers <nick.desaulniers+lkml@gmail.com> <ndesaulniers@google.com>
645646
Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
646647
Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
647648
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
@@ -708,6 +709,10 @@ Qi Zheng <qi.zheng@linux.dev> <zhengqi.arch@bytedance.com>
708709
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
709710
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
710711
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
712+
Radu Rendec <radu@rendec.net> <radu.rendec@ines.ro>
713+
Radu Rendec <radu@rendec.net> <rrendec@arista.com>
714+
Radu Rendec <radu@rendec.net> <radu.rendec@gmail.com>
715+
Radu Rendec <radu@rendec.net> <rrendec@redhat.com>
711716
Rae Moar <raemoar63@gmail.com> <rmoar@google.com>
712717
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
713718
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
@@ -821,8 +826,8 @@ Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
821826
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
822827
Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>
823828
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
824-
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <s.grosjean@peak-system.com>
825-
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <stephane.grosjean@free.fr>
829+
Stéphane Grosjean <s.grosjean@peak-system.fr> <s.grosjean@peak-system.com>
830+
Stéphane Grosjean <s.grosjean@peak-system.fr> <stephane.grosjean@free.fr>
826831
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
827832
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
828833
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>

CREDITS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3626,6 +3626,13 @@ S: 69 rue Dunois
36263626
S: 75013 Paris
36273627
S: France
36283628

3629+
N: Wolfram Sang
3630+
E: wsa@kernel.org
3631+
W: sang-engineering.com
3632+
P: rsa4096/140DE4CC14A029B6 3991 B1EA B9E2 6751 A4F7 645D 140D E4CC 14A0 29B6
3633+
D: I2C Maintainer 2012 - 2026
3634+
S: Berlin, Germany
3635+
36293636
N: Aleksa Sarai
36303637
E: cyphar@cyphar.com
36313638
W: https://www.cyphar.com/

Documentation/ABI/testing/debugfs-vfio

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,29 @@ Date: Oct 2025
2929
KernelVersion: 6.18
3030
Contact: Cédric Le Goater <clg@redhat.com>
3131
Description: Read the migration features of the vfio device.
32+
33+
What: /sys/kernel/debug/vfio/<device>/pci
34+
Date: June 2026
35+
KernelVersion: 7.2
36+
Contact: Alex Williamson <alex.williamson@nvidia.com>
37+
Description: This debugfs file directory is used for debugging
38+
VFIO PCI devices.
39+
40+
What: /sys/kernel/debug/vfio/<device>/pci/nointxmask
41+
Date: June 2026
42+
KernelVersion: 7.2
43+
Contact: Alex Williamson <alex.williamson@nvidia.com>
44+
Description: Read the nointxmask policy latched for this device. This
45+
policy governs whether the device may use PCI 2.3 style
46+
INTx masking when supported, reporting a value of "N", or
47+
requires APIC level INTx masking, reporting a value of "Y".
48+
49+
What: /sys/kernel/debug/vfio/<device>/pci/disable_idle_d3
50+
Date: June 2026
51+
KernelVersion: 7.2
52+
Contact: Alex Williamson <alex.williamson@nvidia.com>
53+
Description: Read the disable_idle_d3 policy latched for this device. This
54+
policy governs whether the device PM runtime usage count is
55+
kept elevated while the device is bound to the driver and
56+
unused, reporting a value of "Y", or decremented to allow the
57+
device to enter a low power state, reporting a value of "N".

Documentation/ABI/testing/sysfs-bus-pci-drivers-xhci_hcd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Description:
2222

2323
Reading this attribute gives the state of the DbC. It
2424
can be one of the following states: disabled, enabled,
25-
initialized, connected or configured.
25+
initialized, connected, configured or suspended.
2626

2727
What: /sys/bus/pci/drivers/xhci_hcd/.../dbc_idVendor
2828
Date: March 2023

Documentation/admin-guide/cgroup-v1/rdma.rst

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ RDMA Controller
99
1-2. Why RDMA controller needed?
1010
1-3. How is RDMA controller implemented?
1111
2. Usage Examples
12+
3. RDMA Interface Files
1213
1314
1. Overview
1415
===========
@@ -115,3 +116,68 @@ Following resources can be accounted by rdma controller.
115116
(d) Delete resource limit::
116117

117118
echo mlx4_0 hca_handle=max hca_object=max > /sys/fs/cgroup/rdma/1/rdma.max
119+
120+
3. RDMA Interface Files
121+
========================
122+
123+
The following interface files are available in each non-root RDMA cgroup.
124+
125+
rdma.max
126+
A read-write file which describes the configured resource limit
127+
for an RDMA/IB device. See the Usage Examples above.
128+
129+
rdma.current
130+
A read-only file which describes the current resource usage.
131+
132+
rdma.peak
133+
A read-only nested-keyed file which shows the historical high
134+
watermark of resource usage per device since the cgroup was created.
135+
136+
An example for mlx4 and ocrdma device follows::
137+
138+
mlx4_0 hca_handle=1 hca_object=20
139+
ocrdma1 hca_handle=0 hca_object=23
140+
141+
rdma.events
142+
A read-only nested-keyed file which exists on non-root cgroups
143+
and contains the following keys:
144+
145+
max
146+
The number of times a process in this cgroup or its
147+
descendants attempted an RDMA resource allocation that
148+
was rejected because a rdma.max limit in the subtree
149+
was reached. This is a hierarchical counter propagated
150+
upward to all ancestor cgroups. A value change in this
151+
file generates a file modified event.
152+
153+
alloc_fail
154+
The number of RDMA resource allocation attempts that
155+
originated in this cgroup or its descendants and failed
156+
due to a rdma.max limit being reached. This is a
157+
hierarchical counter propagated upward.
158+
159+
An example for mlx4 device follows::
160+
161+
mlx4_0 hca_handle.max=5 hca_handle.alloc_fail=3 hca_object.max=0 hca_object.alloc_fail=0
162+
163+
rdma.events.local
164+
Similar to rdma.events but the fields are local to the cgroup,
165+
i.e. not hierarchical. The file modified event generated on this
166+
file reflects only the local events.
167+
168+
The following nested keys are defined.
169+
170+
max
171+
The number of times a process in this cgroup or its
172+
descendants attempted an RDMA resource allocation that
173+
was rejected because this cgroup's own rdma.max limit
174+
was reached.
175+
176+
alloc_fail
177+
The number of RDMA resource allocation attempts
178+
originating from this cgroup that failed due to this
179+
cgroup's or an ancestor's rdma.max limit.
180+
181+
An example for mlx4 device follows::
182+
183+
mlx4_0 hca_handle.max=5 hca_handle.alloc_fail=0 hca_object.max=0 hca_object.alloc_fail=0

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,7 +1570,7 @@ The following nested keys are defined.
15701570
sock (npn)
15711571
Amount of memory used in network transmission buffers
15721572

1573-
vmalloc (npn)
1573+
vmalloc
15741574
Amount of memory used for vmap backed memory.
15751575

15761576
shmem
@@ -1735,7 +1735,7 @@ The following nested keys are defined.
17351735
Number of pages written from zswap to swap.
17361736

17371737
zswap_incomp
1738-
Number of incompressible pages currently stored in zswap
1738+
Amount of memory used by incompressible pages currently stored in zswap
17391739
without compression. These pages could not be compressed to
17401740
a size smaller than PAGE_SIZE, so they are stored as-is.
17411741

@@ -2257,10 +2257,11 @@ groups D and F will influence each other. Group G will influence nobody::
22572257
So the ideal way to configure this is to set io.latency in groups A, B, and C.
22582258
Generally you do not want to set a value lower than the latency your device
22592259
supports. Experiment to find the value that works best for your workload.
2260-
Start at higher than the expected latency for your device and watch the
2261-
avg_lat value in io.stat for your workload group to get an idea of the
2262-
latency you see during normal operation. Use the avg_lat value as a basis for
2263-
your real setting, setting at 10-15% higher than the value in io.stat.
2260+
Start at higher than the expected latency for your device and, with
2261+
blkcg_debug_stats enabled, watch the avg_lat value in io.stat for your
2262+
workload group to get an idea of the latency you see during normal operation.
2263+
Use the avg_lat value as a basis for your real setting, setting at 10-15%
2264+
higher than the value in io.stat.
22642265

22652266
How IO Latency Throttling Works
22662267
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2298,7 +2299,9 @@ IO Latency Interface Files
22982299

22992300
io.stat
23002301
If the controller is enabled you will see extra stats in io.stat in
2301-
addition to the normal ones.
2302+
addition to the normal ones. These debug stats are only emitted when
2303+
the blkcg_debug_stats module parameter is enabled (it is disabled by
2304+
default).
23022305

23032306
depth
23042307
This is the current queue depth for the group.
@@ -2934,7 +2937,8 @@ include/linux/misc_cgroup.h.
29342937
Misc Interface Files
29352938
~~~~~~~~~~~~~~~~~~~~
29362939

2937-
Miscellaneous controller provides 3 interface files. If two misc resources (res_a and res_b) are registered then:
2940+
Miscellaneous controller provides the following interface files. If two misc
2941+
resources (res_a and res_b) are registered then:
29382942

29392943
misc.capacity
29402944
A read-only flat-keyed file shown only in the root cgroup. It shows

Documentation/arch/arm64/cpu-hotplug.rst

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@ ever have can be described at boot. There are no power-domain considerations
4747
as such devices are emulated.
4848

4949
CPU Hotplug on virtual systems is supported. It is distinct from physical
50-
CPU Hotplug as all resources are described as ``present``, but CPUs may be
51-
marked as disabled by firmware. Only the CPU's online/offline behaviour is
52-
influenced by firmware. An example is where a virtual machine boots with a
53-
single CPU, and additional CPUs are added once a cloud orchestrator deploys
54-
the workload.
50+
CPU Hotplug as all vCPU resources are statically described in the firmware
51+
configuration tables (e.g. MADT), meaning their maximum possible count is
52+
known at boot. However, vCPUs that are not enabled at boot are not marked
53+
as ``present`` by the kernel until they are hotplugged. An example is where
54+
a virtual machine boots with a single CPU, and additional CPUs are added
55+
once a cloud orchestrator deploys the workload.
5556

5657
For a virtual machine, the VMM (e.g. Qemu) plays the part of firmware.
5758

@@ -60,16 +61,19 @@ brought online. Firmware can enforce its policy via PSCI's return codes. e.g.
6061
``DENIED``.
6162

6263
The ACPI tables must describe all the resources of the virtual machine. CPUs
63-
that firmware wishes to disable either from boot (or later) should not be
64-
``enabled`` in the MADT GICC structures, but should have the ``online capable``
65-
bit set, to indicate they can be enabled later. The boot CPU must be marked as
66-
``enabled``. The 'always on' GICR structure must be used to describe the
67-
redistributors.
64+
that are hot-pluggable must have the ``online capable`` bit set and the
65+
``enabled`` bit cleared in the MADT GICC structures to indicate they can be
66+
enabled later. The boot CPU must be marked as ``enabled`` with its
67+
``online capable`` bit cleared. The 'always on' GICR structure must be used
68+
to describe the redistributors.
6869

6970
CPUs described as ``online capable`` but not ``enabled`` can be set to enabled
7071
by the DSDT's Processor object's _STA method. On virtual systems the _STA method
71-
must always report the CPU as ``present``. Changes to the firmware policy can
72-
be notified to the OS via device-check or eject-request.
72+
must always set the ``ACPI_STA_DEVICE_PRESENT`` bit, while toggling the
73+
``ACPI_STA_DEVICE_ENABLED`` bit to reflect its plug status. The kernel will
74+
then dynamically mark the vCPU as ``present`` within the OS when the
75+
``ACPI_STA_DEVICE_ENABLED`` bit becomes set during hot-add. Changes to the
76+
firmware policy can be notified to the OS via device-check or eject-request.
7377

7478
CPUs described as ``enabled`` in the static table, should not have their _STA
7579
modified dynamically by firmware. Soft-restart features such as kexec will

0 commit comments

Comments
 (0)