Skip to content

Commit 9b9c280

Browse files
author
Ingo Molnar
committed
Merge branch 'x86/urgent' into x86/apic, to resolve conflicts
 Conflicts: arch/x86/kernel/cpu/common.c arch/x86/kernel/cpu/intel.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 6be4ec2 + 8009479 commit 9b9c280

File tree

511 files changed

+3795
-2108
lines changed

Some content is hidden

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

511 files changed

+3795
-2108
lines changed

‎.mailmap

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,11 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
191191
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
192192
Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
193193
Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
194-
Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>
195-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>
196-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>
197-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>
194+
Geliang Tang <geliang@kernel.org> <geliang.tang@linux.dev>
195+
Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>
196+
Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>
197+
Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>
198+
Geliang Tang <geliang@kernel.org> <geliangtang@163.com>
198199
Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
199200
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
200201
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

‎Documentation/ABI/testing/sysfs-class-net-statistics

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
What: /sys/class/<iface>/statistics/collisions
1+
What: /sys/class/net/<iface>/statistics/collisions
22
Date: April 2005
33
KernelVersion: 2.6.12
44
Contact: netdev@vger.kernel.org
55
Description:
66
Indicates the number of collisions seen by this network device.
77
This value might not be relevant with all MAC layers.
88

9-
What: /sys/class/<iface>/statistics/multicast
9+
What: /sys/class/net/<iface>/statistics/multicast
1010
Date: April 2005
1111
KernelVersion: 2.6.12
1212
Contact: netdev@vger.kernel.org
1313
Description:
1414
Indicates the number of multicast packets received by this
1515
network device.
1616

17-
What: /sys/class/<iface>/statistics/rx_bytes
17+
What: /sys/class/net/<iface>/statistics/rx_bytes
1818
Date: April 2005
1919
KernelVersion: 2.6.12
2020
Contact: netdev@vger.kernel.org
@@ -23,7 +23,7 @@ Description:
2323
See the network driver for the exact meaning of when this
2424
value is incremented.
2525

26-
What: /sys/class/<iface>/statistics/rx_compressed
26+
What: /sys/class/net/<iface>/statistics/rx_compressed
2727
Date: April 2005
2828
KernelVersion: 2.6.12
2929
Contact: netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description:
3232
network device. This value might only be relevant for interfaces
3333
that support packet compression (e.g: PPP).
3434

35-
What: /sys/class/<iface>/statistics/rx_crc_errors
35+
What: /sys/class/net/<iface>/statistics/rx_crc_errors
3636
Date: April 2005
3737
KernelVersion: 2.6.12
3838
Contact: netdev@vger.kernel.org
@@ -41,7 +41,7 @@ Description:
4141
by this network device. Note that the specific meaning might
4242
depend on the MAC layer used by the interface.
4343

44-
What: /sys/class/<iface>/statistics/rx_dropped
44+
What: /sys/class/net/<iface>/statistics/rx_dropped
4545
Date: April 2005
4646
KernelVersion: 2.6.12
4747
Contact: netdev@vger.kernel.org
@@ -51,15 +51,15 @@ Description:
5151
packet processing. See the network driver for the exact
5252
meaning of this value.
5353

54-
What: /sys/class/<iface>/statistics/rx_errors
54+
What: /sys/class/net/<iface>/statistics/rx_errors
5555
Date: April 2005
5656
KernelVersion: 2.6.12
5757
Contact: netdev@vger.kernel.org
5858
Description:
5959
Indicates the number of receive errors on this network device.
6060
See the network driver for the exact meaning of this value.
6161

62-
What: /sys/class/<iface>/statistics/rx_fifo_errors
62+
What: /sys/class/net/<iface>/statistics/rx_fifo_errors
6363
Date: April 2005
6464
KernelVersion: 2.6.12
6565
Contact: netdev@vger.kernel.org
@@ -68,7 +68,7 @@ Description:
6868
network device. See the network driver for the exact
6969
meaning of this value.
7070

71-
What: /sys/class/<iface>/statistics/rx_frame_errors
71+
What: /sys/class/net/<iface>/statistics/rx_frame_errors
7272
Date: April 2005
7373
KernelVersion: 2.6.12
7474
Contact: netdev@vger.kernel.org
@@ -78,7 +78,7 @@ Description:
7878
on the MAC layer protocol used. See the network driver for
7979
the exact meaning of this value.
8080

