KVM: arm64: Reduce hyp_vmemmap overhead
v2 cover KVM: arm64: Reduce hyp_vmemmap overhead
Hi all,
This is a v2 of the patch series previously posted here:
https://lore.kernel.org/r/[email protected]/
Please refer to the cover letter of v1 for the context and motivation behind the series.
Changes since v1:
- Added comment/doc in page_alloc.c explaining the locking expectations;
- Removed unnecessary casts in the 'page-to-list-node' helpers;
- A few other cosmetic changes in the allocator.
Thanks,
Quentin
Quentin Perret (7):
KVM: arm64: Move hyp_pool locking out of refcount helpers
KVM: arm64: Use refcount at hyp to check page availability
KVM: arm64: Remove list_head from hyp_page
KVM: arm64: Unify MMIO and mem host stage-2 pools
KVM: arm64: Remove hyp_pool pointer from struct hyp_page
KVM: arm64: Use less bits for hyp_page order
KVM: arm64: Use less bits for hyp_page refcount
arch/arm64/kvm/hyp/include/nvhe/gfp.h | 45 +------ arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 +- arch/arm64/kvm/hyp/include/nvhe/memory.h | 7 +- arch/arm64/kvm/hyp/include/nvhe/mm.h | 13 +- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 60 +++++----- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 112 +++++++++++++----- arch/arm64/kvm/hyp/nvhe/setup.c | 30 +++-- arch/arm64/kvm/hyp/reserved_mem.c | 3 +- 8 files changed, 145 insertions(+), 127 deletions(-)
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog
PATCH v2 1/7 KVM: arm64: Move hyp_pool locking out of refcount helpers
The hyp_page refcount helpers currently rely on the hyp_pool lock for serialization. However, this means the refcounts can't be changed from the buddy allocator core as it already holds the lock, which means pages have to go through odd transient states.
For example, when a page is freed, its refcount is set to 0, and the lock is transiently released before the page can be attached to a free list in the buddy tree. This is currently harmless as the allocator checks the list node of each page to see if it is available for allocation or not, but it means the page refcount can't be trusted to represent the state of the page even if the pool lock is held.
In order to fix this, remove the pool locking from the refcount helpers, and move all the logic to the buddy allocator. This will simplify the removal of the list node from struct hyp_page in a later patch.
--- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 35 ---------------------- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 43 ++++++++++++++++++++------- 2 files changed, 32 insertions(+), 46 deletions(-)
arch/arm64/kvm/hyp/include/nvhe/gfp.h +0 -35
@@ -22,41 +22,6 @@ struct hyp_pool {unsigned int max_order; }; -static inline void hyp_page_ref_inc (struct hyp_page *p) -{ -struct hyp_pool *pool =hyp_page_to_pool (p); - -hyp_spin_lock (&pool->lock); - p->refcount++; -hyp_spin_unlock (&pool->lock); -} - -static inline int hyp_page_ref_dec_and_test (struct hyp_page *p) -{ -struct hyp_pool *pool =hyp_page_to_pool (p); -int ret; - -hyp_spin_lock (&pool->lock); - p->refcount--; - ret = (p->refcount ==0 ); -hyp_spin_unlock (&pool->lock); - -return ret; -} - -static inline void hyp_set_page_refcounted (struct hyp_page *p) -{ -struct hyp_pool *pool =hyp_page_to_pool (p); - -hyp_spin_lock (&pool->lock); -if (p->refcount) { -hyp_spin_unlock (&pool->lock); -BUG (); - } - p->refcount =1 ; -hyp_spin_unlock (&pool->lock); -} -/* Allocation */ void *hyp_alloc_pages (struct hyp_pool *pool,unsigned int order);void hyp_get_page (void *addr);
arch/arm64/kvm/hyp/nvhe/page_alloc.c +32 -11
74 lines not on this page · raw message
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog
PATCH v2 2/7 KVM: arm64: Use refcount at hyp to check page availability
In reply to Quentin PerretThe hyp buddy allocator currently checks the struct hyp_page list node to see if a page is available for allocation or not when trying to coalesce memory. Now that decrementing the refcount and attaching to the buddy tree is done in the same critical section, we can rely on the refcount of the buddy page to be in sync, which allows to replace the list node check by a refcount check. This will ease removing the list node from struct hyp_page later on.
--- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
arch/arm64/kvm/hyp/nvhe/page_alloc.c +11 -5
@@ -55,7 +55,7 @@ static struct hyp_page *__find_buddy_avail(struct hyp_pool *pool, {struct hyp_page *buddy =__find_buddy_nocheck (pool, p, order); -if (!buddy || buddy->order != order ||list_empty (&buddy->node)) +if (!buddy || buddy->order != order || buddy->refcount)return NULL ;return buddy;
@@ -133,6 +133,12 @@ static inline void hyp_set_page_refcounted(struct hyp_page *p) p->refcount =1 ; } +static void __hyp_put_page (struct hyp_pool *pool,struct hyp_page *p) +{ +if (hyp_page_ref_dec_and_test (p)) +__hyp_attach_page (pool, p); +} +/* * Changes to the buddy tree and page refcounts must be done with the hyp_pool * lock held. If a refcount change requires an update to the buddy tree (e.g.
@@ -146,8 +152,7 @@ void hyp_put_page(void *addr)struct hyp_pool *pool =hyp_page_to_pool (p);hyp_spin_lock (&pool->lock); -if (hyp_page_ref_dec_and_test (p)) -__hyp_attach_page (pool, p); +__hyp_put_page (pool, p);hyp_spin_unlock (&pool->lock); }
@@ -202,15 +207,16 @@ int hyp_pool_init(struct hyp_pool *pool, u64 pfn, unsigned int nr_pages,/* Init the vmemmap portion */ p =hyp_phys_to_page (phys); -memset (p,0 ,sizeof (*p) * nr_pages);for (i =0 ; i < nr_pages; i++) { p[i].pool = pool; + p[i].order =0 ;INIT_LIST_HEAD (&p[i].node); +hyp_set_page_refcounted (&p[i]); }/* Attach the unused pages to the buddy tree */ for (i = reserved_pages; i < nr_pages; i++) -__hyp_attach_page (pool, &p[i]); +__hyp_put_page (pool, &p[i]);return 0 ; }
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog
PATCH v2 3/7 KVM: arm64: Remove list_head from hyp_page
In reply to Quentin PerretThe list_head member of struct hyp_page is only needed when the page is attached to a free-list, which by definition implies the page is free. As such, nothing prevents us from using the page itself to store the list_head, hence reducing the size of the vmemmap.
--- arch/arm64/kvm/hyp/include/nvhe/memory.h | 1 - arch/arm64/kvm/hyp/nvhe/page_alloc.c | 39 ++++++++++++++++++++---- 2 files changed, 33 insertions(+), 7 deletions(-)
arch/arm64/kvm/hyp/include/nvhe/memory.h +0 -1
@@ -12,7 +12,6 @@ struct hyp_page {unsigned int refcount;unsigned int order;struct hyp_pool *pool; -struct list_head node; };extern u64 __hyp_vmemmap;
arch/arm64/kvm/hyp/nvhe/page_alloc.c +33 -6
@@ -62,6 +62,34 @@ static struct hyp_page *__find_buddy_avail(struct hyp_pool *pool, } +/* +* Pages that are available for allocation are tracked in free-lists, so we use +* the pages themselves to store the list nodes to avoid wasting space. As the +* allocator always returns zeroed pages (which are zeroed on the hyp_put_page() +* path to optimize allocation speed), we also need to clean-up the list node in +* each page when we take it out of the list. +*/ +static inline void page_remove_from_list (struct hyp_page *p) +{ +struct list_head *node =hyp_page_to_virt (p); + +__list_del_entry (node); +memset (node,0 ,sizeof (*node)); +} + +static inline void page_add_to_list (struct hyp_page *p,struct list_head *head) +{ +struct list_head *node =hyp_page_to_virt (p); + +INIT_LIST_HEAD (node); +list_add_tail (node, head); +} + +static inline struct hyp_page *node_to_page (struct list_head *node) +{ +return hyp_virt_to_page (node); +} +static void __hyp_attach_page (struct hyp_pool *pool,struct hyp_page *p) {
@@ -83,14 +111,14 @@ static void __hyp_attach_page(struct hyp_pool *pool,break ;/* Take the buddy out of its list, and coallesce with @p */ -list_del_init (&buddy->node); +page_remove_from_list (buddy); buddy->order =HYP_NO_ORDER ; p =min (p, buddy); }/* Mark the new head, and insert it */ p->order = order; -list_add_tail (&p->node, &pool->free_area[order]); +page_add_to_list (p, &pool->free_area[order]); } static struct hyp_page *__hyp_extract_page(struct hyp_pool *pool,
@@ -99,7 +127,7 @@ static struct hyp_page *__hyp_extract_page(struct hyp_pool *pool, {struct hyp_page *buddy; -list_del_init (&p->node); +page_remove_from_list (p);while (p->order > order) {/* * The buddy of order n - 1 currently has HYP_NO_ORDER as it
@@ -110,7 +138,7 @@ static struct hyp_page *__hyp_extract_page(struct hyp_pool *pool, p->order--; buddy =__find_buddy_nocheck (pool, p, p->order); buddy->order = p->order; -list_add_tail (&buddy->node, &pool->free_area[buddy->order]); +page_add_to_list (buddy, &pool->free_area[buddy->order]); }return p;
@@ -182,7 +210,7 @@ void *hyp_alloc_pages(struct hyp_pool *pool, unsigned int order) }/* Extract it from the tree at the right order */ - p = list_first_entry(&pool->free_area[i], struct hyp_page, node); + p =node_to_page (pool->free_area[i].next); p =__hyp_extract_page (pool, p, order);hyp_set_page_refcounted (p);
@@ -210,7 +238,6 @@ int hyp_pool_init(struct hyp_pool *pool, u64 pfn, unsigned int nr_pages,for (i =0 ; i < nr_pages; i++) { p[i].pool = pool; p[i].order =0 ; -INIT_LIST_HEAD (&p[i].node);hyp_set_page_refcounted (&p[i]); }
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog
PATCH v2 4/7 KVM: arm64: Unify MMIO and mem host stage-2 pools
In reply to Quentin PerretWe currently maintain two separate memory pools for the host stage-2, one for pages used in the page-table when mapping memory regions, and the other to map MMIO regions. The former is large enough to map all of memory with page granularity and the latter can cover an arbitrary portion of IPA space, but allows to 'recycle' pages.
However, this split makes accounting difficult to manage as pages at intermediate levels of the page-table may be used to map both memory and MMIO regions. Simplify the scheme by merging both pools into one. This means we can now hit the -ENOMEM case in the memory abort path, but we're still guaranteed forward-progress in the worst case by unmapping MMIO regions. On the plus side this also means we can usually map a lot more MMIO space at once if memory ranges happen to be mapped with block mappings.
--- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 +- arch/arm64/kvm/hyp/include/nvhe/mm.h | 13 +++--- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 46 ++++++++----------- arch/arm64/kvm/hyp/nvhe/setup.c | 16 ++----- arch/arm64/kvm/hyp/reserved_mem.c | 3 +- 5 files changed, 32 insertions(+), 48 deletions(-)
arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +1 -1
@@ -23,7 +23,7 @@ extern struct host_kvm host_kvm;int __pkvm_prot_finalize (void );int __pkvm_mark_hyp (phys_addr_t start,phys_addr_t end); -int kvm_host_prepare_stage2 (void *mem_pgt_pool,void *dev_pgt_pool); +int kvm_host_prepare_stage2 (void *pgt_pool_base);void handle_host_mem_abort (struct kvm_cpu_context *host_ctxt); static __always_inline void __load_host_stage2(void)
arch/arm64/kvm/hyp/include/nvhe/mm.h +7 -6
@@ -78,19 +78,20 @@ static inline unsigned long hyp_s1_pgtable_pages(void) return res; } -static inline unsigned long host_s2_mem_pgtable_pages (void ) +static inline unsigned long host_s2_pgtable_pages (void ) { +unsigned long res; +/* * Include an extra 16 pages to safely upper-bound the worst case of * concatenated pgds. */ -return __hyp_pgtable_total_pages () +16 ; -} + res =__hyp_pgtable_total_pages () +16 ; -static inline unsigned long host_s2_dev_pgtable_pages (void ) -{/* Allow 1 GiB for MMIO mappings */ -return __hyp_pgtable_max_pages (SZ_1G >>PAGE_SHIFT ); + res +=__hyp_pgtable_max_pages (SZ_1G >>PAGE_SHIFT ); + +return res; }#endif /* __KVM_HYP_MM_H */
arch/arm64/kvm/hyp/nvhe/mem_protect.c +18 -28
114 lines not on this page · raw message
arch/arm64/kvm/hyp/nvhe/setup.c +5 -11
@@ -25,8 +25,7 @@ unsigned long hyp_nr_cpus;static void *vmemmap_base;static void *hyp_pgt_base; -static void *host_s2_mem_pgt_base; -static void *host_s2_dev_pgt_base; +static void *host_s2_pgt_base;static int divide_memory_pool (void *virt,unsigned long size) {
@@ -45,14 +44,9 @@ static int divide_memory_pool(void *virt, unsigned long size)if (!hyp_pgt_base)return -ENOMEM ; - nr_pages =host_s2_mem_pgtable_pages (); - host_s2_mem_pgt_base =hyp_early_alloc_contig (nr_pages); -if (!host_s2_mem_pgt_base) -return -ENOMEM ; - - nr_pages =host_s2_dev_pgtable_pages (); - host_s2_dev_pgt_base =hyp_early_alloc_contig (nr_pages); -if (!host_s2_dev_pgt_base) + nr_pages =host_s2_pgtable_pages (); + host_s2_pgt_base =hyp_early_alloc_contig (nr_pages); +if (!host_s2_pgt_base)return -ENOMEM ;return 0 ;
@@ -158,7 +152,7 @@ void __noreturn __pkvm_init_finalise(void)if (ret) goto out; - ret =kvm_host_prepare_stage2 (host_s2_mem_pgt_base, host_s2_dev_pgt_base); + ret =kvm_host_prepare_stage2 (host_s2_pgt_base);if (ret) goto out;
arch/arm64/kvm/hyp/reserved_mem.c +1 -2
@@ -71,8 +71,7 @@ void __init kvm_hyp_reserve(void) } hyp_mem_pages +=hyp_s1_pgtable_pages (); - hyp_mem_pages +=host_s2_mem_pgtable_pages (); - hyp_mem_pages +=host_s2_dev_pgtable_pages (); + hyp_mem_pages +=host_s2_pgtable_pages ();/* * The hyp_vmemmap needs to be backed by pages, but these pages
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog
Marc Zyngier
maintainerRe: [PATCH v2 4/7] KVM: arm64: Unify MMIO and mem host stage-2 pools
Quoted 15 lines · Quentin Perret
We currently maintain two separate memory pools for the host stage-2, one for pages used in the page-table when mapping memory regions, and the other to map MMIO regions. The former is large enough to map all of memory with page granularity and the latter can cover an arbitrary portion of IPA space, but allows to 'recycle' pages.
However, this split makes accounting difficult to manage as pages at intermediate levels of the page-table may be used to map both memory and MMIO regions. Simplify the scheme by merging both pools into one. This means we can now hit the
-ENOMEMcase in the memory abort path, but we're still guaranteed forward-progress in the worst case by unmapping MMIO regions. On the plus side this also means we can usually map a lot more MMIO space at once if memory ranges happen to be mapped with block mappings.
Quoted 1 line
Signed-off-by Quentin Perret <[email protected]>
This patch fails to apply on top of -rc4. Did you use some more exotic base or, as I suspect, a development tree?
Please check and respin the series if necessary.
M.
Signature · 5 lines
Jazz is not dead. It just smells funny... _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v2 4/7] KVM: arm64: Unify MMIO and mem host stage-2 pools
Quoted 16 lines · Marc Zyngier
Quoted 15 lines · Quentin Perret
We currently maintain two separate memory pools for the host stage-2, one for pages used in the page-table when mapping memory regions, and the other to map MMIO regions. The former is large enough to map all of memory with page granularity and the latter can cover an arbitrary portion of IPA space, but allows to 'recycle' pages.
However, this split makes accounting difficult to manage as pages at intermediate levels of the page-table may be used to map both memory and MMIO regions. Simplify the scheme by merging both pools into one. This means we can now hit the
-ENOMEMcase in the memory abort path, but we're still guaranteed forward-progress in the worst case by unmapping MMIO regions. On the plus side this also means we can usually map a lot more MMIO space at once if memory ranges happen to be mapped with block mappings.
Quoted 6 lines
Quoted 1 line
Signed-off-by Quentin Perret <[email protected]>This patch fails to apply on top of -rc4. Did you use some more exotic base or, as I suspect, a development tree?
Please check and respin the series if necessary.
I used kvmarm/next, but clearly an out-of-date one. I'll respin -- sorry about that.
Thanks,
Quentin
PATCH v2 5/7 KVM: arm64: Remove hyp_pool pointer from struct hyp_page
In reply to Quentin PerretEach struct hyp_page currently contains a pointer to a hyp_pool struct where the page should be freed if its refcount reaches 0. However, this information can always be inferred from the context in the EL2 code, so drop the pointer to save a few bytes in the vmemmap.
--- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 4 ++-- arch/arm64/kvm/hyp/include/nvhe/memory.h | 2 -- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 14 ++++++++++++-- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 7 ++----- arch/arm64/kvm/hyp/nvhe/setup.c | 14 ++++++++++++-- 5 files changed, 28 insertions(+), 13 deletions(-)
arch/arm64/kvm/hyp/include/nvhe/gfp.h +2 -2
@@ -24,8 +24,8 @@ struct hyp_pool {/* Allocation */ void *hyp_alloc_pages (struct hyp_pool *pool,unsigned int order); -void hyp_get_page (void *addr); -void hyp_put_page (void *addr); +void hyp_get_page (struct hyp_pool *pool,void *addr); +void hyp_put_page (struct hyp_pool *pool,void *addr);/* Used pages cannot be freed */ int hyp_pool_init(struct hyp_pool *pool, u64 pfn, unsigned int nr_pages,
arch/arm64/kvm/hyp/include/nvhe/memory.h +0 -2
@@ -7,11 +7,9 @@#include <linux/types.h> -struct hyp_pool ;struct hyp_page {unsigned int refcount;unsigned int order; -struct hyp_pool *pool; };extern u64 __hyp_vmemmap;
arch/arm64/kvm/hyp/nvhe/mem_protect.c +12 -2
@@ -43,6 +43,16 @@ static void *host_s2_zalloc_page(void *pool)return hyp_alloc_pages (pool,0 ); } +static void host_s2_get_page (void *addr) +{ +hyp_get_page (&host_s2_pool, addr); +} + +static void host_s2_put_page (void *addr) +{ +hyp_put_page (&host_s2_pool, addr); +} +static int prepare_s2_pool (void *pgt_pool_base) {unsigned long nr_pages, pfn;
@@ -60,8 +70,8 @@ static int prepare_s2_pool(void *pgt_pool_base) .phys_to_virt = hyp_phys_to_virt, .virt_to_phys = hyp_virt_to_phys, .page_count = hyp_page_count, - .get_page = hyp_get_page, - .put_page = hyp_put_page, + .get_page = host_s2_get_page, + .put_page = host_s2_put_page, };return 0 ;
arch/arm64/kvm/hyp/nvhe/page_alloc.c +2 -5
@@ -174,20 +174,18 @@ static void __hyp_put_page(struct hyp_pool *pool, struct hyp_page *p)* section to guarantee transient states (e.g. a page with null refcount but * not yet attached to a free list) can't be observed by well-behaved readers. */ -void hyp_put_page (void *addr) +void hyp_put_page (struct hyp_pool *pool,void *addr) {struct hyp_page *p =hyp_virt_to_page (addr); -struct hyp_pool *pool =hyp_page_to_pool (p);hyp_spin_lock (&pool->lock);__hyp_put_page (pool, p);hyp_spin_unlock (&pool->lock); } -void hyp_get_page (void *addr) +void hyp_get_page (struct hyp_pool *pool,void *addr) {struct hyp_page *p =hyp_virt_to_page (addr); -struct hyp_pool *pool =hyp_page_to_pool (p);hyp_spin_lock (&pool->lock);hyp_page_ref_inc (p);
@@ -236,7 +234,6 @@ int hyp_pool_init(struct hyp_pool *pool, u64 pfn, unsigned int nr_pages,/* Init the vmemmap portion */ p =hyp_phys_to_page (phys);for (i =0 ; i < nr_pages; i++) { - p[i].pool = pool; p[i].order =0 ;hyp_set_page_refcounted (&p[i]); }
arch/arm64/kvm/hyp/nvhe/setup.c +12 -2
@@ -137,6 +137,16 @@ static void *hyp_zalloc_hyp_page(void *arg)return hyp_alloc_pages (&hpool,0 ); } +static void hpool_get_page (void *addr) +{ +hyp_get_page (&hpool, addr); +} + +static void hpool_put_page (void *addr) +{ +hyp_put_page (&hpool, addr); +} +void __noreturn __pkvm_init_finalise (void ) {struct kvm_host_data *host_data =this_cpu_ptr (&kvm_host_data);
@@ -160,8 +170,8 @@ void __noreturn __pkvm_init_finalise(void) .zalloc_page = hyp_zalloc_hyp_page, .phys_to_virt = hyp_phys_to_virt, .virt_to_phys = hyp_virt_to_phys, - .get_page = hyp_get_page, - .put_page = hyp_put_page, + .get_page = hpool_get_page, + .put_page = hpool_put_page, }; pkvm_pgtable.mm_ops = &pkvm_pgtable_mm_ops;
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog
PATCH v2 6/7 KVM: arm64: Use less bits for hyp_page order
In reply to Quentin PerretThe hyp_page order is currently encoded on 4 bytes even though it is guaranteed to be smaller than this. Make it 2 bytes to reduce the hyp vmemmap overhead.
--- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 6 +++--- arch/arm64/kvm/hyp/include/nvhe/memory.h | 2 +- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-)
arch/arm64/kvm/hyp/include/nvhe/gfp.h +3 -3
@@ -7,7 +7,7 @@#include <nvhe/memory.h> #include <nvhe/spinlock.h> -#define HYP_NO_ORDER UINT_MAX +#define HYP_NO_ORDER USHRT_MAXstruct hyp_pool {/*
@@ -19,11 +19,11 @@ struct hyp_pool {struct list_head free_area[MAX_ORDER ];phys_addr_t range_start;phys_addr_t range_end; -unsigned int max_order; +unsigned short max_order; };/* Allocation */ -void *hyp_alloc_pages (struct hyp_pool *pool,unsigned int order); +void *hyp_alloc_pages (struct hyp_pool *pool,unsigned short order);void hyp_get_page (struct hyp_pool *pool,void *addr);void hyp_put_page (struct hyp_pool *pool,void *addr);
arch/arm64/kvm/hyp/include/nvhe/memory.h +1 -1
@@ -9,7 +9,7 @@struct hyp_page {unsigned int refcount; -unsigned int order; +unsigned short order; };extern u64 __hyp_vmemmap;
arch/arm64/kvm/hyp/nvhe/page_alloc.c +6 -6
@@ -32,7 +32,7 @@ u64 __hyp_vmemmap;*/ static struct hyp_page *__find_buddy_nocheck (struct hyp_pool *pool,struct hyp_page *p, -unsigned int order) +unsigned short order) {phys_addr_t addr =hyp_page_to_phys (p);
@@ -51,7 +51,7 @@ static struct hyp_page *__find_buddy_nocheck(struct hyp_pool *pool,/* Find a buddy page currently available for allocation */ static struct hyp_page *__find_buddy_avail (struct hyp_pool *pool,struct hyp_page *p, -unsigned int order) +unsigned short order) {struct hyp_page *buddy =__find_buddy_nocheck (pool, p, order);
@@ -93,7 +93,7 @@ static inline struct hyp_page *node_to_page(struct list_head *node)static void __hyp_attach_page (struct hyp_pool *pool,struct hyp_page *p) { -unsigned int order = p->order; +unsigned short order = p->order;struct hyp_page *buddy;memset (hyp_page_to_virt (p),0 ,PAGE_SIZE << p->order);
@@ -123,7 +123,7 @@ static void __hyp_attach_page(struct hyp_pool *pool,static struct hyp_page *__hyp_extract_page (struct hyp_pool *pool,struct hyp_page *p, -unsigned int order) +unsigned short order) {struct hyp_page *buddy;
@@ -192,9 +192,9 @@ void hyp_get_page(struct hyp_pool *pool, void *addr)hyp_spin_unlock (&pool->lock); } -void *hyp_alloc_pages (struct hyp_pool *pool,unsigned int order) +void *hyp_alloc_pages (struct hyp_pool *pool,unsigned short order) { -unsigned int i = order; +unsigned short i = order;struct hyp_page *p;hyp_spin_lock (&pool->lock);
Signature · 6 lines
2.32.0.rc0.204.g9fa02ecfa5-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v2 7/7 KVM: arm64: Use less bits for hyp_page refcount
In reply to Quentin PerretThe hyp_page refcount is currently encoded on 4 bytes even though we never need to count that many objects in a page. Make it 2 bytes to save some space in the vmemmap.
As overflows are more likely to happen as well, make sure to catch those with a BUG in the increment function.
--- arch/arm64/kvm/hyp/include/nvhe/memory.h | 2 +- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
arch/arm64/kvm/hyp/include/nvhe/memory.h +1 -1
@@ -8,7 +8,7 @@#include <linux/types.h> struct hyp_page { -unsigned int refcount; +unsigned short refcount;unsigned short order; };
arch/arm64/kvm/hyp/nvhe/page_alloc.c +1 -0
@@ -146,6 +146,7 @@ static struct hyp_page *__hyp_extract_page(struct hyp_pool *pool,static inline void hyp_page_ref_inc (struct hyp_page *p) { +BUG_ON (p->refcount ==USHRT_MAX ); p->refcount++; }
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog