Skip to content

Commit 5a4d3b3

Browse files
author
Peter Zijlstra
committed
Merge branch 'v6.3-rc7'
Sync with the urgent patches; in particular: a53ce18 ("sched/fair: Sanitize vruntime of entity being migrated") Signed-off-by: Peter Zijlstra <peterz@infradead.org>
2 parents 9b8e178 + 6a8f57a commit 5a4d3b3

878 files changed

Lines changed: 10252 additions & 4598 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: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
133133
Domen Puncer <domen@coderock.org>
134134
Douglas Gilbert <dougg@torque.net>
135135
Ed L. Cashin <ecashin@coraid.com>
136+
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
137+
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
136138
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
137139
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
138140
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
@@ -263,7 +265,9 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
263265
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
264266
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
265267
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
268+
Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>
266269
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
270+
Leonard Göhrs <l.goehrs@pengutronix.de>
267271
Leonid I Ananiev <leonid.i.ananiev@intel.com>
268272
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
269273
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
@@ -379,6 +383,7 @@ Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
379383
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
380384
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
381385
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
386+
Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>
382387
Rajesh Shah <rajesh.shah@intel.com>
383388
Ralf Baechle <ralf@linux-mips.org>
384389
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -387,6 +392,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
387392
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
388393
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
389394
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
395+
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
396+
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
397+
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
390398
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
391399
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
392400
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
@@ -397,6 +405,7 @@ Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
397405
Rudolf Marek <R.Marek@sh.cvut.cz>
398406
Rui Saraiva <rmps@joel.ist.utl.pt>
399407
Sachin P Sant <ssant@in.ibm.com>
408+
Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>
400409
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
401410
Sam Ravnborg <sam@mars.ravnborg.org>
402411
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
@@ -437,6 +446,10 @@ Thomas Graf <tgraf@suug.ch>
437446
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
438447
Thomas Pedersen <twp@codeaurora.org>
439448
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
449+
Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>
450+
Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>
451+
Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>
452+
Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>
440453
Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
441454
Tony Luck <tony.luck@intel.com>
442455
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

Documentation/admin-guide/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ problems and bugs in particular.
3636

3737
reporting-issues
3838
reporting-regressions
39-
security-bugs
4039
bug-hunting
4140
bug-bisect
4241
tainted-kernels

Documentation/admin-guide/reporting-issues.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ might want to be aware of; it for example explains how to add your issue to the
395395
list of tracked regressions, to ensure it won't fall through the cracks.
396396

397397
What qualifies as security issue is left to your judgment. Consider reading
398-
Documentation/admin-guide/security-bugs.rst before proceeding, as it
398+
Documentation/process/security-bugs.rst before proceeding, as it
399399
provides additional details how to best handle security issues.
400400

401401
An issue is a 'really severe problem' when something totally unacceptably bad
@@ -1269,7 +1269,7 @@ them when sending the report by mail. If you filed it in a bug tracker, forward
12691269
the report's text to these addresses; but on top of it put a small note where
12701270
you mention that you filed it with a link to the ticket.
12711271

1272-
See Documentation/admin-guide/security-bugs.rst for more information.
1272+
See Documentation/process/security-bugs.rst for more information.
12731273

12741274

12751275
Duties after the report went out

Documentation/devicetree/bindings/interrupt-controller/loongarch,cpu-interrupt-controller.yaml renamed to Documentation/devicetree/bindings/interrupt-controller/loongson,cpu-interrupt-controller.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/interrupt-controller/loongarch,cpu-interrupt-controller.yaml#
4+
$id: http://devicetree.org/schemas/interrupt-controller/loongson,cpu-interrupt-controller.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: LoongArch CPU Interrupt Controller
@@ -11,7 +11,7 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
const: loongarch,cpu-interrupt-controller
14+
const: loongson,cpu-interrupt-controller
1515

