Linux KVM/arm64 development list
 help / color / mirror / Atom feed
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 v5 8/9] KVM: arm64: Check whether a VM IOCTL is allowed in pKVM
Date: Tue, 18 Nov 2025 10:38:05 +0000	[thread overview]
Message-ID: <20251118103807.707500-9-tabba@google.com> (raw)
In-Reply-To: <20251118103807.707500-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 | 21 +++++++++++++++++++++
 arch/arm64/kvm/arm.c              |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h
index 5b564576160d..dcba7f99b88c 100644
--- a/arch/arm64/include/asm/kvm_pkvm.h
+++ b/arch/arm64/include/asm/kvm_pkvm.h
@@ -9,6 +9,7 @@
 #include <linux/arm_ffa.h>
 #include <linux/memblock.h>
 #include <linux/scatterlist.h>
+#include <asm/kvm_host.h>
 #include <asm/kvm_pgtable.h>
 
 /* Maximum number of VMs that can co-exist under pKVM. */
@@ -31,6 +32,7 @@ int pkvm_create_hyp_vcpu(struct kvm_vcpu *vcpu);
 static inline bool kvm_pkvm_ext_allowed(struct kvm *kvm, long ext)
 {
 	switch (ext) {
+	case KVM_CAP_CORE:
 	case KVM_CAP_IRQCHIP:
 	case KVM_CAP_ARM_PSCI:
 	case KVM_CAP_ARM_PSCI_0_2:
@@ -51,6 +53,25 @@ static inline bool kvm_pkvm_ext_allowed(struct kvm *kvm, long ext)
 	}
 }
 
+/*
+ * Check whether the KVM VM 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)
+{
+	long ext;
+	int r;
+
+	r = kvm_get_cap_for_kvm_ioctl(ioctl, &ext);
+
+	if (WARN_ON_ONCE(r < 0))
+		return false;
+
+	return kvm_pkvm_ext_allowed(kvm, ext);
+}
+
 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.52.0.rc1.455.g30608eb744-goog


  parent reply	other threads:[~2025-11-18 10:38 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-18 10:37 [PATCH v5 0/9] KVM: arm64: Fixes for guest CPU feature trapping and enabling Fuad Tabba
2025-11-18 10:37 ` [PATCH v5 1/9] KVM: arm64: Fix Trace Buffer trapping for protected VMs Fuad Tabba
2025-11-18 10:37 ` [PATCH v5 2/9] KVM: arm64: Fix Trace Buffer trap polarity " Fuad Tabba
2025-11-18 11:11   ` Suzuki K Poulose
2025-11-26 10:23   ` Marc Zyngier
2025-11-26 10:29     ` James Clark
2025-11-26 10:36       ` Fuad Tabba
2025-11-26 10:39         ` James Clark
2025-11-26 10:37     ` Fuad Tabba
2025-11-26 11:47       ` Marc Zyngier
2025-11-26 11:48         ` Fuad Tabba
2025-11-27 15:26           ` James Clark
2025-11-27 15:38             ` Fuad Tabba
2025-11-27 16:06               ` James Clark
2025-11-27 16:23                 ` Fuad Tabba
2025-11-18 10:38 ` [PATCH v5 3/9] KVM: arm64: Fix MTE flag initialization " Fuad Tabba
2025-11-18 10:38 ` [PATCH v5 4/9] KVM: arm64: Introduce helper to calculate fault IPA offset Fuad Tabba
2025-11-18 10:38 ` [PATCH v5 5/9] KVM: arm64: Include VM type when checking VM capabilities in pKVM Fuad Tabba
2025-11-26 10:52   ` Marc Zyngier
2025-11-26 11:00     ` Fuad Tabba
2025-11-26 15:36       ` Marc Zyngier
2025-11-26 17:05         ` Fuad Tabba
2025-11-18 10:38 ` [PATCH v5 6/9] KVM: arm64: Do not allow KVM_CAP_ARM_MTE for any guest " Fuad Tabba
2025-11-18 10:38 ` [PATCH v5 7/9] KVM: arm64: Track KVM IOCTLs and their associated KVM caps Fuad Tabba
2025-11-18 10:38 ` Fuad Tabba [this message]
2025-11-18 10:38 ` [PATCH v5 9/9] KVM: arm64: Prevent host from managing timer offsets for protected VMs Fuad Tabba
2025-11-18 10:39 ` [PATCH v5 0/9] KVM: arm64: Fixes for guest CPU feature trapping and enabling 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=20251118103807.707500-9-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