From 8a68b06812be0c6b3face2de4035d2d2c88429c2 Mon Sep 17 00:00:00 2001 From: Vincent Donnefort Date: Wed, 11 Sep 2024 10:30:21 +0100 Subject: [PATCH] FROMLIST: KVM: arm64: Support unaligned fixmap in the nVHE hyp Return the fixmap VA with the page offset, instead of the page base address. Bug: 357781595 Link: https://lore.kernel.org/all/20240911093029.3279154-6-vdonnefort@google.com/ Change-Id: I23704024c4cfa607361c0900f6371b0a4780745e Signed-off-by: Vincent Donnefort --- arch/arm64/kvm/hyp/nvhe/mm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/mm.c b/arch/arm64/kvm/hyp/nvhe/mm.c index 8850b591d775..c5a9d8874eb2 100644 --- a/arch/arm64/kvm/hyp/nvhe/mm.c +++ b/arch/arm64/kvm/hyp/nvhe/mm.c @@ -240,7 +240,7 @@ void *hyp_fixmap_map(phys_addr_t phys) WRITE_ONCE(*ptep, pte); dsb(ishst); - return (void *)slot->addr; + return (void *)slot->addr + offset_in_page(phys); } static void fixmap_clear_slot(struct hyp_fixmap_slot *slot)