1616
'#interrupt-cells':
1717
const: 1
@@ -28,7 +28,7 @@ required:
2828
examples:
2929
- |
3030
interrupt-controller {
31-
compatible = "loongarch,cpu-interrupt-controller";
31+
compatible = "loongson,cpu-interrupt-controller";
3232
#interrupt-cells = <1>;
3333
interrupt-controller;
3434
};

Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ properties:
7676
If "broken-flash-reset" is present then having this property does not
7777
make any difference.
7878

79+
spi-cpol: true
80+
spi-cpha: true
81+
82+
dependencies:
83+
spi-cpol: [ spi-cpha ]
84+
spi-cpha: [ spi-cpol ]
85+
7986
unevaluatedProperties: false
8087

8188
examples:

Documentation/devicetree/bindings/pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ $defs:
9696
2: Lower Slew rate (slower edges)
9797
3: Reserved (No adjustments)
9898
99+
bias-bus-hold: true
99100
bias-pull-down: true
100101
bias-pull-up: true
101102
bias-disable: true
103+
input-enable: true
102104
output-high: true
103105
output-low: true
104106

Documentation/devicetree/bindings/serial/renesas,scif.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ properties:
9292
- description: Error interrupt
9393
- description: Receive buffer full interrupt
9494
- description: Transmit buffer empty interrupt
95-
- description: Transmit End interrupt
95+
- description: Break interrupt
9696
- items:
9797
- description: Error interrupt
9898
- description: Receive buffer full interrupt
@@ -107,7 +107,7 @@ properties:
107107
- const: eri
108108
- const: rxi
109109
- const: txi
110-
- const: tei
110+
- const: bri
111111
- items:
112112
- const: eri
113113
- const: rxi

Documentation/kbuild/llvm.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,10 @@ Getting Help
171171
Getting LLVM
172172
-------------
173173

174+
We provide prebuilt stable versions of LLVM on `kernel.org <https://kernel.org/pub/tools/llvm/>`_.
175+
Below are links that may be useful for building LLVM from source or procuring
176+
it through a distribution's package manager.
177+
174178
- https://releases.llvm.org/download.html
175179
- https://github.com/llvm/llvm-project
176180
- https://llvm.org/docs/GettingStarted.html

Documentation/mm/zsmalloc.rst

Lines changed: 76 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,12 @@ With CONFIG_ZSMALLOC_STAT, we could see zsmalloc internal information via
3939

4040
# cat /sys/kernel/debug/zsmalloc/zram0/classes
4141

42-
class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage
42+
class size 10% 20% 30% 40% 50% 60% 70% 80% 90% 99% 100% obj_allocated obj_used pages_used pages_per_zspage freeable
4343
...
4444
...
45-
9 176 0 1 186 129 8 4
46-
10 192 1 0 2880 2872 135 3
47-
11 208 0 1 819 795 42 2
48-
12 224 0 1 219 159 12 4
45+
30 512 0 12 4 1 0 1 0 0 1 0 414 3464 3346 433 1 14
46+
31 528 2 7 2 2 1 0 1 0 0 2 117 4154 3793 536 4 44
47+
32 544 6 3 4 1 2 1 0 0 0 1 260 4170 3965 556 2 26
4948
...
5049
...
5150

@@ -54,10 +53,28 @@ class
5453
index
5554
size
5655
object size zspage stores
57-
almost_empty
58-
the number of ZS_ALMOST_EMPTY zspages(see below)
59-
almost_full
60-
the number of ZS_ALMOST_FULL zspages(see below)
56+
10%
57+
the number of zspages with usage ratio less than 10% (see below)
58+
20%
59+
the number of zspages with usage ratio between 10% and 20%
60+
30%
61+
the number of zspages with usage ratio between 20% and 30%
62+
40%
63+
the number of zspages with usage ratio between 30% and 40%
64+
50%
65+
the number of zspages with usage ratio between 40% and 50%
66+
60%
67+
the number of zspages with usage ratio between 50% and 60%
68+
70%
69+
the number of zspages with usage ratio between 60% and 70%
70+
80%
71+
the number of zspages with usage ratio between 70% and 80%
72+
90%
73+
the number of zspages with usage ratio between 80% and 90%
74+
99%
75+
the number of zspages with usage ratio between 90% and 99%
76+
100%
77+
the number of zspages with usage ratio 100%
6178
obj_allocated
6279
the number of objects allocated
6380
obj_used
@@ -66,19 +83,14 @@ pages_used
6683
the number of pages allocated for the class
6784
pages_per_zspage
6885
the number of 0-order pages to make a zspage
86+
freeable
87+
the approximate number of pages class compaction can free
6988