81-
What: /sys/class/<iface>/statistics/rx_length_errors
81+
What: /sys/class/net/<iface>/statistics/rx_length_errors
8282
Date: April 2005
8383
KernelVersion: 2.6.12
8484
Contact: netdev@vger.kernel.org
@@ -87,7 +87,7 @@ Description:
8787
error, oversized or undersized. See the network driver for the
8888
exact meaning of this value.
8989

90-
What: /sys/class/<iface>/statistics/rx_missed_errors
90+
What: /sys/class/net/<iface>/statistics/rx_missed_errors
9191
Date: April 2005
9292
KernelVersion: 2.6.12
9393
Contact: netdev@vger.kernel.org
@@ -96,15 +96,15 @@ Description:
9696
due to lack of capacity in the receive side. See the network
9797
driver for the exact meaning of this value.
9898

99-
What: /sys/class/<iface>/statistics/rx_nohandler
99+
What: /sys/class/net/<iface>/statistics/rx_nohandler
100100
Date: February 2016
101101
KernelVersion: 4.6
102102
Contact: netdev@vger.kernel.org
103103
Description:
104104
Indicates the number of received packets that were dropped on
105105
an inactive device by the network core.
106106

107-
What: /sys/class/<iface>/statistics/rx_over_errors
107+
What: /sys/class/net/<iface>/statistics/rx_over_errors
108108
Date: April 2005
109109
KernelVersion: 2.6.12
110110
Contact: netdev@vger.kernel.org
@@ -114,15 +114,15 @@ Description:
114114
(e.g: larger than MTU). See the network driver for the exact
115115
meaning of this value.
116116

117-
What: /sys/class/<iface>/statistics/rx_packets
117+
What: /sys/class/net/<iface>/statistics/rx_packets
118118
Date: April 2005
119119
KernelVersion: 2.6.12
120120
Contact: netdev@vger.kernel.org
121121
Description:
122122
Indicates the total number of good packets received by this
123123
network device.
124124

125-
What: /sys/class/<iface>/statistics/tx_aborted_errors
125+
What: /sys/class/net/<iface>/statistics/tx_aborted_errors
126126
Date: April 2005
127127
KernelVersion: 2.6.12
128128
Contact: netdev@vger.kernel.org
@@ -132,7 +132,7 @@ Description:
132132
a medium collision). See the network driver for the exact
133133
meaning of this value.
134134

135-
What: /sys/class/<iface>/statistics/tx_bytes
135+
What: /sys/class/net/<iface>/statistics/tx_bytes
136136
Date: April 2005
137137
KernelVersion: 2.6.12
138138
Contact: netdev@vger.kernel.org
@@ -143,7 +143,7 @@ Description:
143143
transmitted packets or all packets that have been queued for
144144
transmission.
145145

146-
What: /sys/class/<iface>/statistics/tx_carrier_errors
146+
What: /sys/class/net/<iface>/statistics/tx_carrier_errors
147147
Date: April 2005
148148
KernelVersion: 2.6.12
149149
Contact: netdev@vger.kernel.org
@@ -152,7 +152,7 @@ Description:
152152
because of carrier errors (e.g: physical link down). See the
153153
network driver for the exact meaning of this value.
154154

155-
What: /sys/class/<iface>/statistics/tx_compressed
155+
What: /sys/class/net/<iface>/statistics/tx_compressed
156156
Date: April 2005
157157
KernelVersion: 2.6.12
158158
Contact: netdev@vger.kernel.org
@@ -161,7 +161,7 @@ Description:
161161
this might only be relevant for devices that support
162162
compression (e.g: PPP).
163163

164-
What: /sys/class/<iface>/statistics/tx_dropped
164+
What: /sys/class/net/<iface>/statistics/tx_dropped
165165
Date: April 2005
166166
KernelVersion: 2.6.12
167167
Contact: netdev@vger.kernel.org
@@ -170,7 +170,7 @@ Description:
170170
See the driver for the exact reasons as to why the packets were
171171
dropped.
172172

173-
What: /sys/class/<iface>/statistics/tx_errors
173+
What: /sys/class/net/<iface>/statistics/tx_errors
174174
Date: April 2005
175175
KernelVersion: 2.6.12
176176
Contact: netdev@vger.kernel.org
@@ -179,7 +179,7 @@ Description:
179179
a network device. See the driver for the exact reasons as to
180180
why the packets were dropped.
181181

182-
What: /sys/class/<iface>/statistics/tx_fifo_errors
182+
What: /sys/class/net/<iface>/statistics/tx_fifo_errors
183183
Date: April 2005
184184
KernelVersion: 2.6.12
185185
Contact: netdev@vger.kernel.org
@@ -188,7 +188,7 @@ Description:
188188
FIFO error. See the driver for the exact reasons as to why the
189189
packets were dropped.
190190

