Skip to content

Commit 77856d9

Browse files
torvaldstorvalds
committed
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon: - Fix Kconfig dependencies to re-allow the enabling of function graph tracer and shadow call stacks at the same time. - Revert the workaround for CPU erratum #2645198 since the CONFIG_ guards were incorrect and the code has therefore not seen any real exposure in -next. * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption" ftrace: Allow WITH_ARGS flavour of graph tracer with shadow call stack
2 parents aa4800e + c0cd1d5 commit 77856d9

File tree

9 files changed

+1
-87
lines changed

9 files changed

+1
-87
lines changed

‎Documentation/arm64/silicon-errata.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ stable kernels.
120120
+----------------+-----------------+-----------------+-----------------------------+
121121
| ARM | Cortex-A710 | #2224489 | ARM64_ERRATUM_2224489 |
122122
+----------------+-----------------+-----------------+-----------------------------+
123-
| ARM | Cortex-A715 | #2645198 | ARM64_ERRATUM_2645198 |
124-
+----------------+-----------------+-----------------+-----------------------------+
125123
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
126124
+----------------+-----------------+-----------------+-----------------------------+
127125
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |

‎arch/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ config ARCH_SUPPORTS_SHADOW_CALL_STACK
638638
config SHADOW_CALL_STACK
639639
bool "Shadow Call Stack"
640640
depends on ARCH_SUPPORTS_SHADOW_CALL_STACK
641-
depends on DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER
641+
depends on DYNAMIC_FTRACE_WITH_ARGS || DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER
642642
help
643643
This option enables the compiler's Shadow Call Stack, which
644644
uses a shadow stack to protect function return addresses from

‎arch/arm64/Kconfig‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -972,22 +972,6 @@ config ARM64_ERRATUM_2457168
972972

973973
If unsure, say Y.
974974

975-
config ARM64_ERRATUM_2645198
976-
bool "Cortex-A715: 2645198: Workaround possible [ESR|FAR]_ELx corruption"
977-
default y
978-
help
979-
This option adds the workaround for ARM Cortex-A715 erratum 2645198.
980-
981-
If a Cortex-A715 cpu sees a page mapping permissions change from executable
982-
to non-executable, it may corrupt the ESR_ELx and FAR_ELx registers on the
983-
next instruction abort caused by permission fault.
984-
985-
Only user-space does executable to non-executable permission transition via
986-
mprotect() system call. Workaround the problem by doing a break-before-make
987-
TLB invalidation, for all changes to executable user space mappings.
988-
989-
If unsure, say Y.
990-
991975
config CAVIUM_ERRATUM_22375
992976
bool "Cavium erratum 22375, 24313"
993977
default y

‎arch/arm64/include/asm/hugetlb.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,6 @@ extern pte_t huge_ptep_get(pte_t *ptep);
4949

5050
void __init arm64_hugetlb_cma_reserve(void);
5151

52-
#define huge_ptep_modify_prot_start huge_ptep_modify_prot_start
53-
extern pte_t huge_ptep_modify_prot_start(struct vm_area_struct *vma,
54-
unsigned long addr, pte_t *ptep);
55-
56-
#define huge_ptep_modify_prot_commit huge_ptep_modify_prot_commit
57-
extern void huge_ptep_modify_prot_commit(struct vm_area_struct *vma,
58-
unsigned long addr, pte_t *ptep,
59-
pte_t old_pte, pte_t new_pte);
60-
6152
#include <asm-generic/hugetlb.h>
6253

6354
#endif /* __ASM_HUGETLB_H */

‎arch/arm64/include/asm/pgtable.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,15 +1093,6 @@ static inline bool pud_sect_supported(void)
10931093
}
10941094

10951095

1096-
#define __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION
1097-
#define ptep_modify_prot_start ptep_modify_prot_start
1098-
extern pte_t ptep_modify_prot_start(struct vm_area_struct *vma,
1099-
unsigned long addr, pte_t *ptep);
1100-
1101-
#define ptep_modify_prot_commit ptep_modify_prot_commit
1102-
extern void ptep_modify_prot_commit(struct vm_area_struct *vma,
1103-
unsigned long addr, pte_t *ptep,
1104-
pte_t old_pte, pte_t new_pte);
11051096
#endif /* !__ASSEMBLY__ */
11061097

11071098
#endif /* __ASM_PGTABLE_H */

‎arch/arm64/kernel/cpu_errata.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -661,13 +661,6 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
661661
CAP_MIDR_RANGE_LIST(trbe_write_out_of_range_cpus),
662662
},
663663
#endif
664-
#ifdef CONFIG_ARM64_ERRATUM_2645198
665-
{
666-
.desc = "ARM erratum 2645198",
667-
.capability = ARM64_WORKAROUND_2645198,
668-
ERRATA_MIDR_ALL_VERSIONS(MIDR_CORTEX_A715)
669-
},
670-
#endif
671664
#ifdef CONFIG_ARM64_ERRATUM_2077057
672665
{
673666
.desc = "ARM erratum 2077057",

‎arch/arm64/mm/hugetlbpage.c‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -559,24 +559,3 @@ bool __init arch_hugetlb_valid_size(unsigned long size)
559559
{
560560
return __hugetlb_valid_size(size);
561561
}
562-
563-
pte_t huge_ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
564-
{
565-
if (IS_ENABLED(CONFIG_ARM64_WORKAROUND_2645198) &&
566-
cpus_have_const_cap(ARM64_WORKAROUND_2645198)) {
567-
/*
568-
* Break-before-make (BBM) is required for all user space mappings
569-
* when the permission changes from executable to non-executable
570-
* in cases where cpu is affected with errata #2645198.
571-
*/
572-
if (pte_user_exec(READ_ONCE(*ptep)))
573-
return huge_ptep_clear_flush(vma, addr, ptep);
574-
}
575-
return huge_ptep_get_and_clear(vma->vm_mm, addr, ptep);
576-
}
577-
578-
void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep,
579-
pte_t old_pte, pte_t pte)
580-
{
581-
set_huge_pte_at(vma->vm_mm, addr, ptep, pte);
582-
}

‎arch/arm64/mm/mmu.c‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,24 +1630,3 @@ static int __init prevent_bootmem_remove_init(void)
16301630
}
16311631
early_initcall(prevent_bootmem_remove_init);
16321632
#endif
1633-
1634-
pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
1635-
{
1636-
if (IS_ENABLED(CONFIG_ARM64_WORKAROUND_2645198) &&
1637-
cpus_have_const_cap(ARM64_WORKAROUND_2645198)) {
1638-
/*
1639-
* Break-before-make (BBM) is required for all user space mappings
1640-
* when the permission changes from executable to non-executable
1641-
* in cases where cpu is affected with errata #2645198.
1642-
*/
1643-
if (pte_user_exec(READ_ONCE(*ptep)))
1644-
return ptep_clear_flush(vma, addr, ptep);
1645-
}
1646-
return ptep_get_and_clear(vma->vm_mm, addr, ptep);
1647-
}
1648-
1649-
void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep,
1650-
pte_t old_pte, pte_t pte)
1651-
{
1652-
set_pte_at(vma->vm_mm, addr, ptep, pte);
1653-
}

‎arch/arm64/tools/cpucaps‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ WORKAROUND_2038923
7171
WORKAROUND_2064142
7272
WORKAROUND_2077057
7373
WORKAROUND_2457168
74-
WORKAROUND_2645198
7574
WORKAROUND_2658417
7675
WORKAROUND_TRBE_OVERWRITE_FILL_MODE
7776
WORKAROUND_TSB_FLUSH_FAILURE

0 commit comments

Comments
 (0)