Implement Eager Page Splitting for ARM
Subsystems (4)
v3 cover Implement Eager Page Splitting for ARM
Eager Page Splitting improves the performance of dirty-logging (used in live migrations) when guest memory is backed by huge-pages. It's an optimization used in Google Cloud since 2016 on x86, and for the last couple of months on ARM.
Background and motivation
=========================
Dirty logging is typically used for live-migration iterative copying. KVM implements dirty-logging at the PAGE_SIZE granularity (will refer to 4K pages from now on). It does it by faulting on write-protected 4K pages. Therefore, enabling dirty-logging on a huge-page requires breaking it into 4K pages in the first place. KVM does this breaking on fault, and because it's in the critical path it only maps the 4K page that faulted; every other 4K page is left unmapped. This is not great for performance on ARM for a couple of reasons:
- Splitting on fault can halt vcpus for milliseconds in some implementations. Splitting a block PTE requires using a broadcasted TLB invalidation (TLBI) for every huge-page (due to the break-before-make requirement). Note that x86 doesn't need this. We observed some implementations that take millliseconds to complete broadcasted TLBIs when done in parallel from multiple vcpus. And that's exactly what happens when doing it on fault: multiple vcpus fault at the same time triggering TLBIs in parallel.
- Read intensive guest workloads end up paying for dirty-logging. Only mapping the faulting 4K page means that all the other pages that were part of the huge-page will now be unmapped. The effect is that any access, including reads, now has to fault.
Eager Page Splitting (on ARM)
=============================
Eager Page Splitting fixes the above two issues by eagerly splitting huge-pages when enabling dirty logging. The goal is to avoid doing it while faulting on write-protected pages. This is what the TDP MMU does for x86 [0], except that x86 does it for different reasons: to avoid grabbing the MMU lock on fault. Note that taking care of write-protection faults still requires grabbing the MMU lock on ARM, but not on x86 (with the fast_page_fault path).
An additional benefit of eagerly splitting huge-pages is that it can be done in a controlled way (e.g., via an IOCTL). This series provides two knobs for doing it, just like its x86 counterpart: when enabling dirty logging, and when using the KVM_CLEAR_DIRTY_LOG ioctl. The benefit of doing it on KVM_CLEAR_DIRTY_LOG is that this ioctl takes ranges, and not complete memslots like when enabling dirty logging. This means that the cost of splitting (mainly broadcasted TLBIs) can be throttled: split a range, wait for a bit, split another range, etc. The benefits of this approach were presented by Oliver Upton at KVM Forum 2022 [1].
Implementation
==============
Patches 3-4 add a pgtable utility function for splitting huge block
PTEs: kvm_pgtable_stage2_split(). Patches 5-9 add support for eagerly splitting huge-pages when enabling dirty-logging and when using the KVM_CLEAR_DIRTY_LOG ioctl. Note that this is just like what x86 does, and the code is actually based on it. And finally, patch 9:
KVM: arm64: Use local TLBI on permission relaxation
adds support for using local TLBIs instead of broadcasts when doing permission relaxation. This last patch is key to achieving good performance during dirty-logging, as eagerly breaking huge-pages replaces mapping new pages with permission relaxation. Got this patch (indirectly) from Marc Z. and took the liberty of adding a commit message.
Note: this applies on top of 6.2-rc6.
Performance evaluation
======================
The performance benefits were tested using the dirty_log_perf_test selftest with 2M huge-pages.
The first test uses a write-only sequential workload where the stride is 2M instead of 4K [2]. The idea with this experiment is to emulate a random access pattern writing a different huge-page at every access. Observe that the benefit increases with the number of vcpus: up to 5.76x for 152 vcpus. This table shows the guest dirtying time when using the CLEAR ioctl (and KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2):
/dirty_log_perf_test_sparse -s anonymous_hugetlb_2mb -b 1G -v $i -i 3 -m 2
+-------+----------+------------------+ | vCPUs | 6.2-rc3 | 6.2-rc3 + series | | | (ms) | (ms) | +-------+----------+------------------+ | 1 | 2.63 | 1.66 | | 2 | 2.95 | 1.70 | | 4 | 3.21 | 1.71 | | 8 | 4.97 | 1.78 | | 16 | 9.51 | 1.82 | | 32 | 20.15 | 3.03 | | 64 | 40.09 | 5.80 | | 128 | 80.08 | 12.24 | | 152 | 109.81 | 15.14 | +-------+----------+------------------+
This secondv test measures the benefit of eager page splitting on read intensive workloads (1 write for every 10 reads). As in the other test, the benefit increases with the number of vcpus, up to 8.82x for 152 vcpus. This table shows the guest dirtying time when using the CLEAR ioctl (and KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2):
./dirty_log_perf_test -s anonymous_hugetlb_2mb -b 1G -v $i -i 3 -m 2 -w 10
+-------+----------+------------------+ | vCPUs | 6.2-rc3 | 6.2-rc3 + series | | | (sec) | (sec) | +-------+----------+------------------+ | 1 | 0.65 | 0.07 | | 2 | 0.70 | 0.08 | | 4 | 0.71 | 0.08 | | 8 | 0.72 | 0.08 | | 16 | 0.76 | 0.08 | | 32 | 1.61 | 0.14 | | 64 | 3.46 | 0.30 | | 128 | 5.49 | 0.64 | | 152 | 6.44 | 0.63 | +-------+----------+------------------+
Changes from v2:
https://lore.kernel.org/kvmarm/[email protected]/
- removed redundant kvm_pte_table() check from split walker function. (Gavin)
- fix compilation of patch 8 by moving some definitions from path 9. (Gavin)
- add comment for kvm_mmu_split_nr_page_tables(). (Gavin)
Changes from v1:
https://lore.kernel.org/kvmarm/[email protected]/
- added a capability to set the eager splitting chunk size. This indirectly sets the number of pages in the cache. It also allows for opting out of this feature. (Oliver, Marc)
- changed kvm_pgtable_stage2_split() to split 1g huge-pages using either 513 or 1 at a time (with a cache of 1). (Oliver, Marc)
- added force_pte arg to kvm_pgtable_stage2_create_removed().
- renamed free_removed to free_unlinked. (Ben and Oliver)
- added KVM_PGTABLE_WALK ctx->flags for skipping BBM and CMO, instead of KVM_PGTABLE_WALK_REMOVED. (Oliver)
Changes from the RFC:
https://lore.kernel.org/kvmarm/[email protected]/
- dropped the changes to split on POST visits. No visible perf benefit.
- changed the kvm_pgtable_stage2_free_removed() implementation to reuse the stage2 mapper.
- dropped the FEAT_BBM changes and optimization. Will send this on a different series.
Thanks,
Ricardo
Marc Zyngier (1):
KVM: arm64: Use local TLBI on permission relaxation
Ricardo Koller (11):
KVM: arm64: Add KVM_PGTABLE_WALK ctx->flags for skipping BBM and CMO
KVM: arm64: Rename free_unlinked to free_removed
KVM: arm64: Add helper for creating unlinked stage2 subtrees
KVM: arm64: Add kvm_pgtable_stage2_split()
KVM: arm64: Refactor kvm_arch_commit_memory_region()
KVM: arm64: Add kvm_uninit_stage2_mmu()
KVM: arm64: Export kvm_are_all_memslots_empty()
KVM: arm64: Add KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE
KVM: arm64: Split huge pages when dirty logging is enabled
KVM: arm64: Open-code kvm_mmu_write_protect_pt_masked()
KVM: arm64: Split huge pages during KVM_CLEAR_DIRTY_LOG
Documentation/virt/kvm/api.rst | 26 ++++ arch/arm64/include/asm/kvm_asm.h | 4 + arch/arm64/include/asm/kvm_host.h | 19 +++ arch/arm64/include/asm/kvm_mmu.h | 1 + arch/arm64/include/asm/kvm_pgtable.h | 85 +++++++++++- arch/arm64/kvm/arm.c | 22 +++ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 10 ++ arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +- arch/arm64/kvm/hyp/nvhe/tlb.c | 54 ++++++++ arch/arm64/kvm/hyp/pgtable.c | 187 +++++++++++++++++++++++-- arch/arm64/kvm/hyp/vhe/tlb.c | 32 +++++ arch/arm64/kvm/mmu.c | 188 +++++++++++++++++++++----- include/linux/kvm_host.h | 2 + include/uapi/linux/kvm.h | 1 + virt/kvm/kvm_main.c | 2 +- 15 files changed, 585 insertions(+), 54 deletions(-)
Signature · 1 line
2.39.1.637.g21b0678d19-goog
PATCH v3 1/12 KVM: arm64: Add KVM_PGTABLE_WALK ctx->flags for skipping BBM and CMO
Add two flags to kvm_pgtable_visit_ctx, KVM_PGTABLE_WALK_SKIP_BBM and KVM_PGTABLE_WALK_SKIP_CMO, to indicate that the walk should not perform break-before-make (BBM) nor cache maintenance operations (CMO). This will by a future commit to create unlinked tables not accessible to the HW page-table walker. This is safe as these removed tables are not visible to the HW page-table walker.
--- arch/arm64/include/asm/kvm_pgtable.h | 18 ++++++++++++++++++ arch/arm64/kvm/hyp/pgtable.c | 27 ++++++++++++++++----------- 2 files changed, 34 insertions(+), 11 deletions(-)
arch/arm64/include/asm/kvm_pgtable.h +18 -0
@@ -188,12 +188,20 @@ typedef bool (*kvm_pgtable_force_pte_cb_t)(u64 addr, u64 end,* children. * @KVM_PGTABLE_WALK_SHARED: Indicates the page-tables may be shared * with other software walkers. +* @KVM_PGTABLE_WALK_SKIP_BBM: Visit and update table entries +* without Break-before-make +* requirements. +* @KVM_PGTABLE_WALK_SKIP_CMO: Visit and update table entries +* without Cache maintenance +* operations required. */ enum kvm_pgtable_walk_flags {KVM_PGTABLE_WALK_LEAF =BIT (0 ),KVM_PGTABLE_WALK_TABLE_PRE =BIT (1 ),KVM_PGTABLE_WALK_TABLE_POST =BIT (2 ),KVM_PGTABLE_WALK_SHARED =BIT (3 ), +KVM_PGTABLE_WALK_SKIP_BBM =BIT (4 ), +KVM_PGTABLE_WALK_SKIP_CMO =BIT (4 ), };struct kvm_pgtable_visit_ctx {
@@ -215,6 +223,16 @@ static inline bool kvm_pgtable_walk_shared(const struct kvm_pgtable_visit_ctx *creturn ctx->flags &KVM_PGTABLE_WALK_SHARED ; } +static inline bool kvm_pgtable_walk_skip_bbm (const struct kvm_pgtable_visit_ctx *ctx) +{ +return ctx->flags &KVM_PGTABLE_WALK_SKIP_BBM ; +} + +static inline bool kvm_pgtable_walk_skip_cmo (const struct kvm_pgtable_visit_ctx *ctx) +{ +return ctx->flags &KVM_PGTABLE_WALK_SKIP_CMO ; +} +/** * struct kvm_pgtable_walker - Hook into a page-table walk. * @cb: Callback function to invoke during the walk.
arch/arm64/kvm/hyp/pgtable.c +16 -11
@@ -717,14 +717,17 @@ static bool stage2_try_break_pte(const struct kvm_pgtable_visit_ctx *ctx,if (!stage2_try_set_pte (ctx,KVM_INVALID_PTE_LOCKED ))return false; -/* -* Perform the appropriate TLB invalidation based on the evicted pte -* value (if any). -*/ -if (kvm_pte_table (ctx->old, ctx->level)) -kvm_call_hyp (__kvm_tlb_flush_vmid, mmu); -else if (kvm_pte_valid (ctx->old)) -kvm_call_hyp (__kvm_tlb_flush_vmid_ipa, mmu, ctx->addr, ctx->level); +if (!kvm_pgtable_walk_skip_bbm (ctx)) { +/* +* Perform the appropriate TLB invalidation based on the +* evicted pte value (if any). +*/ +if (kvm_pte_table (ctx->old, ctx->level)) +kvm_call_hyp (__kvm_tlb_flush_vmid, mmu); +else if (kvm_pte_valid (ctx->old)) +kvm_call_hyp (__kvm_tlb_flush_vmid_ipa, mmu, + ctx->addr, ctx->level); + }if (stage2_pte_is_counted (ctx->old)) mm_ops->put_page (ctx->ptep);
@@ -808,11 +811,13 @@ static int stage2_map_walker_try_leaf(const struct kvm_pgtable_visit_ctx *ctx,return -EAGAIN ;/* Perform CMOs before installation of the guest stage-2 PTE */ -if (mm_ops->dcache_clean_inval_poc &&stage2_pte_cacheable (pgt, new)) +if (!kvm_pgtable_walk_skip_cmo (ctx) && mm_ops->dcache_clean_inval_poc && +stage2_pte_cacheable (pgt, new)) mm_ops->dcache_clean_inval_poc (kvm_pte_follow (new, mm_ops), - granule); + granule); -if (mm_ops->icache_inval_pou &&stage2_pte_executable (new)) +if (!kvm_pgtable_walk_skip_cmo (ctx) && mm_ops->icache_inval_pou && +stage2_pte_executable (new)) mm_ops->icache_inval_pou (kvm_pte_follow (new, mm_ops), granule);stage2_make_pte (ctx, new);
Signature · 1 line
2.39.1.637.g21b0678d19-goog
Re: [PATCH v3 01/12] KVM: arm64: Add KVM_PGTABLE_WALK ctx->flags for skipping BBM and CMO
Hi Ricardo,
Quoted 25 lines · Ricardo Koller
Add two flags to
kvm_pgtable_visit_ctx,KVM_PGTABLE_WALK_SKIP_BBMandKVM_PGTABLE_WALK_SKIP_CMO, to indicate that the walk should not perform break-before-make (BBM) nor cache maintenance operations (CMO). This will by a future commit to create unlinked tables not accessible to the HW page-table walker. This is safe as these removed tables are not visible to the HW page-table walker.Signed-off-by Ricardo Koller <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 18 ++++++++++++++++++ arch/arm64/kvm/hyp/pgtable.c | 27 ++++++++++++++++----------- 2 files changed, 34 insertions(+), 11 deletions(-)arch/arm64/include/asm/kvm_pgtable.h +4
-0@@ -188,12 +188,20 @@ typedef bool (*kvm_pgtable_force_pte_cb_t)(u64 addr, u64 end,* children. * @KVM_PGTABLE_WALK_SHARED: Indicates the page-tables may be shared * with other software walkers. +* @KVM_PGTABLE_WALK_SKIP_BBM: Visit and update table entries +* without Break-before-make +* requirements. +* @KVM_PGTABLE_WALK_SKIP_CMO: Visit and update table entries
arch/arm64/include/asm/kvm_pgtable.h typedef bool (*kvm_pgtable_force_pte_cb_t)(u64 addr, u64 end, · line 204
Quoted 10 lines
arch/arm64/include/asm/kvm_pgtable.h +4
-0+* without Cache maintenance +* operations required. */ enum kvm_pgtable_walk_flags {KVM_PGTABLE_WALK_LEAF =BIT (0 ),KVM_PGTABLE_WALK_TABLE_PRE =BIT (1 ),KVM_PGTABLE_WALK_TABLE_POST =BIT (2 ),KVM_PGTABLE_WALK_SHARED =BIT (3 ), +KVM_PGTABLE_WALK_SKIP_BBM =BIT (4 ), +KVM_PGTABLE_WALK_SKIP_CMO =BIT (4 ),
The KVM_PGTABLE_WALK_SKIP_BBM and KVM_PGTABLE_WALK_SKIP_CMO use the same BIT(4), if I understand correctly, the two flags are used in different operation and will never be used at the same time.
Maybe add some comments to illustrate why the two use the same bit can be better.
Quoted 67 lines
arch/arm64/include/asm/kvm_pgtable.h +10
-0};struct kvm_pgtable_visit_ctx {@@ -215,6 +223,16 @@ static inline bool kvm_pgtable_walk_shared(const struct kvm_pgtable_visit_ctx *creturn ctx->flags &KVM_PGTABLE_WALK_SHARED ; } +static inline bool kvm_pgtable_walk_skip_bbm (const struct kvm_pgtable_visit_ctx *ctx) +{ +return ctx->flags &KVM_PGTABLE_WALK_SKIP_BBM ; +} + +static inline bool kvm_pgtable_walk_skip_cmo (const struct kvm_pgtable_visit_ctx *ctx) +{ +return ctx->flags &KVM_PGTABLE_WALK_SKIP_CMO ; +} +/** * struct kvm_pgtable_walker - Hook into a page-table walk. * @cb: Callback function to invoke during the walk. arch/arm64/kvm/hyp/pgtable.c +16
-11@@ -717,14 +717,17 @@ static bool stage2_try_break_pte(const struct kvm_pgtable_visit_ctx *ctx,if (!stage2_try_set_pte (ctx,KVM_INVALID_PTE_LOCKED ))return false; -/* -* Perform the appropriate TLB invalidation based on the evicted pte -* value (if any). -*/ -if (kvm_pte_table (ctx->old, ctx->level)) -kvm_call_hyp (__kvm_tlb_flush_vmid, mmu); -else if (kvm_pte_valid (ctx->old)) -kvm_call_hyp (__kvm_tlb_flush_vmid_ipa, mmu, ctx->addr, ctx->level); +if (!kvm_pgtable_walk_skip_bbm (ctx)) { +/* +* Perform the appropriate TLB invalidation based on the +* evicted pte value (if any). +*/ +if (kvm_pte_table (ctx->old, ctx->level)) +kvm_call_hyp (__kvm_tlb_flush_vmid, mmu); +else if (kvm_pte_valid (ctx->old)) +kvm_call_hyp (__kvm_tlb_flush_vmid_ipa, mmu, + ctx->addr, ctx->level); + }if (stage2_pte_is_counted (ctx->old)) mm_ops->put_page (ctx->ptep);@@ -808,11 +811,13 @@ static int stage2_map_walker_try_leaf(const struct kvm_pgtable_visit_ctx *ctx,return -EAGAIN ;/* Perform CMOs before installation of the guest stage-2 PTE */ -if (mm_ops->dcache_clean_inval_poc &&stage2_pte_cacheable (pgt, new)) +if (!kvm_pgtable_walk_skip_cmo (ctx) && mm_ops->dcache_clean_inval_poc && +stage2_pte_cacheable (pgt, new)) mm_ops->dcache_clean_inval_poc (kvm_pte_follow (new, mm_ops), - granule); + granule); -if (mm_ops->icache_inval_pou &&stage2_pte_executable (new)) +if (!kvm_pgtable_walk_skip_cmo (ctx) && mm_ops->icache_inval_pou && +stage2_pte_executable (new)) mm_ops->icache_inval_pou (kvm_pte_follow (new, mm_ops), granule);stage2_make_pte (ctx, new);
Signature · 2 lines
Regards, Shaoqin
Re: [PATCH v3 01/12] KVM: arm64: Add KVM_PGTABLE_WALK ctx->flags for skipping BBM and CMO
Quoted 35 lines · Shaoqin Huang
Hi Ricardo,
Quoted 31 lines · Ricardo Koller
Add two flags to
kvm_pgtable_visit_ctx,KVM_PGTABLE_WALK_SKIP_BBMandKVM_PGTABLE_WALK_SKIP_CMO, to indicate that the walk should not perform break-before-make (BBM) nor cache maintenance operations (CMO). This will by a future commit to create unlinked tables not accessible to the HW page-table walker. This is safe as these removed tables are not visible to the HW page-table walker.Signed-off-by Ricardo Koller <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 18 ++++++++++++++++++ arch/arm64/kvm/hyp/pgtable.c | 27 ++++++++++++++++----------- 2 files changed, 34 insertions(+), 11 deletions(-)arch/arm64/include/asm/kvm_pgtable.h +6
-0@@ -188,12 +188,20 @@ typedef bool (*kvm_pgtable_force_pte_cb_t)(u64 addr, u64 end,* children. * @KVM_PGTABLE_WALK_SHARED: Indicates the page-tables may be shared * with other software walkers. +* @KVM_PGTABLE_WALK_SKIP_BBM: Visit and update table entries +* without Break-before-make +* requirements. +* @KVM_PGTABLE_WALK_SKIP_CMO: Visit and update table entries +* without Cache maintenance +* operations required. */ enum kvm_pgtable_walk_flags {KVM_PGTABLE_WALK_LEAF =BIT (0 ),KVM_PGTABLE_WALK_TABLE_PRE =BIT (1 ),
Quoted 9 lines
arch/arm64/include/asm/kvm_pgtable.h typedef bool (*kvm_pgtable_force_pte_cb_t)(u64 addr, u64 end, · line 204
Quoted 4 lines
arch/arm64/include/asm/kvm_pgtable.h +2
-0KVM_PGTABLE_WALK_TABLE_POST =BIT (2 ),KVM_PGTABLE_WALK_SHARED =BIT (3 ), +KVM_PGTABLE_WALK_SKIP_BBM =BIT (4 ), + KVM_PGTABLE_WALK_SKIP_CMO = BIT(4),The
KVM_PGTABLE_WALK_SKIP_BBMandKVM_PGTABLE_WALK_SKIP_CMOuse the same BIT(4), if I understand correctly, the two flags are used in different operation and will never be used at the same time.
That was supposed to be a BIT(5):KVM_PGTABLE_WALK_SKIP_BBM = BIT(4),KVM_PGTABLE_WALK_SKIP_CMO = BIT(5),
Quoted 77 lines
Maybe add some comments to illustrate why the two use the same bit can be better.
Quoted 57 lines
arch/arm64/include/asm/kvm_pgtable.h +10
-0};struct kvm_pgtable_visit_ctx {@@ -215,6 +223,16 @@ static inline bool kvm_pgtable_walk_shared(const struct kvm_pgtable_visit_ctx *creturn ctx->flags &KVM_PGTABLE_WALK_SHARED ; } +static inline bool kvm_pgtable_walk_skip_bbm (const struct kvm_pgtable_visit_ctx *ctx) +{ +return ctx->flags &KVM_PGTABLE_WALK_SKIP_BBM ; +} + +static inline bool kvm_pgtable_walk_skip_cmo (const struct kvm_pgtable_visit_ctx *ctx) +{ +return ctx->flags &KVM_PGTABLE_WALK_SKIP_CMO ; +} +/** * struct kvm_pgtable_walker - Hook into a page-table walk. * @cb: Callback function to invoke during the walk. arch/arm64/kvm/hyp/pgtable.c +13
-9@@ -717,14 +717,17 @@ static bool stage2_try_break_pte(const struct kvm_pgtable_visit_ctx *ctx,if (!stage2_try_set_pte (ctx,KVM_INVALID_PTE_LOCKED ))return false; -/* -* Perform the appropriate TLB invalidation based on the evicted pte -* value (if any). -*/ -if (kvm_pte_table (ctx->old, ctx->level)) -kvm_call_hyp (__kvm_tlb_flush_vmid, mmu); -else if (kvm_pte_valid (ctx->old)) -kvm_call_hyp (__kvm_tlb_flush_vmid_ipa, mmu, ctx->addr, ctx->level); +if (!kvm_pgtable_walk_skip_bbm (ctx)) { +/* +* Perform the appropriate TLB invalidation based on the +* evicted pte value (if any). +*/ +if (kvm_pte_table (ctx->old, ctx->level)) +kvm_call_hyp (__kvm_tlb_flush_vmid, mmu); +else if (kvm_pte_valid (ctx->old)) +kvm_call_hyp (__kvm_tlb_flush_vmid_ipa, mmu, + ctx->addr, ctx->level); + }if (stage2_pte_is_counted (ctx->old)) mm_ops->put_page (ctx->ptep);@@ -808,11 +811,13 @@ static int stage2_map_walker_try_leaf(const struct kvm_pgtable_visit_ctx *ctx,return -EAGAIN ;/* Perform CMOs before installation of the guest stage-2 PTE */ -if (mm_ops->dcache_clean_inval_poc &&stage2_pte_cacheable (pgt, new)) +if (!kvm_pgtable_walk_skip_cmo (ctx) && mm_ops->dcache_clean_inval_poc && +stage2_pte_cacheable (pgt, new))arch/arm64/kvm/hyp/pgtable.c static int stage2_map_walker_try_leaf(const struct kvm_pgtable_visit_ctx *ctx, · line 823
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +3
-2mm_ops->dcache_clean_inval_poc (kvm_pte_follow (new, mm_ops), - granule); + granule); -if (mm_ops->icache_inval_pou &&stage2_pte_executable (new)) +if (!kvm_pgtable_walk_skip_cmo (ctx) && mm_ops->icache_inval_pou && +stage2_pte_executable (new)) mm_ops->icache_inval_pou (kvm_pte_follow (new, mm_ops), granule);stage2_make_pte (ctx, new);--
Regards,
Shaoqin
PATCH v3 2/12 KVM: arm64: Rename free_unlinked to free_removed
In reply to Ricardo KollerMake it clearer that the "free_removed" functions refer to tables that have never been part of the paging structure: they are "unlinked".
No functional change intended.
--- arch/arm64/include/asm/kvm_pgtable.h | 8 ++++---- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +++--- arch/arm64/kvm/hyp/pgtable.c | 6 +++--- arch/arm64/kvm/mmu.c | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-)
arch/arm64/include/asm/kvm_pgtable.h +4 -4
@@ -99,7 +99,7 @@ static inline bool kvm_level_supports_block_mapping(u32 level)* allocation is physically contiguous. * @free_pages_exact: Free an exact number of memory pages previously * allocated by zalloc_pages_exact. -* @free_removed_table: Free a removed paging structure by unlinking and +* @free_unlinked_table: Free an unlinked paging structure by unlinking and * dropping references. * @get_page: Increment the refcount on a page. * @put_page: Decrement the refcount on a page. When the
@@ -119,7 +119,7 @@ struct kvm_pgtable_mm_ops {void * (*zalloc_page)(void *arg);void * (*zalloc_pages_exact)(size_t size);void (*free_pages_exact)(void *addr,size_t size); -void (*free_removed_table)(void *addr,u32 level); +void (*free_unlinked_table)(void *addr,u32 level);void (*get_page)(void *addr);void (*put_page)(void *addr);int (*page_count)(void *addr);
@@ -450,7 +450,7 @@ int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu,void kvm_pgtable_stage2_destroy (struct kvm_pgtable *pgt);/** -* kvm_pgtable_stage2_free_removed() - Free a removed stage-2 paging structure. +* kvm_pgtable_stage2_free_unlinked() - Free un unlinked stage-2 paging structure. * @mm_ops: Memory management callbacks. * @pgtable: Unlinked stage-2 paging structure to be freed. * @level: Level of the stage-2 paging structure to be freed.
@@ -458,7 +458,7 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt);* 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_free_removed (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level); +void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level);/** * kvm_pgtable_stage2_map() - Install a mapping in a guest stage-2 page-table.
arch/arm64/kvm/hyp/nvhe/mem_protect.c +3 -3
@@ -91,9 +91,9 @@ static void host_s2_put_page(void *addr)hyp_put_page (&host_s2_pool, addr); } -static void host_s2_free_removed_table (void *addr,u32 level) +static void host_s2_free_unlinked_table (void *addr,u32 level) { -kvm_pgtable_stage2_free_removed (&host_mmu.mm_ops, addr, level); +kvm_pgtable_stage2_free_unlinked (&host_mmu.mm_ops, addr, level); }static int prepare_s2_pool (void *pgt_pool_base)
@@ -110,7 +110,7 @@ static int prepare_s2_pool(void *pgt_pool_base) host_mmu.mm_ops = (struct kvm_pgtable_mm_ops ) { .zalloc_pages_exact = host_s2_zalloc_pages_exact, .zalloc_page = host_s2_zalloc_page, - .free_removed_table = host_s2_free_removed_table, + .free_unlinked_table = host_s2_free_unlinked_table, .phys_to_virt = hyp_phys_to_virt, .virt_to_phys = hyp_virt_to_phys, .page_count = hyp_page_count,
arch/arm64/kvm/hyp/pgtable.c +3 -3
@@ -841,7 +841,7 @@ static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx,if (ret)return ret; - mm_ops->free_removed_table (childp, ctx->level); + mm_ops->free_unlinked_table (childp, ctx->level);return 0 ; }
@@ -886,7 +886,7 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx,* The TABLE_PRE callback runs for table entries on the way down, looking * for table entries which we could conceivably replace with a block entry * for this mapping. If it finds one it replaces the entry and calls -* kvm_pgtable_mm_ops::free_removed_table() to tear down the detached table. +* kvm_pgtable_mm_ops::free_unlinked_table() to tear down the detached table. * * Otherwise, the LEAF callback performs the mapping at the existing leaves * instead.
@@ -1250,7 +1250,7 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt) pgt->pgd =NULL ; } -void kvm_pgtable_stage2_free_removed (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level) +void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level) {kvm_pteref_t ptep = (kvm_pteref_t )pgtable;struct kvm_pgtable_walker walker = {
arch/arm64/kvm/mmu.c +5 -5
@@ -130,21 +130,21 @@ static void kvm_s2_free_pages_exact(void *virt, size_t size)static struct kvm_pgtable_mm_ops kvm_s2_mm_ops; -static void stage2_free_removed_table_rcu_cb (struct rcu_head *head) +static void stage2_free_unlinked_table_rcu_cb (struct rcu_head *head) { struct page *page = container_of(head, struct page, rcu_head);void *pgtable =page_to_virt (page);u32 level =page_private (page); -kvm_pgtable_stage2_free_removed (&kvm_s2_mm_ops, pgtable, level); +kvm_pgtable_stage2_free_unlinked (&kvm_s2_mm_ops, pgtable, level); } -static void stage2_free_removed_table (void *addr,u32 level) +static void stage2_free_unlinked_table (void *addr,u32 level) {struct page *page =virt_to_page (addr);set_page_private (page, (unsigned long )level); -call_rcu (&page->rcu_head, stage2_free_removed_table_rcu_cb); +call_rcu (&page->rcu_head, stage2_free_unlinked_table_rcu_cb); }static void kvm_host_get_page (void *addr)
@@ -681,7 +681,7 @@ static struct kvm_pgtable_mm_ops kvm_s2_mm_ops = { .zalloc_page = stage2_memcache_zalloc_page, .zalloc_pages_exact = kvm_s2_zalloc_pages_exact, .free_pages_exact = kvm_s2_free_pages_exact, - .free_removed_table = stage2_free_removed_table, + .free_unlinked_table = stage2_free_unlinked_table, .get_page = kvm_host_get_page, .put_page = kvm_s2_put_page, .page_count = kvm_host_page_count,
Signature · 1 line
2.39.1.637.g21b0678d19-goog
Re: [PATCH v3 02/12] KVM: arm64: Rename free_unlinked to free_removed
Quoted 2 lines · Ricardo Koller
Make it clearer that the "
free_removed" functions refer to tables that have never been part of the paging structure: they are "unlinked".
the page table passed to ->free_removed_table() was definitely part of a paging structure before. Maybe:
A subsequent change to KVM will add support for building page tables that are not part of an active paging structure. The existing 'removed_table' terminology is quite clunky when applied in this context.
Normalize on referring to tables outside of an active paging structure as 'unlinked'. No functional change intended.
Quoted 3 lines
No functional change intended.
Signed-off-by Ricardo Koller <[email protected]>
besides the changelog nit:
--
Thanks,
Oliver
Quoted 146 lines
--- arch/arm64/include/asm/kvm_pgtable.h | 8 ++++---- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +++--- arch/arm64/kvm/hyp/pgtable.c | 6 +++--- arch/arm64/kvm/mmu.c | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-)arch/arm64/include/asm/kvm_pgtable.h +4
-4@@ -99,7 +99,7 @@ static inline bool kvm_level_supports_block_mapping(u32 level)* allocation is physically contiguous. * @free_pages_exact: Free an exact number of memory pages previously * allocated by zalloc_pages_exact. -* @free_removed_table: Free a removed paging structure by unlinking and +* @free_unlinked_table: Free an unlinked paging structure by unlinking and * dropping references. * @get_page: Increment the refcount on a page. * @put_page: Decrement the refcount on a page. When the @@ -119,7 +119,7 @@ struct kvm_pgtable_mm_ops {void * (*zalloc_page)(void *arg);void * (*zalloc_pages_exact)(size_t size);void (*free_pages_exact)(void *addr,size_t size); -void (*free_removed_table)(void *addr,u32 level); +void (*free_unlinked_table)(void *addr,u32 level);void (*get_page)(void *addr);void (*put_page)(void *addr);int (*page_count)(void *addr);@@ -450,7 +450,7 @@ int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu,void kvm_pgtable_stage2_destroy (struct kvm_pgtable *pgt);/** -* kvm_pgtable_stage2_free_removed() - Free a removed stage-2 paging structure. +* kvm_pgtable_stage2_free_unlinked() - Free un unlinked stage-2 paging structure. * @mm_ops: Memory management callbacks. * @pgtable: Unlinked stage-2 paging structure to be freed. * @level: Level of the stage-2 paging structure to be freed. @@ -458,7 +458,7 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt);* 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_free_removed (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level); +void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level);/** * kvm_pgtable_stage2_map() - Install a mapping in a guest stage-2 page-table. arch/arm64/kvm/hyp/nvhe/mem_protect.c +3
-3@@ -91,9 +91,9 @@ static void host_s2_put_page(void *addr)hyp_put_page (&host_s2_pool, addr); } -static void host_s2_free_removed_table (void *addr,u32 level) +static void host_s2_free_unlinked_table (void *addr,u32 level) { -kvm_pgtable_stage2_free_removed (&host_mmu.mm_ops, addr, level); +kvm_pgtable_stage2_free_unlinked (&host_mmu.mm_ops, addr, level); }static int prepare_s2_pool (void *pgt_pool_base)@@ -110,7 +110,7 @@ static int prepare_s2_pool(void *pgt_pool_base) host_mmu.mm_ops = (struct kvm_pgtable_mm_ops ) { .zalloc_pages_exact = host_s2_zalloc_pages_exact, .zalloc_page = host_s2_zalloc_page, - .free_removed_table = host_s2_free_removed_table, + .free_unlinked_table = host_s2_free_unlinked_table, .phys_to_virt = hyp_phys_to_virt, .virt_to_phys = hyp_virt_to_phys, .page_count = hyp_page_count,arch/arm64/kvm/hyp/pgtable.c +3
-3@@ -841,7 +841,7 @@ static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx,if (ret)return ret; - mm_ops->free_removed_table (childp, ctx->level); + mm_ops->free_unlinked_table (childp, ctx->level);return 0 ; }@@ -886,7 +886,7 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx,* The TABLE_PRE callback runs for table entries on the way down, looking * for table entries which we could conceivably replace with a block entry * for this mapping. If it finds one it replaces the entry and calls -* kvm_pgtable_mm_ops::free_removed_table() to tear down the detached table. +* kvm_pgtable_mm_ops::free_unlinked_table() to tear down the detached table. * * Otherwise, the LEAF callback performs the mapping at the existing leaves * instead. @@ -1250,7 +1250,7 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt) pgt->pgd =NULL ; } -void kvm_pgtable_stage2_free_removed (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level) +void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level) {kvm_pteref_t ptep = (kvm_pteref_t )pgtable;struct kvm_pgtable_walker walker = {arch/arm64/kvm/mmu.c +5
-5@@ -130,21 +130,21 @@ static void kvm_s2_free_pages_exact(void *virt, size_t size)static struct kvm_pgtable_mm_ops kvm_s2_mm_ops; -static void stage2_free_removed_table_rcu_cb (struct rcu_head *head) +static void stage2_free_unlinked_table_rcu_cb (struct rcu_head *head) { struct page *page = container_of(head, struct page, rcu_head);void *pgtable =page_to_virt (page);u32 level =page_private (page); -kvm_pgtable_stage2_free_removed (&kvm_s2_mm_ops, pgtable, level); +kvm_pgtable_stage2_free_unlinked (&kvm_s2_mm_ops, pgtable, level); } -static void stage2_free_removed_table (void *addr,u32 level) +static void stage2_free_unlinked_table (void *addr,u32 level) {struct page *page =virt_to_page (addr);set_page_private (page, (unsigned long )level); -call_rcu (&page->rcu_head, stage2_free_removed_table_rcu_cb); +call_rcu (&page->rcu_head, stage2_free_unlinked_table_rcu_cb); }static void kvm_host_get_page (void *addr)@@ -681,7 +681,7 @@ static struct kvm_pgtable_mm_ops kvm_s2_mm_ops = { .zalloc_page = stage2_memcache_zalloc_page, .zalloc_pages_exact = kvm_s2_zalloc_pages_exact, .free_pages_exact = kvm_s2_free_pages_exact, - .free_removed_table = stage2_free_removed_table, + .free_unlinked_table = stage2_free_unlinked_table, .get_page = kvm_host_get_page, .put_page = kvm_s2_put_page, .page_count = kvm_host_page_count,Signature · 1 line
2.39.1.637.g21b0678d19-goog
Signature · 2 lines
Thanks, Oliver
Re: [PATCH v3 02/12] KVM: arm64: Rename free_unlinked to free_removed
In reply to Ricardo KollerHi Ricardo,
Quoted 36 lines · Ricardo Koller
Make it clearer that the "
free_removed" functions refer to tables that have never been part of the paging structure: they are "unlinked".No functional change intended.
Signed-off-by Ricardo Koller <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 8 ++++---- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +++--- arch/arm64/kvm/hyp/pgtable.c | 6 +++--- arch/arm64/kvm/mmu.c | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-)arch/arm64/include/asm/kvm_pgtable.h +2
-2@@ -99,7 +99,7 @@ static inline bool kvm_level_supports_block_mapping(u32 level)* allocation is physically contiguous. * @free_pages_exact: Free an exact number of memory pages previously * allocated by zalloc_pages_exact. -* @free_removed_table: Free a removed paging structure by unlinking and +* @free_unlinked_table: Free an unlinked paging structure by unlinking and * dropping references. * @get_page: Increment the refcount on a page. * @put_page: Decrement the refcount on a page. When the @@ -119,7 +119,7 @@ struct kvm_pgtable_mm_ops {void * (*zalloc_page)(void *arg);void * (*zalloc_pages_exact)(size_t size);void (*free_pages_exact)(void *addr,size_t size); -void (*free_removed_table)(void *addr,u32 level); +void (*free_unlinked_table)(void *addr,u32 level);void (*get_page)(void *addr);void (*put_page)(void *addr);int (*page_count)(void *addr);
arch/arm64/include/asm/kvm_pgtable.h int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu, · line 453
Quoted 5 lines
arch/arm64/include/asm/kvm_pgtable.h +1
-1@@ -450,7 +450,7 @@ int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu,void kvm_pgtable_stage2_destroy (struct kvm_pgtable *pgt);/** -* kvm_pgtable_stage2_free_removed() - Free a removed stage-2 paging structure. +* kvm_pgtable_stage2_free_unlinked() - Free un unlinked stage-2 paging structure.
Free an unlinked stage-2
Quoted 107 lines
arch/arm64/include/asm/kvm_pgtable.h +1
-1* @mm_ops: Memory management callbacks. * @pgtable: Unlinked stage-2 paging structure to be freed. * @level: Level of the stage-2 paging structure to be freed. @@ -458,7 +458,7 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt);* 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_free_removed (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level); +void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level);/** * kvm_pgtable_stage2_map() - Install a mapping in a guest stage-2 page-table. arch/arm64/kvm/hyp/nvhe/mem_protect.c +3
-3@@ -91,9 +91,9 @@ static void host_s2_put_page(void *addr)hyp_put_page (&host_s2_pool, addr); } -static void host_s2_free_removed_table (void *addr,u32 level) +static void host_s2_free_unlinked_table (void *addr,u32 level) { -kvm_pgtable_stage2_free_removed (&host_mmu.mm_ops, addr, level); +kvm_pgtable_stage2_free_unlinked (&host_mmu.mm_ops, addr, level); }static int prepare_s2_pool (void *pgt_pool_base)@@ -110,7 +110,7 @@ static int prepare_s2_pool(void *pgt_pool_base) host_mmu.mm_ops = (struct kvm_pgtable_mm_ops ) { .zalloc_pages_exact = host_s2_zalloc_pages_exact, .zalloc_page = host_s2_zalloc_page, - .free_removed_table = host_s2_free_removed_table, + .free_unlinked_table = host_s2_free_unlinked_table, .phys_to_virt = hyp_phys_to_virt, .virt_to_phys = hyp_virt_to_phys, .page_count = hyp_page_count,arch/arm64/kvm/hyp/pgtable.c +3
-3@@ -841,7 +841,7 @@ static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx,if (ret)return ret; - mm_ops->free_removed_table (childp, ctx->level); + mm_ops->free_unlinked_table (childp, ctx->level);return 0 ; }@@ -886,7 +886,7 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx,* The TABLE_PRE callback runs for table entries on the way down, looking * for table entries which we could conceivably replace with a block entry * for this mapping. If it finds one it replaces the entry and calls -* kvm_pgtable_mm_ops::free_removed_table() to tear down the detached table. +* kvm_pgtable_mm_ops::free_unlinked_table() to tear down the detached table. * * Otherwise, the LEAF callback performs the mapping at the existing leaves * instead. @@ -1250,7 +1250,7 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt) pgt->pgd =NULL ; } -void kvm_pgtable_stage2_free_removed (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level) +void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level) {kvm_pteref_t ptep = (kvm_pteref_t )pgtable;struct kvm_pgtable_walker walker = {arch/arm64/kvm/mmu.c +5
-5@@ -130,21 +130,21 @@ static void kvm_s2_free_pages_exact(void *virt, size_t size)static struct kvm_pgtable_mm_ops kvm_s2_mm_ops; -static void stage2_free_removed_table_rcu_cb (struct rcu_head *head) +static void stage2_free_unlinked_table_rcu_cb (struct rcu_head *head) { struct page *page = container_of(head, struct page, rcu_head);void *pgtable =page_to_virt (page);u32 level =page_private (page); -kvm_pgtable_stage2_free_removed (&kvm_s2_mm_ops, pgtable, level); +kvm_pgtable_stage2_free_unlinked (&kvm_s2_mm_ops, pgtable, level); } -static void stage2_free_removed_table (void *addr,u32 level) +static void stage2_free_unlinked_table (void *addr,u32 level) {struct page *page =virt_to_page (addr);set_page_private (page, (unsigned long )level); -call_rcu (&page->rcu_head, stage2_free_removed_table_rcu_cb); +call_rcu (&page->rcu_head, stage2_free_unlinked_table_rcu_cb); }static void kvm_host_get_page (void *addr)@@ -681,7 +681,7 @@ static struct kvm_pgtable_mm_ops kvm_s2_mm_ops = { .zalloc_page = stage2_memcache_zalloc_page, .zalloc_pages_exact = kvm_s2_zalloc_pages_exact, .free_pages_exact = kvm_s2_free_pages_exact, - .free_removed_table = stage2_free_removed_table, + .free_unlinked_table = stage2_free_unlinked_table, .get_page = kvm_host_get_page, .put_page = kvm_s2_put_page, .page_count = kvm_host_page_count,
Signature · 2 lines
Regards, Shaoqin
Re: [PATCH v3 02/12] KVM: arm64: Rename free_unlinked to free_removed
Quoted 42 lines · Shaoqin Huang
Hi Ricardo,
Quoted 38 lines · Ricardo Koller
Make it clearer that the "
free_removed" functions refer to tables that have never been part of the paging structure: they are "unlinked".No functional change intended.
Signed-off-by Ricardo Koller <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 8 ++++---- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +++--- arch/arm64/kvm/hyp/pgtable.c | 6 +++--- arch/arm64/kvm/mmu.c | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-)arch/arm64/include/asm/kvm_pgtable.h +2
-2@@ -99,7 +99,7 @@ static inline bool kvm_level_supports_block_mapping(u32 level)* allocation is physically contiguous. * @free_pages_exact: Free an exact number of memory pages previously * allocated by zalloc_pages_exact. -* @free_removed_table: Free a removed paging structure by unlinking and +* @free_unlinked_table: Free an unlinked paging structure by unlinking and * dropping references. * @get_page: Increment the refcount on a page. * @put_page: Decrement the refcount on a page. When the @@ -119,7 +119,7 @@ struct kvm_pgtable_mm_ops {void * (*zalloc_page)(void *arg);void * (*zalloc_pages_exact)(size_t size);void (*free_pages_exact)(void *addr,size_t size); -void (*free_removed_table)(void *addr,u32 level); +void (*free_unlinked_table)(void *addr,u32 level);void (*get_page)(void *addr);void (*put_page)(void *addr);int (*page_count)(void *addr);@@ -450,7 +450,7 @@ int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu,void kvm_pgtable_stage2_destroy (struct kvm_pgtable *pgt);
Quoted 5 lines
arch/arm64/include/asm/kvm_pgtable.h int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu, · line 453
Quoted 3 lines
arch/arm64/include/asm/kvm_pgtable.h +1
-1/** -* kvm_pgtable_stage2_free_removed() - Free a removed stage-2 paging structure. +* kvm_pgtable_stage2_free_unlinked() - Free un unlinked stage-2 paging structure. Free an unlinked stage-2
ACK, will fix on v4.
Quoted 113 lines
Quoted 100 lines
arch/arm64/include/asm/kvm_pgtable.h +1
-1* @mm_ops: Memory management callbacks. * @pgtable: Unlinked stage-2 paging structure to be freed. * @level: Level of the stage-2 paging structure to be freed. @@ -458,7 +458,7 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt);* 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_free_removed (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level); +void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level);/** * kvm_pgtable_stage2_map() - Install a mapping in a guest stage-2 page-table. arch/arm64/kvm/hyp/nvhe/mem_protect.c +3
-3@@ -91,9 +91,9 @@ static void host_s2_put_page(void *addr)hyp_put_page (&host_s2_pool, addr); } -static void host_s2_free_removed_table (void *addr,u32 level) +static void host_s2_free_unlinked_table (void *addr,u32 level) { -kvm_pgtable_stage2_free_removed (&host_mmu.mm_ops, addr, level); +kvm_pgtable_stage2_free_unlinked (&host_mmu.mm_ops, addr, level); }static int prepare_s2_pool (void *pgt_pool_base)@@ -110,7 +110,7 @@ static int prepare_s2_pool(void *pgt_pool_base) host_mmu.mm_ops = (struct kvm_pgtable_mm_ops ) { .zalloc_pages_exact = host_s2_zalloc_pages_exact, .zalloc_page = host_s2_zalloc_page, - .free_removed_table = host_s2_free_removed_table, + .free_unlinked_table = host_s2_free_unlinked_table, .phys_to_virt = hyp_phys_to_virt, .virt_to_phys = hyp_virt_to_phys, .page_count = hyp_page_count,arch/arm64/kvm/hyp/pgtable.c +3
-3@@ -841,7 +841,7 @@ static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx,if (ret)return ret; - mm_ops->free_removed_table (childp, ctx->level); + mm_ops->free_unlinked_table (childp, ctx->level);return 0 ; }@@ -886,7 +886,7 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx,* The TABLE_PRE callback runs for table entries on the way down, looking * for table entries which we could conceivably replace with a block entry * for this mapping. If it finds one it replaces the entry and calls -* kvm_pgtable_mm_ops::free_removed_table() to tear down the detached table. +* kvm_pgtable_mm_ops::free_unlinked_table() to tear down the detached table. * * Otherwise, the LEAF callback performs the mapping at the existing leaves * instead. @@ -1250,7 +1250,7 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt) pgt->pgd =NULL ; } -void kvm_pgtable_stage2_free_removed (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level) +void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level) {kvm_pteref_t ptep = (kvm_pteref_t )pgtable;struct kvm_pgtable_walker walker = {arch/arm64/kvm/mmu.c +4
-4@@ -130,21 +130,21 @@ static void kvm_s2_free_pages_exact(void *virt, size_t size)static struct kvm_pgtable_mm_ops kvm_s2_mm_ops; -static void stage2_free_removed_table_rcu_cb (struct rcu_head *head) +static void stage2_free_unlinked_table_rcu_cb (struct rcu_head *head) { struct page *page = container_of(head, struct page, rcu_head);void *pgtable =page_to_virt (page);u32 level =page_private (page); -kvm_pgtable_stage2_free_removed (&kvm_s2_mm_ops, pgtable, level); +kvm_pgtable_stage2_free_unlinked (&kvm_s2_mm_ops, pgtable, level); } -static void stage2_free_removed_table (void *addr,u32 level) +static void stage2_free_unlinked_table (void *addr,u32 level) {struct page *page =virt_to_page (addr);set_page_private (page, (unsigned long )level); -call_rcu (&page->rcu_head, stage2_free_removed_table_rcu_cb); +call_rcu (&page->rcu_head, stage2_free_unlinked_table_rcu_cb); }static void kvm_host_get_page (void *addr)arch/arm64/kvm/mmu.c static struct kvm_pgtable_mm_ops kvm_s2_mm_ops = { · line 687
Quoted 8 lines
arch/arm64/kvm/mmu.c +1
-1@@ -681,7 +681,7 @@ static struct kvm_pgtable_mm_ops kvm_s2_mm_ops = { .zalloc_page = stage2_memcache_zalloc_page, .zalloc_pages_exact = kvm_s2_zalloc_pages_exact, .free_pages_exact = kvm_s2_free_pages_exact, - .free_removed_table = stage2_free_removed_table, + .free_unlinked_table = stage2_free_unlinked_table, .get_page = kvm_host_get_page, .put_page = kvm_s2_put_page, .page_count = kvm_host_page_count,--
Regards,
Shaoqin
PATCH v3 3/12 KVM: arm64: Add helper for creating unlinked stage2 subtrees
In reply to Ricardo KollerAdd a stage2 helper, kvm_pgtable_stage2_create_unlinked(), for creating unlinked tables (the opposite of kvm_pgtable_stage2_free_unlinked()). Creating an unlinked table is useful for splitting block PTEs into subtrees of 4K PTEs. For example, a 1G block PTE can be split into 4K PTEs by first creating a fully populated tree, and then use it to replace the 1G PTE in a single step. This will be used in a subsequent commit for eager huge-page splitting (a dirty-logging optimization).
No functional change intended. This new function will be used in a subsequent commit.
--- arch/arm64/include/asm/kvm_pgtable.h | 29 +++++++++++++++++ arch/arm64/kvm/hyp/pgtable.c | 47 ++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+)
arch/arm64/include/asm/kvm_pgtable.h +29 -0
@@ -460,6 +460,35 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt);*/ void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level); +/** +* kvm_pgtable_stage2_create_unlinked() - Create an unlinked stage-2 paging structure. +* @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*(). +* @new: Unlinked stage-2 paging structure to be created. +* @phys: Physical address of the memory to map. +* @level: Level of the stage-2 paging structure to be created. +* @prot: Permissions and attributes for the mapping. +* @mc: Cache of pre-allocated and zeroed memory from which to allocate +* page-table pages. +* @force_pte: Force mappings to PAGE_SIZE granularity. +* +* Create an unlinked page-table tree under @new. If @force_pte is +* true or @level is the PMD level, then the tree is mapped up to the +* PAGE_SIZE leaf PTE; the tree is mapped up one level otherwise. This +* new page-table tree is not reachable (i.e., it is removed) from the +* root pgd and it's therefore unreachableby the hardware page-table +* walker. No TLB invalidation or CMOs are performed. +* +* If device attributes are not explicitly requested in @prot, then the +* mapping will be normal, cacheable. +* +* Return: 0 only if a fully populated tree was created (all memory +* under @level is mapped), negative error code on failure. +*/ +int kvm_pgtable_stage2_create_unlinked (struct kvm_pgtable *pgt, +kvm_pte_t *new,u64 phys,u32 level, +enum kvm_pgtable_prot prot,void *mc, +bool force_pte); +/** * kvm_pgtable_stage2_map() - Install a mapping in a guest stage-2 page-table. * @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*().
arch/arm64/kvm/hyp/pgtable.c +47 -0
53 lines not on this page · raw message
Signature · 1 line
2.39.1.637.g21b0678d19-goog
Re: [PATCH v3 03/12] KVM: arm64: Add helper for creating unlinked stage2 subtrees
Quoted 2 lines · Ricardo Koller
Add a stage2 helper,
kvm_pgtable_stage2_create_unlinked(), for creating unlinked tables (the opposite ofkvm_pgtable_stage2_free_unlinked()).
You don't need to mention the free_unlinked() side of things, IMO.
Quoted 6 lines
Creating an unlinked table is useful for splitting block PTEs into subtrees of 4K PTEs. For example, a 1G block PTE can be split into 4K PTEs by first creating a fully populated tree, and then use it to replace the 1G PTE in a single step. This will be used in a subsequent commit for eager huge-page splitting (a dirty-logging optimization).
This is all very PAGE_SIZE=4K centric :) Could you instead describe the operation in terms of the Linux page table hierarchy?
i.e. '... useful for splitting hugepages into PTE-level mappings'
Quoted 14 lines
No functional change intended. This new function will be used in a subsequent commit.
Signed-off-by Ricardo Koller <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 29 +++++++++++++++++ arch/arm64/kvm/hyp/pgtable.c | 47 ++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+)arch/arm64/include/asm/kvm_pgtable.h +0
-0
arch/arm64/include/asm/kvm_pgtable.h void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt); · line 468
Quoted 9 lines
arch/arm64/include/asm/kvm_pgtable.h +6
-0@@ -460,6 +460,35 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt);*/ void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level); +/** +* kvm_pgtable_stage2_create_unlinked() - Create an unlinked stage-2 paging structure. +* @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*(). +* @new: Unlinked stage-2 paging structure to be created. +* @phys: Physical address of the memory to map. +* @level: Level of the stage-2 paging structure to be created.
I believe this is the starting level of the page table to be created, right? Might be worth calling that out explicitly as level could also be interpreted as mapping level.
arch/arm64/include/asm/kvm_pgtable.h void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt); · line 477
Quoted 9 lines
arch/arm64/include/asm/kvm_pgtable.h +9
-0+* @prot: Permissions and attributes for the mapping. +* @mc: Cache of pre-allocated and zeroed memory from which to allocate +* page-table pages. +* @force_pte: Force mappings to PAGE_SIZE granularity. +* +* Create an unlinked page-table tree under @new. If @force_pte is +* true or @level is the PMD level, then the tree is mapped up to the +* PAGE_SIZE leaf PTE; the tree is mapped up one level otherwise. This +* new page-table tree is not reachable (i.e., it is removed) from the
'i.e. it is unlinked'
Quoted 61 lines
arch/arm64/include/asm/kvm_pgtable.h +14
-0+* root pgd and it's therefore unreachableby the hardware page-table +* walker. No TLB invalidation or CMOs are performed. +* +* If device attributes are not explicitly requested in @prot, then the +* mapping will be normal, cacheable. +* +* Return: 0 only if a fully populated tree was created (all memory +* under @level is mapped), negative error code on failure. +*/ +int kvm_pgtable_stage2_create_unlinked (struct kvm_pgtable *pgt, +kvm_pte_t *new,u64 phys,u32 level, +enum kvm_pgtable_prot prot,void *mc, +bool force_pte); +/** * kvm_pgtable_stage2_map() - Install a mapping in a guest stage-2 page-table. * @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*(). arch/arm64/kvm/hyp/pgtable.c +36
-0@@ -1181,6 +1181,53 @@ int kvm_pgtable_stage2_flush(struct kvm_pgtable *pgt, u64 addr, u64 size)return kvm_pgtable_walk (pgt, addr, size, &walker); } +int kvm_pgtable_stage2_create_unlinked (struct kvm_pgtable *pgt, +kvm_pte_t *new,u64 phys,u32 level, +enum kvm_pgtable_prot prot,void *mc, +bool force_pte) +{ +struct stage2_map_data map_data = { + .phys = phys, + .mmu = pgt->mmu, + .memcache = mc, + .force_pte = force_pte, + }; +struct kvm_pgtable_walker walker = { + .cb = stage2_map_walker, + .flags =KVM_PGTABLE_WALK_LEAF | +KVM_PGTABLE_WALK_SKIP_BBM | +KVM_PGTABLE_WALK_SKIP_CMO , + .arg = &map_data, + }; +/* .addr (the IPA) is irrelevant for a removed table */ +struct kvm_pgtable_walk_data data = { + .walker = &walker, + .addr =0 , + .end =kvm_granule_size (level), + }; +struct kvm_pgtable_mm_ops *mm_ops = pgt->mm_ops; +kvm_pte_t *pgtable; +int ret; + + ret =stage2_set_prot_attr (pgt, prot, &map_data.attr); +if (ret) +return ret; + + pgtable = mm_ops->zalloc_page (mc); +if (!pgtable) +return -ENOMEM ; +
arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_flush(struct kvm_pgtable *pgt, u64 addr, u64 size) · line 1229
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +10
-0+ ret =__kvm_pgtable_walk (&data, mm_ops, (kvm_pteref_t )pgtable, + level +1 ); +if (ret) { +kvm_pgtable_stage2_free_unlinked (mm_ops, pgtable, level); + mm_ops->put_page (pgtable); +return ret; + } + + *new =kvm_init_table_pte (pgtable, mm_ops); +return 0 ;
Hmm. I don't think you really need the 'out' pointer here. Either the function fails and it returns a negative error, or it succeeds and returns a pointer.
kvm_pte_t *kvm_pgtable_stage2_create_unlinked(...)
{
int ret; [...]
ret = __kvm_pgtable_walk(...);
if (ret) {
kvm_pgtable_stage2_free_unlinked(...);
mm_ops->put_page(pgtable);
return ERR_PTR(ret);
}
return pgtable;}
[...]
pgtable = kvm_pgtable_stage2_create_unlinked(...); if (IS_ERR(pgtable)) return PTR_ERR(pgtable);
Signature · 2 lines
Thanks, Oliver
Re: [PATCH v3 03/12] KVM: arm64: Add helper for creating unlinked stage2 subtrees
Quoted 57 lines · Oliver Upton
Quoted 2 lines · Ricardo Koller
Add a stage2 helper,
kvm_pgtable_stage2_create_unlinked(), for creating unlinked tables (the opposite ofkvm_pgtable_stage2_free_unlinked()).You don't need to mention the
free_unlinked()side of things, IMO.Quoted 6 lines
Creating an unlinked table is useful for splitting block PTEs into subtrees of 4K PTEs. For example, a 1G block PTE can be split into 4K PTEs by first creating a fully populated tree, and then use it to replace the 1G PTE in a single step. This will be used in a subsequent commit for eager huge-page splitting (a dirty-logging optimization).
This is all very PAGE_SIZE=4K centric :) Could you instead describe the operation in terms of the Linux page table hierarchy?
i.e. '... useful for splitting hugepages into PTE-level mappings'
Quoted 14 lines
No functional change intended. This new function will be used in a subsequent commit.
Signed-off-by Ricardo Koller <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 29 +++++++++++++++++ arch/arm64/kvm/hyp/pgtable.c | 47 ++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+)arch/arm64/include/asm/kvm_pgtable.h +0
-0arch/arm64/include/asm/kvm_pgtable.h void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt); · line 468
Quoted 9 lines
arch/arm64/include/asm/kvm_pgtable.h +6
-0@@ -460,6 +460,35 @@ void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt);*/ void kvm_pgtable_stage2_free_unlinked (struct kvm_pgtable_mm_ops *mm_ops,void *pgtable,u32 level); +/** +* kvm_pgtable_stage2_create_unlinked() - Create an unlinked stage-2 paging structure. +* @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*(). +* @new: Unlinked stage-2 paging structure to be created. +* @phys: Physical address of the memory to map. +* @level: Level of the stage-2 paging structure to be created. I believe this is the starting level of the page table to be created, right? Might be worth calling that out explicitly as level could also be interpreted as mapping level.
arch/arm64/include/asm/kvm_pgtable.h void kvm_pgtable_stage2_destroy(struct kvm_pgtable *pgt); · line 477
Quoted 9 lines
arch/arm64/include/asm/kvm_pgtable.h +9
-0+* @prot: Permissions and attributes for the mapping. +* @mc: Cache of pre-allocated and zeroed memory from which to allocate +* page-table pages. +* @force_pte: Force mappings to PAGE_SIZE granularity. +* +* Create an unlinked page-table tree under @new. If @force_pte is +* true or @level is the PMD level, then the tree is mapped up to the +* PAGE_SIZE leaf PTE; the tree is mapped up one level otherwise. This +* new page-table tree is not reachable (i.e., it is removed) from the
Quoted 1 line
'i.e. it is unlinked'
ACK
Quoted 68 lines
Quoted 68 lines
arch/arm64/include/asm/kvm_pgtable.h +14
-0+* root pgd and it's therefore unreachableby the hardware page-table +* walker. No TLB invalidation or CMOs are performed. +* +* If device attributes are not explicitly requested in @prot, then the +* mapping will be normal, cacheable. +* +* Return: 0 only if a fully populated tree was created (all memory +* under @level is mapped), negative error code on failure. +*/ +int kvm_pgtable_stage2_create_unlinked (struct kvm_pgtable *pgt, +kvm_pte_t *new,u64 phys,u32 level, +enum kvm_pgtable_prot prot,void *mc, +bool force_pte); +/** * kvm_pgtable_stage2_map() - Install a mapping in a guest stage-2 page-table. * @pgt: Page-table structure initialised by kvm_pgtable_stage2_init*(). arch/arm64/kvm/hyp/pgtable.c +42
-0@@ -1181,6 +1181,53 @@ int kvm_pgtable_stage2_flush(struct kvm_pgtable *pgt, u64 addr, u64 size)return kvm_pgtable_walk (pgt, addr, size, &walker); } +int kvm_pgtable_stage2_create_unlinked (struct kvm_pgtable *pgt, +kvm_pte_t *new,u64 phys,u32 level, +enum kvm_pgtable_prot prot,void *mc, +bool force_pte) +{ +struct stage2_map_data map_data = { + .phys = phys, + .mmu = pgt->mmu, + .memcache = mc, + .force_pte = force_pte, + }; +struct kvm_pgtable_walker walker = { + .cb = stage2_map_walker, + .flags =KVM_PGTABLE_WALK_LEAF | +KVM_PGTABLE_WALK_SKIP_BBM | +KVM_PGTABLE_WALK_SKIP_CMO , + .arg = &map_data, + }; +/* .addr (the IPA) is irrelevant for a removed table */ +struct kvm_pgtable_walk_data data = { + .walker = &walker, + .addr =0 , + .end =kvm_granule_size (level), + }; +struct kvm_pgtable_mm_ops *mm_ops = pgt->mm_ops; +kvm_pte_t *pgtable; +int ret; + + ret =stage2_set_prot_attr (pgt, prot, &map_data.attr); +if (ret) +return ret; + + pgtable = mm_ops->zalloc_page (mc); +if (!pgtable) +return -ENOMEM ; + + ret =__kvm_pgtable_walk (&data, mm_ops, (kvm_pteref_t )pgtable, + level +1 ); +if (ret) { +kvm_pgtable_stage2_free_unlinked (mm_ops, pgtable, level); + mm_ops->put_page (pgtable); +return ret;
Quoted 8 lines
arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_flush(struct kvm_pgtable *pgt, u64 addr, u64 size) · line 1229
Quoted 4 lines
arch/arm64/kvm/hyp/pgtable.c +4
-0+ } + + *new =kvm_init_table_pte (pgtable, mm_ops); +return 0 ;Hmm. I don't think you really need the 'out' pointer here. Either the function fails and it returns a negative error, or it succeeds and returns a pointer.
Ah, good point. I don't think it's needed.
Quoted 27 lines
kvm_pte_t *kvm_pgtable_stage2_create_unlinked(...) { int ret;[...] ret = __kvm_pgtable_walk(...); if (ret) { kvm_pgtable_stage2_free_unlinked(...); mm_ops->put_page(pgtable); return ERR_PTR(ret); } return pgtable;}
[...]
pgtable = kvm_pgtable_stage2_create_unlinked(...); if (IS_ERR(pgtable)) return PTR_ERR(pgtable);--
Thanks,
Oliver
PATCH v3 4/12 KVM: arm64: Add kvm_pgtable_stage2_split()
In reply to Ricardo KollerAdd a new stage2 function, kvm_pgtable_stage2_split(), for splitting a range of huge pages. This will be used for eager-splitting huge pages into PAGE_SIZE pages. The goal is to avoid having to split huge pages on write-protection faults, and instead use this function to do it ahead of time for large ranges (e.g., all guest memory in 1G chunks at a time).
No functional change intended. This new function will be used in a subsequent commit.
--- arch/arm64/include/asm/kvm_pgtable.h | 30 ++++++++ arch/arm64/kvm/hyp/pgtable.c | 105 +++++++++++++++++++++++++++ 2 files changed, 135 insertions(+)
arch/arm64/include/asm/kvm_pgtable.h +30 -0
@@ -658,6 +658,36 @@ bool kvm_pgtable_stage2_is_young(struct kvm_pgtable *pgt, u64 addr);*/ int kvm_pgtable_stage2_flush (struct kvm_pgtable *pgt,u64 addr,u64 size); +/** +* kvm_pgtable_stage2_split() - Split a range of huge pages into leaf PTEs pointing +* to PAGE_SIZE guest pages. +* @pgt: Page-table structure initialised by kvm_pgtable_stage2_init(). +* @addr: Intermediate physical address from which to split. +* @size: Size of the range. +* @mc: Cache of pre-allocated and zeroed memory from which to allocate +* page-table pages. +* @mc_capacity: Number of pages in @mc. +* +* @addr and the end (@addr + @size) are effectively aligned down and up to +* the top level huge-page block size. This is an example using 1GB +* huge-pages and 4KB granules. +* +* [---input range---] +* : : +* [--1G block pte--][--1G block pte--][--1G block pte--][--1G block pte--] +* : : +* [--2MB--][--2MB--][--2MB--][--2MB--] +* : : +* [ ][ ][:][ ][ ][ ][ ][ ][:][ ][ ][ ] +* : : +* +* Return: 0 on success, negative error code on failure. Note that +* kvm_pgtable_stage2_split() is best effort: it tries to break as many +* blocks in the input range as allowed by @mc_capacity. +*/ +int kvm_pgtable_stage2_split (struct kvm_pgtable *pgt,u64 addr,u64 size, +void *mc,u64 mc_capacity); +/** * kvm_pgtable_walk() - Walk a page-table. * @pgt: Page-table structure initialised by kvm_pgtable_*_init().
arch/arm64/kvm/hyp/pgtable.c +105 -0
111 lines not on this page · raw message
Signature · 1 line
2.39.1.637.g21b0678d19-goog
Re: [PATCH v3 04/12] KVM: arm64: Add kvm_pgtable_stage2_split()
On Wed, Feb 15, 2023 at 05:40:38PM +0000, Ricardo Koller wrote:
[...]
Quoted 20 lines
arch/arm64/kvm/hyp/pgtable.c +12
-0@@ -1229,6 +1229,111 @@ int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt,return 0 ; } +struct stage2_split_data { +struct kvm_s2_mmu *mmu; +void *memcache; +u64 mc_capacity; +}; + +/* +* Get the number of page-tables needed to replace a bock with a fully +* populated tree, up to the PTE level, at particular level. +*/ +static inline u32 stage2_block_get_nr_page_tables (u32 level) +{
arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1253
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +10
-0+switch (level) { +/* There are no blocks at level 0 */ +case 1 :return 1 +PTRS_PER_PTE ; +case 2 :return 1 ; +case 3 :return 0 ; +default : +WARN_ON_ONCE (1 ); +return ~0 ; + } +}
This doesn't take into account our varying degrees of hugepage support across page sizes. Perhaps:
static inline int stage2_block_get_nr_page_tables(u32 level)
{
if (WARN_ON_ONCE(level < KVM_PGTABLE_MIN_BLOCK_LEVEL ||
level >= KVM_PGTABLE_MAX_LEVELS))
return -EINVAL;
switch (level) {
case 1:
return PTRS_PER_PTE + 1;
case 2:
return 1;
case 3:
return 0;
}}
paired with an explicit error check and early return on the caller side.
Quoted 24 lines
arch/arm64/kvm/hyp/pgtable.c +24
-0+static int stage2_split_walker (const struct kvm_pgtable_visit_ctx *ctx, +enum kvm_pgtable_walk_flags visit) +{ +struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; +struct stage2_split_data *data = ctx->arg; +kvm_pte_t pte = ctx->old, new, *childp; +enum kvm_pgtable_prot prot; +void *mc = data->memcache; +u32 level = ctx->level; +u64 phys, nr_pages; +bool force_pte; +int ret; + +/* No huge-pages exist at the last level */ +if (level ==KVM_PGTABLE_MAX_LEVELS -1 ) +return 0 ; + +/* We only split valid block mappings */ +if (!kvm_pte_valid (pte)) +return 0 ; + + nr_pages =stage2_block_get_nr_page_tables (level); +if (data->mc_capacity >= nr_pages) { +/* Build a tree mapped down to the PTE granularity. */
arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1288
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +10
-0+ force_pte = true; + }else { +/* +* Don't force PTEs. This requires a single page of PMDs at the +* PUD level, or a single page of PTEs at the PMD level. If we +* are at the PUD level, the PTEs will be created recursively. +*/ + force_pte = false; + nr_pages =1 ; + }
Do we know if the 'else' branch here is even desirable? I.e. has recursive shattering been tested with PUD hugepages (HugeTLB 1G) and shown to improve guest performance while dirty tracking?
The observations we've made on existing systems were that the successive break-before-make operations led to a measurable slowdown in guest pre-copy performance. Recursively building the page tables should actually result in *more* break-before-makes than if we just let the vCPU fault path lazily shatter hugepages.
Signature · 2 lines
Thanks, Oliver
Re: [PATCH v3 04/12] KVM: arm64: Add kvm_pgtable_stage2_split()
Quoted 53 lines · Oliver Upton
On Wed, Feb 15, 2023 at 05:40:38PM +0000, Ricardo Koller wrote:
[...]
Quoted 20 lines
arch/arm64/kvm/hyp/pgtable.c +12
-0@@ -1229,6 +1229,111 @@ int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt,return 0 ; } +struct stage2_split_data { +struct kvm_s2_mmu *mmu; +void *memcache; +u64 mc_capacity; +}; + +/* +* Get the number of page-tables needed to replace a bock with a fully +* populated tree, up to the PTE level, at particular level. +*/ +static inline u32 stage2_block_get_nr_page_tables (u32 level) +{arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1253
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +10
-0+switch (level) { +/* There are no blocks at level 0 */ +case 1 :return 1 +PTRS_PER_PTE ; +case 2 :return 1 ; +case 3 :return 0 ; +default : +WARN_ON_ONCE (1 ); +return ~0 ; + } +}This doesn't take into account our varying degrees of hugepage support across page sizes. Perhaps:
static inline int stage2_block_get_nr_page_tables(u32 level) { if (WARN_ON_ONCE(level < KVM_PGTABLE_MIN_BLOCK_LEVEL || level >= KVM_PGTABLE_MAX_LEVELS)) return -EINVAL;switch (level) { case 1: return PTRS_PER_PTE + 1; case 2: return 1; case 3: return 0; }
Quoted 3 lines
}
paired with an explicit error check and early return on the caller side.
Sounds good, will add this to the next version.
Quoted 31 lines
Quoted 31 lines
arch/arm64/kvm/hyp/pgtable.c +30
-0+static int stage2_split_walker (const struct kvm_pgtable_visit_ctx *ctx, +enum kvm_pgtable_walk_flags visit) +{ +struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; +struct stage2_split_data *data = ctx->arg; +kvm_pte_t pte = ctx->old, new, *childp; +enum kvm_pgtable_prot prot; +void *mc = data->memcache; +u32 level = ctx->level; +u64 phys, nr_pages; +bool force_pte; +int ret; + +/* No huge-pages exist at the last level */ +if (level ==KVM_PGTABLE_MAX_LEVELS -1 ) +return 0 ; + +/* We only split valid block mappings */ +if (!kvm_pte_valid (pte)) +return 0 ; + + nr_pages =stage2_block_get_nr_page_tables (level); +if (data->mc_capacity >= nr_pages) { +/* Build a tree mapped down to the PTE granularity. */ + force_pte = true; + }else { +/* +* Don't force PTEs. This requires a single page of PMDs at the +* PUD level, or a single page of PTEs at the PMD level. If we +* are at the PUD level, the PTEs will be created recursively.
Quoted 8 lines
arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1288
Quoted 4 lines
arch/arm64/kvm/hyp/pgtable.c +4
-0+*/ + force_pte = false; + nr_pages =1 ; + }Do we know if the 'else' branch here is even desirable? I.e. has recursive shattering been tested with PUD hugepages (HugeTLB 1G) and shown to improve guest performance while dirty tracking?
Yes, I think it's desirable. Here are some numbers on a neoverse n1 using dirty_log_perf_test (152 vcpus, 1G each, 4K pages):
CHUNK_SIZE=1G
Enabling dirty logging time: 2.468014046s
Iteration 1 dirty memory time: 4.275447900s
CHUNK_SIZE=2M
Enabling dirty logging time: 2.692124099s
Iteration 1 dirty memory time: 4.284682220s
Enabling dirty logging increases as expected when using a smaller CHUNK_SIZE, but not by too much (~9%). It's a fair tradeoff for users not willing to allocate large
caches.
Quoted 10 lines
The observations we've made on existing systems were that the successive break-before-make operations led to a measurable slowdown in guest pre-copy performance. Recursively building the page tables should actually result in *more* break-before-makes than if we just let the vCPU fault path lazily shatter hugepages.
--
Thanks,
Oliver
Re: [PATCH v3 04/12] KVM: arm64: Add kvm_pgtable_stage2_split()
Quoted 108 lines · Ricardo Koller
Quoted 53 lines · Oliver Upton
On Wed, Feb 15, 2023 at 05:40:38PM +0000, Ricardo Koller wrote:
[...]
Quoted 20 lines
arch/arm64/kvm/hyp/pgtable.c +12
-0@@ -1229,6 +1229,111 @@ int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt,return 0 ; } +struct stage2_split_data { +struct kvm_s2_mmu *mmu; +void *memcache; +u64 mc_capacity; +}; + +/* +* Get the number of page-tables needed to replace a bock with a fully +* populated tree, up to the PTE level, at particular level. +*/ +static inline u32 stage2_block_get_nr_page_tables (u32 level) +{arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1253
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +10
-0+switch (level) { +/* There are no blocks at level 0 */ +case 1 :return 1 +PTRS_PER_PTE ; +case 2 :return 1 ; +case 3 :return 0 ; +default : +WARN_ON_ONCE (1 ); +return ~0 ; + } +}This doesn't take into account our varying degrees of hugepage support across page sizes. Perhaps:
static inline int stage2_block_get_nr_page_tables(u32 level) { if (WARN_ON_ONCE(level < KVM_PGTABLE_MIN_BLOCK_LEVEL || level >= KVM_PGTABLE_MAX_LEVELS)) return -EINVAL;switch (level) { case 1: return PTRS_PER_PTE + 1; case 2: return 1; case 3: return 0; }Quoted 3 lines
}
paired with an explicit error check and early return on the caller side.
Sounds good, will add this to the next version.
Quoted 31 lines
Quoted 31 lines
arch/arm64/kvm/hyp/pgtable.c +30
-0+static int stage2_split_walker (const struct kvm_pgtable_visit_ctx *ctx, +enum kvm_pgtable_walk_flags visit) +{ +struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; +struct stage2_split_data *data = ctx->arg; +kvm_pte_t pte = ctx->old, new, *childp; +enum kvm_pgtable_prot prot; +void *mc = data->memcache; +u32 level = ctx->level; +u64 phys, nr_pages; +bool force_pte; +int ret; + +/* No huge-pages exist at the last level */ +if (level ==KVM_PGTABLE_MAX_LEVELS -1 ) +return 0 ; + +/* We only split valid block mappings */ +if (!kvm_pte_valid (pte)) +return 0 ; + + nr_pages =stage2_block_get_nr_page_tables (level); +if (data->mc_capacity >= nr_pages) { +/* Build a tree mapped down to the PTE granularity. */ + force_pte = true; + }else { +/* +* Don't force PTEs. This requires a single page of PMDs at the +* PUD level, or a single page of PTEs at the PMD level. If we +* are at the PUD level, the PTEs will be created recursively. Quoted 8 lines
arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1288
Quoted 4 lines
arch/arm64/kvm/hyp/pgtable.c +4
-0+*/ + force_pte = false; + nr_pages =1 ; + }Do we know if the 'else' branch here is even desirable? I.e. has recursive shattering been tested with PUD hugepages (HugeTLB 1G) and shown to improve guest performance while dirty tracking?
Yes, I think it's desirable. Here are some numbers on a neoverse n1 using
dirty_log_perf_test(152 vcpus, 1G each, 4K pages):CHUNK_SIZE=1G
Enabling dirty logging time: 2.468014046s
Iteration 1 dirty memory time: 4.275447900s
Quoted 19 lines
CHUNK_SIZE=2M
Enabling dirty logging time: 2.692124099s
Iteration 1 dirty memory time: 4.284682220sEnabling dirty logging increases as expected when using a smaller
CHUNK_SIZE, but not by too much (~9%). It's a fair tradeoff for users not willing to allocate large
caches.Quoted 10 lines
The observations we've made on existing systems were that the successive break-before-make operations led to a measurable slowdown in guest pre-copy performance. Recursively building the page tables should actually result in *more* break-before-makes than if we just let the vCPU fault path lazily shatter hugepages.
--
Thanks,
Oliver
There is a terribly offensive image that was attached to the previous email. I would like to apologize for
attaching it. I don't know how that happened.
Ricardo
Re: [PATCH v3 04/12] KVM: arm64: Add kvm_pgtable_stage2_split()
In reply to Ricardo KollerHi Ricardo,
Quoted 63 lines · Ricardo Koller
Add a new stage2 function,
kvm_pgtable_stage2_split(), for splitting a range of huge pages. This will be used for eager-splitting huge pages intoPAGE_SIZEpages. The goal is to avoid having to split huge pages on write-protection faults, and instead use this function to do it ahead of time for large ranges (e.g., all guest memory in 1G chunks at a time).No functional change intended. This new function will be used in a subsequent commit.
Signed-off-by Ricardo Koller <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 30 ++++++++ arch/arm64/kvm/hyp/pgtable.c | 105 +++++++++++++++++++++++++++ 2 files changed, 135 insertions(+)arch/arm64/include/asm/kvm_pgtable.h +30
-0@@ -658,6 +658,36 @@ bool kvm_pgtable_stage2_is_young(struct kvm_pgtable *pgt, u64 addr);*/ int kvm_pgtable_stage2_flush (struct kvm_pgtable *pgt,u64 addr,u64 size); +/** +* kvm_pgtable_stage2_split() - Split a range of huge pages into leaf PTEs pointing +* to PAGE_SIZE guest pages. +* @pgt: Page-table structure initialised by kvm_pgtable_stage2_init(). +* @addr: Intermediate physical address from which to split. +* @size: Size of the range. +* @mc: Cache of pre-allocated and zeroed memory from which to allocate +* page-table pages. +* @mc_capacity: Number of pages in @mc. +* +* @addr and the end (@addr + @size) are effectively aligned down and up to +* the top level huge-page block size. This is an example using 1GB +* huge-pages and 4KB granules. +* +* [---input range---] +* : : +* [--1G block pte--][--1G block pte--][--1G block pte--][--1G block pte--] +* : : +* [--2MB--][--2MB--][--2MB--][--2MB--] +* : : +* [ ][ ][:][ ][ ][ ][ ][ ][:][ ][ ][ ] +* : : +* +* Return: 0 on success, negative error code on failure. Note that +* kvm_pgtable_stage2_split() is best effort: it tries to break as many +* blocks in the input range as allowed by @mc_capacity. +*/ +int kvm_pgtable_stage2_split (struct kvm_pgtable *pgt,u64 addr,u64 size, +void *mc,u64 mc_capacity); +/** * kvm_pgtable_walk() - Walk a page-table. * @pgt: Page-table structure initialised by kvm_pgtable_*_init(). arch/arm64/kvm/hyp/pgtable.c +0
-0@@ -1229,6 +1229,111 @@ int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt,return 0 ;
arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1239
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +8
-0} +struct stage2_split_data { +struct kvm_s2_mmu *mmu; +void *memcache; +u64 mc_capacity; +}; + +/* +* Get the number of page-tables needed to replace a bock with a fully
/s/bock/block
Thanks,
Quoted 100 lines
arch/arm64/kvm/hyp/pgtable.c +97
-0+* populated tree, up to the PTE level, at particular level. +*/ +static inline u32 stage2_block_get_nr_page_tables (u32 level) +{ +switch (level) { +/* There are no blocks at level 0 */ +case 1 :return 1 +PTRS_PER_PTE ; +case 2 :return 1 ; +case 3 :return 0 ; +default : +WARN_ON_ONCE (1 ); +return ~0 ; + } +} + +static int stage2_split_walker (const struct kvm_pgtable_visit_ctx *ctx, +enum kvm_pgtable_walk_flags visit) +{ +struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; +struct stage2_split_data *data = ctx->arg; +kvm_pte_t pte = ctx->old, new, *childp; +enum kvm_pgtable_prot prot; +void *mc = data->memcache; +u32 level = ctx->level; +u64 phys, nr_pages; +bool force_pte; +int ret; + +/* No huge-pages exist at the last level */ +if (level ==KVM_PGTABLE_MAX_LEVELS -1 ) +return 0 ; + +/* We only split valid block mappings */ +if (!kvm_pte_valid (pte)) +return 0 ; + + nr_pages =stage2_block_get_nr_page_tables (level); +if (data->mc_capacity >= nr_pages) { +/* Build a tree mapped down to the PTE granularity. */ + force_pte = true; + }else { +/* +* Don't force PTEs. This requires a single page of PMDs at the +* PUD level, or a single page of PTEs at the PMD level. If we +* are at the PUD level, the PTEs will be created recursively. +*/ + force_pte = false; + nr_pages =1 ; + } + +if (data->mc_capacity < nr_pages) +return -ENOMEM ; + + phys =kvm_pte_to_phys (pte); + prot =kvm_pgtable_stage2_pte_prot (pte); + + ret =kvm_pgtable_stage2_create_unlinked (data->mmu->pgt, &new, phys, + level, prot, mc, force_pte); +if (ret) +return ret; + +if (!stage2_try_break_pte (ctx, data->mmu)) { + childp =kvm_pte_follow (new, mm_ops); +kvm_pgtable_stage2_free_unlinked (mm_ops, childp, level); + mm_ops->put_page (childp); +return -EAGAIN ; + } + +/* +* Note, the contents of the page table are guaranteed to be made +* visible before the new PTE is assigned because stage2_make_pte() +* writes the PTE using smp_store_release(). +*/ +stage2_make_pte (ctx, new); +dsb (ishst); + data->mc_capacity -= nr_pages; +return 0 ; +} + +int kvm_pgtable_stage2_split (struct kvm_pgtable *pgt,u64 addr,u64 size, +void *mc,u64 mc_capacity) +{ +struct stage2_split_data split_data = { + .mmu = pgt->mmu, + .memcache = mc, + .mc_capacity = mc_capacity, + }; + +struct kvm_pgtable_walker walker = { + .cb = stage2_split_walker, + .flags =KVM_PGTABLE_WALK_LEAF , + .arg = &split_data, + }; + +return kvm_pgtable_walk (pgt, addr, size, &walker); +} + int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu, struct kvm_pgtable_mm_ops *mm_ops, enum kvm_pgtable_stage2_flags flags,
Signature · 2 lines
Regards, Shaoqin
Re: [PATCH v3 04/12] KVM: arm64: Add kvm_pgtable_stage2_split()
Quoted 69 lines · Shaoqin Huang
Hi Ricardo,
Quoted 65 lines · Ricardo Koller
Add a new stage2 function,
kvm_pgtable_stage2_split(), for splitting a range of huge pages. This will be used for eager-splitting huge pages intoPAGE_SIZEpages. The goal is to avoid having to split huge pages on write-protection faults, and instead use this function to do it ahead of time for large ranges (e.g., all guest memory in 1G chunks at a time).No functional change intended. This new function will be used in a subsequent commit.
Signed-off-by Ricardo Koller <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 30 ++++++++ arch/arm64/kvm/hyp/pgtable.c | 105 +++++++++++++++++++++++++++ 2 files changed, 135 insertions(+)arch/arm64/include/asm/kvm_pgtable.h +30
-0@@ -658,6 +658,36 @@ bool kvm_pgtable_stage2_is_young(struct kvm_pgtable *pgt, u64 addr);*/ int kvm_pgtable_stage2_flush (struct kvm_pgtable *pgt,u64 addr,u64 size); +/** +* kvm_pgtable_stage2_split() - Split a range of huge pages into leaf PTEs pointing +* to PAGE_SIZE guest pages. +* @pgt: Page-table structure initialised by kvm_pgtable_stage2_init(). +* @addr: Intermediate physical address from which to split. +* @size: Size of the range. +* @mc: Cache of pre-allocated and zeroed memory from which to allocate +* page-table pages. +* @mc_capacity: Number of pages in @mc. +* +* @addr and the end (@addr + @size) are effectively aligned down and up to +* the top level huge-page block size. This is an example using 1GB +* huge-pages and 4KB granules. +* +* [---input range---] +* : : +* [--1G block pte--][--1G block pte--][--1G block pte--][--1G block pte--] +* : : +* [--2MB--][--2MB--][--2MB--][--2MB--] +* : : +* [ ][ ][:][ ][ ][ ][ ][ ][:][ ][ ][ ] +* : : +* +* Return: 0 on success, negative error code on failure. Note that +* kvm_pgtable_stage2_split() is best effort: it tries to break as many +* blocks in the input range as allowed by @mc_capacity. +*/ +int kvm_pgtable_stage2_split (struct kvm_pgtable *pgt,u64 addr,u64 size, +void *mc,u64 mc_capacity); +/** * kvm_pgtable_walk() - Walk a page-table. * @pgt: Page-table structure initialised by kvm_pgtable_*_init(). arch/arm64/kvm/hyp/pgtable.c +0
-0@@ -1229,6 +1229,111 @@ int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt,return 0 ; }
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1239
Quoted 8 lines
arch/arm64/kvm/hyp/pgtable.c +8
-0+struct stage2_split_data { +struct kvm_s2_mmu *mmu; +void *memcache; +u64 mc_capacity; +}; + +/* +* Get the number of page-tables needed to replace a bock with a fully /s/bock/block
ACK. Will fix this on v4.
Quoted 108 lines
Thanks,
Quoted 90 lines
arch/arm64/kvm/hyp/pgtable.c +90
-0+* populated tree, up to the PTE level, at particular level. +*/ +static inline u32 stage2_block_get_nr_page_tables (u32 level) +{ +switch (level) { +/* There are no blocks at level 0 */ +case 1 :return 1 +PTRS_PER_PTE ; +case 2 :return 1 ; +case 3 :return 0 ; +default : +WARN_ON_ONCE (1 ); +return ~0 ; + } +} + +static int stage2_split_walker (const struct kvm_pgtable_visit_ctx *ctx, +enum kvm_pgtable_walk_flags visit) +{ +struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; +struct stage2_split_data *data = ctx->arg; +kvm_pte_t pte = ctx->old, new, *childp; +enum kvm_pgtable_prot prot; +void *mc = data->memcache; +u32 level = ctx->level; +u64 phys, nr_pages; +bool force_pte; +int ret; + +/* No huge-pages exist at the last level */ +if (level ==KVM_PGTABLE_MAX_LEVELS -1 ) +return 0 ; + +/* We only split valid block mappings */ +if (!kvm_pte_valid (pte)) +return 0 ; + + nr_pages =stage2_block_get_nr_page_tables (level); +if (data->mc_capacity >= nr_pages) { +/* Build a tree mapped down to the PTE granularity. */ + force_pte = true; + }else { +/* +* Don't force PTEs. This requires a single page of PMDs at the +* PUD level, or a single page of PTEs at the PMD level. If we +* are at the PUD level, the PTEs will be created recursively. +*/ + force_pte = false; + nr_pages =1 ; + } + +if (data->mc_capacity < nr_pages) +return -ENOMEM ; + + phys =kvm_pte_to_phys (pte); + prot =kvm_pgtable_stage2_pte_prot (pte); + + ret =kvm_pgtable_stage2_create_unlinked (data->mmu->pgt, &new, phys, + level, prot, mc, force_pte); +if (ret) +return ret; + +if (!stage2_try_break_pte (ctx, data->mmu)) { + childp =kvm_pte_follow (new, mm_ops); +kvm_pgtable_stage2_free_unlinked (mm_ops, childp, level); + mm_ops->put_page (childp); +return -EAGAIN ; + } + +/* +* Note, the contents of the page table are guaranteed to be made +* visible before the new PTE is assigned because stage2_make_pte() +* writes the PTE using smp_store_release(). +*/ +stage2_make_pte (ctx, new); +dsb (ishst); + data->mc_capacity -= nr_pages; +return 0 ; +} + +int kvm_pgtable_stage2_split (struct kvm_pgtable *pgt,u64 addr,u64 size, +void *mc,u64 mc_capacity) +{ +struct stage2_split_data split_data = { + .mmu = pgt->mmu, + .memcache = mc, + .mc_capacity = mc_capacity, + }; + +struct kvm_pgtable_walker walker = { + .cb = stage2_split_walker,arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1339
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +7
-0+ .flags = KVM_PGTABLE_WALK_LEAF, + .arg = &split_data, + }; + +return kvm_pgtable_walk (pgt, addr, size, &walker); +} + int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu, struct kvm_pgtable_mm_ops *mm_ops, enum kvm_pgtable_stage2_flags flags,--
Regards,
Shaoqin
Re: [PATCH v3 04/12] KVM: arm64: Add kvm_pgtable_stage2_split()
In reply to Ricardo KollerHi Ricardo,
Quoted 72 lines · Ricardo Koller
Add a new stage2 function,
kvm_pgtable_stage2_split(), for splitting a range of huge pages. This will be used for eager-splitting huge pages intoPAGE_SIZEpages. The goal is to avoid having to split huge pages on write-protection faults, and instead use this function to do it ahead of time for large ranges (e.g., all guest memory in 1G chunks at a time).No functional change intended. This new function will be used in a subsequent commit.
Signed-off-by Ricardo Koller <[email protected]>--- arch/arm64/include/asm/kvm_pgtable.h | 30 ++++++++ arch/arm64/kvm/hyp/pgtable.c | 105 +++++++++++++++++++++++++++ 2 files changed, 135 insertions(+)arch/arm64/include/asm/kvm_pgtable.h +30
-0@@ -658,6 +658,36 @@ bool kvm_pgtable_stage2_is_young(struct kvm_pgtable *pgt, u64 addr);*/ int kvm_pgtable_stage2_flush (struct kvm_pgtable *pgt,u64 addr,u64 size); +/** +* kvm_pgtable_stage2_split() - Split a range of huge pages into leaf PTEs pointing +* to PAGE_SIZE guest pages. +* @pgt: Page-table structure initialised by kvm_pgtable_stage2_init(). +* @addr: Intermediate physical address from which to split. +* @size: Size of the range. +* @mc: Cache of pre-allocated and zeroed memory from which to allocate +* page-table pages. +* @mc_capacity: Number of pages in @mc. +* +* @addr and the end (@addr + @size) are effectively aligned down and up to +* the top level huge-page block size. This is an example using 1GB +* huge-pages and 4KB granules. +* +* [---input range---] +* : : +* [--1G block pte--][--1G block pte--][--1G block pte--][--1G block pte--] +* : : +* [--2MB--][--2MB--][--2MB--][--2MB--] +* : : +* [ ][ ][:][ ][ ][ ][ ][ ][:][ ][ ][ ] +* : : +* +* Return: 0 on success, negative error code on failure. Note that +* kvm_pgtable_stage2_split() is best effort: it tries to break as many +* blocks in the input range as allowed by @mc_capacity. +*/ +int kvm_pgtable_stage2_split (struct kvm_pgtable *pgt,u64 addr,u64 size, +void *mc,u64 mc_capacity); +/** * kvm_pgtable_walk() - Walk a page-table. * @pgt: Page-table structure initialised by kvm_pgtable_*_init(). arch/arm64/kvm/hyp/pgtable.c +7
-0@@ -1229,6 +1229,111 @@ int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt,return 0 ; } +struct stage2_split_data { +struct kvm_s2_mmu *mmu; +void *memcache; +u64 mc_capacity; +}; + +/*
arch/arm64/kvm/hyp/pgtable.c int kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt, · line 1248
Quoted 10 lines
arch/arm64/kvm/hyp/pgtable.c +10
-0+* Get the number of page-tables needed to replace a bock with a fully +* populated tree, up to the PTE level, at particular level. +*/ +static inline u32 stage2_block_get_nr_page_tables (u32 level) +{ +switch (level) { +/* There are no blocks at level 0 */ +case 1 :return 1 +PTRS_PER_PTE ; +case 2 :return 1 ; +case 3 :return 0 ;
Is the level 3 check really needed?
Because level 3 will be first detected by:
+ if (level == KVM_PGTABLE_MAX_LEVELS - 1)
+ return 0;
in the stage2_split_walker().
Even if the case 3 return 0 and continue execute, it will still trigger:kvm_pgtable_stage2_create_unlinked(..level..)
-> __kvm_pgtable_walk(..level+1..)
-> WARN_ON_ONCE(level >= KVM_PGTABLE_MAX_LEVELS)
Thanks,
Shaoqin
Quoted 91 lines
arch/arm64/kvm/hyp/pgtable.c +88
-0+default : +WARN_ON_ONCE (1 ); +return ~0 ; + } +} + +static int stage2_split_walker (const struct kvm_pgtable_visit_ctx *ctx, +enum kvm_pgtable_walk_flags visit) +{ +struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; +struct stage2_split_data *data = ctx->arg; +kvm_pte_t pte = ctx->old, new, *childp; +enum kvm_pgtable_prot prot; +void *mc = data->memcache; +u32 level = ctx->level; +u64 phys, nr_pages; +bool force_pte; +int ret; + +/* No huge-pages exist at the last level */ +if (level ==KVM_PGTABLE_MAX_LEVELS -1 ) +return 0 ; + +/* We only split valid block mappings */ +if (!kvm_pte_valid (pte)) +return 0 ; + + nr_pages =stage2_block_get_nr_page_tables (level); +if (data->mc_capacity >= nr_pages) { +/* Build a tree mapped down to the PTE granularity. */ + force_pte = true; + }else { +/* +* Don't force PTEs. This requires a single page of PMDs at the +* PUD level, or a single page of PTEs at the PMD level. If we +* are at the PUD level, the PTEs will be created recursively. +*/ + force_pte = false; + nr_pages =1 ; + } + +if (data->mc_capacity < nr_pages) +return -ENOMEM ; + + phys =kvm_pte_to_phys (pte); + prot =kvm_pgtable_stage2_pte_prot (pte); + + ret =kvm_pgtable_stage2_create_unlinked (data->mmu->pgt, &new, phys, + level, prot, mc, force_pte); +if (ret) +return ret; + +if (!stage2_try_break_pte (ctx, data->mmu)) { + childp =kvm_pte_follow (new, mm_ops); +kvm_pgtable_stage2_free_unlinked (mm_ops, childp, level); + mm_ops->put_page (childp); +return -EAGAIN ; + } + +/* +* Note, the contents of the page table are guaranteed to be made +* visible before the new PTE is assigned because stage2_make_pte() +* writes the PTE using smp_store_release(). +*/ +stage2_make_pte (ctx, new); +dsb (ishst); + data->mc_capacity -= nr_pages; +return 0 ; +} + +int kvm_pgtable_stage2_split (struct kvm_pgtable *pgt,u64 addr,u64 size, +void *mc,u64 mc_capacity) +{ +struct stage2_split_data split_data = { + .mmu = pgt->mmu, + .memcache = mc, + .mc_capacity = mc_capacity, + }; + +struct kvm_pgtable_walker walker = { + .cb = stage2_split_walker, + .flags =KVM_PGTABLE_WALK_LEAF , + .arg = &split_data, + }; + +return kvm_pgtable_walk (pgt, addr, size, &walker); +} + int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu, struct kvm_pgtable_mm_ops *mm_ops, enum kvm_pgtable_stage2_flags flags,
Signature · 2 lines
Regards, Shaoqin
PATCH v3 5/12 KVM: arm64: Refactor kvm_arch_commit_memory_region()
In reply to Ricardo KollerRefactor kvm_arch_commit_memory_region() as a preparation for a future commit to look cleaner and more understandable. Also, it looks more like its x86 counterpart (in kvm_mmu_slot_apply_flags()).
No functional change intended.
--- arch/arm64/kvm/mmu.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
arch/arm64/kvm/mmu.c +11 -4
@@ -1761,20 +1761,27 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,const struct kvm_memory_slot *new, enum kvm_mr_change change) { + bool log_dirty_pages = new && new->flags & KVM_MEM_LOG_DIRTY_PAGES; +/* * At this point memslot has been committed and there is an * allocated dirty_bitmap[], dirty pages will be tracked while the * memory slot is write protected. */ -if (change !=KVM_MR_DELETE && new->flags &KVM_MEM_LOG_DIRTY_PAGES ) { +if (log_dirty_pages) { + +if (change ==KVM_MR_DELETE ) +return ; +/* * If we're with initial-all-set, we don't need to write * protect any pages because they're all reported as dirty. * Huge pages and normal pages will be write protect gradually. */ -if (!kvm_dirty_log_manual_protect_and_init_set (kvm)) { -kvm_mmu_wp_memory_region (kvm, new->id); - } +if (kvm_dirty_log_manual_protect_and_init_set (kvm)) +return ; + +kvm_mmu_wp_memory_region (kvm, new->id); } }
Signature · 1 line
2.39.1.637.g21b0678d19-goog
PATCH v3 6/12 KVM: arm64: Add kvm_uninit_stage2_mmu()
In reply to Ricardo KollerAdd kvm_uninit_stage2_mmu() and move kvm_free_stage2_pgd() into it. A future commit will add some more things to do inside of kvm_uninit_stage2_mmu().
No functional change intended.
--- arch/arm64/include/asm/kvm_mmu.h | 1 + arch/arm64/kvm/mmu.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
arch/arm64/include/asm/kvm_mmu.h +1 -0
@@ -167,6 +167,7 @@ void free_hyp_pgds(void);void stage2_unmap_vm (struct kvm *kvm);int kvm_init_stage2_mmu (struct kvm *kvm,struct kvm_s2_mmu *mmu,unsigned long type); +void kvm_uninit_stage2_mmu (struct kvm *kvm);void kvm_free_stage2_pgd (struct kvm_s2_mmu *mmu);int kvm_phys_addr_ioremap (struct kvm *kvm,phys_addr_t guest_ipa,phys_addr_t pa,unsigned long size,bool writable);
arch/arm64/kvm/mmu.c +6 -1
@@ -766,6 +766,11 @@ int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu, unsigned long treturn err; } +void kvm_uninit_stage2_mmu (struct kvm *kvm) +{ +kvm_free_stage2_pgd (&kvm->arch.mmu); +} +static void stage2_unmap_memslot (struct kvm *kvm,struct kvm_memory_slot *memslot) {
@@ -1855,7 +1860,7 @@ void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen)void kvm_arch_flush_shadow_all (struct kvm *kvm) { -kvm_free_stage2_pgd (&kvm->arch.mmu); +kvm_uninit_stage2_mmu (kvm); } void kvm_arch_flush_shadow_memslot(struct kvm *kvm,
Signature · 1 line
2.39.1.637.g21b0678d19-goog
PATCH v3 7/12 KVM: arm64: Export kvm_are_all_memslots_empty()
In reply to Ricardo KollerExport kvm_are_all_memslots_empty(). This will be used by a future commit when checking before setting a capability.
No functional change intended.
--- include/linux/kvm_host.h | 2 ++ virt/kvm/kvm_main.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
include/linux/kvm_host.h +2 -0
@@ -991,6 +991,8 @@ static inline bool kvm_memslots_empty(struct kvm_memslots *slots)return RB_EMPTY_ROOT (&slots->gfn_tree); } +bool kvm_are_all_memslots_empty (struct kvm *kvm); +#define kvm_for_each_memslot (memslot, bkt, slots) \ hash_for_each(slots->id_hash, bkt, memslot, id_node[slots->node_idx]) \ if (WARN_ON_ONCE(!memslot->npages)) { \
virt/kvm/kvm_main.c +1 -1
@@ -4604,7 +4604,7 @@ int __attribute__((weak)) kvm_vm_ioctl_enable_cap(struct kvm *kvm,return -EINVAL ; } -static bool kvm_are_all_memslots_empty (struct kvm *kvm) +bool kvm_are_all_memslots_empty (struct kvm *kvm) {int i;
Signature · 1 line
2.39.1.637.g21b0678d19-goog
PATCH v3 8/12 KVM: arm64: Add KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE
In reply to Ricardo KollerAdd a capability for userspace to specify the eager split chunk size. The chunk size specifies how many pages to break at a time, using a single allocation. Bigger the chunk size, more pages need to be allocated ahead of time.
--- Documentation/virt/kvm/api.rst | 26 ++++++++++++++++++++++++++ arch/arm64/include/asm/kvm_host.h | 19 +++++++++++++++++++ arch/arm64/kvm/arm.c | 22 ++++++++++++++++++++++ arch/arm64/kvm/mmu.c | 3 +++ include/uapi/linux/kvm.h | 1 + 5 files changed, 71 insertions(+)
Documentation/virt/kvm/api.rst +26 -0
@@ -8284,6 +8284,32 @@ structure. When getting the Modified Change Topology Report value, the attr->addr must point to a byte where the value will be stored or retrieved from. +8.40 KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE +--------------------------------------- + +:Capability: KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE +:Architectures: arm64 +:Type: vm +:Parameters: arg[0] is the new chunk size. +:Returns: 0 on success, -EINVAL if any memslot has been created. + +This capability sets the chunk size used in Eager Page Splitting. + +Eager Page Splitting improves the performance of dirty-logging (used +in live migrations) when guest memory is backed by huge-pages. This +optimization is enabled by default on arm64. It avoids splitting +huge-pages (into PAGE_SIZE pages) on fault, by doing it eagerly when +enabling dirty logging (with the KVM_MEM_LOG_DIRTY_PAGES flag for a +memory region), or when using KVM_CLEAR_DIRTY_LOG. + +The chunk size specifies how many pages to break at a time, using a +single allocation for each chunk. Bigger the chunk size, more pages +need to be allocated ahead of time. A good heuristic is to pick the +size of the huge-pages as the chunk size. + +If the chunk size (arg[0]) is zero, then no eager page splitting is +performed. The default value PMD size (e.g., 2M when PAGE_SIZE is 4K). + 9. Known KVM API problems =========================
arch/arm64/include/asm/kvm_host.h +19 -0
@@ -153,6 +153,25 @@ struct kvm_s2_mmu {/* The last vcpu id that ran on each physical CPU */ int __percpu *last_vcpu_ran; +#define KVM_ARM_EAGER_SPLIT_CHUNK_SIZE_DEFAULT PMD_SIZE +/* +* Memory cache used to split +* KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE worth of huge pages. It +* is used to allocate stage2 page tables while splitting huge +* pages. Note that the choice of EAGER_PAGE_SPLIT_CHUNK_SIZE +* influences both the capacity of the split page cache, and +* how often KVM reschedules. Be wary of raising CHUNK_SIZE +* too high. +* +* A good heuristic to pick CHUNK_SIZE is that it should be +* the size of the huge-pages backing guest memory. If not +* known, the PMD size (usually 2M) is a good guess. +* +* Protected by kvm->slots_lock. +*/ +struct kvm_mmu_memory_cache split_page_cache; +uint64_t split_page_chunk_size; +struct kvm_arch *arch; };
arch/arm64/kvm/arm.c +22 -0
@@ -101,6 +101,22 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, r =0 ;set_bit (KVM_ARCH_FLAG_SYSTEM_SUSPEND_ENABLED , &kvm->arch.flags);break ; +case KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE : +mutex_lock (&kvm->lock); +mutex_lock (&kvm->slots_lock); +/* +* To keep things simple, allow changing the chunk +* size only if there are no memslots created. +*/ +if (!kvm_are_all_memslots_empty (kvm)) { + r = -EINVAL ; + }else { + r =0 ; + kvm->arch.mmu.split_page_chunk_size = cap->args[0 ]; + } +mutex_unlock (&kvm->slots_lock); +mutex_unlock (&kvm->lock); +break ;default : r = -EINVAL ;break ;
@@ -298,6 +314,12 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_ARM_PTRAUTH_GENERIC : r =system_has_full_ptr_auth ();break ; +case KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE : +if (kvm) + r = kvm->arch.mmu.split_page_chunk_size; +else + r =KVM_ARM_EAGER_SPLIT_CHUNK_SIZE_DEFAULT ; +break ;default : r =0 ; }
arch/arm64/kvm/mmu.c +3 -0
@@ -755,6 +755,9 @@ int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu, unsigned long tfor_each_possible_cpu (cpu) *per_cpu_ptr (mmu->last_vcpu_ran, cpu) =-1 ; + mmu->split_page_cache.gfp_zero = __GFP_ZERO; + mmu->split_page_chunk_size =KVM_ARM_EAGER_SPLIT_CHUNK_SIZE_DEFAULT ; + mmu->pgt = pgt; mmu->pgd_phys =__pa (pgt->pgd);return 0 ;
include/uapi/linux/kvm.h +1 -0
@@ -1175,6 +1175,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223#define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 224#define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225 +#define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 226#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
2.39.1.637.g21b0678d19-goog
PATCH v3 9/12 KVM: arm64: Split huge pages when dirty logging is enabled
In reply to Ricardo KollerSplit huge pages eagerly when enabling dirty logging. The goal is to avoid doing it while faulting on write-protected pages, which negatively impacts guest performance.
A memslot marked for dirty logging is split in 1GB pieces at a time. This is in order to release the mmu_lock and give other kernel threads the opportunity to run, and also in order to allocate enough pages to split a 1GB range worth of huge pages (or a single 1GB huge page). Note that these page allocations can fail, so eager page splitting is best-effort. This is not a correctness issue though, as huge pages can still be split on write-faults.
The benefits of eager page splitting are the same as in x86, added with commit a3fe5dbda0a4 ("KVM: x86/mmu: Split huge pages mapped by the TDP MMU when dirty logging is enabled"). For example, when running dirty_log_perf_test with 64 virtual CPUs (Ampere Altra), 1GB per vCPU, 50% reads, and 2MB HugeTLB memory, the time it takes vCPUs to access all of their memory after dirty logging is enabled decreased by 44% from 2.58s to 1.42s.
--- arch/arm64/kvm/mmu.c | 118 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 2 deletions(-)
arch/arm64/kvm/mmu.c +116 -2
@@ -31,14 +31,21 @@ static phys_addr_t hyp_idmap_vector;static unsigned long io_map_base; -static phys_addr_t stage2_range_addr_end (phys_addr_t addr,phys_addr_t end) +static phys_addr_t __stage2_range_addr_end (phys_addr_t addr,phys_addr_t end, +phys_addr_t size) { -phys_addr_t size =kvm_granule_size (KVM_PGTABLE_MIN_BLOCK_LEVEL );phys_addr_t boundary =ALIGN_DOWN (addr + size, size);return (boundary -1 < end -1 ) ? boundary : end; } +static phys_addr_t stage2_range_addr_end (phys_addr_t addr,phys_addr_t end) +{ +phys_addr_t size =kvm_granule_size (KVM_PGTABLE_MIN_BLOCK_LEVEL ); + +return __stage2_range_addr_end (addr, end, size); +} +/* * Release kvm_mmu_lock periodically if the memory region is large. Otherwise, * we may see kernel panics with CONFIG_DETECT_HUNG_TASK,
@@ -71,6 +78,77 @@ static int stage2_apply_range(struct kvm *kvm, phys_addr_t addr,return ret; } +static bool need_topup_split_page_cache_or_resched (struct kvm *kvm,uint64_t min) +{ +struct kvm_mmu_memory_cache *cache; + +if (need_resched () ||rwlock_needbreak (&kvm->mmu_lock)) +return true; + + cache = &kvm->arch.mmu.split_page_cache; +return kvm_mmu_memory_cache_nr_free_objects (cache) < min; +} + +/* +* Get the maximum number of page-tables needed to split a range of +* blocks into PAGE_SIZE PTEs. It assumes the range is already mapped +* at the PMD level, or at the PUD level if allowed. +*/ +static int kvm_mmu_split_nr_page_tables (u64 range) +{ +int n =0 ; + +if (KVM_PGTABLE_MIN_BLOCK_LEVEL <2 ) + n +=DIV_ROUND_UP_ULL (range,PUD_SIZE ); + n +=DIV_ROUND_UP_ULL (range,PMD_SIZE ); +return n; +} + +static int kvm_mmu_split_huge_pages (struct kvm *kvm,phys_addr_t addr, +phys_addr_t end) +{ +struct kvm_mmu_memory_cache *cache; +struct kvm_pgtable *pgt; +int ret; +u64 next; +u64 chunk_size = kvm->arch.mmu.split_page_chunk_size; +int cache_capacity =kvm_mmu_split_nr_page_tables (chunk_size); + +if (chunk_size ==0 ) +return 0 ; + +lockdep_assert_held_write (&kvm->mmu_lock); + + cache = &kvm->arch.mmu.split_page_cache; + +do { +if (need_topup_split_page_cache_or_resched (kvm, + cache_capacity)) { +write_unlock (&kvm->mmu_lock); +cond_resched (); +/* Eager page splitting is best-effort. */ + ret =__kvm_mmu_topup_memory_cache (cache, + cache_capacity, + cache_capacity); +write_lock (&kvm->mmu_lock); +if (ret) +break ; + } + + pgt = kvm->arch.mmu.pgt; +if (!pgt) +return -EINVAL ; + + next =__stage2_range_addr_end (addr, end, chunk_size); + ret =kvm_pgtable_stage2_split (pgt, addr, next - addr, + cache, cache_capacity); +if (ret) +break ; + }while (addr = next, addr != end); + +return ret; +} +#define stage2_apply_range_resched (kvm, addr, end, fn) \ stage2_apply_range(kvm, addr, end, fn, true)
@@ -772,6 +850,7 @@ int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu, unsigned long tvoid kvm_uninit_stage2_mmu (struct kvm *kvm) {kvm_free_stage2_pgd (&kvm->arch.mmu); +kvm_mmu_free_memory_cache (&kvm->arch.mmu.split_page_cache); } static void stage2_unmap_memslot(struct kvm *kvm,
@@ -999,6 +1078,31 @@ static void kvm_mmu_write_protect_pt_masked(struct kvm *kvm,stage2_wp_range (&kvm->arch.mmu, start, end); } +/** +* kvm_mmu_split_memory_region() - split the stage 2 blocks into PAGE_SIZE +* pages for memory slot +* @kvm: The KVM pointer +* @slot: The memory slot to split +* +* Acquires kvm->mmu_lock. Called with kvm->slots_lock mutex acquired, +* serializing operations for VM memory regions. +*/ +static void kvm_mmu_split_memory_region (struct kvm *kvm,int slot) +{ +struct kvm_memslots *slots =kvm_memslots (kvm); +struct kvm_memory_slot *memslot =id_to_memslot (slots, slot); +phys_addr_t start, end; + +lockdep_assert_held (&kvm->slots_lock); + + start = memslot->base_gfn <<PAGE_SHIFT ; + end = (memslot->base_gfn + memslot->npages) <<PAGE_SHIFT ; + +write_lock (&kvm->mmu_lock); +kvm_mmu_split_huge_pages (kvm, start, end); +write_unlock (&kvm->mmu_lock); +} +/* * kvm_arch_mmu_enable_log_dirty_pt_masked - enable dirty logging for selected * dirty pages.
@@ -1790,6 +1894,16 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,return ;kvm_mmu_wp_memory_region (kvm, new->id); +kvm_mmu_split_memory_region (kvm, new->id); + }else { +/* +* Free any leftovers from the eager page splitting cache. Do +* this when deleting, moving, disabling dirty logging, or +* creating the memslot (a nop). Doing it for deletes makes +* sure we don't leak memory, and there's no need to keep the +* cache around for any of the other cases. +*/ +kvm_mmu_free_memory_cache (&kvm->arch.mmu.split_page_cache); } }
Signature · 1 line
2.39.1.637.g21b0678d19-goog
PATCH v3 10/12 KVM: arm64: Open-code kvm_mmu_write_protect_pt_masked()
In reply to Ricardo KollerMove the functionality of kvm_mmu_write_protect_pt_masked() into its caller, kvm_arch_mmu_enable_log_dirty_pt_masked(). This will be used in a subsequent commit in order to share some of the code in kvm_arch_mmu_enable_log_dirty_pt_masked().
No functional change intended.
--- arch/arm64/kvm/mmu.c | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-)
arch/arm64/kvm/mmu.c +15 -27
@@ -1056,28 +1056,6 @@ static void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot)kvm_flush_remote_tlbs (kvm); } -/** -* kvm_mmu_write_protect_pt_masked() - write protect dirty pages -* @kvm: The KVM pointer -* @slot: The memory slot associated with mask -* @gfn_offset: The gfn offset in memory slot -* @mask: The mask of dirty pages at offset 'gfn_offset' in this memory -* slot to be write protected -* -* Walks bits set in mask write protects the associated pte's. Caller must -* acquire kvm_mmu_lock. -*/ -static void kvm_mmu_write_protect_pt_masked (struct kvm *kvm, -struct kvm_memory_slot *slot, -gfn_t gfn_offset,unsigned long mask) -{ -phys_addr_t base_gfn = slot->base_gfn + gfn_offset; -phys_addr_t start = (base_gfn +__ffs (mask)) <<PAGE_SHIFT ; -phys_addr_t end = (base_gfn +__fls (mask) +1 ) <<PAGE_SHIFT ; - -stage2_wp_range (&kvm->arch.mmu, start, end); -} -/** * kvm_mmu_split_memory_region() - split the stage 2 blocks into PAGE_SIZE * pages for memory slot
@@ -1104,17 +1082,27 @@ static void kvm_mmu_split_memory_region(struct kvm *kvm, int slot) }/* -* kvm_arch_mmu_enable_log_dirty_pt_masked - enable dirty logging for selected -* dirty pages. +* kvm_arch_mmu_enable_log_dirty_pt_masked() - enable dirty logging for selected pages. +* @kvm: The KVM pointer +* @slot: The memory slot associated with mask +* @gfn_offset: The gfn offset in memory slot +* @mask: The mask of pages at offset 'gfn_offset' in this memory +* slot to enable dirty logging on * -* It calls kvm_mmu_write_protect_pt_masked to write protect selected pages to -* enable dirty logging for them. +* Writes protect selected pages to enable dirty logging for them. Caller must +* acquire kvm->mmu_lock. */ void kvm_arch_mmu_enable_log_dirty_pt_masked (struct kvm *kvm,struct kvm_memory_slot *slot,gfn_t gfn_offset,unsigned long mask) { -kvm_mmu_write_protect_pt_masked (kvm, slot, gfn_offset, mask); +phys_addr_t base_gfn = slot->base_gfn + gfn_offset; +phys_addr_t start = (base_gfn +__ffs (mask)) <<PAGE_SHIFT ; +phys_addr_t end = (base_gfn +__fls (mask) +1 ) <<PAGE_SHIFT ; + +lockdep_assert_held_write (&kvm->mmu_lock); + +stage2_wp_range (&kvm->arch.mmu, start, end); }static void kvm_send_hwpoison_signal (unsigned long address,short lsb)
Signature · 1 line
2.39.1.637.g21b0678d19-goog
PATCH v3 11/12 KVM: arm64: Split huge pages during KVM_CLEAR_DIRTY_LOG
In reply to Ricardo KollerThis is the arm64 counterpart of commit cb00a70bd4b7 ("KVM: x86/mmu:
Split huge pages mapped by the TDP MMU during KVM_CLEAR_DIRTY_LOG"), which has the benefit of splitting the cost of splitting a memslot across multiple ioctls.
Split huge pages on the range specified using KVM_CLEAR_DIRTY_LOG. And do not split when enabling dirty logging if KVM_DIRTY_LOG_INITIALLY_SET is set.
--- arch/arm64/kvm/mmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
arch/arm64/kvm/mmu.c +12 -3
@@ -1089,8 +1089,8 @@ static void kvm_mmu_split_memory_region(struct kvm *kvm, int slot)* @mask: The mask of pages at offset 'gfn_offset' in this memory * slot to enable dirty logging on * -* Writes protect selected pages to enable dirty logging for them. Caller must -* acquire kvm->mmu_lock. +* Splits selected pages to PAGE_SIZE and then writes protect them to enable +* dirty logging for them. Caller must acquire kvm->mmu_lock. */ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, struct kvm_memory_slot *slot,
@@ -1103,6 +1103,13 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm,lockdep_assert_held_write (&kvm->mmu_lock);stage2_wp_range (&kvm->arch.mmu, start, end); + +/* +* If initially-all-set mode is not set, then huge-pages were already +* split when enabling dirty logging: no need to do it again. +*/ +if (kvm_dirty_log_manual_protect_and_init_set (kvm)) +kvm_mmu_split_huge_pages (kvm, start, end); }static void kvm_send_hwpoison_signal (unsigned long address,short lsb)
@@ -1889,7 +1896,9 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,* this when deleting, moving, disabling dirty logging, or * creating the memslot (a nop). Doing it for deletes makes * sure we don't leak memory, and there's no need to keep the -* cache around for any of the other cases. +* cache around for any of the other cases. Keeping the cache +* is useful for successive KVM_CLEAR_DIRTY_LOG calls, which is +* not handled in this function. */ kvm_mmu_free_memory_cache (&kvm->arch.mmu.split_page_cache); }
Signature · 1 line
2.39.1.637.g21b0678d19-goog
PATCH v3 12/12 KVM: arm64: Use local TLBI on permission relaxation
In reply to Ricardo KollerFrom: Marc Zyngier <[email protected]>
Broadcasted TLB invalidations (TLBI) are usually less performant than their local variant. In particular, we observed some implementations that take millliseconds to complete parallel broadcasted TLBIs.
It's safe to use local, non-shareable, TLBIs when relaxing permissions on a PTE in the KVM case for a couple of reasons. First, according to the ARM Arm (DDI 0487H.a D5-4913), permission relaxation does not need break-before-make. Second, KVM does not set the VTTBR_EL2.CnP bit, so each PE has its own TLB entry for the same page. KVM could tolerate that when doing permission relaxation (i.e., not having changes broadcasted to all PEs).
--- arch/arm64/include/asm/kvm_asm.h | 4 +++ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 10 ++++++ arch/arm64/kvm/hyp/nvhe/tlb.c | 54 ++++++++++++++++++++++++++++++ arch/arm64/kvm/hyp/pgtable.c | 2 +- arch/arm64/kvm/hyp/vhe/tlb.c | 32 ++++++++++++++++++ 5 files changed, 101 insertions(+), 1 deletion(-)
arch/arm64/include/asm/kvm_asm.h +4 -0
@@ -68,6 +68,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run, __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context, __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa, + __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa_nsh, __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid, __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context, __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff,
@@ -225,6 +226,9 @@ extern void __kvm_flush_vm_context(void);extern void __kvm_flush_cpu_context (struct kvm_s2_mmu *mmu);extern void __kvm_tlb_flush_vmid_ipa (struct kvm_s2_mmu *mmu,phys_addr_t ipa,int level); +extern void __kvm_tlb_flush_vmid_ipa_nsh (struct kvm_s2_mmu *mmu, +phys_addr_t ipa, +int level);extern void __kvm_tlb_flush_vmid (struct kvm_s2_mmu *mmu);extern void __kvm_timer_set_cntvoff (u64 cntvoff);
arch/arm64/kvm/hyp/nvhe/hyp-main.c +10 -0
@@ -125,6 +125,15 @@ static void handle___kvm_tlb_flush_vmid_ipa(struct kvm_cpu_context *host_ctxt)__kvm_tlb_flush_vmid_ipa (kern_hyp_va (mmu), ipa, level); } +static void handle___kvm_tlb_flush_vmid_ipa_nsh (struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(struct kvm_s2_mmu *, mmu, host_ctxt, 1); +DECLARE_REG (phys_addr_t, ipa, host_ctxt,2 ); +DECLARE_REG (int, level, host_ctxt,3 ); + +__kvm_tlb_flush_vmid_ipa_nsh (kern_hyp_va (mmu), ipa, level); +} +static void handle___kvm_tlb_flush_vmid (struct kvm_cpu_context *host_ctxt) { DECLARE_REG(struct kvm_s2_mmu *, mmu, host_ctxt, 1);
@@ -315,6 +324,7 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__kvm_vcpu_run),HANDLE_FUNC (__kvm_flush_vm_context),HANDLE_FUNC (__kvm_tlb_flush_vmid_ipa), +HANDLE_FUNC (__kvm_tlb_flush_vmid_ipa_nsh),HANDLE_FUNC (__kvm_tlb_flush_vmid),HANDLE_FUNC (__kvm_flush_cpu_context), HANDLE_FUNC(__kvm_timer_set_cntvoff),
arch/arm64/kvm/hyp/nvhe/tlb.c +54 -0
60 lines not on this page · raw message
arch/arm64/kvm/hyp/pgtable.c +1 -1
@@ -1148,7 +1148,7 @@ int kvm_pgtable_stage2_relax_perms(struct kvm_pgtable *pgt, u64 addr, ret =stage2_update_leaf_attrs (pgt, addr,1 , set, clr,NULL , &level,KVM_PGTABLE_WALK_SHARED );if (!ret) -kvm_call_hyp (__kvm_tlb_flush_vmid_ipa, pgt->mmu, addr, level); +kvm_call_hyp (__kvm_tlb_flush_vmid_ipa_nsh, pgt->mmu, addr, level);return ret; }
arch/arm64/kvm/hyp/vhe/tlb.c +32 -0
@@ -111,6 +111,38 @@ void __kvm_tlb_flush_vmid_ipa(struct kvm_s2_mmu *mmu,__tlb_switch_to_host (&cxt); } +void __kvm_tlb_flush_vmid_ipa_nsh (struct kvm_s2_mmu *mmu, +phys_addr_t ipa,int level) +{ +struct tlb_inv_context cxt; + +dsb (nshst); + +/* Switch to requested VMID */ +__tlb_switch_to_guest (mmu, &cxt); + +/* +* We could do so much better if we had the VA as well. +* Instead, we invalidate Stage-2 for this IPA, and the +* whole of Stage-1. Weep... +*/ + ipa >>=12 ; +__tlbi_level (ipas2e1, ipa, level); + +/* +* We have to ensure completion of the invalidation at Stage-2, +* since a table walk on another CPU could refill a TLB with a +* complete (S1 + S2) walk based on the old Stage-2 mapping if +* the Stage-1 invalidation happened first. +*/ +dsb (nsh); +__tlbi (vmalle1); +dsb (nsh); +isb (); + +__tlb_switch_to_host (&cxt); +} +void __kvm_tlb_flush_vmid (struct kvm_s2_mmu *mmu) {struct tlb_inv_context cxt;
Signature · 1 line
2.39.1.637.g21b0678d19-goog