Commit 4cdf8dec authored by Vincent Donnefort's avatar Vincent Donnefort Committed by Marc Zyngier
Browse files

KVM: arm64: Support unaligned fixmap in the pKVM hyp 



Return the fixmap VA with the page offset, instead of the page base
address. This allows to use hyp_fixmap_map() seamlessly regardless of
the address alignment. While at it, do the same for hyp_fixblock_map().

Signed-off-by: default avatarVincent Donnefort <vdonnefort@google.com>
Link: https://patch.msgid.link/20260309162516.2623589-23-vdonnefort@google.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 8bbeb4d1

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

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void *fixmap_map_slot(struct hyp_fixmap_slot *slot, phys_addr_t phys) 


void *hyp_fixmap_map(phys_addr_t phys)

{

	return fixmap_map_slot(this_cpu_ptr(&fixmap_slots), phys);

	return fixmap_map_slot(this_cpu_ptr(&fixmap_slots), phys) + offset_in_page(phys);

}



static void fixmap_clear_slot(struct hyp_fixmap_slot *slot)
@@ -366,7 +366,7 @@ void *hyp_fixblock_map(phys_addr_t phys, size_t *size) 
#ifdef HAS_FIXBLOCK

	*size = PMD_SIZE;

	hyp_spin_lock(&hyp_fixblock_lock);

	return fixmap_map_slot(&hyp_fixblock_slot, phys);

	return fixmap_map_slot(&hyp_fixblock_slot, phys) + offset_in_page(phys);

#else

	*size = PAGE_SIZE;

	return hyp_fixmap_map(phys);