191-
What: /sys/class/<iface>/statistics/tx_heartbeat_errors
191+
What: /sys/class/net/<iface>/statistics/tx_heartbeat_errors
192192
Date: April 2005
193193
KernelVersion: 2.6.12
194194
Contact: netdev@vger.kernel.org
@@ -197,7 +197,7 @@ Description:
197197
reported as heartbeat errors. See the driver for the exact
198198
reasons as to why the packets were dropped.
199199

200-
What: /sys/class/<iface>/statistics/tx_packets
200+
What: /sys/class/net/<iface>/statistics/tx_packets
201201
Date: April 2005
202202
KernelVersion: 2.6.12
203203
Contact: netdev@vger.kernel.org
@@ -206,7 +206,7 @@ Description:
206206
device. See the driver for whether this reports the number of all
207207
attempted or successful transmissions.
208208

209-
What: /sys/class/<iface>/statistics/tx_window_errors
209+
What: /sys/class/net/<iface>/statistics/tx_window_errors
210210
Date: April 2005
211211
KernelVersion: 2.6.12
212212
Contact: netdev@vger.kernel.org

‎Documentation/ABI/testing/sysfs-nvmem-cells

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ KernelVersion: 6.5
44
Contact: Miquel Raynal <miquel.raynal@bootlin.com>
55
Description:
66
The "cells" folder contains one file per cell exposed by the
7-
NVMEM device. The name of the file is: <name>@<where>, with
8-
<name> being the cell name and <where> its location in the NVMEM
9-
device, in hexadecimal (without the '0x' prefix, to mimic device
10-
tree node names). The length of the file is the size of the cell
11-
(when known). The content of the file is the binary content of
12-
the cell (may sometimes be ASCII, likely without trailing
13-
character).
7+
NVMEM device. The name of the file is: "<name>@<byte>,<bit>",
8+
with <name> being the cell name and <where> its location in
9+
the NVMEM device, in hexadecimal bytes and bits (without the
10+
'0x' prefix, to mimic device tree node names). The length of
11+
the file is the size of the cell (when known). The content of
12+
the file is the binary content of the cell (may sometimes be
13+
ASCII, likely without trailing character).
1414
Note: This file is only present if CONFIG_NVMEM_SYSFS
1515
is enabled.
1616

1717
Example::
1818

19-
hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d
19+
hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d,0
2020
00000000 54 4e 34 38 4d 2d 50 2d 44 4e |TN48M-P-DN|
2121
0000000a

‎Documentation/arch/arm64/silicon-errata.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,10 @@ stable kernels.
243243
+----------------+-----------------+-----------------+-----------------------------+
244244
| ASR | ASR8601 | #8601001 | N/A |
245245
+----------------+-----------------+-----------------+-----------------------------+
246+
+----------------+-----------------+-----------------+-----------------------------+
247+
| Microsoft | Azure Cobalt 100| #2139208 | ARM64_ERRATUM_2139208 |
248+
+----------------+-----------------+-----------------+-----------------------------+
249+
| Microsoft | Azure Cobalt 100| #2067961 | ARM64_ERRATUM_2067961 |
250+
+----------------+-----------------+-----------------+-----------------------------+
251+
| Microsoft | Azure Cobalt 100| #2253138 | ARM64_ERRATUM_2253138 |
252+
+----------------+-----------------+-----------------+-----------------------------+

‎Documentation/arch/x86/mds.rst

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ The kernel provides a function to invoke the buffer clearing:
9595

9696
mds_clear_cpu_buffers()
9797

98+
Also macro CLEAR_CPU_BUFFERS can be used in ASM late in exit-to-user path.
99+
Other than CFLAGS.ZF, this macro doesn't clobber any registers.
100+
98101
The mitigation is invoked on kernel/userspace, hypervisor/guest and C-state
99102
(idle) transitions.
100103

@@ -138,17 +141,30 @@ Mitigation points
138141

