Commit 0f4f7ae1 authored by Quentin Perret's avatar Quentin Perret Committed by Marc Zyngier
Browse files

KVM: arm64: Move hyp refcount manipulation helpers to common header file 



We will soon need to manipulate 'struct hyp_page' refcounts from outside
page_alloc.c, so move the helpers to a common header file to allow them
to be reused easily.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Tested-by: default avatarVincent Donnefort <vdonnefort@google.com>
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221110190259.26861-2-will@kernel.org
parent 30a0b95b

arch/arm64/kvm/hyp/include/nvhe/memory.h

+22 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ static inline phys_addr_t hyp_virt_to_phys(void *addr) 
#define hyp_page_to_virt(page)	__hyp_va(hyp_page_to_phys(page))

#define hyp_page_to_pool(page)	(((struct hyp_page *)page)->pool)



/*

 * Refcounting for 'struct hyp_page'.

 * hyp_pool::lock must be held if atomic access to the refcount is required.

 */

static inline int hyp_page_count(void *addr)

{

	struct hyp_page *p = hyp_virt_to_page(addr);
@@ -45,4 +49,22 @@ static inline int hyp_page_count(void *addr) 
	return p->refcount;

}



static inline void hyp_page_ref_inc(struct hyp_page *p)

{

	BUG_ON(p->refcount == USHRT_MAX);

	p->refcount++;

}



static inline int hyp_page_ref_dec_and_test(struct hyp_page *p)

{

	BUG_ON(!p->refcount);

	p->refcount--;

	return (p->refcount == 0);

}



static inline void hyp_set_page_refcounted(struct hyp_page *p)

{

	BUG_ON(p->refcount);

	p->refcount = 1;

}

#endif /* __KVM_HYP_MEMORY_H */

arch/arm64/kvm/hyp/nvhe/page_alloc.c

+0 −19
Original line number Diff line number Diff line
@@ -144,25 +144,6 @@ static struct hyp_page *__hyp_extract_page(struct hyp_pool *pool, 
	return p;

}



static inline void hyp_page_ref_inc(struct hyp_page *p)

{

	BUG_ON(p->refcount == USHRT_MAX);

	p->refcount++;

}



static inline int hyp_page_ref_dec_and_test(struct hyp_page *p)

{

	BUG_ON(!p->refcount);

	p->refcount--;

	return (p->refcount == 0);

}



static inline void hyp_set_page_refcounted(struct hyp_page *p)

{

	BUG_ON(p->refcount);

	p->refcount = 1;

}



static void __hyp_put_page(struct hyp_pool *pool, struct hyp_page *p)

{

	if (hyp_page_ref_dec_and_test(p))