Skip to content

Commit 51cce81

Browse files
bmastbergenPlaidCat
bmastbergen
authored and
PlaidCat
committed
arm64: errata: Mitigate TLBI errata on various Arm CPUs
cve cve-2025-10263 commit-author Mark Rutland <mark.rutland@arm.com> commit - commit-source-sha cfd391e commit-source arm64 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. 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: Will Deacon <will@kernel.org> (cherry picked from commit cfd391e) Signed-off-by: Jonathan Maple <jmaple@ciq.com> (cherry picked from commit a96d5f4) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 3a67092 commit 51cce81

3 files changed

Lines changed: 104 additions & 1 deletion

File tree

‎Documentation/arm64/silicon-errata.rst‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,58 @@ stable kernels.
8888
+----------------+-----------------+-----------------+-----------------------------+
8989
| ARM | Cortex-A76 | #1463225 | ARM64_ERRATUM_1463225 |
9090
+----------------+-----------------+-----------------+-----------------------------+
91+
| ARM | Cortex-A76 | #4193800 | ARM64_ERRATUM_4118414 |
92+
+----------------+-----------------+-----------------+-----------------------------+
93+
| ARM | Cortex-A76AE | #4193801 | ARM64_ERRATUM_4118414 |
94+
+----------------+-----------------+-----------------+-----------------------------+
95+
| ARM | Cortex-A77 | #4193798 | ARM64_ERRATUM_4118414 |
96+
+----------------+-----------------+-----------------+-----------------------------+
97+
| ARM | Cortex-A78 | #4193791 | ARM64_ERRATUM_4118414 |
98+
+----------------+-----------------+-----------------+-----------------------------+
99+
| ARM | Cortex-A78AE | #4193793 | ARM64_ERRATUM_4118414 |
100+
+----------------+-----------------+-----------------+-----------------------------+
101+
| ARM | Cortex-A78C | #4193794 | ARM64_ERRATUM_4118414 |
102+
+----------------+-----------------+-----------------+-----------------------------+
103+
| ARM | Cortex-A710 | #4193788 | ARM64_ERRATUM_4118414 |
104+
+----------------+-----------------+-----------------+-----------------------------+
91105
| ARM | Cortex-A55 | #1530923 | ARM64_ERRATUM_1530923 |
92106
+----------------+-----------------+-----------------+-----------------------------+
93107
| ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 |
94108
+----------------+-----------------+-----------------+-----------------------------+
109+
| ARM | Cortex-X1 | #4193791 | ARM64_ERRATUM_4118414 |
110+
+----------------+-----------------+-----------------+-----------------------------+
111+
| ARM | Cortex-X1C | #4193792 | ARM64_ERRATUM_4118414 |
112+
+----------------+-----------------+-----------------+-----------------------------+
113+
| ARM | Cortex-X2 | #4193788 | ARM64_ERRATUM_4118414 |
114+
+----------------+-----------------+-----------------+-----------------------------+
115+
| ARM | Cortex-X3 | #4193786 | ARM64_ERRATUM_4118414 |
116+
+----------------+-----------------+-----------------+-----------------------------+
117+
| ARM | Cortex-X4 | #4118414 | ARM64_ERRATUM_4118414 |
118+
+----------------+-----------------+-----------------+-----------------------------+
119+
| ARM | Cortex-X925 | #4193781 | ARM64_ERRATUM_4118414 |
120+
+----------------+-----------------+-----------------+-----------------------------+
121+
| ARM | Neoverse-N1 | #1349291 | N/A |
122+
+----------------+-----------------+-----------------+-----------------------------+
95123
| ARM | Neoverse-N1 | #1188873,1418040| ARM64_ERRATUM_1418040 |
96124
+----------------+-----------------+-----------------+-----------------------------+
97125
| ARM | Neoverse-N1 | #1349291 | N/A |
98126
+----------------+-----------------+-----------------+-----------------------------+
99127
| ARM | Neoverse-N1 | #1542419 | ARM64_ERRATUM_1542419 |
100128
+----------------+-----------------+-----------------+-----------------------------+
129+
| ARM | Neoverse-N1 | #4193800 | ARM64_ERRATUM_4118414 |
130+
+----------------+-----------------+-----------------+-----------------------------+
131+
| ARM | Neoverse-N2 | #4193789 | ARM64_ERRATUM_4118414 |
132+
+----------------+-----------------+-----------------+-----------------------------+
133+
| ARM | Neoverse-V1 | #4193790 | ARM64_ERRATUM_4118414 |
134+
+----------------+-----------------+-----------------+-----------------------------+
135+
| ARM | Neoverse-V3 | #4193784 | ARM64_ERRATUM_4118414 |
136+
+----------------+-----------------+-----------------+-----------------------------+
137+
| ARM | Neoverse-V3AE | #4193784 | ARM64_ERRATUM_4118414 |
138+
+----------------+-----------------+-----------------+-----------------------------+
139+
| ARM | C1-Premium | #4193780 | ARM64_ERRATUM_4118414 |
140+
+----------------+-----------------+-----------------+-----------------------------+
141+
| ARM | C1-Ultra | #4193780 | ARM64_ERRATUM_4118414 |
142+
+----------------+-----------------+-----------------+-----------------------------+
101143
| ARM | MMU-500 | #841119,826419 | N/A |
102144
+----------------+-----------------+-----------------+-----------------------------+
103145
+----------------+-----------------+-----------------+-----------------------------+

