From: Marc Zyngier <marc.zyngier@arm.com>
To: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org,
kvmarm@lists.cs.columbia.edu
Cc: Russell King <linux@arm.linux.org.uk>,
Christoffer Dall <christoffer.dall@linaro.org>,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
James Morse <james.morse@arm.com>
Subject: [PATCH 11/20] ARM: Expose the VA/IDMAP offset
Date: Fri, 17 Feb 2017 15:44:20 +0000 [thread overview]
Message-ID: <20170217154429.5000-12-marc.zyngier@arm.com> (raw)
In-Reply-To: <20170217154429.5000-1-marc.zyngier@arm.com>
The KVM code needs to be able to compute the address of
symbols in its idmap page (the equivalent of a virt_to_idmap()
call). Unfortunately, virt_to_idmap is slightly complicated,
depending on the use of arch_phys_to_idmap_offset or not, and
none of that is readily available at HYP.
Instead, expose a single kimage_voffset variable which contains the
offset between a kernel VA and its idmap address, enabling the
VA->IDMAP conversion. This allows the KVM code to behave similarily
to its arm64 counterpart.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/mm/mmu.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 4001dd15818d..d9bb3ae876ad 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -87,6 +87,8 @@ struct cachepolicy {
#define s2_policy(policy) 0
#endif
+unsigned long kimage_voffset __ro_after_init;
+
static struct cachepolicy cache_policies[] __initdata = {
{
.policy = "uncached",
@@ -1654,4 +1656,7 @@ void __init paging_init(const struct machine_desc *mdesc)
empty_zero_page = virt_to_page(zero_page);
__flush_dcache_page(NULL, empty_zero_page);
+
+ /* Compute the virt/idmap offset, mostly for the sake of KVM */
+ kimage_voffset = (unsigned long)&kimage_voffset - virt_to_idmap(&kimage_voffset);
}
--
2.11.0
next prev parent reply other threads:[~2017-02-17 15:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 15:44 [PATCH 00/20] arm/arm64: KVM: Rework the hyp-stub API Marc Zyngier
2017-02-17 15:44 ` [PATCH 01/20] arm64: hyp-stub: Implement HVC_RESET_VECTORS stub hypercall Marc Zyngier
2017-02-17 15:44 ` [PATCH 02/20] arm64: KVM: " Marc Zyngier
2017-02-20 16:54 ` James Morse
2017-02-17 15:44 ` [PATCH 03/20] arm64: KVM: Implement HVC_GET_VECTORS in the init code Marc Zyngier
2017-02-17 15:44 ` [PATCH 04/20] arm64: KVM: Allow the main HYP code to use the init hyp stub implementation Marc Zyngier
2017-02-17 15:44 ` [PATCH 05/20] arm64: KVM: Convert __cpu_reset_hyp_mode to using __hyp_reset_vectors Marc Zyngier
2017-02-17 15:44 ` [PATCH 06/20] arm64: KVM: Implement HVC_SOFT_RESTART in the init code Marc Zyngier
2017-02-17 15:44 ` [PATCH 07/20] ARM: hyp-stub: improve ABI Marc Zyngier
2017-02-17 15:44 ` [PATCH 08/20] ARM: soft-reboot into same mode that we entered the kernel Marc Zyngier
2017-02-17 15:44 ` [PATCH 09/20] ARM: KVM: Convert KVM to use HVC_GET_VECTORS Marc Zyngier
2017-02-17 15:44 ` [PATCH 10/20] ARM: hyp-stub: Use r1 for the soft-restart address Marc Zyngier
2017-02-19 8:22 ` Ard Biesheuvel
2017-02-19 11:09 ` Marc Zyngier
2017-02-17 15:44 ` Marc Zyngier [this message]
2017-02-17 15:44 ` [PATCH 12/20] ARM: hyp-stub: Implement HVC_RESET_VECTORS stub hypercall Marc Zyngier
2017-02-17 15:44 ` [PATCH 13/20] ARM: KVM: " Marc Zyngier
2017-02-19 8:07 ` Ard Biesheuvel
2017-02-19 11:19 ` Marc Zyngier
2017-02-19 11:42 ` Ard Biesheuvel
2017-02-17 15:44 ` [PATCH 14/20] ARM: KVM: Implement HVC_GET_VECTORS in the init code Marc Zyngier
2017-02-17 15:44 ` [PATCH 15/20] ARM: KVM: Allow the main HYP code to use the init hyp stub implementation Marc Zyngier
2017-02-17 15:44 ` [PATCH 16/20] ARM: KVM: Convert __cpu_reset_hyp_mode to using __hyp_reset_vectors Marc Zyngier
2017-02-17 15:44 ` [PATCH 17/20] ARM: KVM: Implement HVC_SOFT_RESTART in the init code Marc Zyngier
2017-02-17 15:44 ` [PATCH 18/20] arm/arm64: KVM: Simplify __cpu_reset_hyp_mode Marc Zyngier
2017-02-17 15:44 ` [PATCH 19/20] arm/arm64: KVM: Remove kvm_get_idmap_start Marc Zyngier
2017-02-17 15:44 ` [PATCH 20/20] arm/arm64: Add hyp-stub API documentation Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170217154429.5000-12-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=james.morse@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox