KVM: arm64: Reschedule as needed when destroying the stage-2 page-tables
v2 cover KVM: arm64: Reschedule as needed when destroying the stage-2 page-tables
Hello,
When destroying a fully-mapped 128G VM abruptly, the following scheduler warning is observed:
sched: CPU 0 need_resched set for > 100018840 ns (100 ticks) without schedule
CPU: 0 UID: 0 PID: 9617 Comm: kvm_page_table_ Tainted: G O 6.16.0-smp-DEV #3 NONE
Tainted: [O]=OOT_MODULE
Call trace:
show_stack+0x20/0x38 (C)
dump_stack_lvl+0x3c/0xb8
dump_stack+0x18/0x30
resched_latency_warn+0x7c/0x88
sched_tick+0x1c4/0x268
update_process_times+0xa8/0xd8
tick_nohz_handler+0xc8/0x168
__hrtimer_run_queues+0x11c/0x338
hrtimer_interrupt+0x104/0x308
arch_timer_handler_phys+0x40/0x58
handle_percpu_devid_irq+0x8c/0x1b0
generic_handle_domain_irq+0x48/0x78
gic_handle_irq+0x1b8/0x408
call_on_irq_stack+0x24/0x30
do_interrupt_handler+0x54/0x78
el1_interrupt+0x44/0x88
el1h_64_irq_handler+0x18/0x28
el1h_64_irq+0x84/0x88
stage2_free_walker+0x30/0xa0 (P)
__kvm_pgtable_walk+0x11c/0x258
__kvm_pgtable_walk+0x180/0x258
__kvm_pgtable_walk+0x180/0x258
__kvm_pgtable_walk+0x180/0x258
kvm_pgtable_walk+0xc4/0x140
kvm_pgtable_stage2_destroy+0x5c/0xf0
kvm_free_stage2_pgd+0x6c/0xe8
kvm_uninit_stage2_mmu+0x24/0x48
kvm_arch_flush_shadow_all+0x80/0xa0
kvm_mmu_notifier_release+0x38/0x78
__mmu_notifier_release+0x15c/0x250
exit_mmap+0x68/0x400
__mmput+0x38/0x1c8
mmput+0x30/0x68
exit_mm+0xd4/0x198
do_exit+0x1a4/0xb00
do_group_exit+0x8c/0x120
get_signal+0x6d4/0x778
do_signal+0x90/0x718
do_notify_resume+0x70/0x170
el0_svc+0x74/0xd8
el0t_64_sync_handler+0x60/0xc8
el0t_64_sync+0x1b0/0x1b8The host kernel was running with CONFIG_PREEMPT_NONE=y, and since the page-table walk operation takes considerable amount of time for a VM with such a large number of PTEs mapped, the warning is seen.
To mitigate this, split the walk into smaller ranges, by checking for cond_resched() between each range. Since the path is executed during VM destruction, after the page-table structure is unlinked from the KVM MMU, relying on cond_resched_rwlock_write() isn't necessary.
Patch-1 splits the kvm_pgtable_stage2_destroy() function into separate 'walk' and 'free PGD' parts.
Patch-2 leverages the split and performs the walk periodically over smaller ranges and calls cond_resched() between them.
v2: Thanks, Oliver for the suggestions.
- Apply the rescheduling to pKVM as well.
- Use VTCR_EL2_IPA(pgt->mmu->vtcr) to get the full possible range of the VM for pKVM.
- Deference the pgd using rcu_deference_raw() in kvm_pgtable_stage2_destroy_pgd() instead of using a null walker.
- Rename/restructure the functions to avoid duplications.
v1: https://lore.kernel.org/all/[email protected]/
Thank you.
Raghavendra
Raghavendra Rao Ananta (2):
KVM: arm64: Split kvm_pgtable_stage2_destroy()
KVM: arm64: Reschedule as needed when destroying the stage-2
page-tables
arch/arm64/include/asm/kvm_pgtable.h | 30 +++++++++++++++++++++++ arch/arm64/include/asm/kvm_pkvm.h | 4 +++- arch/arm64/kvm/hyp/pgtable.c | 25 +++++++++++++++---- arch/arm64/kvm/mmu.c | 36 ++++++++++++++++++++++++++-- arch/arm64/kvm/pkvm.c | 11 +++++++-- 5 files changed, 97 insertions(+), 9 deletions(-)
base-commit: 8f5ae30d69d7543eee0d70083daf4de8fe15d585 --
2.51.0.rc2.233.g662b1ed5c5-goog
PATCH v2 1/2 KVM: arm64: Split kvm_pgtable_stage2_destroy()
Split kvm_pgtable_stage2_destroy() into two:
- kvm_pgtable_stage2_destroy_range(), that performs the page-table walk and free the entries over a range of addresses.
- kvm_pgtable_stage2_destroy_pgd(), that frees the PGD.
This refactoring enables subsequent patches to free large page-tables in chunks, calling cond_resched() between each chunk, to yield the CPU as necessary.
Existing callers of kvm_pgtable_stage2_destroy(), that probably cannot take advantage of this (such as nVMHE), will continue to function as is.
--- arch/arm64/include/asm/kvm_pgtable.h | 30 ++++++++++++++++++++++++++++ arch/arm64/include/asm/kvm_pkvm.h | 4 +++- arch/arm64/kvm/hyp/pgtable.c | 25 +++++++++++++++++++---- arch/arm64/kvm/mmu.c | 12 +++++++++-- arch/arm64/kvm/pkvm.c | 11 ++++++++-- 5 files changed, 73 insertions(+), 9 deletions(-)
arch/arm64/include/asm/kvm_pgtable.h +30 -0
@@ -355,6 +355,11 @@ static inline kvm_pte_t *kvm_dereference_pteref(struct kvm_pgtable_walker *walkereturn pteref; } +static inline kvm_pte_t *kvm_dereference_pteref_raw (kvm_pteref_t pteref) +{ +return pteref; +} +static inline int kvm_pgtable_walk_begin (struct kvm_pgtable_walker *walker) {/*
@@ -384,6 +389,11 @@ static inline kvm_pte_t *kvm_dereference_pteref(struct kvm_pgtable_walker *walkereturn rcu_dereference_check (pteref, !(walker->flags &KVM_PGTABLE_WALK_SHARED )); } +static inline kvm_pte_t *kvm_dereference_pteref_raw (kvm_pteref_t pteref) +{ +return rcu_dereference_raw (pteref); +} +static inline int kvm_pgtable_walk_begin (struct kvm_pgtable_walker *walker) {if (walker->flags &KVM_PGTABLE_WALK_SHARED )
@@ -551,6 +561,26 @@ static inline int kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2*/ void kvm_pgtable_stage2_destroy (struct kvm_pgtable *pgt); +/** +* kvm_pgtable_stage2_destroy_range() - Destroy the unlinked range of addresses. +* @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*(). +* @addr: Intermediate physical address at which to place the mapping. +* @size: Size of the mapping. +* +* The page-table is assumed to be unreachable by any hardware walkers prior +* to freeing and therefore no TLB invalidation is performed. +*/ +void kvm_pgtable_stage2_destroy_range (struct kvm_pgtable *pgt, +u64 addr,u64 size); + +/** +* kvm_pgtable_stage2_destroy_pgd() - Destroy the PGD of guest stage-2 page-table. +* @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*(). +* +* It is assumed that the rest of the page-table is freed before this operation. +*/ +void kvm_pgtable_stage2_destroy_pgd (struct kvm_pgtable *pgt); +/** * kvm_pgtable_stage2_free_unlinked() - Free an unlinked stage-2 paging structure. * @mm_ops: Memory management callbacks.
arch/arm64/include/asm/kvm_pkvm.h +3 -1
@@ -179,7 +179,9 @@ struct pkvm_mapping {int pkvm_pgtable_stage2_init (struct kvm_pgtable *pgt,struct kvm_s2_mmu *mmu,struct kvm_pgtable_mm_ops *mm_ops); -void pkvm_pgtable_stage2_destroy (struct kvm_pgtable *pgt); +void pkvm_pgtable_stage2_destroy_range (struct kvm_pgtable *pgt, +u64 addr,u64 size); +void pkvm_pgtable_stage2_destroy_pgd (struct kvm_pgtable *pgt);int pkvm_pgtable_stage2_map (struct kvm_pgtable *pgt,u64 addr,u64 size,u64 phys,enum kvm_pgtable_prot prot,void *mc,enum kvm_pgtable_walk_flags flags);
arch/arm64/kvm/hyp/pgtable.c +21 -4
@@ -1551,21 +1551,38 @@ static int stage2_free_walker(const struct kvm_pgtable_visit_ctx *ctx,return 0 ; } -void kvm_pgtable_stage2_destroy (struct kvm_pgtable *pgt) +void kvm_pgtable_stage2_destroy_range (struct kvm_pgtable *pgt, +u64 addr,u64 size) { -size_t pgd_sz;struct kvm_pgtable_walker walker = { .cb = stage2_free_walker, .flags =KVM_PGTABLE_WALK_LEAF |KVM_PGTABLE_WALK_TABLE_POST , }; -WARN_ON (kvm_pgtable_walk (pgt,0 ,BIT (pgt->ia_bits), &walker)); +WARN_ON (kvm_pgtable_walk (pgt, addr, size, &walker)); +} + +void kvm_pgtable_stage2_destroy_pgd (struct kvm_pgtable *pgt) +{ +size_t pgd_sz; + pgd_sz =kvm_pgd_pages (pgt->ia_bits, pgt->start_level) *PAGE_SIZE ; - pgt->mm_ops->free_pages_exact (kvm_dereference_pteref (&walker, pgt->pgd), pgd_sz); + +/* +* Since the pgtable is unlinked at this point, and not shared with +* other walkers, safely deference pgd with kvm_dereference_pteref_raw() +*/ + pgt->mm_ops->free_pages_exact (kvm_dereference_pteref_raw (pgt->pgd), pgd_sz); pgt->pgd =NULL ; } +void kvm_pgtable_stage2_destroy (struct kvm_pgtable *pgt) +{ +kvm_pgtable_stage2_destroy_range (pgt,0 ,BIT (pgt->ia_bits)); +kvm_pgtable_stage2_destroy_pgd (pgt); +} +void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,s8 level) {kvm_pteref_t ptep = (kvm_pteref_t )pgtable;
arch/arm64/kvm/mmu.c +10 -2
@@ -903,6 +903,14 @@ static int kvm_init_ipa_range(struct kvm_s2_mmu *mmu, unsigned long type)return 0 ; } +static void kvm_stage2_destroy (struct kvm_pgtable *pgt) +{ +unsigned int ia_bits =VTCR_EL2_IPA (pgt->mmu->vtcr); + +KVM_PGT_FN (kvm_pgtable_stage2_destroy_range)(pgt,0 ,BIT (ia_bits)); +KVM_PGT_FN (kvm_pgtable_stage2_destroy_pgd)(pgt); +} +/** * kvm_init_stage2_mmu - Initialise a S2 MMU structure * @kvm: The pointer to the KVM structure
@@ -979,7 +987,7 @@ int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu, unsigned long treturn 0 ; out_destroy_pgtable: -KVM_PGT_FN (kvm_pgtable_stage2_destroy)(pgt); +kvm_stage2_destroy (pgt); out_free_pgtable:kfree (pgt);return err;
@@ -1076,7 +1084,7 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu)write_unlock (&kvm->mmu_lock);if (pgt) { -KVM_PGT_FN (kvm_pgtable_stage2_destroy)(pgt); +kvm_stage2_destroy (pgt);kfree (pgt); } }
arch/arm64/kvm/pkvm.c +9 -2
@@ -316,9 +316,16 @@ static int __pkvm_pgtable_stage2_unmap(struct kvm_pgtable *pgt, u64 start, u64 ereturn 0 ; } -void pkvm_pgtable_stage2_destroy (struct kvm_pgtable *pgt) +void pkvm_pgtable_stage2_destroy_range (struct kvm_pgtable *pgt, +u64 addr,u64 size) { -__pkvm_pgtable_stage2_unmap (pgt,0 , ~(0ULL )); +__pkvm_pgtable_stage2_unmap (pgt, addr, addr + size); +} + +void pkvm_pgtable_stage2_destroy_pgd (struct kvm_pgtable *pgt) +{ +/* Expected to be called after all pKVM mappings have been released. */ +WARN_ON_ONCE (!RB_EMPTY_ROOT (&pgt->pkvm_mappings.rb_root)); } int pkvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size,
Signature · 1 line
2.51.0.rc2.233.g662b1ed5c5-goog
PATCH v2 2/2 KVM: arm64: Reschedule as needed when destroying the stage-2 page-tables
In reply to Raghavendra Rao AnantaWhen a large VM, specifically one that holds a significant number of PTEs, gets abruptly destroyed, the following warning is seen during the page-table walk:
sched: CPU 0 need_resched set for > 100018840 ns (100 ticks) without schedule
CPU: 0 UID: 0 PID: 9617 Comm: kvm_page_table_ Tainted: G O 6.16.0-smp-DEV #3 NONE Tainted: [O]=OOT_MODULE Call trace: show_stack+0x20/0x38 (C) dump_stack_lvl+0x3c/0xb8 dump_stack+0x18/0x30 resched_latency_warn+0x7c/0x88 sched_tick+0x1c4/0x268 update_process_times+0xa8/0xd8 tick_nohz_handler+0xc8/0x168 __hrtimer_run_queues+0x11c/0x338 hrtimer_interrupt+0x104/0x308 arch_timer_handler_phys+0x40/0x58 handle_percpu_devid_irq+0x8c/0x1b0 generic_handle_domain_irq+0x48/0x78 gic_handle_irq+0x1b8/0x408 call_on_irq_stack+0x24/0x30 do_interrupt_handler+0x54/0x78 el1_interrupt+0x44/0x88 el1h_64_irq_handler+0x18/0x28 el1h_64_irq+0x84/0x88 stage2_free_walker+0x30/0xa0 (P) __kvm_pgtable_walk+0x11c/0x258 __kvm_pgtable_walk+0x180/0x258 __kvm_pgtable_walk+0x180/0x258 __kvm_pgtable_walk+0x180/0x258 kvm_pgtable_walk+0xc4/0x140 kvm_pgtable_stage2_destroy+0x5c/0xf0 kvm_free_stage2_pgd+0x6c/0xe8 kvm_uninit_stage2_mmu+0x24/0x48 kvm_arch_flush_shadow_all+0x80/0xa0 kvm_mmu_notifier_release+0x38/0x78 __mmu_notifier_release+0x15c/0x250 exit_mmap+0x68/0x400 __mmput+0x38/0x1c8 mmput+0x30/0x68 exit_mm+0xd4/0x198 do_exit+0x1a4/0xb00 do_group_exit+0x8c/0x120 get_signal+0x6d4/0x778 do_signal+0x90/0x718 do_notify_resume+0x70/0x170 el0_svc+0x74/0xd8 el0t_64_sync_handler+0x60/0xc8 el0t_64_sync+0x1b0/0x1b8
The warning is seen majorly on the host kernels that are configured not to force-preempt, such as CONFIG_PREEMPT_NONE=y. To avoid this, instead of walking the entire page-table in one go, split it into smaller ranges, by checking for cond_resched() between each range. Since the path is executed during VM destruction, after the page-table structure is unlinked from the KVM MMU, relying on cond_resched_rwlock_write() isn't necessary.
--- arch/arm64/kvm/mmu.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
arch/arm64/kvm/mmu.c +25 -1
@@ -903,11 +903,35 @@ static int kvm_init_ipa_range(struct kvm_s2_mmu *mmu, unsigned long type)return 0 ; } +/* +* Assume that @pgt is valid and unlinked from the KVM MMU to free the +* page-table without taking the kvm_mmu_lock and without performing any +* TLB invalidations. +* +* Also, the range of addresses can be large enough to cause need_resched +* warnings, for instance on CONFIG_PREEMPT_NONE kernels. Hence, invoke +* cond_resched() periodically to prevent hogging the CPU for a long time +* and schedule something else, if required. +*/ +static void stage2_destroy_range (struct kvm_pgtable *pgt,phys_addr_t addr, +phys_addr_t end) +{ +u64 next; + +do { + next =stage2_range_addr_end (addr, end); +KVM_PGT_FN (kvm_pgtable_stage2_destroy_range)(pgt, addr, + next - addr); +if (next != end) +cond_resched (); + }while (addr = next, addr != end); +} +static void kvm_stage2_destroy (struct kvm_pgtable *pgt) {unsigned int ia_bits =VTCR_EL2_IPA (pgt->mmu->vtcr); -KVM_PGT_FN (kvm_pgtable_stage2_destroy_range)(pgt,0 ,BIT (ia_bits)); +stage2_destroy_range (pgt,0 ,BIT (ia_bits));KVM_PGT_FN (kvm_pgtable_stage2_destroy_pgd)(pgt); }
Signature · 1 line
2.51.0.rc2.233.g662b1ed5c5-goog
Oliver Upton
AppliedQuoted 50 lines · Raghavendra Rao Ananta
When destroying a fully-mapped 128G VM abruptly, the following scheduler warning is observed:
sched: CPU 0
need_reschedset for > 100018840 ns (100 ticks) without scheduleCPU: 0 UID: 0 PID: 9617 Comm: kvm_page_table_ Tainted: G O 6.16.0-smp-DEV #3 NONE Tainted: [O]=OOT_MODULE Call trace: show_stack+0x20/0x38 (C) dump_stack_lvl+0x3c/0xb8 dump_stack+0x18/0x30 resched_latency_warn+0x7c/0x88 sched_tick+0x1c4/0x268 update_process_times+0xa8/0xd8 tick_nohz_handler+0xc8/0x168 __hrtimer_run_queues+0x11c/0x338 hrtimer_interrupt+0x104/0x308 arch_timer_handler_phys+0x40/0x58 handle_percpu_devid_irq+0x8c/0x1b0 generic_handle_domain_irq+0x48/0x78 gic_handle_irq+0x1b8/0x408 call_on_irq_stack+0x24/0x30 do_interrupt_handler+0x54/0x78 el1_interrupt+0x44/0x88 el1h_64_irq_handler+0x18/0x28 el1h_64_irq+0x84/0x88 stage2_free_walker+0x30/0xa0 (P) __kvm_pgtable_walk+0x11c/0x258 __kvm_pgtable_walk+0x180/0x258 __kvm_pgtable_walk+0x180/0x258 __kvm_pgtable_walk+0x180/0x258 kvm_pgtable_walk+0xc4/0x140 kvm_pgtable_stage2_destroy+0x5c/0xf0 kvm_free_stage2_pgd+0x6c/0xe8 kvm_uninit_stage2_mmu+0x24/0x48 kvm_arch_flush_shadow_all+0x80/0xa0 kvm_mmu_notifier_release+0x38/0x78 __mmu_notifier_release+0x15c/0x250 exit_mmap+0x68/0x400 __mmput+0x38/0x1c8 mmput+0x30/0x68 exit_mm+0xd4/0x198 do_exit+0x1a4/0xb00 do_group_exit+0x8c/0x120 get_signal+0x6d4/0x778 do_signal+0x90/0x718 do_notify_resume+0x70/0x170 el0_svc+0x74/0xd8 el0t_64_sync_handler+0x60/0xc8 el0t_64_sync+0x1b0/0x1b8
Quoted 1 line
[...]
Applied to fixes, thanks!
[1/2] KVM: arm64: Split kvm_pgtable_stage2_destroy()
https://git.kernel.org/kvmarm/kvmarm/c/0e89ca13ee5f [2/2] KVM: arm64: Reschedule as needed when destroying the stage-2 page-tables https://git.kernel.org/kvmarm/kvmarm/c/e9abe311f356
--
Best,
Oliver