‎arch/arm64/Kconfig‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,39 @@ config ARM64_ERRATUM_1508412
669669
Work around the issue by inserting DMB SY barriers around PAR_EL1
670670
register reads and warning KVM users. The DMB barrier is sufficient
671671
to prevent a speculative PAR_EL1 read.
672+
config ARM64_ERRATUM_4118414
673+
bool "Cortex-*/Neoverse-*/C1-*: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
674+
default y
675+
select ARM64_WORKAROUND_REPEAT_TLBI
676+
help
677+
This option adds a workaround for the following errata:
678+
679+
* ARM C1-Premium erratum 4193780
680+
* ARM C1-Ultra erratum 4193780
681+
* ARM Cortex-A76 erratum 4193800
682+
* ARM Cortex-A76AE erratum 4193801
683+
* ARM Cortex-A77 erratum 4193798
684+
* ARM Cortex-A78 erratum 4193791
685+
* ARM Cortex-A78AE erratum 4193793
686+
* ARM Cortex-A78C erratum 4193794
687+
* ARM Cortex-A710 erratum 4193788
688+
* ARM Cortex-X1 erratum 4193791
689+
* ARM Cortex-X1C erratum 4193792
690+
* ARM Cortex-X2 erratum 4193788
691+
* ARM Cortex-X3 erratum 4193786
692+
* ARM Cortex-X4 erratum 4118414
693+
* ARM Cortex-X925 erratum 4193781
694+
* ARM Neoverse-N1 erratum 4193800
695+
* ARM Neoverse-N2 erratum 4193789
696+
* ARM Neoverse-V1 erratum 4193790
697+
* ARM Neoverse-V2 erratum 4193787
698+
* ARM Neoverse-V3 erratum 4193784
699+
* ARM Neoverse-V3AE erratum 4193784
700+
701+
On affected cores, some memory accesses might not be completed by
702+
broadcast TLB invalidation.
703+
704+
This issue is also known as CVE-2025-10263.
672705

673706
If unsure, say Y.
674707

‎arch/arm64/kernel/cpu_errata.c‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,34 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = {
684684
{
685685
ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 3, 0),
686686
},
687+
#endif
688+
#ifdef CONFIG_ARM64_ERRATUM_4118414
689+
{
690+
ERRATA_MIDR_RANGE_LIST(((const struct midr_range[]) {
691+
MIDR_ALL_VERSIONS(MIDR_C1_PREMIUM),
692+
MIDR_ALL_VERSIONS(MIDR_C1_ULTRA),
693+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A76),
694+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A76AE),
695+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A77),
696+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78),
697+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78AE),
698+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78C),
699+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
700+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X1),
701+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X1C),
702+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X2),
703+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X3),
704+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X4),
705+
MIDR_ALL_VERSIONS(MIDR_CORTEX_X925),
706+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1),
707+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
708+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V1),
709+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),
710+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
711+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3AE),
712+
{}
713+
})),
714+
},
687715
#endif
688716
{},
689717
};
@@ -900,7 +928,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
900928
#endif
901929
#ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI
902930
{
903-
.desc = "Qualcomm erratum 1009, or ARM erratum 1286807",
931+
.desc = "Broken broadcast TLBI completion",
904932
.capability = ARM64_WORKAROUND_REPEAT_TLBI,
905933
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
906934
.matches = cpucap_multi_entry_cap_matches,

0 commit comments

Comments
 (0)