Skip to content

Commit 0363133

Browse files
committed
Merge tag 'v5.4-rc5' into rdma.git for-next
Linux 5.4-rc5 For dependencies in the next patches Conflict resolved by keeping the delete of the unlock. Signed-off-by: Jason Gunthorpe <[email protected]>
2 parents a52dc3a + d6d5df1 commit 0363133

File tree

939 files changed

+8788
-7831
lines changed

Some content is hidden

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

939 files changed

+8788
-7831
lines changed

.mailmap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ Oleksij Rempel <[email protected]> <[email protected]>
196196
197197
Paolo 'Blaisorblade' Giarrusso <[email protected]>
198198
Patrick Mochel <[email protected]>
199-
199+
200+
200201
Peter A Jonsson <[email protected]>
201202
Peter Oruba <[email protected]>
202203
Peter Oruba <[email protected]>
@@ -229,6 +230,7 @@ Shuah Khan <[email protected]> <[email protected]>
229230
230231
231232
233+
232234
Simon Kelley <[email protected]>
233235
Stéphane Witzmann <[email protected]>
234236
Stephen Hemminger <[email protected]>

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18
16371637
S: D-69126 Heidelberg
16381638
S: Germany
16391639

1640+
N: Simon Horman
1641+
1642+
D: Renesas ARM/ARM64 SoC maintainer
1643+
16401644
N: Christopher Horn
16411645
16421646
D: Miscellaneous sysctl hacks

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,8 @@ on an IO device and is an example of this type.
615615
Protections
616616
-----------
617617

618-
A cgroup is protected to be allocated upto the configured amount of
619-
the resource if the usages of all its ancestors are under their
618+
A cgroup is protected upto the configured amount of the resource
619+
as long as the usages of all its ancestors are under their
620620
protected levels. Protections can be hard guarantees or best effort
621621
soft boundaries. Protections can also be over-committed in which case
622622
only upto the amount available to the parent is protected among
@@ -1096,7 +1096,10 @@ PAGE_SIZE multiple when read back.
10961096
is within its effective min boundary, the cgroup's memory
10971097
won't be reclaimed under any conditions. If there is no
10981098
unprotected reclaimable memory available, OOM killer
1099-
is invoked.
1099+
is invoked. Above the effective min boundary (or
1100+
effective low boundary if it is higher), pages are reclaimed
1101+
proportionally to the overage, reducing reclaim pressure for
1102+
smaller overages.
11001103

11011104
Effective min boundary is limited by memory.min values of
11021105
all ancestor cgroups. If there is memory.min overcommitment
@@ -1118,7 +1121,10 @@ PAGE_SIZE multiple when read back.
11181121
Best-effort memory protection. If the memory usage of a
11191122
cgroup is within its effective low boundary, the cgroup's
11201123
memory won't be reclaimed unless memory can be reclaimed
1121-
from unprotected cgroups.
1124+
from unprotected cgroups. Above the effective low boundary (or
1125+
effective min boundary if it is higher), pages are reclaimed
1126+
proportionally to the overage, reducing reclaim pressure for
1127+
smaller overages.
11221128

11231129
Effective low boundary is limited by memory.low values of
11241130
all ancestor cgroups. If there is memory.low overcommitment
@@ -2482,8 +2488,10 @@ system performance due to overreclaim, to the point where the feature
24822488
becomes self-defeating.
24832489

24842490
The memory.low boundary on the other hand is a top-down allocated
2485-
reserve. A cgroup enjoys reclaim protection when it's within its low,
2486-
which makes delegation of subtrees possible.
2491+
reserve. A cgroup enjoys reclaim protection when it's within its
2492+
effective low, which makes delegation of subtrees possible. It also
2493+
enjoys having reclaim pressure proportional to its overage when
2494+
above its effective low.
24872495

24882496
The original high boundary, the hard limit, is defined as a strict
24892497
limit that can not budge, even if the OOM killer has to be called.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5302,6 +5302,10 @@
53025302
the unplug protocol
53035303
never -- do not unplug even if version check succeeds
53045304

5305+
xen_legacy_crash [X86,XEN]
5306+
Crash from Xen panic notifier, without executing late
5307+
panic() code such as dumping handler.
5308+
53055309
xen_nopvspin [X86,XEN]
53065310
Disables the ticketlock slowpath using Xen PV
53075311
optimizations.

Documentation/arm64/memory.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,18 @@ return virtual addresses to userspace from a 48-bit range.
154154

155155
Software can "opt-in" to receiving VAs from a 52-bit space by
156156
specifying an mmap hint parameter that is larger than 48-bit.
157+
157158
For example:
158-
maybe_high_address = mmap(~0UL, size, prot, flags,...);
159+
160+
.. code-block:: c
161+
162+
maybe_high_address = mmap(~0UL, size, prot, flags,...);
159163
160164
It is also possible to build a debug kernel that returns addresses
161165
from a 52-bit space by enabling the following kernel config options:
166+
167+
.. code-block:: sh
168+
162169
CONFIG_EXPERT=y && CONFIG_ARM64_FORCE_52BIT=y
163170
164171
Note that this option is only intended for debugging applications

Documentation/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ stable kernels.
107107
+----------------+-----------------+-----------------+-----------------------------+
108108
| Cavium | ThunderX2 SMMUv3| #126 | N/A |
109109
+----------------+-----------------+-----------------+-----------------------------+
110+
| Cavium | ThunderX2 Core | #219 | CAVIUM_TX2_ERRATUM_219 |
111+
+----------------+-----------------+-----------------+-----------------------------+
110112
+----------------+-----------------+-----------------+-----------------------------+
111113
| Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 |
112114
+----------------+-----------------+-----------------+-----------------------------+

Documentation/core-api/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Core utilities
3838
protection-keys
3939
../RCU/index
4040
gcc-plugins
41+
symbol-namespaces
4142

4243

4344
Interfaces for kernel debugging

Documentation/core-api/memory-allocation.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ limited. The actual limit depends on the hardware and the kernel
9898
configuration, but it is a good practice to use `kmalloc` for objects
9999
smaller than page size.
100100

101+
The address of a chunk allocated with `kmalloc` is aligned to at least
102+
ARCH_KMALLOC_MINALIGN bytes. For sizes which are a power of two, the
103+
alignment is also guaranteed to be at least the respective size.
104+
101105
For large allocations you can use :c:func:`vmalloc` and
102106
:c:func:`vzalloc`, or directly request pages from the page
103107
allocator. The memory allocated by `vmalloc` and related functions is
File renamed without changes.

Documentation/dev-tools/kasan.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ smaller binary while the latter is 1.1 - 2 times faster.
4141
Both KASAN modes work with both SLUB and SLAB memory allocators.
4242
For better bug detection and nicer reporting, enable CONFIG_STACKTRACE.
4343

44+
To augment reports with last allocation and freeing stack of the physical page,
45+
it is recommended to enable also CONFIG_PAGE_OWNER and boot with page_owner=on.
46+
4447
To disable instrumentation for specific files or directories, add a line
4548
similar to the following to the respective kernel Makefile:
4649

0 commit comments

Comments
 (0)