From: Quentin Perret <qperret@google.com>
To: Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org,
kernel-team@android.com, qperret@google.com
Subject: [PATCH 5/6] KVM: arm64: pkvm: Stub io map functions
Date: Wed, 8 Dec 2021 15:22:58 +0000 [thread overview]
Message-ID: <20211208152300.2478542-6-qperret@google.com> (raw)
In-Reply-To: <20211208152300.2478542-1-qperret@google.com>
Now that GICv2 is disabled in nVHE protected mode there should be no
other reason for the host to use create_hyp_io_mappings() or
kvm_phys_addr_ioremap(). Add sanity checks to make sure that assumption
remains true looking forward.
Signed-off-by: Quentin Perret <qperret@google.com>
---
arch/arm64/kvm/mmu.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index 326cdfec74a1..605c104eb030 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -407,6 +407,9 @@ int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size,
unsigned long addr;
int ret;
+ if (is_protected_kvm_enabled())
+ return -EPERM;
+
*kaddr = ioremap(phys_addr, size);
if (!*kaddr)
return -ENOMEM;
@@ -650,6 +653,9 @@ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa,
KVM_PGTABLE_PROT_R |
(writable ? KVM_PGTABLE_PROT_W : 0);
+ if (is_protected_kvm_enabled())
+ return -EPERM;
+
size += offset_in_page(guest_ipa);
guest_ipa &= PAGE_MASK;
--
2.34.1.400.ga245620fadb-goog
next prev parent reply other threads:[~2021-12-08 15:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 15:22 [PATCH 0/6] KVM: arm64: Miscellaneous pkvm fixes Quentin Perret
2021-12-08 15:22 ` [PATCH 1/6] KVM: arm64: pkvm: Fix hyp_pool max order Quentin Perret
2021-12-08 17:27 ` Will Deacon
2021-12-08 15:22 ` [PATCH 2/6] KVM: arm64: pkvm: Disable GICv2 support Quentin Perret
2021-12-08 17:44 ` Will Deacon
2021-12-08 15:22 ` [PATCH 3/6] KVM: arm64: Make the hyp memory pool static Quentin Perret
2021-12-08 16:23 ` Andrew Walbran
2021-12-08 15:22 ` [PATCH 4/6] KVM: arm64: Make __io_map_base static Quentin Perret
2021-12-08 17:45 ` Will Deacon
2021-12-08 15:22 ` Quentin Perret [this message]
2021-12-08 17:49 ` [PATCH 5/6] KVM: arm64: pkvm: Stub io map functions Will Deacon
2021-12-08 15:22 ` [PATCH 6/6] KVM: arm64: pkvm: Make kvm_host_owns_hyp_mappings() robust to VHE Quentin Perret
2021-12-08 17:50 ` Will Deacon
2021-12-15 14:30 ` [PATCH 0/6] KVM: arm64: Miscellaneous pkvm fixes 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=20211208152300.2478542-6-qperret@google.com \
--to=qperret@google.com \
--cc=alexandru.elisei@arm.com \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.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).