KVM: arm64: Hypervisor stack enhancements
v2 cover KVM: arm64: Hypervisor stack enhancements
Hi all,
This is v2 of the nVHE hypervisor stack enhancements. v1 can be found at:
https://lore.kernel.org/r/[email protected]/
This version has been updated to work for 'classic' KVM in nVHE mode in addition to pKVM, per Marc; and rebased on 5.17-rc5.
The cover letter has been copied below for convenience.
Thanks,
Kalesh
-----
This series adds the following stack features to the KVM nVHE hypervisor:
== Hyp Stack Guard Pages ==
Based on the technique used by arm64 VMAP_STACK to detect overflow. i.e. the stack is aligned to twice its size which ensure that the 'stack shift' bit of any valid SP is 0. The 'stack shift' bit can be tested in the exception entry to detect overflow without corrupting GPRs.
== Hyp Stack Unwinder ==
Based on the arm64 kernel stack unwinder
(See: arch/arm64/kernel/stacktrace.c)
The unwinding and dumping of the hyp stack is not enabled by default and depends on CONFIG_NVHE_EL2_DEBUG to avoid potential information leaks.
When CONFIG_NVHE_EL2_DEBUG is enabled the host stage 2 protection is disabled, allowing the host to read the hypervisor stack pages and unwind the stack from EL1. This allows us to print the hypervisor stacktrace before panicking the host; as shown below:
kvm [408]: nVHE hyp panic at: \
[<ffffffc01161460c>] __kvm_nvhe_overflow_stack+0x10/0x34!
kvm [408]: nVHE HYP call trace:
kvm [408]: [<ffffffc011614974>] __kvm_nvhe_hyp_panic_bad_stack+0xc/0x10 kvm [408]: [<ffffffc01160fa48>] __kvm_nvhe___kvm_hyp_host_vector+0x248/0x794 kvm [408]: [<ffffffc01161461c>] __kvm_nvhe_overflow_stack+0x20/0x34 . . .
kvm [408]: [<ffffffc01161461c>] __kvm_nvhe_overflow_stack+0x20/0x34 kvm [408]: [<ffffffc01161421c>] __kvm_nvhe___kvm_vcpu_run+0x2c/0x40c kvm [408]: [<ffffffc011615e14>] __kvm_nvhe_handle___kvm_vcpu_run+0x1c8/0x36c kvm [408]: [<ffffffc0116157c4>] __kvm_nvhe_handle_trap+0xa4/0x124 kvm [408]: [<ffffffc01160f060>] __kvm_nvhe___host_exit+0x60/0x64 kvm [408]: ---- end of nVHE HYP call trace ----
Kalesh Singh (8):
KVM: arm64: Introduce hyp_alloc_private_va_range()
KVM: arm64: Introduce pkvm_alloc_private_va_range()
KVM: arm64: Add guard pages for KVM nVHE hypervisor stack
KVM: arm64: Add guard pages for pKVM (protected nVHE) hypervisor stack
KVM: arm64: Detect and handle hypervisor stack overflows
KVM: arm64: Add hypervisor overflow stack
KVM: arm64: Unwind and dump nVHE HYP stacktrace
KVM: arm64: Symbolize the nVHE HYP backtrace
Quentin Perret (1):
arm64: asm: Introduce test_sp_overflow macro
arch/arm64/include/asm/assembler.h | 11 + arch/arm64/include/asm/kvm_asm.h | 18 ++ arch/arm64/include/asm/kvm_mmu.h | 4 + arch/arm64/kernel/entry.S | 7 +- arch/arm64/kvm/Kconfig | 5 +- arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/arm.c | 34 +++- arch/arm64/kvm/handle_exit.c | 16 +- arch/arm64/kvm/hyp/include/nvhe/mm.h | 3 +- arch/arm64/kvm/hyp/nvhe/host.S | 21 ++ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 5 +- arch/arm64/kvm/hyp/nvhe/mm.c | 49 +++-- arch/arm64/kvm/hyp/nvhe/setup.c | 25 ++- arch/arm64/kvm/hyp/nvhe/switch.c | 29 +++ arch/arm64/kvm/mmu.c | 61 ++++-- arch/arm64/kvm/stacktrace.c | 290 +++++++++++++++++++++++++++ arch/arm64/kvm/stacktrace.h | 17 ++ scripts/kallsyms.c | 2 +- 18 files changed, 533 insertions(+), 65 deletions(-) create mode 100644 arch/arm64/kvm/stacktrace.c create mode 100644 arch/arm64/kvm/stacktrace.h
base-commit: cfb92440ee71adcc2105b0890bb01ac3cddb8507
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
PATCH v2 1/9 KVM: arm64: Introduce hyp_alloc_private_va_range()
hyp_alloc_private_va_range() can be used to reserve private VA ranges in the nVHE hypervisor. Also update __create_hyp_private_mapping() to allow specifying an alignment for the private VA mapping.
These will be used to implement stack guard pages for KVM nVHE hypervisor (nVHE Hyp mode / not pKVM), in a subsequent patch in the series.
--- arch/arm64/include/asm/kvm_mmu.h | 4 +++ arch/arm64/kvm/mmu.c | 61 +++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 21 deletions(-)
arch/arm64/include/asm/kvm_mmu.h +4 -0
@@ -153,6 +153,10 @@ static __always_inline unsigned long __kern_hyp_va(unsigned long v)int kvm_share_hyp (void *from,void *to);void kvm_unshare_hyp (void *from,void *to);int create_hyp_mappings (void *from,void *to,enum kvm_pgtable_prot prot); +unsigned long hyp_alloc_private_va_range (size_t size,size_t align); +int __create_hyp_private_mapping (phys_addr_t phys_addr,size_t size, +size_t align,unsigned long *haddr, +enum kvm_pgtable_prot prot);int create_hyp_io_mappings (phys_addr_t phys_addr,size_t size,void __iomem **kaddr,void __iomem **haddr);
arch/arm64/kvm/mmu.c +40 -21
104 lines not on this page · raw message
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
Mark Rutland
reviewerRe: [PATCH v2 1/9] KVM: arm64: Introduce hyp_alloc_private_va_range()
Quoted 46 lines · Kalesh Singh
hyp_alloc_private_va_range()can be used to reserve private VA ranges in the nVHE hypervisor. Also update__create_hyp_private_mapping()to allow specifying an alignment for the private VA mapping.These will be used to implement stack guard pages for KVM nVHE hypervisor (nVHE Hyp mode / not pKVM), in a subsequent patch in the series.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/kvm_mmu.h | 4 +++ arch/arm64/kvm/mmu.c | 61 +++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 21 deletions(-)arch/arm64/include/asm/kvm_mmu.h +4
-0@@ -153,6 +153,10 @@ static __always_inline unsigned long __kern_hyp_va(unsigned long v)int kvm_share_hyp (void *from,void *to);void kvm_unshare_hyp (void *from,void *to);int create_hyp_mappings (void *from,void *to,enum kvm_pgtable_prot prot); +unsigned long hyp_alloc_private_va_range (size_t size,size_t align); +int __create_hyp_private_mapping (phys_addr_t phys_addr,size_t size, +size_t align,unsigned long *haddr, +enum kvm_pgtable_prot prot);int create_hyp_io_mappings (phys_addr_t phys_addr,size_t size,void __iomem **kaddr,void __iomem **haddr);arch/arm64/kvm/mmu.c +7
-3@@ -457,22 +457,16 @@ int create_hyp_mappings(void *from, void *to, enum kvm_pgtable_prot prot)return 0 ; } -static int __create_hyp_private_mapping (phys_addr_t phys_addr,size_t size, -unsigned long *haddr, -enum kvm_pgtable_prot prot) + +/* +* Allocates a private VA range below io_map_base. +* +* @size: The size of the VA range to reserve. +* @align: The required alignment for the allocation. +*/
arch/arm64/kvm/mmu.c int create_hyp_mappings(void *from, void *to, enum kvm_pgtable_prot prot) · line 471
Quoted 10 lines
arch/arm64/kvm/mmu.c +1
-7+unsigned long hyp_alloc_private_va_range (size_t size,size_t align) {unsigned long base; -int ret =0 ; - -if (!kvm_host_owns_hyp_mappings ()) { - base =kvm_call_hyp_nvhe (__pkvm_create_private_mapping, - phys_addr, size, prot); -if (IS_ERR_OR_NULL ((void *)base)) -return PTR_ERR ((void *)base);
There is a latent bug here; PTR_ERR() is not valid for NULL.
Today on arm64 that will happen to return 0, which may or may not be what you want, but it's a bad pattern regardless.
That applies to the two copies below that this has been transformed into.
Thanks,
Mark
Quoted 88 lines
arch/arm64/kvm/mmu.c +32
-11- *haddr = base; - -return 0 ; - }mutex_lock (&kvm_hyp_pgd_mutex);@@ -484,8 +478,8 @@ static int __create_hyp_private_mapping(phys_addr_t phys_addr, size_t size,* * The allocated size is always a multiple of PAGE_SIZE. */ - size =PAGE_ALIGN (size +offset_in_page (phys_addr)); - base = io_map_base - size; + base = io_map_base -PAGE_ALIGN (size); + base =ALIGN_DOWN (base, align);/* * Verify that BIT(VA_BITS - 1) hasn't been flipped by @@ -493,20 +487,45 @@ static int __create_hyp_private_mapping(phys_addr_t phys_addr, size_t size,* overflowed the idmap/IO address range. */ if ((base ^ io_map_base) &BIT (VA_BITS -1 )) - ret = -ENOMEM ; + base = (unsigned long )ERR_PTR (-ENOMEM );else io_map_base = base;mutex_unlock (&kvm_hyp_pgd_mutex); +return base; +} + +int __create_hyp_private_mapping (phys_addr_t phys_addr,size_t size, +size_t align,unsigned long *haddr, +enum kvm_pgtable_prot prot) +{ +unsigned long addr; +int ret =0 ; + +if (!kvm_host_owns_hyp_mappings ()) { + addr =kvm_call_hyp_nvhe (__pkvm_create_private_mapping, + phys_addr, size, prot); +if (IS_ERR_OR_NULL ((void *)addr)) +return PTR_ERR ((void *)addr); + *haddr = addr; + +return 0 ; + } + + size +=offset_in_page (phys_addr); + addr =hyp_alloc_private_va_range (size, align); +if (IS_ERR_OR_NULL ((void *)addr)) +return PTR_ERR ((void *)addr); +if (ret) goto out; - ret =__create_hyp_mappings (base, size, phys_addr, prot); + ret =__create_hyp_mappings (addr, size, phys_addr, prot);if (ret) goto out; - *haddr = base +offset_in_page (phys_addr); + *haddr = addr +offset_in_page (phys_addr); out:return ret; }@@ -537,7 +556,7 @@ int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size,return 0 ; } - ret =__create_hyp_private_mapping (phys_addr, size, + ret =__create_hyp_private_mapping (phys_addr, size,PAGE_SIZE , &addr,PAGE_HYP_DEVICE );if (ret) {iounmap (*kaddr);@@ -564,7 +583,7 @@ int create_hyp_exec_mappings(phys_addr_t phys_addr, size_t size,BUG_ON (is_kernel_in_hyp_mode ()); - ret =__create_hyp_private_mapping (phys_addr, size, + ret =__create_hyp_private_mapping (phys_addr, size,PAGE_SIZE , &addr,PAGE_HYP_EXEC );if (ret) { *haddr =NULL ;Signature · 1 line
2.35.1.473.g83b2b277ed-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v2 2/9 KVM: arm64: Introduce pkvm_alloc_private_va_range()
In reply to Kalesh Singhpkvm_hyp_alloc_private_va_range() can be used to reserve private VA ranges in the pKVM nVHE hypervisor (). Also update __pkvm_create_private_mapping() to allow specifying an alignment for the private VA mapping.
These will be used to implement stack guard pages for pKVM nVHE hypervisor (in a subsequent patch in the series).
Credits to Quentin Perret <[email protected]> for the idea of moving private VA allocation out of __pkvm_create_private_mapping()
---
Changes in v2:
- Allow specifying an alignment for the private VA allocations, per Marc
arch/arm64/kvm/hyp/include/nvhe/mm.h | 3 +- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 5 +-- arch/arm64/kvm/hyp/nvhe/mm.c | 49 +++++++++++++++++++--------- arch/arm64/kvm/mmu.c | 2 +- 4 files changed, 39 insertions(+), 20 deletions(-)
arch/arm64/kvm/hyp/include/nvhe/mm.h +2 -1
@@ -20,7 +20,8 @@ int pkvm_cpu_set_vector(enum arm64_hyp_spectre_vector slot);int pkvm_create_mappings (void *from,void *to,enum kvm_pgtable_prot prot);int pkvm_create_mappings_locked (void *from,void *to,enum kvm_pgtable_prot prot);unsigned long __pkvm_create_private_mapping (phys_addr_t phys,size_t size, -enum kvm_pgtable_prot prot); +size_t align,enum kvm_pgtable_prot prot); +unsigned long pkvm_alloc_private_va_range (size_t size,size_t align);static inline void hyp_vmemmap_range (phys_addr_t phys,unsigned long size,unsigned long *start,unsigned long *end)
arch/arm64/kvm/hyp/nvhe/hyp-main.c +3 -2
@@ -158,9 +158,10 @@ static void handle___pkvm_create_private_mapping(struct kvm_cpu_context *host_ct {DECLARE_REG (phys_addr_t, phys, host_ctxt,1 );DECLARE_REG (size_t, size, host_ctxt,2 ); - DECLARE_REG(enum kvm_pgtable_prot, prot, host_ctxt, 3); +DECLARE_REG (size_t, align, host_ctxt,3 ); + DECLARE_REG(enum kvm_pgtable_prot, prot, host_ctxt, 4); -cpu_reg (host_ctxt,1 ) =__pkvm_create_private_mapping (phys, size, prot); +cpu_reg (host_ctxt,1 ) =__pkvm_create_private_mapping (phys, size, align, prot); }static void handle___pkvm_prot_finalize (struct kvm_cpu_context *host_ctxt)
arch/arm64/kvm/hyp/nvhe/mm.c +33 -16
76 lines not on this page · raw message
arch/arm64/kvm/mmu.c +1 -1
@@ -505,7 +505,7 @@ int __create_hyp_private_mapping(phys_addr_t phys_addr, size_t size,if (!kvm_host_owns_hyp_mappings ()) { addr =kvm_call_hyp_nvhe (__pkvm_create_private_mapping, - phys_addr, size, prot); + phys_addr, size, align, prot);if (IS_ERR_OR_NULL ((void *)addr))return PTR_ERR ((void *)addr); *haddr = addr;
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
PATCH v2 3/9 KVM: arm64: Add guard pages for KVM nVHE hypervisor stack
In reply to Kalesh SinghMaps the stack pages in the flexible private VA range and allocates guard pages below the stack as unbacked VA space. The stack is aligned to twice its size to aid overflow detection (implemented in a subsequent patch in the series).
--- arch/arm64/include/asm/kvm_asm.h | 1 + arch/arm64/kvm/arm.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-)
arch/arm64/include/asm/kvm_asm.h +1 -0
@@ -169,6 +169,7 @@ struct kvm_nvhe_init_params {unsigned long tcr_el2;unsigned long tpidr_el2;unsigned long stack_hyp_va; +unsigned long stack_pa;phys_addr_t pgd_pa;unsigned long hcr_el2;unsigned long vttbr;
arch/arm64/kvm/arm.c +29 -3
@@ -1541,7 +1541,6 @@ static void cpu_prepare_hyp_mode(int cpu) tcr |= (idmap_t0sz &GENMASK (TCR_TxSZ_WIDTH -1 ,0 )) <<TCR_T0SZ_OFFSET ; params->tcr_el2 = tcr; - params->stack_hyp_va =kern_hyp_va (per_cpu (kvm_arm_hyp_stack_page, cpu) +PAGE_SIZE ); params->pgd_pa =kvm_mmu_get_httbr ();if (is_protected_kvm_enabled ()) params->hcr_el2 =HCR_HOST_NVHE_PROTECTED_FLAGS ;
@@ -1990,14 +1989,41 @@ static int init_hyp_mode(void)* Map the Hyp stack pages */ for_each_possible_cpu (cpu) { +struct kvm_nvhe_init_params *params =per_cpu_ptr_nvhe_sym (kvm_init_params, cpu);char *stack_page = (char *)per_cpu (kvm_arm_hyp_stack_page, cpu); - err =create_hyp_mappings (stack_page, stack_page +PAGE_SIZE , -PAGE_HYP ); +unsigned long stack_hyp_va, guard_hyp_va; +/* +* Private mappings are allocated downwards from io_map_base +* so allocate the stack first then the guard page. +* +* The stack is aligned to twice its size to facilitate overflow +* detection. +*/ + err =__create_hyp_private_mapping (__pa (stack_page),PAGE_SIZE , +PAGE_SIZE *2 , &stack_hyp_va,PAGE_HYP );if (err) {kvm_err ("Cannot map hyp stack\n" ); goto out_err; } + +/* Allocate unbacked private VA range for stack guard page */ + guard_hyp_va =hyp_alloc_private_va_range (PAGE_SIZE ,PAGE_SIZE ); +if (IS_ERR ((void *)guard_hyp_va)) { + err =PTR_ERR ((void *)guard_hyp_va); +kvm_err ("Cannot allocate hyp stack guard page\n" ); + goto out_err; + } + +/* +* Save the stack PA in nvhe_init_params. This will be needed to recreate +* the stack mapping in protected nVHE mode. __hyp_pa() won't do the right +* thing there, since the stack has been mapped in the flexible private +* VA space. +*/ + params->stack_pa =__pa (stack_page) +PAGE_SIZE ; + + params->stack_hyp_va = stack_hyp_va +PAGE_SIZE ; }for_each_possible_cpu (cpu) {
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
PATCH v2 4/9 KVM: arm64: Add guard pages for pKVM (protected nVHE) hypervisor stack
In reply to Kalesh SinghMaps the stack pages in the flexible private VA range and allocates guard pages below the stack as unbacked VA space. The stack is aligned to twice its size to aid overflow detection (implemented in a subsequent patch in the series).
--- arch/arm64/kvm/hyp/nvhe/setup.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
arch/arm64/kvm/hyp/nvhe/setup.c +21 -4
@@ -105,11 +105,28 @@ static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size,if (ret)return ret; - end = (void *)per_cpu_ptr (&kvm_init_params, i)->stack_hyp_va; +/* +* Private mappings are allocated upwards from __io_map_base +* so allocate the guard page first then the stack. +*/ + start = (void *)pkvm_alloc_private_va_range (PAGE_SIZE ,PAGE_SIZE ); +if (IS_ERR_OR_NULL (start)) +return PTR_ERR (start); + +/* +* The stack is aligned to twice its size to facilitate overflow +* detection. +*/ + end = (void *)per_cpu_ptr (&kvm_init_params, i)->stack_pa; start = end -PAGE_SIZE ; - ret =pkvm_create_mappings (start, end,PAGE_HYP ); -if (ret) -return ret; + start = (void *)__pkvm_create_private_mapping ((phys_addr_t )start, +PAGE_SIZE ,PAGE_SIZE *2 ,PAGE_HYP ); +if (IS_ERR_OR_NULL (start)) +return PTR_ERR (start); + end = start +PAGE_SIZE ; + +/* Update stack_hyp_va to end of the stack's private VA range */ +per_cpu_ptr (&kvm_init_params, i)->stack_hyp_va = (unsigned long ) end; }/*
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
Mark Rutland
reviewerRe: [PATCH v2 4/9] KVM: arm64: Add guard pages for pKVM (protected nVHE) hypervisor stack
Quoted 16 lines · Kalesh Singh
Maps the stack pages in the flexible private VA range and allocates guard pages below the stack as unbacked VA space. The stack is aligned to twice its size to aid overflow detection (implemented in a subsequent patch in the series).
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/kvm/hyp/nvhe/setup.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)arch/arm64/kvm/hyp/nvhe/setup.c +0
-0@@ -105,11 +105,28 @@ static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size,if (ret)
arch/arm64/kvm/hyp/nvhe/setup.c static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size, · line 114
Quoted 10 lines
arch/arm64/kvm/hyp/nvhe/setup.c +7
-1return ret; - end = (void *)per_cpu_ptr (&kvm_init_params, i)->stack_hyp_va; +/* +* Private mappings are allocated upwards from __io_map_base +* so allocate the guard page first then the stack. +*/ + start = (void *)pkvm_alloc_private_va_range (PAGE_SIZE ,PAGE_SIZE ); +if (IS_ERR_OR_NULL (start)) +return PTR_ERR (start);
As on a prior patch, this usage of PTR_ERR() pattern is wrong when the ptr is NULL.
arch/arm64/kvm/hyp/nvhe/setup.c static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size, · line 125
Quoted 13 lines
arch/arm64/kvm/hyp/nvhe/setup.c +9
-3+/* +* The stack is aligned to twice its size to facilitate overflow +* detection. +*/ + end = (void *)per_cpu_ptr (&kvm_init_params, i)->stack_pa; start = end -PAGE_SIZE ; - ret =pkvm_create_mappings (start, end,PAGE_HYP ); -if (ret) -return ret; + start = (void *)__pkvm_create_private_mapping ((phys_addr_t )start, +PAGE_SIZE ,PAGE_SIZE *2 ,PAGE_HYP ); +if (IS_ERR_OR_NULL (start)) +return PTR_ERR (start);
Likewise.
Thanks,
Mark.
Quoted 10 lines
arch/arm64/kvm/hyp/nvhe/setup.c +4
-0+ end = start +PAGE_SIZE ; + +/* Update stack_hyp_va to end of the stack's private VA range */ +per_cpu_ptr (&kvm_init_params, i)->stack_hyp_va = (unsigned long ) end; }/* Signature · 1 line
2.35.1.473.g83b2b277ed-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v2 4/9] KVM: arm64: Add guard pages for pKVM (protected nVHE) hypervisor stack
Quoted 20 lines · Mark Rutland
Quoted 18 lines · Kalesh Singh
Maps the stack pages in the flexible private VA range and allocates guard pages below the stack as unbacked VA space. The stack is aligned to twice its size to aid overflow detection (implemented in a subsequent patch in the series).
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/kvm/hyp/nvhe/setup.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)arch/arm64/kvm/hyp/nvhe/setup.c +0
-0@@ -105,11 +105,28 @@ static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size,if (ret)return ret;
Quoted 11 lines
arch/arm64/kvm/hyp/nvhe/setup.c static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size, · line 114
Quoted 8 lines
arch/arm64/kvm/hyp/nvhe/setup.c +7
-1- end = (void *)per_cpu_ptr (&kvm_init_params, i)->stack_hyp_va; +/* +* Private mappings are allocated upwards from __io_map_base +* so allocate the guard page first then the stack. +*/ + start = (void *)pkvm_alloc_private_va_range (PAGE_SIZE ,PAGE_SIZE ); +if (IS_ERR_OR_NULL (start)) +return PTR_ERR (start);As on a prior patch, this usage of
PTR_ERR()pattern is wrong when the ptr is NULL.
Ack. I'll fix these in the next version.
Thanks,
Kalesh
Quoted 30 lines
Quoted 4 lines
arch/arm64/kvm/hyp/nvhe/setup.c +3
-0+/* +* The stack is aligned to twice its size to facilitate overflow +* detection. arch/arm64/kvm/hyp/nvhe/setup.c static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size, · line 125
Quoted 10 lines
arch/arm64/kvm/hyp/nvhe/setup.c +6
-3+*/ + end = (void *)per_cpu_ptr (&kvm_init_params, i)->stack_pa; start = end -PAGE_SIZE ; - ret =pkvm_create_mappings (start, end,PAGE_HYP ); -if (ret) -return ret; + start = (void *)__pkvm_create_private_mapping ((phys_addr_t )start, +PAGE_SIZE ,PAGE_SIZE *2 ,PAGE_HYP ); +if (IS_ERR_OR_NULL (start)) +return PTR_ERR (start);Likewise.
Thanks,
Mark.Quoted 10 lines
arch/arm64/kvm/hyp/nvhe/setup.c +4
-1+ end = start +PAGE_SIZE ; + +/* Update stack_hyp_va to end of the stack's private VA range */ +per_cpu_ptr (&kvm_init_params, i)->stack_hyp_va = (unsigned long ) end; }/* -- 2.35.1.473.g83b2b277ed-goog
PATCH v2 5/9 arm64: asm: Introduce test_sp_overflow macro
In reply to Kalesh SinghFrom: Quentin Perret <[email protected]>
The asm entry code in the kernel uses a trick to check if VMAP'd stacks have overflowed by aligning them at THREAD_SHIFT * 2 granularity and checking the SP's THREAD_SHIFT bit.
Protected KVM will soon make use of a similar trick to detect stack overflows, so factor out the asm code in a re-usable macro.
--- arch/arm64/include/asm/assembler.h | 11 +++++++++++ arch/arm64/kernel/entry.S | 7 +------ 2 files changed, 12 insertions(+), 6 deletions(-)
arch/arm64/include/asm/assembler.h +11 -0
@@ -850,4 +850,15 @@ alternative_endif#endif /* GNU_PROPERTY_AARCH64_FEATURE_1_DEFAULT */ +/* +* Test whether the SP has overflowed, without corrupting a GPR. +*/ +.macro test_sp_overflow shift, label + add sp, sp, x0 // sp' = sp + x0 + sub x0, sp, x0 // x0' = sp' - x0 = (sp + x0) - x0 = sp + tbnz x0, #\shift, \label + sub x0, sp, x0 // x0'' = sp' - x0' = (sp + x0) - sp = x0 + sub sp, sp, x0 // sp'' = sp' - x0 = (sp + x0) - x0 = sp +.endm + #endif /* __ASM_ASSEMBLER_H */
arch/arm64/kernel/entry.S +1 -6
@@ -53,15 +53,10 @@ alternative_else_nop_endif sub sp, sp, #PT_REGS_SIZE #ifdef CONFIG_VMAP_STACK /* - * Test whether the SP has overflowed, without corrupting a GPR. * Task and IRQ stacks are aligned so that SP & (1 << THREAD_SHIFT) * should always be zero. */ - add sp, sp, x0 // sp' = sp + x0 - sub x0, sp, x0 // x0' = sp' - x0 = (sp + x0) - x0 = sp - tbnz x0, #THREAD_SHIFT, 0f - sub x0, sp, x0 // x0'' = sp' - x0' = (sp + x0) - sp = x0 - sub sp, sp, x0 // sp'' = sp' - x0 = (sp + x0) - x0 = sp + test_sp_overflow THREAD_SHIFT, 0f b el\el\ht\()_\regsize\()_\label 0:
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
Mark Rutland
reviewerRe: [PATCH v2 5/9] arm64: asm: Introduce test_sp_overflow macro
Quoted 25 lines · Kalesh Singh
From: Quentin Perret <[email protected]>
The asm entry code in the kernel uses a trick to check if VMAP'd stacks have overflowed by aligning them at
THREAD_SHIFT* 2 granularity and checking the SP'sTHREAD_SHIFTbit.Protected KVM will soon make use of a similar trick to detect stack overflows, so factor out the asm code in a re-usable macro.
Signed-off-by Quentin Perret <[email protected]>[Kalesh - Resolve minor conflicts]Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/assembler.h | 11 +++++++++++ arch/arm64/kernel/entry.S | 7 +------ 2 files changed, 12 insertions(+), 6 deletions(-)arch/arm64/include/asm/assembler.h +0
-0@@ -850,4 +850,15 @@ alternative_endif#endif /* GNU_PROPERTY_AARCH64_FEATURE_1_DEFAULT */
arch/arm64/include/asm/assembler.h alternative_endif · line 862
Quoted 10 lines
arch/arm64/include/asm/assembler.h +10
-0+/* +* Test whether the SP has overflowed, without corrupting a GPR. +*/ +.macro test_sp_overflow shift, label + add sp, sp, x0 // sp' = sp + x0 + sub x0, sp, x0 // x0' = sp' - x0 = (sp + x0) - x0 = sp + tbnz x0, #\shift, \label + sub x0, sp, x0 // x0'' = sp' - x0' = (sp + x0) - sp = x0 + sub sp, sp, x0 // sp'' = sp' - x0 = (sp + x0) - x0 = sp +.endm
I'm a little unhappy about factoring this out, since it's not really self-contained and leaves sp and x0 partially-swapped when it branches to the label. You can't really make that clear with comments on the macro, and you need comments at each use-sire, so I'd ratehr we just open-coded a copy of this.
Quoted 13 lines
arch/arm64/include/asm/assembler.h +1
-0+#endif /* __ASM_ASSEMBLER_H */ arch/arm64/kernel/entry.S +0
-1@@ -53,15 +53,10 @@ alternative_else_nop_endif sub sp, sp, #PT_REGS_SIZE #ifdef CONFIG_VMAP_STACK /* - * Test whether the SP has overflowed, without corrupting a GPR. * Task and IRQ stacks are aligned so that SP & (1 << THREAD_SHIFT) * should always be zero.
arch/arm64/kernel/entry.S alternative_else_nop_endif · line 62
Quoted 10 lines
arch/arm64/kernel/entry.S +1
-5*/ - add sp, sp, x0 // sp' = sp + x0 - sub x0, sp, x0 // x0' = sp' - x0 = (sp + x0) - x0 = sp - tbnz x0, #THREAD_SHIFT, 0f - sub x0, sp, x0 // x0'' = sp' - x0' = (sp + x0) - sp = x0 - sub sp, sp, x0 // sp'' = sp' - x0 = (sp + x0) - x0 = sp + test_sp_overflow THREAD_SHIFT, 0f b el\el\ht\()_\regsize\()_\label 0:
Further to my comment above, immediately after this we have:
/* Stash the original SP (minus PT_REGS_SIZE) in tpidr_el0. */
msr tpidr_el0, x0
/* Recover the original x0 value and stash it in tpidrro_el0 */
sub x0, sp, x0
msr tpidrro_el0, x0
... which is really surprising with the test_sp_overflow macro because it's not clear that modifies x0 and sp in this way.
Thanks,
Mark.
...
Quoted 3 lines
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v2 5/9] arm64: asm: Introduce test_sp_overflow macro
Quoted 73 lines · Mark Rutland
Quoted 25 lines · Kalesh Singh
From: Quentin Perret <[email protected]>
The asm entry code in the kernel uses a trick to check if VMAP'd stacks have overflowed by aligning them at
THREAD_SHIFT* 2 granularity and checking the SP'sTHREAD_SHIFTbit.Protected KVM will soon make use of a similar trick to detect stack overflows, so factor out the asm code in a re-usable macro.
Signed-off-by Quentin Perret <[email protected]>[Kalesh - Resolve minor conflicts]Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/assembler.h | 11 +++++++++++ arch/arm64/kernel/entry.S | 7 +------ 2 files changed, 12 insertions(+), 6 deletions(-)arch/arm64/include/asm/assembler.h +0
-0@@ -850,4 +850,15 @@ alternative_endif#endif /* GNU_PROPERTY_AARCH64_FEATURE_1_DEFAULT */ arch/arm64/include/asm/assembler.h alternative_endif · line 862
Quoted 10 lines
arch/arm64/include/asm/assembler.h +10
-0+/* +* Test whether the SP has overflowed, without corrupting a GPR. +*/ +.macro test_sp_overflow shift, label + add sp, sp, x0 // sp' = sp + x0 + sub x0, sp, x0 // x0' = sp' - x0 = (sp + x0) - x0 = sp + tbnz x0, #\shift, \label + sub x0, sp, x0 // x0'' = sp' - x0' = (sp + x0) - sp = x0 + sub sp, sp, x0 // sp'' = sp' - x0 = (sp + x0) - x0 = sp +.endmI'm a little unhappy about factoring this out, since it's not really self-contained and leaves sp and x0 partially-swapped when it branches to the label. You can't really make that clear with comments on the macro, and you need comments at each use-sire, so I'd ratehr we just open-coded a copy of this.
Quoted 13 lines
arch/arm64/include/asm/assembler.h +1
-0+#endif /* __ASM_ASSEMBLER_H */ arch/arm64/kernel/entry.S +0
-1@@ -53,15 +53,10 @@ alternative_else_nop_endif sub sp, sp, #PT_REGS_SIZE #ifdef CONFIG_VMAP_STACK /* - * Test whether the SP has overflowed, without corrupting a GPR. * Task and IRQ stacks are aligned so that SP & (1 << THREAD_SHIFT) * should always be zero.arch/arm64/kernel/entry.S alternative_else_nop_endif · line 62
Quoted 10 lines
arch/arm64/kernel/entry.S +1
-5*/ - add sp, sp, x0 // sp' = sp + x0 - sub x0, sp, x0 // x0' = sp' - x0 = (sp + x0) - x0 = sp - tbnz x0, #THREAD_SHIFT, 0f - sub x0, sp, x0 // x0'' = sp' - x0' = (sp + x0) - sp = x0 - sub sp, sp, x0 // sp'' = sp' - x0 = (sp + x0) - x0 = sp + test_sp_overflow THREAD_SHIFT, 0f b el\el\ht\()_\regsize\()_\label 0:Further to my comment above, immediately after this we have:
/* Stash the original SP (minus
PT_REGS_SIZE) intpidr_el0. */
msrtpidr_el0, x0
Quoted 6 lines
/* Recover the original x0 value and stash it in
tpidrro_el0*/
sub x0, sp, x0
msrtpidrro_el0, x0... which is really surprising with the
test_sp_overflowmacro because it's not clear that modifies x0 and sp in this way.
Hi Mark,
I agree the macro hides the fact that sp and x0 are left in an 'corrupt' state if the branch happens. Not a problem in this case but it could be misleading to new users. I'll remove this per your suggestion in the next version.
Thanks,
Kalesh
Quoted 8 lines
Thanks,
Mark.
...Quoted 3 lines
--
2.35.1.473.g83b2b277ed-goog
PATCH v2 6/9 KVM: arm64: Detect and handle hypervisor stack overflows
In reply to Kalesh SinghThe hypervisor stacks (for both nVHE Hyp mode and nVHE protected mode) are aligned to twice their size (PAGE_SIZE), meaning that any valid stack address has PAGE_SHIFT bit as 0. This allows us to conveniently check for overflow in the exception entry without corrupting any GPRs. We won't recover from a stack overflow so panic the hypervisor.
--- arch/arm64/kvm/hyp/nvhe/host.S | 16 ++++++++++++++++ arch/arm64/kvm/hyp/nvhe/switch.c | 5 +++++ 2 files changed, 21 insertions(+)
arch/arm64/kvm/hyp/nvhe/host.S +16 -0
@@ -153,6 +153,10 @@ SYM_FUNC_END(__host_hvc) .macro invalid_host_el2_vect .align 7 + + /* Test stack overflow without corrupting GPRs */ + test_sp_overflow PAGE_SHIFT, .L__hyp_sp_overflow\@ + /* If a guest is loaded, panic out of it. */ stp x0, x1, [sp, #-16]! get_loaded_vcpu x0, x1
@@ -165,6 +169,18 @@ SYM_FUNC_END(__host_hvc) * been partially clobbered by __host_enter. */ b hyp_panic + +.L__hyp_sp_overflow\@: + /* + * Reset SP to the top of the stack, to allow handling the hyp_panic. + * This corrupts the stack but is ok, since we won't be attempting + * any unwinding here. + */ + ldr_this_cpu x0, kvm_init_params + NVHE_INIT_STACK_HYP_VA, x1 + mov sp, x0 + + bl hyp_panic_bad_stack + ASM_BUG() .endm .macro invalid_host_el1_vect
arch/arm64/kvm/hyp/nvhe/switch.c +5 -0
@@ -369,6 +369,11 @@ void __noreturn hyp_panic(void)unreachable (); } +void __noreturn hyp_panic_bad_stack (void ) +{ +hyp_panic (); +} + asmlinkage void kvm_unexpected_el2_exception(void) {return __kvm_unexpected_el2_exception ();
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
kernel test robot
build botRe: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
Thank you for the patch! Perhaps something to improve:
Hi Kalesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on cfb92440ee71adcc2105b0890bb01ac3cddb8507]
url: https://github.com/0day-ci/linux/commits/Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 base: cfb92440ee71adcc2105b0890bb01ac3cddb8507 config: arm64-defconfig (https://download.01.org/0day-ci/archive/20220223/[email protected]/config) compiler: aarch64-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/7fe99fd40f7c4b2973218045ca5b9c9160524db1
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 git checkout 7fe99fd40f7c4b2973218045ca5b9c9160524db1
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm64 SHELL=/bin/bash arch/arm64/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
arch/arm64/kvm/hyp/nvhe/switch.c:197:43: warning: initialized field overwritten [-Woverride-init]
197 | [ESR_ELx_EC_CP15_32] = kvm_hyp_handle_cp15_32,
| ^~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:197:43: note: (near initialization for 'hyp_exit_handlers[3]')
arch/arm64/kvm/hyp/nvhe/switch.c:198:43: warning: initialized field overwritten [-Woverride-init]
198 | [ESR_ELx_EC_SYS64] = kvm_hyp_handle_sysreg,
| ^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:198:43: note: (near initialization for 'hyp_exit_handlers[24]')
arch/arm64/kvm/hyp/nvhe/switch.c:199:43: warning: initialized field overwritten [-Woverride-init]
199 | [ESR_ELx_EC_SVE] = kvm_hyp_handle_fpsimd,
| ^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:199:43: note: (near initialization for 'hyp_exit_handlers[25]')
arch/arm64/kvm/hyp/nvhe/switch.c:200:43: warning: initialized field overwritten [-Woverride-init]
200 | [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd,
| ^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:200:43: note: (near initialization for 'hyp_exit_handlers[7]')
arch/arm64/kvm/hyp/nvhe/switch.c:201:43: warning: initialized field overwritten [-Woverride-init]
201 | [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low,
| ^~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:201:43: note: (near initialization for 'hyp_exit_handlers[32]')
arch/arm64/kvm/hyp/nvhe/switch.c:202:43: warning: initialized field overwritten [-Woverride-init]
202 | [ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low,
| ^~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:202:43: note: (near initialization for 'hyp_exit_handlers[36]')
arch/arm64/kvm/hyp/nvhe/switch.c:203:43: warning: initialized field overwritten [-Woverride-init]
203 | [ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth,
| ^~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:203:43: note: (near initialization for 'hyp_exit_handlers[9]')
arch/arm64/kvm/hyp/nvhe/switch.c:208:43: warning: initialized field overwritten [-Woverride-init]
208 | [ESR_ELx_EC_SYS64] = kvm_handle_pvm_sys64,
| ^~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:208:43: note: (near initialization for 'pvm_exit_handlers[24]')
arch/arm64/kvm/hyp/nvhe/switch.c:209:43: warning: initialized field overwritten [-Woverride-init]
209 | [ESR_ELx_EC_SVE] = kvm_handle_pvm_restricted,
| ^~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:209:43: note: (near initialization for 'pvm_exit_handlers[25]')
arch/arm64/kvm/hyp/nvhe/switch.c:210:43: warning: initialized field overwritten [-Woverride-init]
210 | [ESR_ELx_EC_FP_ASIMD] = kvm_handle_pvm_fpsimd,
| ^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:210:43: note: (near initialization for 'pvm_exit_handlers[7]')
arch/arm64/kvm/hyp/nvhe/switch.c:211:43: warning: initialized field overwritten [-Woverride-init]
211 | [ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low,
| ^~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:211:43: note: (near initialization for 'pvm_exit_handlers[32]')
arch/arm64/kvm/hyp/nvhe/switch.c:212:43: warning: initialized field overwritten [-Woverride-init]
212 | [ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low,
| ^~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:212:43: note: (near initialization for 'pvm_exit_handlers[36]')
arch/arm64/kvm/hyp/nvhe/switch.c:213:43: warning: initialized field overwritten [-Woverride-init]
213 | [ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth,
| ^~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:213:43: note: (near initialization for 'pvm_exit_handlers[9]')
arch/arm64/kvm/hyp/nvhe/switch.c:350:17: warning: no previous prototype for 'hyp_panic' [-Wmissing-prototypes]
350 | void __noreturn hyp_panic(void)
| ^~~~~~~~~
>> arch/arm64/kvm/hyp/nvhe/switch.c:372:17: warning: no previous prototype for 'hyp_panic_bad_stack' [-Wmissing-prototypes] 372 | void __noreturn hyp_panic_bad_stack(void)
| ^~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:377:17: warning: no previous prototype for 'kvm_unexpected_el2_exception' [-Wmissing-prototypes]
377 | asmlinkage void kvm_unexpected_el2_exception(void)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/hyp_panic_bad_stack +372 arch/arm64/kvm/hyp/nvhe/switch.c
371
> 372 void __noreturn hyp_panic_bad_stack(void)
373 {
374 hyp_panic();
375 }
376
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
kernel test robot
build botRe: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
In reply to Kalesh SinghThank you for the patch! Perhaps something to improve:
Hi Kalesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on cfb92440ee71adcc2105b0890bb01ac3cddb8507]
url: https://github.com/0day-ci/linux/commits/Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 base: cfb92440ee71adcc2105b0890bb01ac3cddb8507 config: arm64-randconfig-r011-20220221 (https://download.01.org/0day-ci/archive/20220223/[email protected]/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project d271fc04d5b97b12e6b797c6067d3c96a8d7470e)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/7fe99fd40f7c4b2973218045ca5b9c9160524db1
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 git checkout 7fe99fd40f7c4b2973218045ca5b9c9160524db1
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash arch/arm64/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:200:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd,
^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:201:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low,
^~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:202:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low,
^~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:203:22: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth,
^~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:208:24: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_SYS64] = kvm_handle_pvm_sys64,
^~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:207:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:209:22: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_SVE] = kvm_handle_pvm_restricted,
^~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:207:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:210:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_FP_ASIMD] = kvm_handle_pvm_fpsimd,
^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:207:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:211:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_IABT_LOW] = kvm_hyp_handle_iabt_low,
^~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:207:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:212:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_DABT_LOW] = kvm_hyp_handle_dabt_low,
^~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:207:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:213:22: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth,
^~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:207:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:350:17: warning: no previous prototype for function 'hyp_panic' [-Wmissing-prototypes]
void __noreturn hyp_panic(void)
^
arch/arm64/kvm/hyp/nvhe/switch.c:350:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
void __noreturn hyp_panic(void)
^
static
>> arch/arm64/kvm/hyp/nvhe/switch.c:372:17: warning: no previous prototype for function 'hyp_panic_bad_stack' [-Wmissing-prototypes]
void __noreturn hyp_panic_bad_stack(void)
^
arch/arm64/kvm/hyp/nvhe/switch.c:372:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
void __noreturn hyp_panic_bad_stack(void)
^
static
arch/arm64/kvm/hyp/nvhe/switch.c:377:17: warning: no previous prototype for function 'kvm_unexpected_el2_exception' [-Wmissing-prototypes]
asmlinkage void kvm_unexpected_el2_exception(void)
^
arch/arm64/kvm/hyp/nvhe/switch.c:377:12: note: declare 'static' if the function is not intended to be used outside of this translation unit
asmlinkage void kvm_unexpected_el2_exception(void)
^
static 16 warnings generated.
vim +/hyp_panic_bad_stack +372 arch/arm64/kvm/hyp/nvhe/switch.c
371
> 372 void __noreturn hyp_panic_bad_stack(void)
373 {
374 hyp_panic();
375 }
376
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
Marc Zyngier
maintainerRe: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
Quoted 29 lines · kernel test robot
Hi Kalesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on
cfb92440ee71adcc2105b0890bb01ac3cddb8507]url: https://github.com/0day-ci/linux/commits/Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 base: cfb92440ee71adcc2105b0890bb01ac3cddb8507 config: arm64-randconfig-r011-20220221 (https://download.01.org/0day-ci/archive/20220223/202202231727.L621fVgD-lkp(a)intel.com/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project d271fc04d5b97b12e6b797c6067d3c96a8d7470e)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/7fe99fd40f7c4b2973218045ca5b9c9160524db1
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 git checkout7fe99fd40f7c4b2973218045ca5b9c9160524db1
# save the config file to linux build tree
mkdirbuild_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/basharch/arm64/If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
Quoted 12 lines
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:200:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
[ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd,
^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previous initialization is here
[0 ... ESR_ELx_EC_MAX] = NULL,
^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~Kalesh, please ignore this nonsense. There may be things to improve, but this is *NOT* one of them.
These reports are pretty useless, and just lead people to ignore real bug reports.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [kbuild-all] Re: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
Quoted 44 lines · Marc Zyngier
Quoted 29 lines · kernel test robot
Hi Kalesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on
cfb92440ee71adcc2105b0890bb01ac3cddb8507]url: https://github.com/0day-ci/linux/commits/Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 base: cfb92440ee71adcc2105b0890bb01ac3cddb8507 config: arm64-randconfig-r011-20220221 (https://download.01.org/0day-ci/archive/20220223/[email protected]/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project d271fc04d5b97b12e6b797c6067d3c96a8d7470e)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/7fe99fd40f7c4b2973218045ca5b9c9160524db1
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 git checkout7fe99fd40f7c4b2973218045ca5b9c9160524db1
# save the config file to linux build tree
mkdirbuild_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/basharch/arm64/If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
Quoted 12 lines
include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ arch/arm64/kvm/hyp/nvhe/switch.c:200:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides] [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, ^~~~~~~~~~~~~~~~~~~~~ arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previous initialization is here [0 ... ESR_ELx_EC_MAX] = NULL, ^~~~ include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~
Quoted 5 lines
Kalesh, please ignore this nonsense. There may be things to improve, but this is *NOT* one of them.
These reports are pretty useless, and just lead people to ignore real bug reports.
Hi Kalesh, sorry there're some irrelevant issues mixed in the report, kindly ignore them. And the valuable ones are the new ones that prefixed by >>, as the below one in original report.
Quoted 1 line
Quoted 1 line
arch/arm64/kvm/hyp/nvhe/switch.c:372:17: warning: no previous prototype for function 'hyp_panic_bad_stack' [-Wmissing-prototypes]
void __noreturn hyp_panic_bad_stack(void)
^
Thanks
Quoted 8 lines
M.Signature · 4 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kbuild-all mailing list -- [email protected] To unsubscribe send an email to [email protected]
Marc Zyngier
maintainerRe: [kbuild-all] Re: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
Quoted 51 lines · Philip Li
Quoted 44 lines · Marc Zyngier
Quoted 29 lines · kernel test robot
Hi Kalesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on
cfb92440ee71adcc2105b0890bb01ac3cddb8507]url: https://github.com/0day-ci/linux/commits/Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 base: cfb92440ee71adcc2105b0890bb01ac3cddb8507 config: arm64-randconfig-r011-20220221 (https://download.01.org/0day-ci/archive/20220223/202202231727.L621fVgD-lkp(a)intel.com/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project d271fc04d5b97b12e6b797c6067d3c96a8d7470e)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/7fe99fd40f7c4b2973218045ca5b9c9160524db1
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 git checkout7fe99fd40f7c4b2973218045ca5b9c9160524db1
# save the config file to linux build tree
mkdirbuild_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/basharch/arm64/If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
Quoted 12 lines
include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ arch/arm64/kvm/hyp/nvhe/switch.c:200:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides] [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, ^~~~~~~~~~~~~~~~~~~~~ arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previous initialization is here [0 ... ESR_ELx_EC_MAX] = NULL, ^~~~ include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~Quoted 5 lines
Kalesh, please ignore this nonsense. There may be things to improve, but this is *NOT* one of them.
These reports are pretty useless, and just lead people to ignore real bug reports.
Quoted 8 lines
Hi Kalesh, sorry there're some irrelevant issues mixed in the report, kindly ignore them. And the valuable ones are the new ones that prefixed by >>, as the below one in original report.
Quoted 2 lines
Quoted 2 lines
arch/arm64/kvm/hyp/nvhe/switch.c:372:17: warning: no previous prototype for function 'hyp_panic_bad_stack' [-Wmissing-prototypes]void
__noreturnhyp_panic_bad_stack(void)^
This is only called from assembly code, so a prototype wouldn't bring much.
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [kbuild-all] Re: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
Quoted 57 lines · Marc Zyngier
Quoted 55 lines · Philip Li
Quoted 44 lines · Marc Zyngier
Quoted 29 lines · kernel test robot
Hi Kalesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on
cfb92440ee71adcc2105b0890bb01ac3cddb8507]url: https://github.com/0day-ci/linux/commits/Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 base: cfb92440ee71adcc2105b0890bb01ac3cddb8507 config: arm64-randconfig-r011-20220221 (https://download.01.org/0day-ci/archive/20220223/202202231727.L621fVgD-lkp(a)intel.com/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project d271fc04d5b97b12e6b797c6067d3c96a8d7470e)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/7fe99fd40f7c4b2973218045ca5b9c9160524db1
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 git checkout7fe99fd40f7c4b2973218045ca5b9c9160524db1
# save the config file to linux build tree
mkdirbuild_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/basharch/arm64/If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
Quoted 12 lines
include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ arch/arm64/kvm/hyp/nvhe/switch.c:200:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides] [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, ^~~~~~~~~~~~~~~~~~~~~ arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previous initialization is here [0 ... ESR_ELx_EC_MAX] = NULL, ^~~~ include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~Quoted 5 lines
Kalesh, please ignore this nonsense. There may be things to improve, but this is *NOT* one of them.
These reports are pretty useless, and just lead people to ignore real bug reports.
Hi Kalesh, sorry there're some irrelevant issues mixed in the report, kindly ignore them. And the valuable ones are the new ones that prefixed by >>, as the below one in original report.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
arch/arm64/kvm/hyp/nvhe/switch.c:372:17: warning: no previous prototype for function 'hyp_panic_bad_stack' [-Wmissing-prototypes]void
__noreturnhyp_panic_bad_stack(void)^This is only called from assembly code, so a prototype wouldn't bring much.
Should probably be marked as 'asmlinkage' then. I've suggested many times already that this bogus diagnostic should either be disabled, or disregard 'asmlinkage' symbols.
Marc Zyngier
maintainerRe: [kbuild-all] Re: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
Quoted 63 lines · Ard Biesheuvel
Quoted 62 lines · Marc Zyngier
Quoted 59 lines · Philip Li
Quoted 44 lines · Marc Zyngier
Quoted 29 lines · kernel test robot
Hi Kalesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on
cfb92440ee71adcc2105b0890bb01ac3cddb8507]url: https://github.com/0day-ci/linux/commits/Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 base: cfb92440ee71adcc2105b0890bb01ac3cddb8507 config: arm64-randconfig-r011-20220221 (https://download.01.org/0day-ci/archive/20220223/202202231727.L621fVgD-lkp(a)intel.com/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project d271fc04d5b97b12e6b797c6067d3c96a8d7470e)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/7fe99fd40f7c4b2973218045ca5b9c9160524db1
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522 git checkout7fe99fd40f7c4b2973218045ca5b9c9160524db1
# save the config file to linux build tree
mkdirbuild_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/basharch/arm64/If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
Quoted 12 lines
include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ arch/arm64/kvm/hyp/nvhe/switch.c:200:27: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides] [ESR_ELx_EC_FP_ASIMD] = kvm_hyp_handle_fpsimd, ^~~~~~~~~~~~~~~~~~~~~ arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previous initialization is here [0 ... ESR_ELx_EC_MAX] = NULL, ^~~~ include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~Quoted 5 lines
Kalesh, please ignore this nonsense. There may be things to improve, but this is *NOT* one of them.
These reports are pretty useless, and just lead people to ignore real bug reports.
Hi Kalesh, sorry there're some irrelevant issues mixed in the report, kindly ignore them. And the valuable ones are the new ones that prefixed by >>, as the below one in original report.
Quoted 2 lines
Quoted 2 lines
arch/arm64/kvm/hyp/nvhe/switch.c:372:17: warning: no previous prototype for function 'hyp_panic_bad_stack' [-Wmissing-prototypes]void
__noreturnhyp_panic_bad_stack(void)^
Quoted 7 lines
Quoted 3 lines
This is only called from assembly code, so a prototype wouldn't bring much.
Should probably be marked as 'asmlinkage' then. I've suggested many times already that this bogus diagnostic should either be disabled, or disregard 'asmlinkage' symbols.
Yes, asmlinkage is definitely missing.
But it is pretty obvious that the robot people aren't interested in fixing this particular issue, given how long we have been suggesting this...
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [kbuild-all] Re: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
Quoted 87 lines · Marc Zyngier
Quoted 78 lines · Ard Biesheuvel
Quoted 77 lines · Marc Zyngier
Quoted 9 lines · Philip Li
Quoted 8 lines · Marc Zyngier
Quoted 6 lines · kernel test robot
Hi Kalesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on
cfb92440ee71adcc2105b0890bb01ac3cddb8507]Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
url:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
base:
cfb92440ee71adcc2105b0890bb01ac3cddb8507
config: arm64-randconfig-r011-20220221(https://download.01.org/0day-ci/archive/20220223/[email protected]/config)
Quoted 1 line
Quoted 1 line
Quoted 1 line
compiler: clang version 15.0.0
(https://github.com/llvm/llvm-project
d271fc04d5b97b12e6b797c6067d3c96a8d7470e)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
reproduce (this is a W=1 build):
wgethttps://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross
-O ~/bin/make.crossQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build # apt-get install binutils-aarch64-linux-gnu #https://github.com/0day-ci/linux/commit/7fe99fd40f7c4b2973218045ca5b9c9160524db1
Quoted 1 line
Quoted 1 line
Quoted 1 line
git remote add linux-review
https://github.com/0day-ci/linux
Quoted 1 line
Quoted 1 line
Quoted 1 line
git fetch --no-tags linux-review
Kalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
git checkout
7fe99fd40f7c4b2973218045ca5b9c9160524db1# save the config file to linux build tree mkdir build_dir COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clangmake.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash
arch/arm64/Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0)
^~~~~~~~~~~arch/arm64/kvm/hyp/nvhe/switch.c:200:27: warning: initializeroverrides prior initialization of this subobject [-Winitializer-overrides]
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
[ESR_ELx_EC_FP_ASIMD] =
kvm_hyp_handle_fpsimd, ^~~~~~~~~~~~~~~~~~~~~arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previousinitialization is here
Quoted 20 lines
Quoted 11 lines
Quoted 5 lines
[0 ... ESR_ELx_EC_MAX] = NULL, ^~~~
include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0)
^~~~~~~~~~~Kalesh, please ignore this nonsense. There may be things to improve, but this is *NOT* one of them.
These reports are pretty useless, and just lead people to ignore real bug reports.
Hi Kalesh, sorry there're some irrelevant issues mixed in the report, kindly ignore them. And the valuable ones are the new ones that prefixed by >>, as the below one in original report.
Quoted 2 lines
Quoted 2 lines
arch/arm64/kvm/hyp/nvhe/switch.c:372:17: warning: no previous prototype for function 'hyp_panic_bad_stack' [-Wmissing-prototypes]void
__noreturnhyp_panic_bad_stack(void)
^Quoted 7 lines
Quoted 3 lines
This is only called from assembly code, so a prototype wouldn't bring much.
Should probably be marked as 'asmlinkage' then. I've suggested many times already that this bogus diagnostic should either be disabled, or disregard 'asmlinkage' symbols.
Quoted 7 lines
Yes, asmlinkage is definitely missing.
But it is pretty obvious that the robot people aren't interested in fixing this particular issue, given how long we have been suggesting this...
M.
Hi Marc, Ard,
We have ignored the warning related to asmlinkage according to the below advice:
https://lore.kernel.org/lkml/CAMj1kXHrRYagSVniSetHdG15rkQS+fm4zVOtN=Zda3W0QaEoJA@mail.gmail.com/
do you want the bot ignore such warning if asmlinkage not specified?
Best Regards,
Rong Chen
Re: [kbuild-all] Re: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
Quoted 101 lines · Rong A
Quoted 89 lines · Marc Zyngier
Quoted 80 lines · Ard Biesheuvel
Quoted 79 lines · Marc Zyngier
Quoted 9 lines · Philip Li
Quoted 8 lines · Marc Zyngier
Quoted 6 lines · kernel test robot
Hi Kalesh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on
cfb92440ee71adcc2105b0890bb01ac3cddb8507]Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
url:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
base: cfb92440ee71adcc2105b0890bb01ac3cddb8507 config: arm64-randconfig-r011-20220221(https://download.01.org/0day-ci/archive/20220223/202202231727.L621fVgD-lkp(a)intel.com/config)
Quoted 1 line
Quoted 1 line
Quoted 1 line
compiler: clang version 15.0.0
(https://github.com/llvm/llvm-project
d271fc04d5b97b12e6b797c6067d3c96a8d7470e)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
reproduce (this is a W=1 build):
wgethttps://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross
-O ~/bin/make.crossQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build # apt-get install binutils-aarch64-linux-gnu #https://github.com/0day-ci/linux/commit/7fe99fd40f7c4b2973218045ca5b9c9160524db1
Quoted 1 line
Quoted 1 line
Quoted 1 line
git remote add linux-review
https://github.com/0day-ci/linux
Quoted 1 line
Quoted 1 line
Quoted 1 line
git fetch --no-tags linux-reviewKalesh-Singh/KVM-arm64-Hypervisor-stack-enhancements/20220223-010522
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
git checkout
7fe99fd40f7c4b2973218045ca5b9c9160524db1# save the config file to linux build tree mkdirbuild_dirCOMPILER_INSTALL_PATH=$HOME/0day COMPILER=clangmake.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash
arch/arm64/Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ arch/arm64/kvm/hyp/nvhe/switch.c:200:27: warning: initializeroverrides prior initialization of this subobject
[-Winitializer-overrides]Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
[
ESR_ELx_EC_FP_ASIMD] =kvm_hyp_handle_fpsimd,
^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/nvhe/switch.c:196:28: note: previousinitialization is here
Quoted 20 lines
Quoted 11 lines
Quoted 5 lines
[0 ... ESR_ELx_EC_MAX] = NULL, ^~~~ include/linux/stddef.h:8:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~Kalesh, please ignore this nonsense. There may be things to improve, but this is *NOT* one of them.
These reports are pretty useless, and just lead people to ignore real bug reports.
Hi Kalesh, sorry there're some irrelevant issues mixed in the report, kindly ignore them. And the valuable ones are the new ones that prefixed by >>, as the below one in original report.
Quoted 2 lines
Quoted 2 lines
arch/arm64/kvm/hyp/nvhe/switch.c:372:17: warning: no previous prototype for function 'hyp_panic_bad_stack' [-Wmissing-prototypes]void
__noreturnhyp_panic_bad_stack(void)^Quoted 7 lines
Quoted 3 lines
This is only called from assembly code, so a prototype wouldn't bring much.
Should probably be marked as 'asmlinkage' then. I've suggested many times already that this bogus diagnostic should either be disabled, or disregard 'asmlinkage' symbols.
Quoted 7 lines
Yes, asmlinkage is definitely missing.
But it is pretty obvious that the robot people aren't interested in fixing this particular issue, given how long we have been suggesting this...
M.
Quoted 8 lines
Hi Marc, Ard,
We have ignored the warning related to asmlinkage according to the below advice:
https://lore.kernel.org/lkml/CAMj1kXHrRYagSVniSetHdG15rkQS+fm4zVOtN=Zda3W0QaEoJA(a)mail.gmail.com/
do you want the bot ignore such warning if asmlinkage not specified?
Hi Rong,
I have added asmlinkage to the functions without a prototype in later versions of the patch.
Perhaps the report should be updated to say "functions only called from assembly code should be annotated with the asmlinkage attribute" if the error is a missing prototype
Thanks,
Kalesh
Quoted 7 lines
Best Regards,
Rong Chen--
To unsubscribe from this group and stop receiving emails from it, send an email to kernel-team+unsubscribe(a)android.com.
Marc Zyngier
maintainerRe: [kbuild-all] Re: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
In reply to Chen, Rong AQuoted 7 lines · Rong A
Hi Marc, Ard,
We have ignored the warning related to asmlinkage according to the below advice:
https://lore.kernel.org/lkml/CAMj1kXHrRYagSVniSetHdG15rkQS+fm4zVOtN=Zda3W0QaEoJA(a)mail.gmail.com/
Ah, I didn't realise it had been updated. Apologies for the shouting!
Quoted 1 line
do you want the bot ignore such warning if asmlinkage not specified?
No, there is some value in warning about this particular case.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [kbuild-all] Re: [PATCH v2 6/9] KVM: arm64: Detect and handle hypervisor stack overflows
In reply to Chen, Rong AQuoted 11 lines · Rong A
Hi Marc, Ard,
We have ignored the warning related to asmlinkage according to the below advice:
https://lore.kernel.org/lkml/CAMj1kXHrRYagSVniSetHdG15rkQS+fm4zVOtN=Zda3W0QaEoJA(a)mail.gmail.com/
Excellent! Thanks for implementing this - I wasn't aware that you adopted this suggestion.
Quoted 2 lines
do you want the bot ignore such warning if asmlinkage not specified?
Even though I think this warning has little value, I think asmlinkage is sufficient for us to avoid it for symbols that are exported for use by assembler code.
So I don't think this additional change is needed.
Signature · 1 line
Ard.
PATCH v2 7/9 KVM: arm64: Add hypervisor overflow stack
In reply to Kalesh SinghAllocate and switch to 16-byte aligned secondary stack on overflow. This provides us stack space to better handle overflows; and is used in a subsequent patch to dump the hypervisor stacktrace. The overflow stack is only allocated if CONFIG_NVHE_EL2_DEBUG is enabled, as hypervisor stacktraces is a debug feature dependent on CONFIG_NVHE_EL2_DEBUG.
--- arch/arm64/kvm/hyp/nvhe/host.S | 5 +++++ arch/arm64/kvm/hyp/nvhe/switch.c | 5 +++++ 2 files changed, 10 insertions(+)
arch/arm64/kvm/hyp/nvhe/host.S +5 -0
@@ -171,6 +171,10 @@ SYM_FUNC_END(__host_hvc) b hyp_panic .L__hyp_sp_overflow\@: +#ifdef CONFIG_NVHE_EL2_DEBUG + /* Switch to the overflow stack */ + adr_this_cpu sp, hyp_overflow_stack + PAGE_SIZE, x0 +#else /* * Reset SP to the top of the stack, to allow handling the hyp_panic. * This corrupts the stack but is ok, since we won't be attempting
@@ -178,6 +182,7 @@ SYM_FUNC_END(__host_hvc) */ ldr_this_cpu x0, kvm_init_params + NVHE_INIT_STACK_HYP_VA, x1 mov sp, x0 +#endif bl hyp_panic_bad_stack ASM_BUG()
arch/arm64/kvm/hyp/nvhe/switch.c +5 -0
@@ -34,6 +34,11 @@ DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data); DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); DEFINE_PER_CPU(unsigned long, kvm_hyp_vector); +#ifdef CONFIG_NVHE_EL2_DEBUG +DEFINE_PER_CPU(unsigned long [PAGE_SIZE/sizeof(long)], hyp_overflow_stack) +__aligned(16) ; +#endif +static void __activate_traps (struct kvm_vcpu *vcpu) {u64 val;
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
PATCH v2 8/9 KVM: arm64: Unwind and dump nVHE HYP stacktrace
In reply to Kalesh SinghUnwind the stack in EL1, when CONFIG_NVHE_EL2_DEBUG is enabled. This is possible because CONFIG_NVHE_EL2_DEBUG disables the host stage 2 protection which allows host to access the hypervisor stack pages in EL1.
Unwinding and dumping hyp call traces is gated on CONFIG_NVHE_EL2_DEBUG to avoid the potential leaking of information to the host.
A simple stack overflow test produces the following output:
[ 580.376051][ T412] kvm: nVHE hyp panic at: ffffffc0116145c4! [ 580.378034][ T412] kvm [412]: nVHE HYP call trace: [ 580.378591][ T412] kvm [412]: [<ffffffc011614934>] [ 580.378993][ T412] kvm [412]: [<ffffffc01160fa48>] [ 580.379386][ T412] kvm [412]: [<ffffffc0116145dc>] // Non-terminating recursive call [ 580.379772][ T412] kvm [412]: [<ffffffc0116145dc>] [ 580.380158][ T412] kvm [412]: [<ffffffc0116145dc>] [ 580.380544][ T412] kvm [412]: [<ffffffc0116145dc>] [ 580.380928][ T412] kvm [412]: [<ffffffc0116145dc>]
. . .
Since nVHE hyp symbols are not included by kallsyms to avoid issues with aliasing, we fallback to the vmlinux addresses. Symbolizing the addresses is handled in the next patch in this series.
---
Changes in v2:
- Add cpu_prepare_nvhe_panic_info()
- Move updating the panic info to hyp_panic(), so that unwinding also works for conventional nVHE Hyp-mode.
arch/arm64/include/asm/kvm_asm.h | 17 ++ arch/arm64/kvm/Kconfig | 5 +- arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/arm.c | 2 +- arch/arm64/kvm/handle_exit.c | 3 + arch/arm64/kvm/hyp/nvhe/switch.c | 19 ++ arch/arm64/kvm/stacktrace.c | 290 +++++++++++++++++++++++++++++++ arch/arm64/kvm/stacktrace.h | 17 ++ 8 files changed, 351 insertions(+), 3 deletions(-) create mode 100644 arch/arm64/kvm/stacktrace.c create mode 100644 arch/arm64/kvm/stacktrace.h
arch/arm64/include/asm/kvm_asm.h +17 -0
@@ -176,6 +176,23 @@ struct kvm_nvhe_init_params {unsigned long vtcr; }; +#ifdef CONFIG_NVHE_EL2_DEBUG +/* +* Used by the host in EL1 to dump the nVHE hypervisor backtrace on +* hyp_panic. This is possible because CONFIG_NVHE_EL2_DEBUG disables +* the host stage 2 protection. See: __hyp_do_panic() +* +* @hyp_stack_base: hyp VA of the hyp_stack base. +* @hyp_overflow_stack_base: hyp VA of the hyp_overflow_stack base. +* @start_fp: hyp FP where the hyp backtrace should begin. +*/ +struct kvm_nvhe_panic_info { +unsigned long hyp_stack_base; +unsigned long hyp_overflow_stack_base; +unsigned long start_fp; +}; +#endif +/* Translate a kernel address @ptr into its equivalent linear mapping */ #define kvm_ksym_ref (ptr) \ ({ \
arch/arm64/kvm/Kconfig +3 -2
@@ -51,8 +51,9 @@ config NVHE_EL2_DEBUG depends on KVM help Say Y here to enable the debug mode for the non-VHE KVM EL2 object. - Failure reports will BUG() in the hypervisor. This is intended for - local EL2 hypervisor development. + Failure reports will BUG() in the hypervisor; and panics will print + the hypervisor call stack. This is intended for local EL2 hypervisor + development. If unsure, say N.
arch/arm64/kvm/Makefile +1 -0
@@ -23,6 +23,7 @@ kvm-y += arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \ vgic/vgic-its.o vgic/vgic-debug.o kvm-$(CONFIG_HW_PERF_EVENTS) += pmu-emul.o +kvm-$(CONFIG_NVHE_EL2_DEBUG) += stacktrace.o always-y := hyp_constants.h hyp-constants.s
arch/arm64/kvm/arm.c +1 -1
@@ -49,7 +49,7 @@ DEFINE_STATIC_KEY_FALSE(kvm_protected_mode_initialized); DECLARE_KVM_HYP_PER_CPU(unsigned long, kvm_hyp_vector); -static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page); +DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page);unsigned long kvm_arm_hyp_percpu_base[NR_CPUS ]; DECLARE_KVM_NVHE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);
arch/arm64/kvm/handle_exit.c +3 -0
@@ -23,6 +23,7 @@#define CREATE_TRACE_POINTS #include "trace_handle_exit.h" +#include "stacktrace.h" typedef int (*exit_handle_fn )(struct kvm_vcpu *);
@@ -326,6 +327,8 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr,kvm_err ("nVHE hyp panic at: %016llx!\n" , elr_virt + hyp_offset); } +hyp_dump_backtrace (hyp_offset); +/* * Hyp has panicked and we're going to handle that by panicking the * kernel. The kernel offset will be revealed in the panic so we're
arch/arm64/kvm/hyp/nvhe/switch.c +19 -0
@@ -37,6 +37,23 @@ DEFINE_PER_CPU(unsigned long, kvm_hyp_vector);#ifdef CONFIG_NVHE_EL2_DEBUG DEFINE_PER_CPU(unsigned long [PAGE_SIZE/sizeof(long)], hyp_overflow_stack)__aligned(16) ; +DEFINE_PER_CPU(struct kvm_nvhe_panic_info, kvm_panic_info); + +DECLARE_PER_CPU(struct kvm_nvhe_panic_info, kvm_panic_info); + +static void cpu_prepare_nvhe_panic_info (void ) +{ +struct kvm_nvhe_panic_info *panic_info =this_cpu_ptr (&kvm_panic_info); +struct kvm_nvhe_init_params *params =this_cpu_ptr (&kvm_init_params); + + panic_info->hyp_stack_base = (unsigned long )(params->stack_hyp_va -PAGE_SIZE ); + panic_info->hyp_overflow_stack_base = (unsigned long )this_cpu_ptr (hyp_overflow_stack); + panic_info->start_fp = (unsigned long )__builtin_frame_address (0 ); +} +#else +static void cpu_prepare_nvhe_panic_info (void ) +{ +}#endif static void __activate_traps (struct kvm_vcpu *vcpu)
@@ -360,6 +377,8 @@ void __noreturn hyp_panic(void)struct kvm_cpu_context *host_ctxt;struct kvm_vcpu *vcpu; +cpu_prepare_nvhe_panic_info (); + host_ctxt = &this_cpu_ptr (&kvm_host_data)->host_ctxt; vcpu = host_ctxt->__hyp_running_vcpu;
arch/arm64/kvm/stacktrace.c new file +290 -0
290 lines not on this page · raw message
arch/arm64/kvm/stacktrace.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Stack unwinder for EL2 nVHE hypervisor. +*/ + +#ifndef __KVM_HYP_STACKTRACE_H +#define __KVM_HYP_STACKTRACE_H + +#ifdef CONFIG_NVHE_EL2_DEBUG +void hyp_dump_backtrace (unsigned long hyp_offset); +#else +static inline void hyp_dump_backtrace (unsigned long hyp_offset) +{ +} +#endif /* CONFIG_NVHE_EL2_DEBUG */ + +#endif /* __KVM_HYP_STACKTRACE_H */
Signature · 1 line
2.35.1.473.g83b2b277ed-goog
PATCH v2 9/9 KVM: arm64: Symbolize the nVHE HYP backtrace
In reply to Kalesh SinghReintroduce the __kvm_nvhe_ symbols in kallsyms, ignoring the local symbols in this namespace. The local symbols are not informative and can cause aliasing issues when symbolizing the addresses.
With the necessary symbols now in kallsyms we can symbolize nVHE stacktrace addresses using the %pB print format specifier.
Some sample call traces:
-------
[ 167.018598][ T407] kvm [407]: nVHE hyp panic at: [<ffffffc0116145cc>] __kvm_nvhe_overflow_stack+0x10/0x34! [ 167.020841][ T407] kvm [407]: nVHE HYP call trace: [ 167.021371][ T407] kvm [407]: [<ffffffc011614934>] __kvm_nvhe_hyp_panic_bad_stack+0xc/0x10 [ 167.021972][ T407] kvm [407]: [<ffffffc01160fa48>] __kvm_nvhe___kvm_hyp_host_vector+0x248/0x794 [ 167.022572][ T407] kvm [407]: [<ffffffc0116145dc>] __kvm_nvhe_overflow_stack+0x20/0x34 [ 167.023135][ T407] kvm [407]: [<ffffffc0116145dc>] __kvm_nvhe_overflow_stack+0x20/0x34 [ 167.023699][ T407] kvm [407]: [<ffffffc0116145dc>] __kvm_nvhe_overflow_stack+0x20/0x34 [ 167.024261][ T407] kvm [407]: [<ffffffc0116145dc>] __kvm_nvhe_overflow_stack+0x20/0x34
. . .
-------
[ 166.161699][ T409] kvm [409]: Invalid host exception to nVHE hyp! [ 166.163789][ T409] kvm [409]: nVHE HYP call trace: [ 166.164709][ T409] kvm [409]: [<ffffffc011614fa0>] __kvm_nvhe_handle___kvm_vcpu_run+0x198/0x21c [ 166.165352][ T409] kvm [409]: [<ffffffc011614980>] __kvm_nvhe_handle_trap+0xa4/0x124 [ 166.165911][ T409] kvm [409]: [<ffffffc01160f060>] __kvm_nvhe___host_exit+0x60/0x64 [ 166.166657][ T409] Kernel panic - not syncing: HYP panic:
. . .
-------
---
Changes in v2:
- Fix printk warnings - %p expects (void *)
arch/arm64/kvm/handle_exit.c | 13 +++++-------- arch/arm64/kvm/stacktrace.c | 2 +- scripts/kallsyms.c | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-)
arch/arm64/kvm/handle_exit.c +5 -8
@@ -296,13 +296,8 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr,u64 elr_in_kimg =__phys_to_kimg (elr_phys);u64 hyp_offset = elr_in_kimg -kaslr_offset () - elr_virt;u64 mode = spsr &PSR_MODE_MASK ; +u64 panic_addr = elr_virt + hyp_offset; -/* -* The nVHE hyp symbols are not included by kallsyms to avoid issues -* with aliasing. That means that the symbols cannot be printed with the -* "%pS" format specifier, so fall back to the vmlinux address if -* there's no better option. -*/ if (mode != PSR_MODE_EL2t && mode != PSR_MODE_EL2h) {kvm_err ("Invalid host exception to nVHE hyp!\n" ); } else if (ESR_ELx_EC(esr) == ESR_ELx_EC_BRK64 &&
@@ -322,9 +317,11 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr,if (file)kvm_err ("nVHE hyp BUG at: %s:%u!\n" , file, line);else -kvm_err ("nVHE hyp BUG at: %016llx!\n" , elr_virt + hyp_offset); +kvm_err ("nVHE hyp BUG at: [<%016llx>] %pB!\n" , panic_addr, + (void *)panic_addr); }else { -kvm_err ("nVHE hyp panic at: %016llx!\n" , elr_virt + hyp_offset); +kvm_err ("nVHE hyp panic at: [<%016llx>] %pB!\n" , panic_addr, + (void *)panic_addr); }hyp_dump_backtrace (hyp_offset);
arch/arm64/kvm/stacktrace.c +1 -1
@@ -261,7 +261,7 @@ static void hyp_dump_backtrace_entry(unsigned long hyp_pc, unsigned long hyp_off hyp_pc &= va_mask;/* Mask tags */ hyp_pc += hyp_offset; -kvm_err ("[<%016lx>]\n" , hyp_pc); +kvm_err ("[<%016lx>] %pB\n" , hyp_pc, (void *)hyp_pc); }void hyp_dump_backtrace (unsigned long hyp_offset)
scripts/kallsyms.c +1 -1
@@ -111,7 +111,7 @@ static bool is_ignored_symbol(const char *name, char type)".LASANPC" ,/* s390 kasan local symbols */ "__crc_" ,/* modversions */ "__efistub_" ,/* arm64 EFI stub namespace */ -"__kvm_nvhe_" ,/* arm64 non-VHE KVM namespace */ +"__kvm_nvhe_$" ,/* arm64 local symbols in non-VHE KVM namespace */ "__AArch64ADRPThunk_" ,/* arm64 lld */ "__ARMV5PILongThunk_" ,/* arm lld */ "__ARMV7PILongThunk_",
Signature · 1 line
2.35.1.473.g83b2b277ed-goog