Skip to content

Commit 61fb9b9

Browse files
bmastbergenbmastbergen
committed
arm64: errata: Mitigate TLBI errata on various Arm CPUs
jira VULN-XXXXXX cve CVE-2025-10263 commit-author Mark Rutland <mark.rutland@arm.com> commit - commit-source https://lore.kernel.org/all/20260609101203.1512409-4-mark.rutland@arm.com/ upstream-diff silicon-errata.rst at different path (Documentation/arm64/ vs Documentation/arch/arm64/) and required manual conflict resolution due to condensed table formatting and missing entries in our branch. Content is identical. A number of CPUs developed by Arm suffer from errata whereby a broadcast TLBI;DSB sequence may complete before the global observation of writes which are translated by an affected TLB entry. These errata ONLY affect the completion of memory accesses which have been translated by an invalidated TLB entry, and these errata DO NOT affect the actual invalidation of TLB entries. TLB entries are removed correctly. This issue has been assigned CVE ID CVE-2025-10263. To mitigate this issue, Arm recommends that software follows any affected TLBI;DSB sequence with an additional TLBI;DSB, which will ensure that all memory write effects affected by the first TLBI have been globally observed. The additional TLBI can use any operation that is broadcast to affected CPUs, and the additional DSB can use any option that is sufficient to complete the additional TLBI. The ARM64_WORKAROUND_REPEAT_TLBI workaround is sufficient to mitigate the issue. Enable this workaround for affected CPUs, and update the silicon errata documentation accordingly. Note that due to the manner in which Arm develops IP and tracks errata, some CPUs share a common erratum number. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Brett Mastbergen <bmastbergen@ciq.com>
1 parent 16b020e commit 61fb9b9

3 files changed

Lines changed: 108 additions & 2 deletions

File tree

