riscv: Fix crash during early errata patching
PATCH 1/2 riscv: Fix crash during early errata patching
The patch function for the T-Head PBMT errata calls __pa_symbol() before relocation. This crashes when CONFIG_DEBUG_VIRTUAL is enabled, because __pa_symbol() forwards to __phys_addr_symbol(), and __phys_addr_symbol() checks against the absolute kernel start/end address.
Fix this by directly using the underlying kernel_mapping_va_to_pa().
---
arch/riscv/errata/thead/errata.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/riscv/errata/thead/errata.c +3 -2
@@ -76,8 +76,9 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alif (cpu_req_errata & tmp) {/* On vm-alternatives, the mmu isn't running yet */ if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -memcpy ((void *)__pa_symbol (alt->old_ptr), - (void *)__pa_symbol (alt->alt_ptr), alt->alt_len); +memcpy ((void *)kernel_mapping_va_to_pa ((unsigned long )alt->old_ptr), + (void *)kernel_mapping_va_to_pa ((unsigned long )alt->alt_ptr), + alt->alt_len);else patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len); }
Signature · 1 line
2.35.1
PATCH 2/2 riscv: Move cast inside kernel_mapping_[pv]a_to_[vp]a
Before commit 44c922572952 ("RISC-V: enable XIP"), these macros cast their argument to unsigned long. That commit moved the cast after an assignment to an unsigned long variable, rendering it ineffectual. Move the cast back, so we can remove the cast at each call site.
---
arch/riscv/errata/thead/errata.c | 4 ++-- arch/riscv/include/asm/page.h | 18 +++++++++--------- arch/riscv/mm/init.c | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-)
arch/riscv/errata/thead/errata.c +2 -2
@@ -76,8 +76,8 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alif (cpu_req_errata & tmp) {/* On vm-alternatives, the mmu isn't running yet */ if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -memcpy ((void *)kernel_mapping_va_to_pa ((unsigned long )alt->old_ptr), - (void *)kernel_mapping_va_to_pa ((unsigned long )alt->alt_ptr), +memcpy ((void *)kernel_mapping_va_to_pa (alt->old_ptr), + (void *)kernel_mapping_va_to_pa (alt->alt_ptr), alt->alt_len);else patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len);
arch/riscv/include/asm/page.h +9 -9
@@ -123,20 +123,20 @@ extern phys_addr_t phys_ram_base; ((x) >= PAGE_OFFSET && (!IS_ENABLED(CONFIG_64BIT) || (x) < PAGE_OFFSET + KERN_VIRT_SIZE))#define linear_mapping_pa_to_va (x) ((void *)((unsigned long)(x) + kernel_map.va_pa_offset)) -#define kernel_mapping_pa_to_va (y) ({ \ - unsigned long _y = y; \ - (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < phys_ram_base) ? \ - (void *)((unsigned long)(_y) + kernel_map.va_kernel_xip_pa_offset) : \ - (void *)((unsigned long)(_y) + kernel_map.va_kernel_pa_offset + XIP_OFFSET); \ +#define kernel_mapping_pa_to_va (y) ({ \ + unsigned long _y = (unsigned long)(y); \ + (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < phys_ram_base) ? \ + (void *)(_y + kernel_map.va_kernel_xip_pa_offset) : \ + (void *)(_y + kernel_map.va_kernel_pa_offset + XIP_OFFSET); \ })#define __pa_to_va_nodebug (x) linear_mapping_pa_to_va(x)#define linear_mapping_va_to_pa (x) ((unsigned long)(x) - kernel_map.va_pa_offset)#define kernel_mapping_va_to_pa (y) ({ \ - unsigned long _y = y; \ - (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ? \ - ((unsigned long)(_y) - kernel_map.va_kernel_xip_pa_offset) : \ - ((unsigned long)(_y) - kernel_map.va_kernel_pa_offset - XIP_OFFSET); \ + unsigned long _y = (unsigned long)(y); \ + (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ? \ + (_y - kernel_map.va_kernel_xip_pa_offset) : \ + (_y - kernel_map.va_kernel_pa_offset - XIP_OFFSET); \ })#define __va_to_pa_nodebug (x) ({ \
arch/riscv/mm/init.c +8 -8
@@ -927,15 +927,15 @@ static void __init pt_ops_set_early(void)*/ static void __init pt_ops_set_fixmap (void ) { - pt_ops.alloc_pte =kernel_mapping_pa_to_va ((uintptr_t )alloc_pte_fixmap); - pt_ops.get_pte_virt =kernel_mapping_pa_to_va ((uintptr_t )get_pte_virt_fixmap); + pt_ops.alloc_pte =kernel_mapping_pa_to_va (alloc_pte_fixmap); + pt_ops.get_pte_virt =kernel_mapping_pa_to_va (get_pte_virt_fixmap);#ifndef __PAGETABLE_PMD_FOLDED - pt_ops.alloc_pmd =kernel_mapping_pa_to_va ((uintptr_t )alloc_pmd_fixmap); - pt_ops.get_pmd_virt =kernel_mapping_pa_to_va ((uintptr_t )get_pmd_virt_fixmap); - pt_ops.alloc_pud =kernel_mapping_pa_to_va ((uintptr_t )alloc_pud_fixmap); - pt_ops.get_pud_virt =kernel_mapping_pa_to_va ((uintptr_t )get_pud_virt_fixmap); - pt_ops.alloc_p4d =kernel_mapping_pa_to_va ((uintptr_t )alloc_p4d_fixmap); - pt_ops.get_p4d_virt =kernel_mapping_pa_to_va ((uintptr_t )get_p4d_virt_fixmap); + pt_ops.alloc_pmd =kernel_mapping_pa_to_va (alloc_pmd_fixmap); + pt_ops.get_pmd_virt =kernel_mapping_pa_to_va (get_pmd_virt_fixmap); + pt_ops.alloc_pud =kernel_mapping_pa_to_va (alloc_pud_fixmap); + pt_ops.get_pud_virt =kernel_mapping_pa_to_va (get_pud_virt_fixmap); + pt_ops.alloc_p4d =kernel_mapping_pa_to_va (alloc_p4d_fixmap); + pt_ops.get_p4d_virt =kernel_mapping_pa_to_va (get_p4d_virt_fixmap);#endif }
Signature · 1 line
2.35.1
Re: [PATCH 2/2] riscv: Move cast inside kernel_mapping_[pv]a_to_[vp]a
Quoted 80 lines · Samuel Holland
Before commit
44c922572952("RISC-V: enable XIP"), these macros cast their argument to unsigned long. That commit moved the cast after an assignment to an unsigned long variable, rendering it ineffectual. Move the cast back, so we can remove the cast at each call site.Signed-off-by Samuel Holland <[email protected]>---
arch/riscv/errata/thead/errata.c | 4 ++-- arch/riscv/include/asm/page.h | 18 +++++++++--------- arch/riscv/mm/init.c | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-)arch/riscv/errata/thead/errata.c +2
-2@@ -76,8 +76,8 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alif (cpu_req_errata & tmp) {/* On vm-alternatives, the mmu isn't running yet */ if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -memcpy ((void *)kernel_mapping_va_to_pa ((unsigned long )alt->old_ptr), - (void *)kernel_mapping_va_to_pa ((unsigned long )alt->alt_ptr), +memcpy ((void *)kernel_mapping_va_to_pa (alt->old_ptr), + (void *)kernel_mapping_va_to_pa (alt->alt_ptr), alt->alt_len);else patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len);arch/riscv/include/asm/page.h +9
-9@@ -123,20 +123,20 @@ extern phys_addr_t phys_ram_base; ((x) >= PAGE_OFFSET && (!IS_ENABLED(CONFIG_64BIT) || (x) < PAGE_OFFSET + KERN_VIRT_SIZE))#define linear_mapping_pa_to_va (x) ((void *)((unsigned long)(x) + kernel_map.va_pa_offset)) -#define kernel_mapping_pa_to_va (y) ({ \ - unsigned long _y = y; \ - (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < phys_ram_base) ? \ - (void *)((unsigned long)(_y) + kernel_map.va_kernel_xip_pa_offset) : \ - (void *)((unsigned long)(_y) + kernel_map.va_kernel_pa_offset + XIP_OFFSET); \ +#define kernel_mapping_pa_to_va (y) ({ \ + unsigned long _y = (unsigned long)(y); \ + (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < phys_ram_base) ? \ + (void *)(_y + kernel_map.va_kernel_xip_pa_offset) : \ + (void *)(_y + kernel_map.va_kernel_pa_offset + XIP_OFFSET); \ })#define __pa_to_va_nodebug (x) linear_mapping_pa_to_va(x)#define linear_mapping_va_to_pa (x) ((unsigned long)(x) - kernel_map.va_pa_offset)#define kernel_mapping_va_to_pa (y) ({ \ - unsigned long _y = y; \ - (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ? \ - ((unsigned long)(_y) - kernel_map.va_kernel_xip_pa_offset) : \ - ((unsigned long)(_y) - kernel_map.va_kernel_pa_offset - XIP_OFFSET); \ + unsigned long _y = (unsigned long)(y); \ + (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ? \ + (_y - kernel_map.va_kernel_xip_pa_offset) : \ + (_y - kernel_map.va_kernel_pa_offset - XIP_OFFSET); \ })#define __va_to_pa_nodebug (x) ({ \arch/riscv/mm/init.c +2
-7@@ -927,15 +927,15 @@ static void __init pt_ops_set_early(void)*/ static void __init pt_ops_set_fixmap (void ) { - pt_ops.alloc_pte =kernel_mapping_pa_to_va ((uintptr_t )alloc_pte_fixmap); - pt_ops.get_pte_virt =kernel_mapping_pa_to_va ((uintptr_t )get_pte_virt_fixmap); + pt_ops.alloc_pte =kernel_mapping_pa_to_va (alloc_pte_fixmap); + pt_ops.get_pte_virt =kernel_mapping_pa_to_va (get_pte_virt_fixmap);#ifndef __PAGETABLE_PMD_FOLDED - pt_ops.alloc_pmd =kernel_mapping_pa_to_va ((uintptr_t )alloc_pmd_fixmap); - pt_ops.get_pmd_virt =kernel_mapping_pa_to_va ((uintptr_t )get_pmd_virt_fixmap); - pt_ops.alloc_pud =kernel_mapping_pa_to_va ((uintptr_t )alloc_pud_fixmap); - pt_ops.get_pud_virt =kernel_mapping_pa_to_va ((uintptr_t )get_pud_virt_fixmap); - pt_ops.alloc_p4d =kernel_mapping_pa_to_va ((uintptr_t )alloc_p4d_fixmap);
arch/riscv/mm/init.c static void __init pt_ops_set_early(void) · line 941
Quoted 10 lines
arch/riscv/mm/init.c +6
-1- pt_ops.get_p4d_virt =kernel_mapping_pa_to_va ((uintptr_t )get_p4d_virt_fixmap); + pt_ops.alloc_pmd =kernel_mapping_pa_to_va (alloc_pmd_fixmap); + pt_ops.get_pmd_virt =kernel_mapping_pa_to_va (get_pmd_virt_fixmap); + pt_ops.alloc_pud =kernel_mapping_pa_to_va (alloc_pud_fixmap); + pt_ops.get_pud_virt =kernel_mapping_pa_to_va (get_pud_virt_fixmap); + pt_ops.alloc_p4d =kernel_mapping_pa_to_va (alloc_p4d_fixmap); + pt_ops.get_p4d_virt =kernel_mapping_pa_to_va (get_p4d_virt_fixmap);#endif }
Indeed, the inner cast was useless:
Thanks,
Alex
Re: [PATCH 2/2] riscv: Move cast inside kernel_mapping_[pv]a_to_[vp]a
In reply to Samuel HollandAm Donnerstag, 22. September 2022, 07:47:42 CEST schrieb Samuel Holland:
Quoted 6 lines
Before commit
44c922572952("RISC-V: enable XIP"), these macros cast their argument to unsigned long. That commit moved the cast after an assignment to an unsigned long variable, rendering it ineffectual. Move the cast back, so we can remove the cast at each call site.Signed-off-by Samuel Holland <[email protected]>
makes the code a lot nicer to read
Quoted 75 lines
---
arch/riscv/errata/thead/errata.c | 4 ++-- arch/riscv/include/asm/page.h | 18 +++++++++--------- arch/riscv/mm/init.c | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-)arch/riscv/errata/thead/errata.c +2
-2@@ -76,8 +76,8 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alif (cpu_req_errata & tmp) {/* On vm-alternatives, the mmu isn't running yet */ if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -memcpy ((void *)kernel_mapping_va_to_pa ((unsigned long )alt->old_ptr), - (void *)kernel_mapping_va_to_pa ((unsigned long )alt->alt_ptr), +memcpy ((void *)kernel_mapping_va_to_pa (alt->old_ptr), + (void *)kernel_mapping_va_to_pa (alt->alt_ptr), alt->alt_len);else patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len);arch/riscv/include/asm/page.h +9
-9@@ -123,20 +123,20 @@ extern phys_addr_t phys_ram_base; ((x) >= PAGE_OFFSET && (!IS_ENABLED(CONFIG_64BIT) || (x) < PAGE_OFFSET + KERN_VIRT_SIZE))#define linear_mapping_pa_to_va (x) ((void *)((unsigned long)(x) + kernel_map.va_pa_offset)) -#define kernel_mapping_pa_to_va (y) ({ \ - unsigned long _y = y; \ - (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < phys_ram_base) ? \ - (void *)((unsigned long)(_y) + kernel_map.va_kernel_xip_pa_offset) : \ - (void *)((unsigned long)(_y) + kernel_map.va_kernel_pa_offset + XIP_OFFSET); \ +#define kernel_mapping_pa_to_va (y) ({ \ + unsigned long _y = (unsigned long)(y); \ + (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < phys_ram_base) ? \ + (void *)(_y + kernel_map.va_kernel_xip_pa_offset) : \ + (void *)(_y + kernel_map.va_kernel_pa_offset + XIP_OFFSET); \ })#define __pa_to_va_nodebug (x) linear_mapping_pa_to_va(x)#define linear_mapping_va_to_pa (x) ((unsigned long)(x) - kernel_map.va_pa_offset)#define kernel_mapping_va_to_pa (y) ({ \ - unsigned long _y = y; \ - (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ? \ - ((unsigned long)(_y) - kernel_map.va_kernel_xip_pa_offset) : \ - ((unsigned long)(_y) - kernel_map.va_kernel_pa_offset - XIP_OFFSET); \ + unsigned long _y = (unsigned long)(y); \ + (IS_ENABLED(CONFIG_XIP_KERNEL) && _y < kernel_map.virt_addr + XIP_OFFSET) ? \ + (_y - kernel_map.va_kernel_xip_pa_offset) : \ + (_y - kernel_map.va_kernel_pa_offset - XIP_OFFSET); \ })#define __va_to_pa_nodebug (x) ({ \arch/riscv/mm/init.c +2
-7@@ -927,15 +927,15 @@ static void __init pt_ops_set_early(void)*/ static void __init pt_ops_set_fixmap (void ) { - pt_ops.alloc_pte =kernel_mapping_pa_to_va ((uintptr_t )alloc_pte_fixmap); - pt_ops.get_pte_virt =kernel_mapping_pa_to_va ((uintptr_t )get_pte_virt_fixmap); + pt_ops.alloc_pte =kernel_mapping_pa_to_va (alloc_pte_fixmap); + pt_ops.get_pte_virt =kernel_mapping_pa_to_va (get_pte_virt_fixmap);#ifndef __PAGETABLE_PMD_FOLDED - pt_ops.alloc_pmd =kernel_mapping_pa_to_va ((uintptr_t )alloc_pmd_fixmap); - pt_ops.get_pmd_virt =kernel_mapping_pa_to_va ((uintptr_t )get_pmd_virt_fixmap); - pt_ops.alloc_pud =kernel_mapping_pa_to_va ((uintptr_t )alloc_pud_fixmap); - pt_ops.get_pud_virt =kernel_mapping_pa_to_va ((uintptr_t )get_pud_virt_fixmap); - pt_ops.alloc_p4d =kernel_mapping_pa_to_va ((uintptr_t )alloc_p4d_fixmap);
arch/riscv/mm/init.c static void __init pt_ops_set_early(void) · line 941
Quoted 10 lines
arch/riscv/mm/init.c +6
-1- pt_ops.get_p4d_virt =kernel_mapping_pa_to_va ((uintptr_t )get_p4d_virt_fixmap); + pt_ops.alloc_pmd =kernel_mapping_pa_to_va (alloc_pmd_fixmap); + pt_ops.get_pmd_virt =kernel_mapping_pa_to_va (get_pmd_virt_fixmap); + pt_ops.alloc_pud =kernel_mapping_pa_to_va (alloc_pud_fixmap); + pt_ops.get_pud_virt =kernel_mapping_pa_to_va (get_pud_virt_fixmap); + pt_ops.alloc_p4d =kernel_mapping_pa_to_va (alloc_p4d_fixmap); + pt_ops.get_p4d_virt =kernel_mapping_pa_to_va (get_p4d_virt_fixmap);#endif }
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Good catch!
Quoted 34 lines · Samuel Holland
The patch function for the T-Head PBMT errata calls
__pa_symbol()before relocation. This crashes whenCONFIG_DEBUG_VIRTUALis enabled, because__pa_symbol()forwards to__phys_addr_symbol(), and__phys_addr_symbol()checks against the absolute kernel start/end address.Fix this by directly using the underlying
kernel_mapping_va_to_pa().Fixes a35707c3d850 ("riscv: add memory-type errata for T-Head")Signed-off-by Samuel Holland <[email protected]>---
arch/riscv/errata/thead/errata.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/riscv/errata/thead/errata.c +3
-3@@ -76,8 +76,9 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alif (cpu_req_errata & tmp) {/* On vm-alternatives, the mmu isn't running yet */ if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -memcpy ((void *)__pa_symbol (alt->old_ptr), - (void *)__pa_symbol (alt->alt_ptr), alt->alt_len); +memcpy ((void *)kernel_mapping_va_to_pa ((unsigned long )alt->old_ptr), + (void *)kernel_mapping_va_to_pa ((unsigned long )alt->alt_ptr), + alt->alt_len);else patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len); } --2.35.1
Signature · 2 lines
Best Regards Guo Ren
Alexandre Ghiti
reviewerHi Samuel,
Quoted 6 lines · Samuel Holland
The patch function for the T-Head PBMT errata calls
__pa_symbol()before relocation. This crashes whenCONFIG_DEBUG_VIRTUALis enabled, because__pa_symbol()forwards to__phys_addr_symbol(), and__phys_addr_symbol()checks against the absolute kernel start/end address.Fix this by directly using the underlying
kernel_mapping_va_to_pa().
I'd rather fix __phys_addr_symbol so that we can use __pa_symbol and then take advantage of the address range check. Instead of using _end in phys_addr_symbol, we have access to the size of the kernel mapping, so we could do something like that:
arch/riscv/mm/physaddr.c +0 -0
@@ -22,7 +22,7 @@ EXPORT_SYMBOL(__virt_to_phys);
phys_addr_t __phys_addr_symbol(unsigned long x)
{
unsigned long kernel_start = kernel_map.virt_addr;
- unsigned long kernel_end = (unsigned long)_end;
+ unsigned long kernel_end = kernel_map.virt_addr + kernel_map.size;
/*
* Boundary checking aginst the kernel image mapping.
Thanks,
Alex
Quoted 24 lines
Fixes a35707c3d850 ("riscv: add memory-type errata for T-Head")Signed-off-by Samuel Holland <[email protected]>---
arch/riscv/errata/thead/errata.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/riscv/errata/thead/errata.c +3
-2@@ -76,8 +76,9 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alif (cpu_req_errata & tmp) {/* On vm-alternatives, the mmu isn't running yet */ if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -memcpy ((void *)__pa_symbol (alt->old_ptr), - (void *)__pa_symbol (alt->alt_ptr), alt->alt_len); +memcpy ((void *)kernel_mapping_va_to_pa ((unsigned long )alt->old_ptr), + (void *)kernel_mapping_va_to_pa ((unsigned long )alt->alt_ptr), + alt->alt_len);else patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len); }
Hi,
Am Donnerstag, 22. September 2022, 09:31:56 CEST schrieb Alexandre Ghiti:
Quoted 22 lines
Hi Samuel,
Quoted 6 lines · Samuel Holland
The patch function for the T-Head PBMT errata calls
__pa_symbol()before relocation. This crashes whenCONFIG_DEBUG_VIRTUALis enabled, because__pa_symbol()forwards to__phys_addr_symbol(), and__phys_addr_symbol()checks against the absolute kernel start/end address.Fix this by directly using the underlying
kernel_mapping_va_to_pa().I'd rather fix
__phys_addr_symbolso that we can use__pa_symboland then take advantage of the address range check. Instead of using_endinphys_addr_symbol, we have access to the size of the kernel mapping, so we could do something like that:arch/riscv/mm/physaddr.c +0
-0
arch/riscv/mm/physaddr.c EXPORT_SYMBOL(__virt_to_phys); · line 28
Quoted 8 lines
arch/riscv/mm/physaddr.c +1
-1@@ -22,7 +22,7 @@ EXPORT_SYMBOL(__virt_to_phys);phys_addr_t __phys_addr_symbol (unsigned long x) {unsigned long kernel_start = kernel_map.virt_addr; -unsigned long kernel_end = (unsigned long )_end; +unsigned long kernel_end = kernel_map.virt_addr + kernel_map.size;/* * Boundary checking aginst the kernel image mapping.
so I did the whole set of original code
- works without DEBUG_VIRTUAL
- breaks with DEBUG_VIRTUAL
and then applied you suggested change to __phys_addr_symbol, which fixes the breakage. And I guess making this usable at all times also makes a lot of sense, so
Quoted 7 lines
Quoted 7 lines
Fixes a35707c3d850 ("riscv: add memory-type errata for T-Head")Signed-off-by Samuel Holland <[email protected]>---
arch/riscv/errata/thead/errata.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Quoted 17 lines
Quoted 6 lines
arch/riscv/errata/thead/errata.c +0
-0@@ -76,8 +76,9 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alif (cpu_req_errata & tmp) {arch/riscv/errata/thead/errata.c void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al · line 84
Quoted 10 lines
arch/riscv/errata/thead/errata.c +3
-2/* On vm-alternatives, the mmu isn't running yet */ if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -memcpy ((void *)__pa_symbol (alt->old_ptr), - (void *)__pa_symbol (alt->alt_ptr), alt->alt_len); +memcpy ((void *)kernel_mapping_va_to_pa ((unsigned long )alt->old_ptr), + (void *)kernel_mapping_va_to_pa ((unsigned long )alt->alt_ptr), + alt->alt_len);else patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len); }
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Palmer Dabbelt
maintainerQuoted 20 lines · On Wed, 21 Sep 2022 22:47:41 PDT (-0700), [email protected] wrote:
The patch function for the T-Head PBMT errata calls
__pa_symbol()before relocation. This crashes whenCONFIG_DEBUG_VIRTUALis enabled, because__pa_symbol()forwards to__phys_addr_symbol(), and__phys_addr_symbol()checks against the absolute kernel start/end address.Fix this by directly using the underlying
kernel_mapping_va_to_pa().Fixes a35707c3d850 ("riscv: add memory-type errata for T-Head")Signed-off-by Samuel Holland <[email protected]>---
arch/riscv/errata/thead/errata.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/riscv/errata/thead/errata.c +0
-0@@ -76,8 +76,9 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alif (cpu_req_errata & tmp) {
arch/riscv/errata/thead/errata.c void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al · line 84
Quoted 10 lines
arch/riscv/errata/thead/errata.c +3
-2/* On vm-alternatives, the mmu isn't running yet */ if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) -memcpy ((void *)__pa_symbol (alt->old_ptr), - (void *)__pa_symbol (alt->alt_ptr), alt->alt_len); +memcpy ((void *)kernel_mapping_va_to_pa ((unsigned long )alt->old_ptr), + (void *)kernel_mapping_va_to_pa ((unsigned long )alt->alt_ptr), + alt->alt_len);else patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len); }
Thanks, these are on for-next.