KVM: arm64: Introduce two cache maintenance callbacks

To prepare for performing CMOs for guest stage-2 in the fault handlers
in pgtable.c, here introduce two cache maintenance callbacks in struct
kvm_pgtable_mm_ops. We also adjust the comment alignment for the
existing part but make no real content change at all.

Reviewed-by: Fuad Tabba <tabba@google.com>
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
[maz: fixed up comments and renamed callbacks]
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210617105824.31752-2-wangyanan55@huawei.com

diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h
index c3674c47d48c6fbd7de55ad3003f720bab0e9bd1..f004c0115d89db1cfd9441382a73e19fbac11613 100644 (file)
--- a/arch/arm64/include/asm/kvm_pgtable.h
+++ b/arch/arm64/include/asm/kvm_pgtable.h
@@ -27,23 +27,29 @@ typedef u64 kvm_pte_t;
 
 /**
  * struct kvm_pgtable_mm_ops - Memory management callbacks.
- * @zalloc_page:       Allocate a single zeroed memory page. The @arg parameter
- *                     can be used by the walker to pass a memcache. The
- *                     initial refcount of the page is 1.
- * @zalloc_pages_exact:        Allocate an exact number of zeroed memory pages. The
- *                     @size parameter is in bytes, and is rounded-up to the
- *                     next page boundary. The resulting allocation is
- *                     physically contiguous.
- * @free_pages_exact:  Free an exact number of memory pages previously
- *                     allocated by zalloc_pages_exact.
- * @get_page:          Increment the refcount on a page.
- * @put_page:          Decrement the refcount on a page. When the refcount
- *                     reaches 0 the page is automatically freed.
- * @page_count:                Return the refcount of a page.
- * @phys_to_virt:      Convert a physical address into a virtual address mapped
- *                     in the current context.
- * @virt_to_phys:      Convert a virtual address mapped in the current context
- *                     into a physical address.
+ * @zalloc_page:               Allocate a single zeroed memory page.
+ *                             The @arg parameter can be used by the walker
+ *                             to pass a memcache. The initial refcount of
+ *                             the page is 1.
+ * @zalloc_pages_exact:                Allocate an exact number of zeroed memory pages.
+ *                             The @size parameter is in bytes, and is rounded
+ *                             up to the next page boundary. The resulting
+ *                             allocation is physically contiguous.
+ * @free_pages_exact:          Free an exact number of memory pages previously
+ *                             allocated by zalloc_pages_exact.
+ * @get_page:                  Increment the refcount on a page.
+ * @put_page:                  Decrement the refcount on a page. When the
+ *                             refcount reaches 0 the page is automatically
+ *                             freed.
+ * @page_count:                        Return the refcount of a page.
+ * @phys_to_virt:              Convert a physical address into a virtual
+ *                             address mapped in the current context.
+ * @virt_to_phys:              Convert a virtual address mapped in the current
+ *                             context into a physical address.
+ * @dcache_clean_inval_poc:    Clean and invalidate the data cache to the PoC
+ *                             for the specified memory address range.
+ * @icache_inval_pou:          Invalidate the instruction cache to the PoU
+ *                             for the specified memory address range.
  */
 struct kvm_pgtable_mm_ops {
        void*           (*zalloc_page)(void *arg);
@@ -54,6 +60,8 @@ struct kvm_pgtable_mm_ops {
        int             (*page_count)(void *addr);
        void*           (*phys_to_virt)(phys_addr_t phys);
        phys_addr_t     (*virt_to_phys)(void *addr);
+       void            (*dcache_clean_inval_poc)(void *addr, size_t size);
+       void            (*icache_inval_pou)(void *addr, size_t size);
 };
 
 /**