‎Documentation/arm64/silicon-errata.rst‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,22 @@ stable kernels.
122122
+----------------+-----------------+-----------------+-----------------------------+
123123
| ARM | Cortex-A76 | #1490853 | N/A |
124124
+----------------+-----------------+-----------------+-----------------------------+
125+
| ARM | Cortex-A76 | #4193800 | ARM64_ERRATUM_4118414 |
126+
+----------------+-----------------+-----------------+-----------------------------+
127+
| ARM | Cortex-A76AE | #4193801 | ARM64_ERRATUM_4118414 |
128+
+----------------+-----------------+-----------------+-----------------------------+
125129
| ARM | Cortex-A77 | #1491015 | N/A |
126130
+----------------+-----------------+-----------------+-----------------------------+
127131
| ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 |
128132
+----------------+-----------------+-----------------+-----------------------------+
133+
| ARM | Cortex-A77 | #4193798 | ARM64_ERRATUM_4118414 |
134+
+----------------+-----------------+-----------------+-----------------------------+
135+
| ARM | Cortex-A78 | #4193791 | ARM64_ERRATUM_4118414 |
136+
+----------------+-----------------+-----------------+-----------------------------+
137+
| ARM | Cortex-A78AE | #4193793 | ARM64_ERRATUM_4118414 |
138+
+----------------+-----------------+-----------------+-----------------------------+
139+
| ARM | Cortex-A78C | #4193794 | ARM64_ERRATUM_4118414 |
140+
+----------------+-----------------+-----------------+-----------------------------+
129141
| ARM | Cortex-A510 | #2051678 | ARM64_ERRATUM_2051678 |
130142
+----------------+-----------------+-----------------+-----------------------------+
131143
| ARM | Cortex-A510 | #2077057 | ARM64_ERRATUM_2077057 |
@@ -142,24 +154,38 @@ stable kernels.
142154
+----------------+-----------------+-----------------+-----------------------------+
143155
| ARM | Cortex-A710 | #3324338 | ARM64_ERRATUM_3194386 |
144156
+----------------+-----------------+-----------------+-----------------------------+
157+
| ARM | Cortex-A710 | #4193788 | ARM64_ERRATUM_4118414 |
158+
+----------------+-----------------+-----------------+-----------------------------+
145159
| ARM | Cortex-A715 | #2645198 | ARM64_ERRATUM_2645198 |
146160
+----------------+-----------------+-----------------+-----------------------------+
147161
| ARM | Cortex-A720 | #3456091 | ARM64_ERRATUM_3194386 |
148162
+----------------+-----------------+-----------------+-----------------------------+
149163
| ARM | Cortex-X1 | #1502854 | N/A |
150164
+----------------+-----------------+-----------------+-----------------------------+
165+
| ARM | Cortex-X1 | #4193791 | ARM64_ERRATUM_4118414 |
166+
+----------------+-----------------+-----------------+-----------------------------+
167+
| ARM | Cortex-X1C | #4193792 | ARM64_ERRATUM_4118414 |
168+
+----------------+-----------------+-----------------+-----------------------------+
151169
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
152170
+----------------+-----------------+-----------------+-----------------------------+
153171
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |
154172
+----------------+-----------------+-----------------+-----------------------------+
155173
| ARM | Cortex-X2 | #3324338 | ARM64_ERRATUM_3194386 |
156174
+----------------+-----------------+-----------------+-----------------------------+
175+
| ARM | Cortex-X2 | #4193788 | ARM64_ERRATUM_4118414 |
176+
+----------------+-----------------+-----------------+-----------------------------+
157177
| ARM | Cortex-X3 | #3324335 | ARM64_ERRATUM_3194386 |
158178
+----------------+-----------------+-----------------+-----------------------------+
179+
| ARM | Cortex-X3 | #4193786 | ARM64_ERRATUM_4118414 |
180+
+----------------+-----------------+-----------------+-----------------------------+
159181
| ARM | Cortex-X4 | #3194386 | ARM64_ERRATUM_3194386 |
160182
+----------------+-----------------+-----------------+-----------------------------+
183+
| ARM | Cortex-X4 | #4118414 | ARM64_ERRATUM_4118414 |
184+
+----------------+-----------------+-----------------+-----------------------------+
161185
| ARM | Cortex-X925 | #3324334 | ARM64_ERRATUM_3194386 |
162186
+----------------+-----------------+-----------------+-----------------------------+
187+
| ARM | Cortex-X925 | #4193781 | ARM64_ERRATUM_4118414 |
188+
+----------------+-----------------+-----------------+-----------------------------+
163189
| ARM | Neoverse-N1 | #1188873,1418040| ARM64_ERRATUM_1418040 |
164190
+----------------+-----------------+-----------------+-----------------------------+
165191
| ARM | Neoverse-N1 | #1349291 | N/A |
@@ -168,6 +194,8 @@ stable kernels.
168194
+----------------+-----------------+-----------------+-----------------------------+
169195
| ARM | Neoverse-N1 | #1542419 | ARM64_ERRATUM_1542419 |
170196
+----------------+-----------------+-----------------+-----------------------------+
197+
| ARM | Neoverse-N1 | #4193800 | ARM64_ERRATUM_4118414 |
198+
+----------------+-----------------+-----------------+-----------------------------+
171199
| ARM | Neoverse-N2 | #2139208 | ARM64_ERRATUM_2139208 |
172200
+----------------+-----------------+-----------------+-----------------------------+
173201
| ARM | Neoverse-N2 | #2067961 | ARM64_ERRATUM_2067961 |
@@ -176,12 +204,26 @@ stable kernels.
176204
+----------------+-----------------+-----------------+-----------------------------+
177205
| ARM | Neoverse-N2 | #3324339 | ARM64_ERRATUM_3194386 |
178206
+----------------+-----------------+-----------------+-----------------------------+
207+
| ARM | Neoverse-N2 | #4193789 | ARM64_ERRATUM_4118414 |
208+
+----------------+-----------------+-----------------+-----------------------------+
179209
| ARM | Neoverse-V2 | #3324336 | ARM64_ERRATUM_3194386 |
180210
+----------------+-----------------+-----------------+-----------------------------+
211+
| ARM | Neoverse-V2 | #4193787 | ARM64_ERRATUM_4118414 |
212+
+----------------+-----------------+-----------------+-----------------------------+
181213
| ARM | Neoverse-V3 | #3312417 | ARM64_ERRATUM_3194386 |
182214
+----------------+-----------------+-----------------+-----------------------------+
215+
| ARM | Neoverse-V3 | #4193784 | ARM64_ERRATUM_4118414 |
216+
+----------------+-----------------+-----------------+-----------------------------+
217+
| ARM | Neoverse-V3AE | #4193784 | ARM64_ERRATUM_4118414 |
218+
+----------------+-----------------+-----------------+-----------------------------+
183219
| ARM | Neoverse-V1 | #1619801 | N/A |
184220
+----------------+-----------------+-----------------+-----------------------------+
221+
| ARM | Neoverse-V1 | #4193790 | ARM64_ERRATUM_4118414 |
222+
+----------------+-----------------+-----------------+-----------------------------+
223+
| ARM | C1-Premium | #4193780 | ARM64_ERRATUM_4118414 |
224+
+----------------+-----------------+-----------------+-----------------------------+
225+
| ARM | C1-Ultra | #4193780 | ARM64_ERRATUM_4118414 |
226+
+----------------+-----------------+-----------------+-----------------------------+
185227
| ARM | MMU-500 | #841119,826419 | N/A |
186228
+----------------+-----------------+-----------------+-----------------------------+
187229
| ARM | MMU-600 | #1076982,1209401| N/A |

