From: Fuad Tabba <tabba@google.com>
To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org
Cc: maz@kernel.org, oliver.upton@linux.dev, will@kernel.org,
joey.gouly@arm.com, suzuki.poulose@arm.com,
yuzenghui@huawei.com, catalin.marinas@arm.com,
vladimir.murzin@arm.com, tabba@google.com
Subject: [PATCH v3 7/8] KVM: arm64: Check whether a VM IOCTL is allowed in pKVM
Date: Mon, 10 Nov 2025 13:45:24 +0000 [thread overview]
Message-ID: <20251110134525.3768197-8-tabba@google.com> (raw)
In-Reply-To: <20251110134525.3768197-1-tabba@google.com>
Certain VM IOCTLs are tied to specific VM features. Since pKVM does not
support all features, restrict which IOCTLs are allowed depending on
whether the associated feature is supported.
Use the existing VM capability check as the source of truth to whether
an IOCTL is allowed for a particular VM by mapping the IOCTLs with their
associated capabilities.
Suggested-by: Oliver Upton <oupton@kernel.org>
Signed-off-by: Fuad Tabba <tabba@google.com>
---
arch/arm64/include/asm/kvm_pkvm.h | 20 ++++++++++++++++++++
arch/arm64/kvm/arm.c | 3 +++
2 files changed, 23 insertions(+)
diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h
index ea5d2275d16d..a2b51590bed0 100644
--- a/arch/arm64/include/asm/kvm_pkvm.h
+++ b/arch/arm64/include/asm/kvm_pkvm.h
@@ -52,6 +52,26 @@ static inline bool kvm_pkvm_ext_allowed(struct kvm *kvm, long ext)
}
}
+/*
+ * Check whether the KVM IOCTL is allowed in pKVM.
+ *
+ * Certain features are allowed only for non-protected VMs in pKVM, which is why
+ * this takes the VM (kvm) as a parameter.
+ */
+static inline bool kvm_pkvm_ioctl_allowed(struct kvm *kvm, unsigned int ioctl)
+{
+ switch (ioctl) {
+ case KVM_CREATE_IRQCHIP:
+ return kvm_pkvm_ext_allowed(kvm, KVM_CAP_IRQCHIP);
+ case KVM_ARM_MTE_COPY_TAGS:
+ return kvm_pkvm_ext_allowed(kvm, KVM_CAP_ARM_MTE);
+ case KVM_ARM_SET_COUNTER_OFFSET:
+ return kvm_pkvm_ext_allowed(kvm, KVM_CAP_COUNTER_OFFSET);
+ default:
+ return true;
+ }
+}
+
extern struct memblock_region kvm_nvhe_sym(hyp_memory)[];
extern unsigned int kvm_nvhe_sym(hyp_memblock_nr);
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 10d853f2722e..020cadd811a3 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -1879,6 +1879,9 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
void __user *argp = (void __user *)arg;
struct kvm_device_attr attr;
+ if (is_protected_kvm_enabled() && !kvm_pkvm_ioctl_allowed(kvm, ioctl))
+ return -EINVAL;
+
switch (ioctl) {
case KVM_CREATE_IRQCHIP: {
int ret;
--
2.51.2.1041.gc1ab5b90ca-goog
next prev parent reply other threads:[~2025-11-10 13:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-10 13:45 [PATCH v3 0/8] KVM: arm64: Fixes for guest CPU feature trapping and enabling Fuad Tabba
2025-11-10 13:45 ` [PATCH v3 1/8] KVM: arm64: Fix Trace Buffer trapping for protected VMs Fuad Tabba
2025-11-10 13:45 ` [PATCH v3 2/8] KVM: arm64: Fix Trace Buffer trap polarity " Fuad Tabba
2025-11-10 13:45 ` [PATCH v3 3/8] KVM: arm64: Fix MTE flag initialization " Fuad Tabba
2025-11-10 14:51 ` Ben Horgan
2025-11-10 15:03 ` Fuad Tabba
2025-11-10 13:45 ` [PATCH v3 4/8] KVM: arm64: Introduce helper to calculate fault IPA offset Fuad Tabba
2025-11-10 13:45 ` [PATCH v3 5/8] KVM: arm64: Include VM type when checking VM capabilities in pKVM Fuad Tabba
2025-11-10 13:45 ` [PATCH v3 6/8] KVM: arm64: Do not allow KVM_CAP_ARM_MTE for any guest " Fuad Tabba
2025-11-10 13:45 ` Fuad Tabba [this message]
2025-11-10 13:45 ` [PATCH v3 8/8] KVM: arm64: Prevent host from managing timer offsets for protected VMs Fuad Tabba
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=20251110134525.3768197-8-tabba@google.com \
--to=tabba@google.com \
--cc=catalin.marinas@arm.com \
--cc=joey.gouly@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=suzuki.poulose@arm.com \
--cc=vladimir.murzin@arm.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.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