From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 55DCA37C0EC for ; Tue, 6 Oct 2026 04:58:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791262702; cv=none; b=lBVinid2vRZdtSznr29MdMgmuhm0mSj/tmCRZxcLVQh1ZyXm7oKVkjTriuXLeL3sLRlpv6upkjlnhF2pKwfz6yiyC81JRF27R68TUGNCuNAT7Bxxp23xy97GiQjdSSh4F7Q/rMLwU9u0GJ2SJXBY5xDgox8NBfT4LKL07YGWU9s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791262702; c=relaxed/simple; bh=6OM9wWHapIU6KE4mRyTPlvJHLyN9Y0AIPIvU/nV26Uo=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=C2swmgibxSra8wH7pctcnA/jKYPgvQD6NXzaMKpe0Jj85oc9y0usaa37/+7luYiSOZm8yaujmGirvGWrjpTJJ7FFLsTNcaGDihEUREFFwrrVtKB67hgyxL3dKySJi7m8QJEhF9BdU3+ytdDCCADbFQw07+KjMG2gw5c2DZ2YqlI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ZlI2N8hY; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZlI2N8hY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1791262699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3xmwhtVAOTYHUjmcRz00UOuxKG7KIIGgmFuc28vNIW8=; b=ZlI2N8hY9ail5uRYH0oltMLEHlsWOD1pioQpFv/sjUFSGD1ayme4ed7ZFS7SNFyZm4hcG0 4LDwrdM7/i2OSoTGsmxZYr0YHw36b8nATUHnGOKZ/92Q3+sQf0YUJJGLdTBGoUkDSXIg5b CWAWdLrflAmOQ7aM6Vk7aOA18Q8YThk= Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-465-IkX-3UzSPVOhmjTz_kGWbg-1; Tue, 06 Oct 2026 00:58:16 -0400 X-MC-Unique: IkX-3UzSPVOhmjTz_kGWbg-1 X-Mimecast-MFC-AGG-ID: IkX-3UzSPVOhmjTz_kGWbg_1791262695 Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-3a4f7eb79f2so2473236a91.1 for ; Mon, 05 Oct 2026 21:58:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791262695; x=1791867495; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3xmwhtVAOTYHUjmcRz00UOuxKG7KIIGgmFuc28vNIW8=; b=yERZxJEgtMQcoRpT/AM6X8WiYCLc7/a7vvr7XtOoI5O/u2FAwPTLQrmDgcI07Z+TRp qjpBGZekj3eUJuWme7jutwXS1RsnZ/jAZ812XG4+gnp/W4nO7pnwBvKT7IQL2HvRoZp7 D//Cwl6Vwast0+fmAliyao+r+3uAmpJch855DzbApNGWqd870MJPNV7YCmgZX5TIzLKr 7PZYeFAfyAFe0Wl5tAFvnRcbMe8cMgeLmgXU2sOV+LCR9MZU1s0E9stHonX1iKRC3saB s529LZq/ePg3LSHc8DHo5mI/dcZYw7X4MEGw4YCgvEYa8CvcFHUinSG4OC9G477tqrkg Jo1g== X-Forwarded-Encrypted: i=1; AKwUvBxgpcGH/K6e6lwDJYZtKNMXzqryw1OUa2FuWls6wQJmIra8YJxk5NEeBF4MIO0Yg25FvWulgc6XvbkS@lists.linux.dev X-Gm-Message-State: AFq9FYIMVkecXLiW5Qs8YP4UFFsPd71XL61iH6yUSm6rFKKX5M/q4L3Z s07CiElGelTh2WpkunkCFJXFmeG3Tw5Hkoy1wifCPIGW4/EcfQdNO5mEPWJ/M2PUrMB4YZcbcnQ qegLYwV0HLbRxhKjYW6YFuSyVbRKn4zi5U7+x6/TfIRBppKxJBFiYSCQhpFrjeZA= X-Gm-Gg: AYBFou28hUNvKBjbu3nNiIGmdMYNna3B3RgpnOmiR7+9PsRP7WteObvDYapfatpj3c4 mfvLj92JfDqJuHeahwlBLalDHH4RcssSsSB3IyQfvZ4O0IyEa+pMxtmnVyvfNNhHkH15qawbqZ2 6mZWrBGnncg7cAZsrf0FXYecX1X8MTns2lBlNrMrBKmnQBFTv8kXwYLU61BXViZmf+x8oEb39uM x1dGWRjoHn7YJ46wT7/cs2UgcfCkjBdHXKT+GzBbhb98BtlpmxO7Uk5pp4AginUn/ayctjqIQGw lhFo2cfuodjUEM4CWFLeNH8DpyqNnwu3AT6FiR2ZRgtutffXk9RkBms67/gXxbYGxYsRtn2LpPj GL+cQi/cyv7xg/e8gCcSXkXiP9MCqYu8Ngv+SjNjwUg== X-Received: by 2002:a17:90b:288c:b0:3a4:b0a1:c7ed with SMTP id 98e67ed59e1d1-3a87350ab48mr128910a91.13.1791262694830; Mon, 05 Oct 2026 21:58:14 -0700 (PDT) X-Received: by 2002:a17:90b:288c:b0:3a4:b0a1:c7ed with SMTP id 98e67ed59e1d1-3a87350ab48mr128872a91.13.1791262694226; Mon, 05 Oct 2026 21:58:14 -0700 (PDT) Received: from [192.168.68.52] (n175-34-8-244.mrk21.qld.optusnet.com.au. [175.34.8.244]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a853d0261csm2783924a91.17.2026.10.05.21.58.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Oct 2026 21:58:13 -0700 (PDT) Message-ID: Date: Tue, 6 Oct 2026 14:58:04 +1000 Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v22 19/23] KVM: arm64: CCA: Don't expose unsupported capabilities for realm guests To: Suzuki K Poulose , kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: maz@kernel.org, will@kernel.org, catalin.marinas@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, steven.price@arm.com, aneesh.kumar@kernel.org, oupton@kernel.org, joey.gouly@arm.com, tabba@google.com, yuzenghui@huawei.com, linux-coco@lists.linux.dev, gankulkarni@os.amperecomputing.com, sdonthineni@nvidia.com, alpergun@google.com, fj0570is@fujitsu.com, WeiLin.Chang@arm.com, lpieralisi@kernel.org, enju.kohei@fujitsu.com, sudeep.holla@arm.com, jonathan.cameron@oss.qualcomm.com References: <20261005090754.2140522-1-suzuki.poulose@arm.com> <20261005090754.2140522-20-suzuki.poulose@arm.com> From: Gavin Shan In-Reply-To: <20261005090754.2140522-20-suzuki.poulose@arm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _j2k93kui37UFT6WbCDHxrYTqsVPA6hCd1FlWe4Je0M_1791262695 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/5/26 7:07 PM, Suzuki K Poulose wrote: > Limit the capabilities that are allowed for Realm VMs. Similarly block > the vm_ioctls backed by the capabilities. > > Repurpose the kvm_pkvm_ioctl_allowed() to support both pKVM and Realm > ioctls. Rename the helper to kvm_vm_ioctl_allowed() and move it > into arch/arm64/kvm/arm.c. Also add a generic kvm_vm_ext_allowed() > to handle pKVM and Realm capability filtering and route them accordingly. > > Signed-off-by: Suzuki K Poulose > --- > Changes since v21: > - Drop WARN_ON_ONCE() from kvm_vm_ioctl_allowed to synchronise with > what is in -rc5 and make the conflict resolution easier. > --- > arch/arm64/include/asm/kvm_pkvm.h | 19 ------------ > arch/arm64/include/asm/kvm_rmi.h | 24 +++++++++++++++ > arch/arm64/kvm/arm.c | 49 +++++++++++++++++++++++++++++-- > 3 files changed, 70 insertions(+), 22 deletions(-) > One nitpick below. In either way: Reviewed-by: Gavin Shan > diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h > index 2addc37c500e1..b833abb1be9c7 100644 > --- a/arch/arm64/include/asm/kvm_pkvm.h > +++ b/arch/arm64/include/asm/kvm_pkvm.h > @@ -53,25 +53,6 @@ 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/include/asm/kvm_rmi.h b/arch/arm64/include/asm/kvm_rmi.h > index 44f5c75a27b5b..ea1450e0c8619 100644 > --- a/arch/arm64/include/asm/kvm_rmi.h > +++ b/arch/arm64/include/asm/kvm_rmi.h > @@ -6,6 +6,8 @@ > #ifndef __ASM_KVM_RMI_H > #define __ASM_KVM_RMI_H > > +#include > + > /** > * enum realm_state - State of a Realm > * > @@ -58,4 +60,26 @@ struct realm { > > void kvm_init_rmi(void); > > +static inline bool kvm_realm_ext_allowed(long ext) > +{ > + switch (ext) { > + case KVM_CAP_IRQCHIP: > + case KVM_CAP_ARM_PSCI: > + case KVM_CAP_ARM_PSCI_0_2: > + case KVM_CAP_DEVICE_CTRL: > + case KVM_CAP_NR_VCPUS: > + case KVM_CAP_MAX_VCPUS: > + case KVM_CAP_MAX_VCPU_ID: > + case KVM_CAP_MSI_DEVID: > + case KVM_CAP_ARM_VM_IPA_SIZE: > + case KVM_CAP_ARM_SVE: > + case KVM_CAP_ONE_REG: > + case KVM_CAP_ARM_PTRAUTH_ADDRESS: > + case KVM_CAP_ARM_PTRAUTH_GENERIC: > + case KVM_CAP_SYNC_MMU: > + return true; > + } > + return false; > +} > + > #endif /* __ASM_KVM_RMI_H */ > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index 37ef2ba4e43e2..fe707a0c47308 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -136,6 +136,49 @@ int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu) > return kvm_vcpu_exiting_guest_mode(vcpu) == IN_GUEST_MODE; > } > > +static inline bool kvm_vm_ext_allowed(struct kvm *kvm, long ext) > +{ > + /* > + * We could be called with kvm as NULL, so can't use kvm_vm_* for pKVM > + * flavors > + */ > + if (is_protected_kvm_enabled()) > + return kvm_pkvm_ext_allowed(kvm, ext); > + else if (kvm && kvm_vm_is_realm(kvm)) > + return kvm_realm_ext_allowed(ext); > + else > + return true; > +} > + > +/* > + * Check whether the KVM VM IOCTL is allowed. For pKVM and Realm VMs, certain > + * ioctls are not allowed. Further, certain features are allowed only for > + * non-protected VMs in pKVM. > + */ > +static inline bool kvm_vm_ioctl_allowed(struct kvm *kvm, unsigned int ioctl) > +{ > + long ext; > + int r; long ext, r; kvm_get_cap_for_kvm_ioctl() returns 'long' instead of 'int' value. > + > + /* > + * We are guaranteed to be called with a valid kvm instance, as the > + * only caller is kvm_arch_vm_ioctl(). Catch any deviations, as we > + * rely on the kvm instance below. > + */ > + if (WARN_ON_ONCE(!kvm)) > + return false; > + > + /* Cover both pKVM host and Realm VMs */ > + if (!kvm_vm_hyp_is_distrusting(kvm)) > + return true; > + > + r = kvm_get_cap_for_kvm_ioctl(ioctl, &ext); > + if (r < 0) > + return false; > + > + return kvm_vm_ext_allowed(kvm, ext); > +} > + > int kvm_vm_ioctl_enable_cap(struct kvm *kvm, > struct kvm_enable_cap *cap) > { > @@ -144,7 +187,7 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, > if (cap->flags) > return -EINVAL; > > - if (is_protected_kvm_enabled() && !kvm_pkvm_ext_allowed(kvm, cap->cap)) > + if (!kvm_vm_ext_allowed(kvm, cap->cap)) > return -EINVAL; > > switch (cap->cap) { > @@ -403,7 +446,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) > { > int r; > > - if (is_protected_kvm_enabled() && !kvm_pkvm_ext_allowed(kvm, ext)) > + if (!kvm_vm_ext_allowed(kvm, ext)) > return 0; > > switch (ext) { > @@ -2146,7 +2189,7 @@ 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)) > + if (!kvm_vm_ioctl_allowed(kvm, ioctl)) > return -EINVAL; > > switch (ioctl) { Thanks, Gavin