‎arch/arm64/Kconfig‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,6 +1068,42 @@ config ARM64_ERRATUM_3194386
10681068

10691069
If unsure, say Y.
10701070

1071+
config ARM64_ERRATUM_4118414
1072+
bool "Cortex-*/Neoverse-*/C1-*: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
1073+
default y
1074+
select ARM64_WORKAROUND_REPEAT_TLBI
1075+
help
1076+
This option adds a workaround for the following errata:
1077+
1078+
* ARM C1-Premium erratum 4193780
1079+
* ARM C1-Ultra erratum 4193780
1080+
* ARM Cortex-A76 erratum 4193800
1081+
* ARM Cortex-A76AE erratum 4193801
1082+
* ARM Cortex-A77 erratum 4193798
1083+
* ARM Cortex-A78 erratum 4193791
1084+
* ARM Cortex-A78AE erratum 4193793
1085+
* ARM Cortex-A78C erratum 4193794
1086+
* ARM Cortex-A710 erratum 4193788
1087+
* ARM Cortex-X1 erratum 4193791
1088+
* ARM Cortex-X1C erratum 4193792
1089+
* ARM Cortex-X2 erratum 4193788
1090+
* ARM Cortex-X3 erratum 4193786
1091+
* ARM Cortex-X4 erratum 4118414
1092+
* ARM Cortex-X925 erratum 4193781
1093+
* ARM Neoverse-N1 erratum 4193800
1094+
* ARM Neoverse-N2 erratum 4193789
1095+
* ARM Neoverse-V1 erratum 4193790
1096+
* ARM Neoverse-V2 erratum 4193787
1097+
* ARM Neoverse-V3 erratum 4193784
1098+
* ARM Neoverse-V3AE erratum 4193784
1099+
1100+
On affected cores, some memory accesses might not be completed by
1101+
broadcast TLB invalidation.
1102+
1103+
This issue is also known as CVE-2025-10263.
1104+
1105+
If unsure, say Y.
1106+
10711107
config CAVIUM_ERRATUM_22375
10721108
bool "Cavium erratum 22375, 24313"
10731109
default y

‎arch/arm64/kernel/cpu_errata.c‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,35 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = {
225225
ERRATA_MIDR_RANGE(MIDR_CORTEX_A510, 0, 0, 1, 1),
226226
},
227227
#endif
228-
{},
228+
#ifdef CONFIG_ARM64_ERRATUM_4118414
229+
{
230+
ERRATA_MIDR_RANGE_LIST(((const struct midr_range[]) {
231+
MIDR_ALL_VERSIONS(MIDR_C1_PREMIUM),
232+
MIDR_ALL_VERSIONS(MIDR_C1_ULTRA),
233+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A76),
234+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A76AE),
235+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A77),
236+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78),
237+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78AE),
238+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78C),
239+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
240+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X1),
241+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X1C),
242+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X2),
243+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X3),
244+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X4),
245+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X925),
246+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1),
247+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
248+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V1),
249+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),
250+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
251+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3AE),
252+
{}
253+
})),
254+
},
255+
#endif
256+
{}
229257
};
230258
#endif
231259

@@ -532,7 +560,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
532560
#endif
533561
#ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI
534562
{
535-
.desc = "Qualcomm erratum 1009, or ARM erratum 1286807, 2441009",
563+
.desc = "Broken broadcast TLBI completion",
536564
.capability = ARM64_WORKAROUND_REPEAT_TLBI,
537565
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
538566
.matches = cpucap_multi_entry_cap_matches,

0 commit comments

Comments
 (0)