From: Suzuki.Poulose@arm.com (Suzuki K Poulose)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 09/23] KVM: arm/arm64: Keep GICv2 HYP VAs in kvm_vgic_global_state
Date: Tue, 13 Mar 2018 09:35:47 +0000 [thread overview]
Message-ID: <2dd9e07b-1fa7-72da-c10d-c4621294a886@arm.com> (raw)
In-Reply-To: <20180301155538.26860-10-marc.zyngier@arm.com>
On 01/03/18 15:55, Marc Zyngier wrote:
> As we're about to change the way we map devices at HYP, we need
> to move away from kern_hyp_va on an IO address.
>
> One way of achieving this is to store the VAs in kvm_vgic_global_state,
> and use that directly from the HYP code. This requires a small change
> to create_hyp_io_mappings so that it can also return a HYP VA.
>
> We take this opportunity to nuke the vctrl_base field in the emulated
> distributor, as it is not used anymore.
>
> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm/include/asm/kvm_mmu.h | 3 ++-
> arch/arm64/include/asm/kvm_mmu.h | 3 ++-
> include/kvm/arm_vgic.h | 12 ++++++------
> virt/kvm/arm/hyp/vgic-v2-sr.c | 10 +++-------
> virt/kvm/arm/mmu.c | 20 +++++++++++++++-----
> virt/kvm/arm/vgic/vgic-init.c | 6 ------
> virt/kvm/arm/vgic/vgic-v2.c | 13 +++++++------
> 7 files changed, 35 insertions(+), 32 deletions(-)
>
...
> diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c
> index 21f963f9780e..38406825e663 100644
> --- a/virt/kvm/arm/vgic/vgic-v2.c
> +++ b/virt/kvm/arm/vgic/vgic-v2.c
> @@ -364,7 +364,8 @@ int vgic_v2_probe(const struct gic_kvm_info *info)
>
> ret = create_hyp_io_mappings(info->vcpu.start,
> resource_size(&info->vcpu),
> - &kvm_vgic_global_state.vcpu_base_va);
> + &kvm_vgic_global_state.vcpu_base_va,
> + &kvm_vgic_global_state.vcpu_hyp_va);
> if (ret) {
> kvm_err("Cannot map GICV into hyp\n");
> goto out;
> @@ -375,7 +376,8 @@ int vgic_v2_probe(const struct gic_kvm_info *info)
>
> ret = create_hyp_io_mappings(info->vctrl.start,
> resource_size(&info->vctrl),
> - &kvm_vgic_global_state.vctrl_base);
> + &kvm_vgic_global_state.vctrl_base,
> + &kvm_vgic_global_state.vctrl_hyp);
Now that we have the hyp VA, does it make sense to unmap the hyp VA, just
like we unmap the kernel io mapping if we fail to register the device ?
Suzuki
next prev parent reply other threads:[~2018-03-13 9:35 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 15:55 [PATCH v5 00/23] KVM/arm64: Randomise EL2 mappings (variant 3a mitigation) Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 01/23] arm64: alternatives: Add dynamic patching feature Marc Zyngier
2018-03-07 18:09 ` Catalin Marinas
2018-03-01 15:55 ` [PATCH v5 02/23] arm64: insn: Add N immediate encoding Marc Zyngier
2018-03-07 18:09 ` Catalin Marinas
2018-03-01 15:55 ` [PATCH v5 03/23] arm64: insn: Add encoder for bitwise operations using literals Marc Zyngier
2018-03-07 18:10 ` Catalin Marinas
2018-03-12 14:44 ` Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 04/23] arm64: KVM: Dynamically patch the kernel/hyp VA mask Marc Zyngier
2018-03-07 18:10 ` Catalin Marinas
2018-03-01 15:55 ` [PATCH v5 05/23] arm64: cpufeatures: Drop the ARM64_HYP_OFFSET_LOW feature flag Marc Zyngier
2018-03-07 18:11 ` Catalin Marinas
2018-03-13 8:44 ` Suzuki K Poulose
2018-03-01 15:55 ` [PATCH v5 06/23] KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 07/23] KVM: arm/arm64: Demote HYP VA range display to being a debug feature Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 08/23] KVM: arm/arm64: Move ioremap calls to create_hyp_io_mappings Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 09/23] KVM: arm/arm64: Keep GICv2 HYP VAs in kvm_vgic_global_state Marc Zyngier
2018-03-13 9:35 ` Suzuki K Poulose [this message]
2018-03-13 11:40 ` Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 10/23] KVM: arm/arm64: Move HYP IO VAs to the "idmap" range Marc Zyngier
2018-03-09 18:59 ` James Morse
2018-03-12 14:02 ` Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 11/23] arm64; insn: Add encoder for the EXTR instruction Marc Zyngier
2018-03-07 18:12 ` Catalin Marinas
2018-03-01 15:55 ` [PATCH v5 12/23] arm64: insn: Allow ADD/SUB (immediate) with LSL #12 Marc Zyngier
2018-03-07 18:13 ` Catalin Marinas
2018-03-01 15:55 ` [PATCH v5 13/23] arm64: KVM: Dynamically compute the HYP VA mask Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 14/23] arm64: KVM: Introduce EL2 VA randomisation Marc Zyngier
2018-03-13 11:31 ` James Morse
2018-03-13 11:48 ` James Morse
2018-03-01 15:55 ` [PATCH v5 15/23] arm64: Update the KVM memory map documentation Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 16/23] arm64: KVM: Move vector offsetting from hyp-init.S to kvm_get_hyp_vector Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 17/23] arm64: KVM: Move stashing of x0/x1 into the vector code itself Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 18/23] arm64: KVM: Add epilogue branching to the vector code Marc Zyngier
2018-03-08 13:59 ` Catalin Marinas
2018-03-01 15:55 ` [PATCH v5 19/23] arm64: KVM: Allow far branches from vector slots to the main vectors Marc Zyngier
2018-03-08 13:59 ` Catalin Marinas
2018-03-12 18:27 ` James Morse
2018-03-12 19:43 ` Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 20/23] arm/arm64: KVM: Introduce EL2-specific executable mappings Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 21/23] arm64: Make BP hardening slot counter available Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 22/23] arm64: KVM: Allow mapping of vectors outside of the RAM region Marc Zyngier
2018-03-08 17:54 ` Andrew Jones
2018-03-13 10:30 ` Marc Zyngier
2018-03-13 11:14 ` Andrew Jones
2018-03-09 18:59 ` James Morse
2018-03-12 14:23 ` Marc Zyngier
2018-03-14 11:40 ` James Morse
2018-03-14 12:02 ` Marc Zyngier
2018-03-01 15:55 ` [PATCH v5 23/23] arm64: Enable ARM64_HARDEN_EL2_VECTORS on Cortex-A57 and A72 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=2dd9e07b-1fa7-72da-c10d-c4621294a886@arm.com \
--to=suzuki.poulose@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).