70-
We assign a zspage to ZS_ALMOST_EMPTY fullness group when n <= N / f, where
71-
72-
* n = number of allocated objects
73-
* N = total number of objects zspage can store
74-
* f = fullness_threshold_frac(ie, 4 at the moment)
75-
76-
Similarly, we assign zspage to:
77-
78-
* ZS_ALMOST_FULL when n > N / f
79-
* ZS_EMPTY when n == 0
80-
* ZS_FULL when n == N
81-
89+
Each zspage maintains inuse counter which keeps track of the number of
90+
objects stored in the zspage. The inuse counter determines the zspage's
91+
"fullness group" which is calculated as the ratio of the "inuse" objects to
92+
the total number of objects the zspage can hold (objs_per_zspage). The
93+
closer the inuse counter is to objs_per_zspage, the better.
8294

8395
Internals
8496
=========
@@ -94,10 +106,10 @@ of objects that each zspage can store.
94106

95107
For instance, consider the following size classes:::
96108

97-
class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable
109+
class size 10% .... 100% obj_allocated obj_used pages_used pages_per_zspage freeable
98110
...
99-
94 1536 0 0 0 0 0 3 0
100-
100 1632 0 0 0 0 0 2 0
111+
94 1536 0 .... 0 0 0 0 3 0
112+
100 1632 0 .... 0 0 0 0 2 0
101113
...
102114

103115

@@ -134,10 +146,11 @@ reduces memory wastage.
134146

135147
Let's take a closer look at the bottom of `/sys/kernel/debug/zsmalloc/zramX/classes`:::
136148

137-
class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable
149+
class size 10% .... 100% obj_allocated obj_used pages_used pages_per_zspage freeable
150+
138151
...
139-
202 3264 0 0 0 0 0 4 0
140-
254 4096 0 0 0 0 0 1 0
152+
202 3264 0 .. 0 0 0 0 4 0
153+
254 4096 0 .. 0 0 0 0 1 0
141154
...
142155

143156
Size class #202 stores objects of size 3264 bytes and has a maximum of 4 pages
@@ -151,40 +164,42 @@ efficient storage of large objects.
151164

152165
For zspage chain size of 8, huge class watermark becomes 3632 bytes:::
153166

154-
class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable
167+
class size 10% .... 100% obj_allocated obj_used pages_used pages_per_zspage freeable
168+
155169
...
156-
202 3264 0 0 0 0 0 4 0
157-
211 3408 0 0 0 0 0 5 0
158-
217 3504 0 0 0 0 0 6 0
159-
222 3584 0 0 0 0 0 7 0
160-
225 3632 0 0 0 0 0 8 0
161-
254 4096 0 0 0 0 0 1 0
170+
202 3264 0 .. 0 0 0 0 4 0
171+
211 3408 0 .. 0 0 0 0 5 0
172+
217 3504 0 .. 0 0 0 0 6 0
173+
222 3584 0 .. 0 0 0 0 7 0
174+
225 3632 0 .. 0 0 0 0 8 0
175+
254 4096 0 .. 0 0 0 0 1 0
162176
...
163177

164178
For zspage chain size of 16, huge class watermark becomes 3840 bytes:::
165179