139142
When transitioning from kernel to user space the CPU buffers are flushed
140143
on affected CPUs when the mitigation is not disabled on the kernel
141-
command line. The migitation is enabled through the static key
142-
mds_user_clear.
143-
144-
The mitigation is invoked in prepare_exit_to_usermode() which covers
145-
all but one of the kernel to user space transitions. The exception
146-
is when we return from a Non Maskable Interrupt (NMI), which is
147-
handled directly in do_nmi().
148-
149-
(The reason that NMI is special is that prepare_exit_to_usermode() can
150-
enable IRQs. In NMI context, NMIs are blocked, and we don't want to
151-
enable IRQs with NMIs blocked.)
144+
command line. The mitigation is enabled through the feature flag
145+
X86_FEATURE_CLEAR_CPU_BUF.
146+
147+
The mitigation is invoked just before transitioning to userspace after
148+
user registers are restored. This is done to minimize the window in
149+
which kernel data could be accessed after VERW e.g. via an NMI after
150+
VERW.
151+
152+
**Corner case not handled**
153+
Interrupts returning to kernel don't clear CPUs buffers since the
154+
exit-to-user path is expected to do that anyways. But, there could be
155+
a case when an NMI is generated in kernel after the exit-to-user path
156+
has cleared the buffers. This case is not handled and NMI returning to
157+
kernel don't clear CPU buffers because:
158+
159+
1. It is rare to get an NMI after VERW, but before returning to userspace.
160+
2. For an unprivileged user, there is no known way to make that NMI
161+
less rare or target it.
162+
3. It would take a large number of these precisely-timed NMIs to mount
163+
an actual attack. There's presumably not enough bandwidth.
164+
4. The NMI in question occurs after a VERW, i.e. when user state is
165+
restored and most interesting data is already scrubbed. Whats left
166+
is only the data that NMI touches, and that may or may not be of
167+
any interest.
152168

153169

154170
2. C-State transition

‎Documentation/devicetree/bindings/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ $(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE
2828
find_all_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
2929
-name 'processed-schema*' \)
3030

31-
find_cmd = $(find_all_cmd) | sed 's|^$(srctree)/$(src)/||' | grep -F -e "$(subst :," -e ",$(DT_SCHEMA_FILES))" | sed 's|^|$(srctree)/$(src)/|'
31+
find_cmd = $(find_all_cmd) | \
32+
sed 's|^$(srctree)/||' | \
33+
grep -F -e "$(subst :," -e ",$(DT_SCHEMA_FILES))" | \
34+
sed 's|^|$(srctree)/|'
3235
CHK_DT_DOCS := $(shell $(find_cmd))
3336

3437
quiet_cmd_yamllint = LINT $(src)

‎Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Ceva AHCI SATA Controller
88

99
maintainers:
10-
- Piyush Mehta <piyush.mehta@amd.com>
10+
- Mubin Sayyed <mubin.sayyed@amd.com>
11+
- Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
1112

1213
description: |
1314
The Ceva SATA controller mostly conforms to the AHCI interface with some

‎Documentation/devicetree/bindings/display/bridge/nxp,tda998x.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,22 @@ properties:
2929

3030
audio-ports:
3131
description:
32-
Array of 8-bit values, 2 values per DAI (Documentation/sound/soc/dai.rst).
32+
Array of 2 values per DAI (Documentation/sound/soc/dai.rst).
3333
The implementation allows one or two DAIs.
3434
If two DAIs are defined, they must be of different type.
3535
$ref: /schemas/types.yaml#/definitions/uint32-matrix
36+
minItems: 1
37+
maxItems: 2
3638
items:
37-
minItems: 1
3839
items:
3940
- description: |
4041
The first value defines the DAI type: TDA998x_SPDIF or TDA998x_I2S
4142
(see include/dt-bindings/display/tda998x.h).
43+
enum: [ 1, 2 ]
4244
- description:
4345
The second value defines the tda998x AP_ENA reg content when the
4446
DAI in question is used.
47+
maximum: 0xff
4548

4649
'#sound-dai-cells':
4750
enum: [ 0, 1 ]

‎Documentation/devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ description:
1212
PS_MODE). Every pin can be configured as input/output.
1313

1414
maintainers:
15-
- Piyush Mehta <piyush.mehta@amd.com>
15+
- Mubin Sayyed <mubin.sayyed@amd.com>
16+
- Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
1617

1718
properties:
1819
compatible:

‎Documentation/devicetree/bindings/net/marvell,prestera.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ examples:
7878
pcie@0 {
7979
#address-cells = <3>;
8080
#size-cells = <2>;
81-
ranges = <0x0 0x0 0x0 0x0 0x0 0x0>;
82-
reg = <0x0 0x0 0x0 0x0 0x0 0x0>;
81+
ranges = <0x02000000 0x0 0x100000 0x10000000 0x0 0x0>;
82+
reg = <0x0 0x1000>;
8383
device_type = "pci";
8484
8585
switch@0,0 {

0 commit comments

Comments
 (0)