166-
class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable
180+
class size 10% .... 100% obj_allocated obj_used pages_used pages_per_zspage freeable
181+
167182
...
168-
202 3264 0 0 0 0 0 4 0
169-
206 3328 0 0 0 0 0 13 0
170-
207 3344 0 0 0 0 0 9 0
171-
208 3360 0 0 0 0 0 14 0
172-
211 3408 0 0 0 0 0 5 0
173-
212 3424 0 0 0 0 0 16 0
174-
214 3456 0 0 0 0 0 11 0
175-
217 3504 0 0 0 0 0 6 0
176-
219 3536 0 0 0 0 0 13 0
177-
222 3584 0 0 0 0 0 7 0
178-
223 3600 0 0 0 0 0 15 0
179-
225 3632 0 0 0 0 0 8 0
180-
228 3680 0 0 0 0 0 9 0
181-
230 3712 0 0 0 0 0 10 0
182-
232 3744 0 0 0 0 0 11 0
183-
234 3776 0 0 0 0 0 12 0
184-
235 3792 0 0 0 0 0 13 0
185-
236 3808 0 0 0 0 0 14 0
186-
238 3840 0 0 0 0 0 15 0
187-
254 4096 0 0 0 0 0 1 0
183+
202 3264 0 .. 0 0 0 0 4 0
184+
206 3328 0 .. 0 0 0 0 13 0
185+
207 3344 0 .. 0 0 0 0 9 0
186+
208 3360 0 .. 0 0 0 0 14 0
187+
211 3408 0 .. 0 0 0 0 5 0
188+
212 3424 0 .. 0 0 0 0 16 0
189+
214 3456 0 .. 0 0 0 0 11 0
190+
217 3504 0 .. 0 0 0 0 6 0
191+
219 3536 0 .. 0 0 0 0 13 0
192+
222 3584 0 .. 0 0 0 0 7 0
193+
223 3600 0 .. 0 0 0 0 15 0
194+
225 3632 0 .. 0 0 0 0 8 0
195+
228 3680 0 .. 0 0 0 0 9 0
196+
230 3712 0 .. 0 0 0 0 10 0
197+
232 3744 0 .. 0 0 0 0 11 0
198+
234 3776 0 .. 0 0 0 0 12 0
199+
235 3792 0 .. 0 0 0 0 13 0
200+
236 3808 0 .. 0 0 0 0 14 0
201+
238 3840 0 .. 0 0 0 0 15 0
202+
254 4096 0 .. 0 0 0 0 1 0
188203
...
189204

190205
Overall the combined zspage chain size effect on zsmalloc pool configuration:::
@@ -214,9 +229,10 @@ zram as a build artifacts storage (Linux kernel compilation).
214229

215230
zsmalloc classes stats:::
216231

217-
class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable
232+
class size 10% .... 100% obj_allocated obj_used pages_used pages_per_zspage freeable
233+
218234
...
219-
Total 13 51 413836 412973 159955 3
235+
Total 13 .. 51 413836 412973 159955 3
220236

221237
zram mm_stat:::
222238

@@ -227,9 +243,10 @@ zram as a build artifacts storage (Linux kernel compilation).
227243

228244
zsmalloc classes stats:::
229245

230-
class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable
246+
class size 10% .... 100% obj_allocated obj_used pages_used pages_per_zspage freeable
247+
231248
...
232-
Total 18 87 414852 412978 156666 0
249+
Total 18 .. 87 414852 412978 156666 0
233250

234251
zram mm_stat:::
235252

Documentation/networking/ip-sysctl.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,8 @@ tcp_app_win - INTEGER
340340
Reserve max(window/2^tcp_app_win, mss) of window for application
341341
buffer. Value 0 is special, it means that nothing is reserved.
342342

343+
Possible values are [0, 31], inclusive.
344+
343345
Default: 31
344346

345347
tcp_autocorking - BOOLEAN

0 commit comments

Comments
 (0)