From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 710E74457A5; Fri, 31 Jul 2026 13:09:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503400; cv=none; b=Wgh4481hX21M/XgSIXE5ZEuW9TXM3fMKKgNgRXjCxCJaMzZ0madiVbJgxcPB3fja6d9nP1cjM90EQsi179kEHUAY9akOhSsSi5XxV4U/6co+XMUgC5otSV4/n91T7iYd2M45NcKKOIrL4SHhvCRWpmCaJMBUrvL7Dp2j2dQk9FE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503400; c=relaxed/simple; bh=CICD/5LiKsZOQio7EnwScEUOi6Hmuo25l1ZaAalt1WU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VijChhV/SK4oyp+Uiyj1jf2u4X5LDNSqttXNos5jhRsiC71L23GvYcsdta132Btie9P3xUJt5ex1x8V7Jg9dkI0ItptWvurNBQQty1Ug31boUGNIEUDvyZvz1VX56HP33AD4pEN0twHxT28T/5higltX0pszTRY7mtzvuPkEMYo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=CkJj1HOw; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="CkJj1HOw" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlwdT1791076; Fri, 31 Jul 2026 13:09:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=haO0xL g1lpYQDFg+IUbQ8KntQoXbMlCu5mOwhPaZ38Y=; b=CkJj1HOwbZfiRhwIjzkUOc hVHGjuN3IGRbD0Nb+r2y1BEIFjjlDHgy+NPANbUhQp0WvTn0mRmj3UWuabS5StiX TqdZmMxvXGU8HF0DBi6DTlEWZS2ieWO7cS0AKXPFgPQH4zla1GlRxp2jfxF9rSnX BOXZrRN6VNzt3q0o6W7qHD/EH79KYw/jryCgc5BXmUP0T5YU75Ankv0p817565tj UDWYxL0ballBkBiv75jExPoocVsXQ9k4161zcKeeWFlNJhUfq34U3q/jwYjjgl/2 cBRSeOhFdbU3ikdbo3k6CH/paF0u/kfVNj6d+44v9un6mS3cC6n5FXLRyPa4CtwQ == Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuwdc41g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:11 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuGHF021726; Fri, 31 Jul 2026 13:09:11 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn7uwg436-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:10 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD93CA32965088 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:03 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B13E620040; Fri, 31 Jul 2026 13:09:03 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3ADD22004B; Fri, 31 Jul 2026 13:09:03 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:03 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 01/31] vfio: Use file-based reference counting for KVM Date: Fri, 31 Jul 2026 15:08:29 +0200 Message-ID: <20260731130902.654679-2-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: Zkjb6K7lJBXcG6qt_qPGmH9FhMYnE4iR X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXx92q1D91z8MN CnLPRFpuefHDoA1CrGKOH8NheaD1LWqVbK9lppP1XCbpey6IekS39BHwoh8ajT6lbVvKF49AlTp KIpmTDTmLV1VbcWsteZ8+0Z1djOWiKc= X-Authority-Analysis: v=2.4 cv=E/z9Y6dl c=1 sm=1 tr=0 ts=6a6c9e78 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=Ikd4Dj_1AAAA:8 a=1XWaLZrsAAAA:8 a=VnNF1IyMAAAA:8 a=x4cQU7UQcekLRWkedJUA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXyEH0gfwrCeq7 hUEgU1RPtk0jO/XM1QZPC6zcC8Vz7Ja3ipTg/s+FnaXJxUlHu/s+/pgT90aWt8IUoyCRbvVPsoc JBvSygvUAP0oUFLtyWxXYa/OYN16f2JFzIJDKFqVMMHYoEwzxMmYauIhL8AzzqJeq3GFvrtC1wc YouVdKb9URxEm656zyE+z353CyNd+TQIoIVAxG08RmHGx92XhkQ9MZ1r4Wpfuwz8sgd6hen1TzF vk2jL5CXsGeML5QjDYDoHeRFHyUpbwZV1csyLS/YMrf0k6BQZV/S7ubd0lLPZcelnI+k6Sk4eIB 3JG2RyjnePDz23MpBvV33u9ntYyScb6EdNJijcoQZqPlYNNRXtzKnfNKnlXK2uLxfZfsRee7kfG 5n0tDAygXmCATKZ4JJQTQcnWa2w5mE5ciH6Qm/psURHnUMYb+cYG/CA8uVaPmxu5Gtuq5sTSP1C 3HN0SvNNZOCjYhL48/w== X-Proofpoint-GUID: u029MMhrGTWQTlFvb-nZKPp46zOeFdW6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Replace manual module reference counting with file-based reference counting for KVM integration. Previously, VFIO used symbol_get() to obtain function pointers for kvm_get_kvm_safe() and kvm_put_kvm(), then manually tracked module references through these symbols. This approach required storing the put_kvm function pointer in each device and carefully managing symbol references. Pass struct file pointers instead of struct kvm pointers throughout the VFIO-KVM interface. This leverages the kernel's existing file reference counting mechanism via get_file_active() and fput(), eliminating the need for manual module reference tracking. The file->private_data field provides access to the underlying struct kvm when needed. This simplifies the code and removes all remaining externally exported symbols for KVM, paving the path for a second concurrent KVM module. Suggested-by: Jason Gunthorpe Suggested-by: Sean Christopherson Signed-off-by: Steffen Eiden --- arch/x86/include/asm/kvm_page_track.h | 8 ++--- arch/x86/kvm/Makefile | 3 -- arch/x86/kvm/mmu/page_track.c | 16 +++++---- drivers/s390/crypto/vfio_ap_ops.c | 24 ++++++++++--- drivers/vfio/group.c | 2 +- drivers/vfio/pci/vfio_pci_zdev.c | 7 +++- drivers/vfio/vfio.h | 10 +++--- drivers/vfio/vfio_main.c | 49 ++++++--------------------- include/linux/kvm_host.h | 2 ++ include/linux/vfio.h | 4 +-- virt/kvm/kvm_main.c | 23 ++++++++++--- virt/kvm/vfio.c | 8 ++--- 12 files changed, 81 insertions(+), 75 deletions(-) diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/k= vm_page_track.h index 3d040741044b..046a25c8fe4f 100644 --- a/arch/x86/include/asm/kvm_page_track.h +++ b/arch/x86/include/asm/kvm_page_track.h @@ -44,13 +44,13 @@ struct kvm_page_track_notifier_node { struct kvm_page_track_notifier_node *node); }; =20 -int kvm_page_track_register_notifier(struct kvm *kvm, +int kvm_page_track_register_notifier(struct file *file, struct kvm_page_track_notifier_node *n); -void kvm_page_track_unregister_notifier(struct kvm *kvm, +void kvm_page_track_unregister_notifier(struct file *file, struct kvm_page_track_notifier_node *n); =20 -int kvm_write_track_add_gfn(struct kvm *kvm, gfn_t gfn); -int kvm_write_track_remove_gfn(struct kvm *kvm, gfn_t gfn); +int kvm_write_track_add_gfn(struct file *file, gfn_t gfn); +int kvm_write_track_remove_gfn(struct file *file, gfn_t gfn); #else /* * Allow defining a node in a structure even if page tracking is disabled,= e.g. diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index 77337c37324b..713fb6e76730 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile @@ -61,9 +61,6 @@ exports_grep_trailer :=3D --include=3D'*.[ch]' -nrw $(src= tree)/virt/kvm $(srctree)/a -e kvm_page_track_unregister_notifier \ -e kvm_write_track_add_gfn \ -e kvm_write_track_remove_gfn \ - -e kvm_get_kvm \ - -e kvm_get_kvm_safe \ - -e kvm_put_kvm =20 # Force grep to emit a goofy group separator that can in turn be replaced = with # the above newline macro (newlines in Make are a nightmare). Note, grep = only diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index 7e8195a311bb..860049ed24ea 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -237,10 +237,11 @@ static int kvm_enable_external_write_tracking(struct = kvm *kvm) * register the notifier so that event interception for the tracked guest * pages can be received. */ -int kvm_page_track_register_notifier(struct kvm *kvm, +int kvm_page_track_register_notifier(struct file *file, struct kvm_page_track_notifier_node *n) { struct kvm_page_track_notifier_head *head; + struct kvm *kvm =3D file_to_kvm(file); int r; =20 if (!kvm || kvm->mm !=3D current->mm) @@ -252,7 +253,7 @@ int kvm_page_track_register_notifier(struct kvm *kvm, return r; } =20 - kvm_get_kvm(kvm); + get_file(file); =20 head =3D &kvm->arch.track_notifier_head; =20 @@ -267,10 +268,11 @@ EXPORT_SYMBOL_GPL(kvm_page_track_register_notifier); * stop receiving the event interception. It is the opposed operation of * kvm_page_track_register_notifier(). */ -void kvm_page_track_unregister_notifier(struct kvm *kvm, +void kvm_page_track_unregister_notifier(struct file *file, struct kvm_page_track_notifier_node *n) { struct kvm_page_track_notifier_head *head; + struct kvm *kvm =3D file_to_kvm(file); =20 head =3D &kvm->arch.track_notifier_head; =20 @@ -279,7 +281,7 @@ void kvm_page_track_unregister_notifier(struct kvm *kvm, write_unlock(&kvm->mmu_lock); synchronize_srcu(&head->track_srcu); =20 - kvm_put_kvm(kvm); + fput(file); } EXPORT_SYMBOL_GPL(kvm_page_track_unregister_notifier); =20 @@ -339,8 +341,9 @@ void kvm_page_track_delete_slot(struct kvm *kvm, struct= kvm_memory_slot *slot) * @kvm: the guest instance we are interested in. * @gfn: the guest page. */ -int kvm_write_track_add_gfn(struct kvm *kvm, gfn_t gfn) +int kvm_write_track_add_gfn(struct file *file, gfn_t gfn) { + struct kvm *kvm =3D file_to_kvm(file); struct kvm_memory_slot *slot; int idx; =20 @@ -369,8 +372,9 @@ EXPORT_SYMBOL_GPL(kvm_write_track_add_gfn); * @kvm: the guest instance we are interested in. * @gfn: the guest page. */ -int kvm_write_track_remove_gfn(struct kvm *kvm, gfn_t gfn) +int kvm_write_track_remove_gfn(struct file *file, gfn_t gfn) { + struct kvm *kvm =3D file_to_kvm(file); struct kvm_memory_slot *slot; int idx; =20 diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_a= p_ops.c index 44b3a1dcc1b3..bf6a5b959fcd 100644 --- a/drivers/s390/crypto/vfio_ap_ops.c +++ b/drivers/s390/crypto/vfio_ap_ops.c @@ -8,6 +8,7 @@ * Halil Pasic * Pierre Morel */ +#include "linux/cleanup.h" #include #include #include @@ -1815,13 +1816,26 @@ static const struct attribute_group *vfio_ap_mdev_a= ttr_groups[] =3D { * @matrix_mdev: a mediated matrix device * @kvm: reference to KVM instance * - * Return: 0 if no other mediated matrix device has a reference to @kvm; - * otherwise, returns an -EPERM. + * Returns: 0 if the reference to kvm is successfully retrieved from @kvm_= file + * and set into @matrix_mdev; otherwise, returns: +=C2=A0* -ENOENT if a reference to kvm could not be retrieved from @kvm_file +=C2=A0* -EPERM if another mediated matrix device already has a reference t= o the same kvm instance + *=20 */ static int vfio_ap_mdev_set_kvm(struct ap_matrix_mdev *matrix_mdev, - struct kvm *kvm) + struct file *kvm_file) { + struct file *kvm_file_ref __free(fput) =3D NULL; struct ap_matrix_mdev *m; + struct kvm *kvm; + + kvm_file_ref =3D get_file_active(&kvm_file); + if (!kvm_file_ref) + return -ENOENT; + + kvm =3D kvm_file->private_data; + if (!kvm) + return -ENOENT; =20 if (kvm->arch.crypto.crycbd) { down_write(&kvm->arch.crypto.pqap_hook_rwsem); @@ -1837,13 +1851,13 @@ static int vfio_ap_mdev_set_kvm(struct ap_matrix_md= ev *matrix_mdev, } } =20 - kvm_get_kvm(kvm); matrix_mdev->kvm =3D kvm; vfio_ap_mdev_update_guest_apcb(matrix_mdev); =20 release_update_locks_for_kvm(kvm); } =20 + no_free_ptr(kvm_file_ref); return 0; } =20 @@ -1891,7 +1905,7 @@ static void vfio_ap_mdev_unset_kvm(struct ap_matrix_m= dev *matrix_mdev) =20 kvm_arch_crypto_clear_masks(kvm); vfio_ap_mdev_reset_queues(matrix_mdev); - kvm_put_kvm(kvm); + fput(kvm->file); matrix_mdev->kvm =3D NULL; =20 release_update_locks_for_kvm(kvm); diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c index b2299e5bc6df..807378cb48de 100644 --- a/drivers/vfio/group.c +++ b/drivers/vfio/group.c @@ -860,7 +860,7 @@ bool vfio_group_enforced_coherent(struct vfio_group *gr= oup) return ret; } =20 -void vfio_group_set_kvm(struct vfio_group *group, struct kvm *kvm) +void vfio_group_set_kvm(struct vfio_group *group, struct file *kvm) { spin_lock(&group->kvm_ref_lock); group->kvm =3D kvm; diff --git a/drivers/vfio/pci/vfio_pci_zdev.c b/drivers/vfio/pci/vfio_pci_z= dev.c index 0990fdb146b7..d3a110101353 100644 --- a/drivers/vfio/pci/vfio_pci_zdev.c +++ b/drivers/vfio/pci/vfio_pci_zdev.c @@ -144,6 +144,7 @@ int vfio_pci_info_zdev_add_caps(struct vfio_pci_core_de= vice *vdev, int vfio_pci_zdev_open_device(struct vfio_pci_core_device *vdev) { struct zpci_dev *zdev =3D to_zpci(vdev->pdev); + struct kvm *kvm; =20 if (!zdev) return -ENODEV; @@ -151,8 +152,12 @@ int vfio_pci_zdev_open_device(struct vfio_pci_core_dev= ice *vdev) if (!vdev->vdev.kvm) return 0; =20 + kvm =3D vdev->vdev.kvm->private_data; + if (!kvm) + return -ENOENT; + if (zpci_kvm_hook.kvm_register) - return zpci_kvm_hook.kvm_register(zdev, vdev->vdev.kvm); + return zpci_kvm_hook.kvm_register(zdev, kvm); =20 return -ENOENT; } diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h index e4b72e79b7e3..ede8a8001b03 100644 --- a/drivers/vfio/vfio.h +++ b/drivers/vfio/vfio.h @@ -23,7 +23,7 @@ struct vfio_device_file { u8 access_granted; u32 devid; /* only valid when iommufd is valid */ spinlock_t kvm_ref_lock; /* protect kvm field */ - struct kvm *kvm; + struct file *kvm; struct iommufd_ctx *iommufd; /* protected by struct vfio_device_set::lock= */ }; =20 @@ -88,7 +88,7 @@ struct vfio_group { #endif enum vfio_group_type type; struct mutex group_lock; - struct kvm *kvm; + struct file *kvm; struct file *opened_file; struct iommufd_ctx *iommufd; spinlock_t kvm_ref_lock; @@ -107,7 +107,7 @@ void vfio_device_group_unuse_iommu(struct vfio_device *= device); void vfio_df_group_close(struct vfio_device_file *df); struct vfio_group *vfio_group_from_file(struct file *file); bool vfio_group_enforced_coherent(struct vfio_group *group); -void vfio_group_set_kvm(struct vfio_group *group, struct kvm *kvm); +void vfio_group_set_kvm(struct vfio_group *group, struct file *kvm); bool vfio_device_has_container(struct vfio_device *device); int __init vfio_group_init(void); void vfio_group_cleanup(void); @@ -434,11 +434,11 @@ static inline void vfio_virqfd_exit(void) #endif =20 #if IS_ENABLED(CONFIG_KVM) -void vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm); +void vfio_device_get_kvm_safe(struct vfio_device *device, struct file *kvm= ); void vfio_device_put_kvm(struct vfio_device *device); #else static inline void vfio_device_get_kvm_safe(struct vfio_device *device, - struct kvm *kvm) + struct file *kvm) { } =20 diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index ed538aebb0b8..8fad1ca1189f 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -448,35 +448,13 @@ void vfio_unregister_group_dev(struct vfio_device *de= vice) EXPORT_SYMBOL_GPL(vfio_unregister_group_dev); =20 #if IS_ENABLED(CONFIG_KVM) -void vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm) +void vfio_device_get_kvm_safe(struct vfio_device *device, struct file *kvm) { - void (*pfn)(struct kvm *kvm); - bool (*fn)(struct kvm *kvm); - bool ret; - lockdep_assert_held(&device->dev_set->lock); =20 - if (!kvm) - return; - - pfn =3D symbol_get(kvm_put_kvm); - if (WARN_ON(!pfn)) + if (!get_file_active(&kvm)) return; =20 - fn =3D symbol_get(kvm_get_kvm_safe); - if (WARN_ON(!fn)) { - symbol_put(kvm_put_kvm); - return; - } - - ret =3D fn(kvm); - symbol_put(kvm_get_kvm_safe); - if (!ret) { - symbol_put(kvm_put_kvm); - return; - } - - device->put_kvm =3D pfn; device->kvm =3D kvm; } =20 @@ -487,14 +465,7 @@ void vfio_device_put_kvm(struct vfio_device *device) if (!device->kvm) return; =20 - if (WARN_ON(!device->put_kvm)) - goto clear; - - device->put_kvm(device->kvm); - device->put_kvm =3D NULL; - symbol_put(kvm_put_kvm); - -clear: + fput(device->kvm); device->kvm =3D NULL; } #endif @@ -1520,7 +1491,7 @@ bool vfio_file_enforced_coherent(struct file *file) } EXPORT_SYMBOL_GPL(vfio_file_enforced_coherent); =20 -static void vfio_device_file_set_kvm(struct file *file, struct kvm *kvm) +static void vfio_device_file_set_kvm(struct file *file, struct file *kvm) { struct vfio_device_file *df =3D file->private_data; =20 @@ -1536,22 +1507,22 @@ static void vfio_device_file_set_kvm(struct file *f= ile, struct kvm *kvm) =20 /** * vfio_file_set_kvm - Link a kvm with VFIO drivers - * @file: VFIO group file or VFIO device file - * @kvm: KVM to link + * @vfio_file: VFIO group file or VFIO device file + * @kvm: KVM file to link * * When a VFIO device is first opened the KVM will be available in * device->kvm if one was associated with the file. */ -void vfio_file_set_kvm(struct file *file, struct kvm *kvm) +void vfio_file_set_kvm(struct file *vfio_file, struct file *kvm) { struct vfio_group *group; =20 - group =3D vfio_group_from_file(file); + group =3D vfio_group_from_file(vfio_file); if (group) vfio_group_set_kvm(group, kvm); =20 - if (vfio_device_from_file(file)) - vfio_device_file_set_kvm(file, kvm); + if (vfio_device_from_file(vfio_file)) + vfio_device_file_set_kvm(vfio_file, kvm); } EXPORT_SYMBOL_GPL(vfio_file_set_kvm); =20 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ab8cfaec82d3..90a9f840fece 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -784,6 +784,7 @@ struct kvm { * kvm_swap_active_memslots(). */ struct mutex slots_arch_lock; + struct file *file; /* Back-reference to VM file descriptor */ struct mm_struct *mm; /* userspace tied to this vm */ unsigned long nr_memslot_pages; /* The two memslot sets - active and inactive (per address space) */ @@ -1074,6 +1075,7 @@ void kvm_get_kvm(struct kvm *kvm); bool kvm_get_kvm_safe(struct kvm *kvm); void kvm_put_kvm(struct kvm *kvm); bool file_is_kvm(struct file *file); +struct kvm *file_to_kvm(struct file *file); void kvm_put_kvm_no_destroy(struct kvm *kvm); =20 static inline struct kvm_memslots *__kvm_memslots(struct kvm *kvm, int as_= id) diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 31b826efba00..b279bdb6f813 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -54,7 +54,7 @@ struct vfio_device { struct list_head dev_set_list; unsigned int migration_flags; u8 precopy_info_v2; - struct kvm *kvm; + struct file *kvm; /* Holds reference to KVM file */ =20 /* Members below here are private, not for driver use */ unsigned int index; @@ -377,7 +377,7 @@ static inline bool vfio_file_has_dev(struct file *file,= struct vfio_device *devi #endif bool vfio_file_is_valid(struct file *file); bool vfio_file_enforced_coherent(struct file *file); -void vfio_file_set_kvm(struct file *file, struct kvm *kvm); +void vfio_file_set_kvm(struct file *vfio_file, struct file *kvm); =20 #define VFIO_PIN_PAGES_MAX_ENTRIES (PAGE_SIZE/sizeof(unsigned long)) =20 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 45e784462ec6..994cb40cf2ef 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1313,7 +1313,7 @@ void kvm_get_kvm(struct kvm *kvm) { refcount_inc(&kvm->users_count); } -EXPORT_SYMBOL_GPL(kvm_get_kvm); +EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_get_kvm); =20 /* * Make sure the vm is not during destruction, which is a safe version of @@ -1323,14 +1323,14 @@ bool kvm_get_kvm_safe(struct kvm *kvm) { return refcount_inc_not_zero(&kvm->users_count); } -EXPORT_SYMBOL_GPL(kvm_get_kvm_safe); +EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_get_kvm_safe); =20 void kvm_put_kvm(struct kvm *kvm) { if (refcount_dec_and_test(&kvm->users_count)) kvm_destroy_vm(kvm); } -EXPORT_SYMBOL_GPL(kvm_put_kvm); +EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_put_kvm); =20 /* * Used to put a reference that was taken on behalf of an object associated @@ -4802,7 +4802,7 @@ void kvm_unregister_device_ops(u32 type) kvm_device_ops_table[type] =3D NULL; } =20 -static int kvm_ioctl_create_device(struct kvm *kvm, +static int kvm_ioctl_create_device(struct file *file, struct kvm *kvm, struct kvm_create_device *cd) { const struct kvm_device_ops *ops; @@ -5345,7 +5345,7 @@ static long kvm_vm_ioctl(struct file *filp, if (copy_from_user(&cd, argp, sizeof(cd))) goto out; =20 - r =3D kvm_ioctl_create_device(kvm, &cd); + r =3D kvm_ioctl_create_device(filp, kvm, &cd); if (r) goto out; =20 @@ -5477,6 +5477,15 @@ bool file_is_kvm(struct file *file) } EXPORT_SYMBOL_FOR_KVM_INTERNAL(file_is_kvm); =20 +struct kvm *file_to_kvm(struct file *file) +{ + if (!file_is_kvm(file)) + return NULL; + + return file->private_data; +} +EXPORT_SYMBOL_FOR_KVM_INTERNAL(file_to_kvm); + static int kvm_dev_ioctl_create_vm(unsigned long type) { char fdname[ITOA_MAX_LEN + 1]; @@ -5508,6 +5517,10 @@ static int kvm_dev_ioctl_create_vm(unsigned long typ= e) * cases it will be called by the final fput(file) and will take * care of doing kvm_put_kvm(kvm). */ + + /* Store back-reference for VFIO and other subsystems */ + kvm->file =3D file; + kvm_uevent_notify_change(KVM_EVENT_CREATE_VM, kvm); =20 fd_install(fd, file); diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c index 6cdc4e9a333a..0166cc4d39b3 100644 --- a/virt/kvm/vfio.c +++ b/virt/kvm/vfio.c @@ -35,15 +35,15 @@ struct kvm_vfio { bool noncoherent; }; =20 -static void kvm_vfio_file_set_kvm(struct file *file, struct kvm *kvm) +static void kvm_vfio_file_set_kvm(struct file *vfio_file, struct file *kvm) { - void (*fn)(struct file *file, struct kvm *kvm); + void (*fn)(struct file *vfio_file, struct file *kvm); =20 fn =3D symbol_get(vfio_file_set_kvm); if (!fn) return; =20 - fn(file, kvm); + fn(vfio_file, kvm); =20 symbol_put(vfio_file_set_kvm); } @@ -168,7 +168,7 @@ static int kvm_vfio_file_add(struct kvm_device *dev, un= signed int fd) kvf->file =3D get_file(filp); list_add_tail(&kvf->node, &kv->file_list); =20 - kvm_vfio_file_set_kvm(kvf->file, dev->kvm); + kvm_vfio_file_set_kvm(kvf->file, dev->kvm->file); kvm_vfio_update_coherency(dev); =20 return 0; --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 F3FEE3FF886; Fri, 31 Jul 2026 13:09:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503375; cv=none; b=gNt2jn3vcCT2DJDoEEtEpndSUqwUV9MiSgh5rIgHxIi7/GZ8jfncWueQYoxi4y9xTvbix0ipkGohAzHXaGPEiHyrS8znuTw4AqoggTxFVTUZdwYAOOCQyArFj4p5rWOPXEFfq8lJDEQICbDd0ZI8qddkza/UOKqCG8igz58FLRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503375; c=relaxed/simple; bh=X2dSRTqO8/lnG5Ozjqe4OPo50dNPQb2MbrUcIPR7VFk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sN52h+i4AZdaWp7vU4dw5ICGfAzk2KQOtVSLJHsWCHT8s8xJcKv4/r3fdTQ1H0DUHTCEj6RALnfdfy7SkDG6gvEZ2II+9p2+j+bUOjEqBd+pDFALAWEBk47MxvJR1Ll95Q4tu946I4Zq3srlmAUxI71iKs79NYhuuOFQFRGEwco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=iZZm+RpC; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="iZZm+RpC" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlZGb4072607; Fri, 31 Jul 2026 13:09:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=OgCWXZefIrbXXFaJf pg2eTiIEQqfkoaud39PK+2kZgw=; b=iZZm+RpCLqI77ocLUtF2Bz2l66xMPhMp+ KYmxjP2RboLcDCvX81lm6cOQ0n/OoMlcgd35l3eC1LCbGS2aTXzCZJR1Rx9YRTRH 1iaWSHlLZhlfg8AQnTAUDV5hKgvE5sI2zABW4KiNQtOmACFnpDgpOdyJwkxhQIYD LapuxQm/AnGOBxLxTdzUEgS/LL5zvG1fPtbX+M+tjbMfCI/BkRsjw1IiLfX4I16E IYFxN+pPcGdmgfXL4DcA0UcE+Z2DJpAt39W0hzGYJs1SdGD9FuvvdDFo6J/IWjmg d03l+J5kh4SpsU2LRSd/+fsR1rzulzAv2JGrP5dytCAs+rq8/NxzA== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2my-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:13 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuP3i021771; Fri, 31 Jul 2026 13:09:12 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn7uwg43a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD95Ht51380698 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:05 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2613920040; Fri, 31 Jul 2026 13:09:04 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B7D4720043; Fri, 31 Jul 2026 13:09:03 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:03 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 02/31] KVM: Make device name configurable Date: Fri, 31 Jul 2026 15:08:30 +0200 Message-ID: <20260731130902.654679-3-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: V6fYSpNAeFcLtfl6NhWWo6vfUFaFWnAJ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXxGpXNCnRG3mr HZaC5H7YO5J4tE9lTCHw7BlmqkpWvccvf7YT7+p7smU5aqyT4SaO3/HJBKlOiuOVPC//9MpYVin cVI9owSMjSAw7GbS6qOxNwXpDNtypTtcyC/lJCbtNPEk/Vd2Iv/sxu+/GjsNXpBS59ptsK20j5i GxPZZdpzPbqLPIcRkeXbSA/6IXfz+oDFhXZ/ns5V/GTRf9ouuF1kRObXBlBgbgSjMxpTZ+zTQ2K Pa5BPYiCRukGBTprIEolgNqdExgyygeZS+dHKZ1HyECbZb8xcEKZtFiWo6fQCQJ1YPfbwJRzSIz bQd7sVl9YBSjCEeHaz7sp4vwQPsEhRe0VmiLE32Trn9kIk62Y2XcDmnEti0fRmEkn7sWwLWpSK6 yH1WDMRKTMt8wnb00A5tqS6DlsIOSacj4/+nUE7A9aXNra8PFQQhyaW5Y+ZaLxJgd1MZEeE+XKV NRrlMVQ4pTuEafz9vIQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXxqX+UltkVUXP kD3p78kgvhqF1Zo4rfSHjQJjkZBV8UgISj9DvkABoiqqq3uCpuBExlbTzAzhI+JDZYlXKsGonbd 6q49iRN3Uq1es6bDYAdOm7DFz1UAYC4= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e7a cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=mNtOeJMeAAAA:8 a=HlZ9FdNpOgxRqm6DjigA:9 a=_FGNsZxrd-dVGcz-3RuP:22 X-Proofpoint-GUID: z45eeoq7oYfjv2J1RfM93CyuIyJaB1Gv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Allow KVM implementations to choose alternative device names. This is especially useful for architectures providing multiple KVM implementations simultaneously. Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Signed-off-by: Steffen Eiden --- include/linux/kvm_host.h | 4 +++- virt/kvm/kvm_main.c | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 90a9f840fece..7a5e2797db7f 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1068,7 +1068,9 @@ static inline void kvm_irqfd_exit(void) { } #endif -int kvm_init(unsigned vcpu_size, unsigned vcpu_align, struct module *modul= e); +int kvm_init(unsigned int vcpu_size, unsigned int vcpu_align, struct modul= e *module); +int kvm_init_with_dev(unsigned int vcpu_size, unsigned int vcpu_align, + struct module *module, const char *dev_name, int minor); void kvm_exit(void); =20 void kvm_get_kvm(struct kvm *kvm); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 994cb40cf2ef..18eb3d5d04f4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -10,6 +10,7 @@ * Yaniv Kamay */ =20 +#include "linux/sprintf.h" #include =20 #include @@ -5575,9 +5576,7 @@ static struct file_operations kvm_chardev_ops =3D { }; =20 static struct miscdevice kvm_dev =3D { - KVM_MINOR, - "kvm", - &kvm_chardev_ops, + .fops =3D &kvm_chardev_ops, }; =20 #ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING @@ -6349,13 +6348,13 @@ static void kvm_uevent_notify_change(unsigned int t= ype, struct kvm *kvm) kfree(env); } =20 -static void kvm_init_debug(void) +static void kvm_init_debug(const char *dev_name) { const struct file_operations *fops; const struct kvm_stats_desc *pdesc; int i; =20 - kvm_debugfs_dir =3D debugfs_create_dir("kvm", NULL); + kvm_debugfs_dir =3D debugfs_create_dir(dev_name, NULL); =20 for (i =3D 0; i < kvm_vm_stats_header.num_desc; ++i) { pdesc =3D &kvm_vm_stats_desc[i]; @@ -6491,23 +6490,39 @@ void kvm_unregister_perf_callbacks(void) } #endif =20 -int kvm_init(unsigned vcpu_size, unsigned vcpu_align, struct module *modul= e) +int kvm_init(unsigned int vcpu_size, unsigned int vcpu_align, struct modul= e *module) { + return kvm_init_with_dev(vcpu_size, vcpu_align, module, "kvm", KVM_MINOR); +} + +int kvm_init_with_dev(unsigned int vcpu_size, unsigned int vcpu_align, + struct module *module, const char *dev_name, int minor) +{ + char *cache_name __free(kfree) =3D NULL; int r; int cpu; =20 + kvm_dev.minor =3D minor; + kvm_dev.name =3D kstrdup_const(dev_name, GFP_KERNEL); + if (!kvm_dev.name) + return -ENOMEM; + /* A kmem cache lets us meet the alignment requirements of fx_save. */ if (!vcpu_align) vcpu_align =3D __alignof__(struct kvm_vcpu); + cache_name =3D kasprintf(GFP_KERNEL, "%s_vcpu", dev_name); + if (!cache_name) + return -ENOMEM; kvm_vcpu_cache =3D - kmem_cache_create_usercopy("kvm_vcpu", vcpu_size, vcpu_align, + kmem_cache_create_usercopy(cache_name, vcpu_size, vcpu_align, SLAB_ACCOUNT, offsetof(struct kvm_vcpu, arch), offsetofend(struct kvm_vcpu, stats_id) - offsetof(struct kvm_vcpu, arch), NULL); + r =3D -ENOMEM; if (!kvm_vcpu_cache) - return -ENOMEM; + goto err_dev_name; =20 for_each_possible_cpu(cpu) { if (!alloc_cpumask_var_node(&per_cpu(cpu_kick_mask, cpu), @@ -6533,7 +6548,7 @@ int kvm_init(unsigned vcpu_size, unsigned vcpu_align,= struct module *module) kvm_preempt_ops.sched_in =3D kvm_sched_in; kvm_preempt_ops.sched_out =3D kvm_sched_out; =20 - kvm_init_debug(); + kvm_init_debug(kvm_dev.name); =20 r =3D kvm_vfio_ops_init(); if (WARN_ON_ONCE(r)) @@ -6574,6 +6589,8 @@ int kvm_init(unsigned vcpu_size, unsigned vcpu_align,= struct module *module) for_each_possible_cpu(cpu) free_cpumask_var(per_cpu(cpu_kick_mask, cpu)); kmem_cache_destroy(kvm_vcpu_cache); +err_dev_name: + kfree_const(kvm_dev.name); return r; } EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_init); @@ -6599,5 +6616,8 @@ void kvm_exit(void) kvm_vfio_ops_exit(); kvm_async_pf_deinit(); kvm_irqfd_exit(); + + kfree_const(kvm_dev.name); + kvm_dev.name =3D NULL; } EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_exit); --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 78CFD414A1E; Fri, 31 Jul 2026 13:09:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503376; cv=none; b=Kk9QNyZ5EPM5i+9NbJNeVfg5iob4/xXuIZ1r/HL+IMm1LfO5sSGFHz4AOXfRWpc0ntj3A9xq9XdpRciJjKC/wgdXMnsxLkHi/YwuuOcvaFny+vz1tsRlthB+fQ306+O5DKEqqt5BwVNZU6FkUXojMMXdIfrPoDWeIpzPEFt21tw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503376; c=relaxed/simple; bh=shf3bWdB62u5SV2u/3gJ0T5lxiAGTldcYcxETPqnncc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ULwAyPAAYE3+wCI9PkD9emZt3WCZ6gP+4G90i5JTQfS8ogKCzNWEZ75alAQX4JZ8almMt2ed1CtDKiRnNLAKt/yS6BjV37CN4zC6USYZmpI08zNm4Jihavfdy8RvYTWti21lJK2ptqXKPRk7cHCnHWdc8bYAQwb2TqkbqJ8A4mw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=g94x0XB8; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="g94x0XB8" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlwiC1791081; Fri, 31 Jul 2026 13:09:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=SM7oNCI4u0y5aJ6mj P8ZOQnyJ9ITYGSkXVkpk4AYg/8=; b=g94x0XB8b+zRs4XLQ7qIp0zYqRcmnmgnY P0MpHxE98/jBcDdodyZBoqjGnA4qAmkAT0OcPcwai7R77iRf39EMFBH3wHCdiAbh aL1t58ojvD3+M7TfZKYyXbTZuyKQCDvKQLSu1DRBK4SYz8UeM8NLa5dxFvWg2lcM fiR4/Ja3hfuqoXKDAFZcdeNc9weHdmvAnABehfjwjP0viIgeRiYOV+bIf5IL+of1 NPQGBVhCMfBALCWUfBCDoBsksFqrGTGmnAYIOSK/T/3AZX9VJeVC2Vbz5iQOoJCT TpXXfk+djqvlQoDRdo1ZMclHSPnyJ5W53DwLboUxMl7rBKJ4TCiqg== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuwdc41m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:12 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuN5O012675; Fri, 31 Jul 2026 13:09:12 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8fkg07r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD94u447382904 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:04 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 91FE82004D; Fri, 31 Jul 2026 13:09:04 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2CD4F2004B; Fri, 31 Jul 2026 13:09:04 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:04 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 03/31] KVM: Allow KVM implementations to switch off MMIO independent of Kconfig Date: Fri, 31 Jul 2026 15:08:31 +0200 Message-ID: <20260731130902.654679-4-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: DFLIu-1q7DRkoGPS0JzL_Dc-7tB-KhNl X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX/fv9TXVmQsVY yMIkJpvl04L5JK/tNXPT8sUWdUId88Tdp3VQ8h0x9sAnNGAAnplI2zJcM/yYJjRLhtyW7i8HMe3 2qkCypsgzL0ELCS22I3i1TtkvvuqV6s= X-Authority-Analysis: v=2.4 cv=E/z9Y6dl c=1 sm=1 tr=0 ts=6a6c9e79 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VnNF1IyMAAAA:8 a=-AqJVl6EvvwGbS2dlloA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX/tIFvvQgwy7K lFdunpfj13EYbP5Z/6kpYT/MeuWHKHzmBKxIgkT9D2oKo8l/ujCFt9mNybL3dVQUm6Z5lfHrYLV XHdyo8F6VkdpyibrL9EZ1r6fk03ummmhNJfd0m1DSIxS7M3clJMJQYLTP32/FysrTHhtsX4aQ6g ZzWayUWA2qijtQ3Zf0Qa428YkJtnTNASXNrEmA4ynHzfr4757utNaL+qWtx8az23NF4H0/oAj4n WrssHWnKGOWGKLMmdNSsihdEc7TAzo5ZvoAB204rIaD4F1my8QXcmPLmz/lTCgKJPAjsZtl8dno QqxVkmifWHA4dF5nU/1Zg1jO6hmP46+nu8krmOlcQYiNRdogOd/ZHnJSouxIHOD2OOMHJf0QyrM XKxTslfidqescdupWL1RQ0pyCQnaCxgzlGrCrwB52R/yxJa6kcWmYkTikm375x4fK/iUsNo8JAG Qz1h7LD6HK/5gvsmMXQ== X-Proofpoint-GUID: 2Sxg6PMissB01-jMXtKoSktWy8YNwTQd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Only defining KVM_MMIO is not flexible enough for multi-KVM systems where one KVM implements MMIO but others do not. Solve this by additionally testing for the non-existence of KVM_NO_MMIO before including MMIO code to KVM. Signed-off-by: Steffen Eiden --- virt/kvm/coalesced_mmio.c | 4 ++++ virt/kvm/coalesced_mmio.h | 2 +- virt/kvm/kvm_main.c | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c index 6b1d90161099..8ff9d9a6f47a 100644 --- a/virt/kvm/coalesced_mmio.c +++ b/virt/kvm/coalesced_mmio.c @@ -15,6 +15,8 @@ #include #include =20 +#ifndef KVM_NO_MMIO + #include "coalesced_mmio.h" =20 static inline struct kvm_coalesced_mmio_dev *to_mmio(struct kvm_io_device = *dev) @@ -188,3 +190,5 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *= kvm, */ return 0; } + +#endif /* ifndef KVM_NO_MMIO */ diff --git a/virt/kvm/coalesced_mmio.h b/virt/kvm/coalesced_mmio.h index 36f84264ed25..826af421a5be 100644 --- a/virt/kvm/coalesced_mmio.h +++ b/virt/kvm/coalesced_mmio.h @@ -11,7 +11,7 @@ * */ =20 -#ifdef CONFIG_KVM_MMIO +#if defined(CONFIG_KVM_MMIO) && !defined(KVM_NO_MMIO) =20 #include =20 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 18eb3d5d04f4..bb3682d8e1f7 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4056,7 +4056,7 @@ static vm_fault_t kvm_vcpu_fault(struct vm_fault *vmf) else if (vmf->pgoff =3D=3D KVM_PIO_PAGE_OFFSET) page =3D virt_to_page(vcpu->arch.pio_data); #endif -#ifdef CONFIG_KVM_MMIO +#if defined(CONFIG_KVM_MMIO) && !defined(KVM_NO_MMIO) else if (vmf->pgoff =3D=3D KVM_COALESCED_MMIO_PAGE_OFFSET) page =3D virt_to_page(vcpu->kvm->coalesced_mmio_ring); #endif @@ -4882,7 +4882,7 @@ static int kvm_vm_ioctl_check_extension_generic(struc= t kvm *kvm, long arg) case KVM_CAP_ENABLE_CAP_VM: case KVM_CAP_HALT_POLL: return 1; -#ifdef CONFIG_KVM_MMIO +#if defined(CONFIG_KVM_MMIO) && !defined(KVM_NO_MMIO) case KVM_CAP_COALESCED_MMIO: return KVM_COALESCED_MMIO_PAGE_OFFSET; case KVM_CAP_COALESCED_PIO: @@ -5223,7 +5223,7 @@ static long kvm_vm_ioctl(struct file *filp, break; } #endif -#ifdef CONFIG_KVM_MMIO +#if defined(CONFIG_KVM_MMIO) && !defined(KVM_NO_MMIO) case KVM_REGISTER_COALESCED_MMIO: { struct kvm_coalesced_mmio_zone zone; =20 @@ -5558,7 +5558,7 @@ static long kvm_dev_ioctl(struct file *filp, #ifdef CONFIG_X86 r +=3D PAGE_SIZE; /* pio data page */ #endif -#ifdef CONFIG_KVM_MMIO +#if defined(CONFIG_KVM_MMIO) && !defined(KVM_NO_MMIO) r +=3D PAGE_SIZE; /* coalesced mmio ring page */ #endif break; --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 9645442980C; Fri, 31 Jul 2026 13:09:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503379; cv=none; b=crh4Z4dNE3dhaIebUz72JVrKtGyt0fwGWxxjp7dfYVObjxKVbyFACq8FCzTh12IobYZwY4X78xWjdJgt/Q413FOQJSWjGlcCLo+5cdx6TAsWYVai1vpW12znJkgjDP45b0whPTA2Te9yYzYxM3vBF5ZyFTsCoY1TsIsAdSOGkTM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503379; c=relaxed/simple; bh=CdRBGytXIXa1zx9eXOvGAuzKgsrn2BprzimKUV3/4dI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NYjVAr9kzxG7uA6XXLejr3yxlJ/oCbRsGyDr6ZGqTB/1psPdNmi51A20IpNufIhF/avpYLAYULrbSZnm2Dx2CykoPdwTgK6HlcG627+4dPBSk8pP3A6cQjAyqGXXoDow3IUQG1CnmrdzPgDsBCFGxhlwUGxFPpIwzdEezuVZRWs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=ZeS7T9fN; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="ZeS7T9fN" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBmZTt1672199; Fri, 31 Jul 2026 13:09:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=eGPgAnjtKT6ftTAM6 aOkUfJetBSRY7Y8hfEs8FIUvWE=; b=ZeS7T9fNdcrXHdAGoCFzonlihd6wN7PyC GNqfp/I3alnQlVQ3Z8ExsFDZ5KRAonSQEPgvn9zU9mNj3/u9+fS0g1BeoD26VcuK GQitZtXRSrBuvoWfSO33wYqBjSF3A8h5wZt+JqWB0TiftEtuL16wc1XjaSlJRBmL 62nDrSJxoF1paBQPHI/hZ6ku+tP0Tawof1m4XD/9+LqOOwj4S55VfKookUuZ2KvX gtypmtXpJeZuAvSalCBMNVbDhpAjpl/+xuV/LEPh2OuXINULXUtulAkVOpaSTgcI aryPgEhPuswTeqYhfVSSXpRtqfUGdpqen0qsx3tTiqONP4SFTCLGw== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuyjm3v6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:13 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuMcr012670; Fri, 31 Jul 2026 13:09:13 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8fkg07u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD95xp28705276 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:05 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0E7AD2004D; Fri, 31 Jul 2026 13:09:05 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 987132004E; Fri, 31 Jul 2026 13:09:04 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:04 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 04/31] arm64: Use proper include variant Date: Fri, 31 Jul 2026 15:08:32 +0200 Message-ID: <20260731130902.654679-5-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXzcRgvUGaGUIE OBMw2u1r4MU8XZRv5I7xWgA8EMjex+IsFxynOSU5uGOLOPDzh5YqLCFrjUocK9dqY7vIaqym78V co1P3GchEEHVmPDiaLq84Ef/AmbIqfg= X-Proofpoint-GUID: QXD5bBxWjvwBFSApnVrk3-n4ykBoB8QY X-Proofpoint-ORIG-GUID: T0xzpMAGbAR7DhOqDV7OE6ZIOJWkbLYg X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX+q3Ksfo+buTb awIjyybs65q3ImQnnYe03LkaryQqFSIN80CstLcHANxoxl3I7J+sce5nwLNTBlEyMHQeIkulV7T idmWMu11VhQeyhA2u1jXxT+CREGpsG0/OsumVYVwduKW9dN7GoQR19hn8Cc5jkIruKMCdo0t90W C7ukQGwKujV7yFhC73Pcwt4qHlTQR77ed/57ZhR9tiuix/vAIM+xDhdC8XYPeMunNLFAdqrCTvH OeOrFFGJwt1x9grJdufYu57hTAwwCVxW0uyQjWow3NAxG795VBKDyn7uoM/QTsOBbt0Ec0Oirez 8fCHN4SMV4iR/lYtJhzYJOp5NAUaI4+MkAUjHO38sqMeNlzCAKQ+gIEXVMZSJFB0C0C/UXEGTbb 9YgXndPxjP9/EUna/gHUnmDj3JwEBlBmfRqROYmFNSrcyoOaLosp35lRcGiYEIflMUnkJ/npAiF Yb1EyKv8WzyRMQmt5yA== X-Authority-Analysis: v=2.4 cv=X5Vi7mTe c=1 sm=1 tr=0 ts=6a6c9e7a cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=d3WjOe2bLlXSZPWdUOEA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Use <> for including the sysreg header as it is not discoverable from the current directory. Fixes: c07d8017bceb ("arm64/sysreg: Enable automatic generation of system r= egister definitions") Signed-off-by: Steffen Eiden --- arch/arm64/include/asm/sysreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 7aa08d59d494..4bfdac9401bd 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -173,7 +173,7 @@ * come from here. The header relies on the definition of sys_reg() * earlier in this file. */ -#include "asm/sysreg-defs.h" +#include =20 /* * System registers, organised loosely by encoding but grouped together --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 E7916416D1A; Fri, 31 Jul 2026 13:09:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503376; cv=none; b=GJdUQa7oYlrhJpH83z3tLcCoUdUgQ5u2iRM/cmWHfwntoaC1fYhN/txH34uv5e1ueSElJldi0voCRL6HSxqBqutwSva/5gangfItHOd8yT8BUs+lRos80sTF25LpMdwVW2R6xB1SRzJQUZcfXDBaaSjikTA/b4wmsD59hk7NEj8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503376; c=relaxed/simple; bh=EAa5FTBEPwE/31jwb1z+GrO7K5vevLQgbYFzgo43IBA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FQpSyfY/e65F1X3ITwQWRKKA4L3TbaIcn5XiwUpZ5YXaRShEU3NBVHkgMHeoUDLOi5bhAxxk/QtjrYLXmx2rwq/CSfoESDyXONNSOqH1wx85A+nM0Xrngcs3/oIE6sG4PLkGKHShPYT7cChOxZyaSgMNt/SJH4JFw7+eEq27qik= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=IjLfiIlX; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="IjLfiIlX" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlkS91765505; Fri, 31 Jul 2026 13:09:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=3UhK5YmUdmMvcOTRb YWKMVw6tSYQ82hiNVjgPLai9/8=; b=IjLfiIlXncP0YHSEOcgh0IudpkBlqANCi LRQKiwdh+XrqEMLjemZ9RZHjO6/DmhMIrdhLmkwvYC/6w3joR7LxapBEhjZKcYit oW4MXTB3jDGmc2OhHoYzhuva2a8/wJTmfH7Um91ecvkwwGmGBNq6uLJkFAGXXDz6 F/CXeT7IUAFtZNWPOG06t8Vf8l66O51CHT7HFsZNl+Hy2lc0r3OTVu+FY+w/E3Vz SqsuY8HMNJhFhcMgSPCfDA/NOvjr7kub9bZQyezE4dQbV3oJqHSn/A4VFSR2Ip0c HAuqpmwsYsDnBUCEtLxRv4d0v6u7VGEZf6Goh9yYmd4MhD8y43/Sw== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmv0y5658-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:13 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuQ1x021776; Fri, 31 Jul 2026 13:09:12 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn7uwg43d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD95pR31130088 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:05 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6F8B520043; Fri, 31 Jul 2026 13:09:05 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1108F2004F; Fri, 31 Jul 2026 13:09:05 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:05 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 05/31] arm64: ptrace: Use constants for compat register numbers Date: Fri, 31 Jul 2026 15:08:33 +0200 Message-ID: <20260731130902.654679-6-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: vIV77J6sCKVUS31HtHRbg5PWhRh2cT7L X-Proofpoint-ORIG-GUID: rRP1Gnw3Vu8yqoAKu3qG3hn5ahB1Z4z0 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX/Bnipok4nDZ9 dknm3KkCWueF0CWTnUB/8pAJwC0T95GhhqyjMzlbSmUhumGgYkpwBcNdLMiT87cQ6T9sOyPDReQ BFxm/pulmcA0LH4SbtMgp3kcecm2lX8= X-Authority-Analysis: v=2.4 cv=dYuwG3Xe c=1 sm=1 tr=0 ts=6a6c9e7a cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=8sKaXpLx0aSSeG29UzUA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX9VROhnMdKu62 /EtrgHI7kTjpuzF1N2XiHYMXgEG8jp7bUssiuYKtCG5xGhGg5GtaPsMNy2qcx1EtwlHbGT0288f iuFJLUWjMKDQIBt1k8cpwFXRGV06HkjvIeWifdRdrFUw8Sq0h+gz+LYThhjSC1dN4oVFoiw2cV6 1HQ+2U3gIVf7BzmW5ZMtaVTz9V6v22v45AoPwL+TTzcQpPSa5NeKNVB3qgrYOv9hoivf/PhPeMw B0nPWj/XG7D13yjgqKoMvzTAIat/p0oiZxe7pXjnrpJ2iNdGLjWmkQQMAObYNnhx9xFTuT/pz9v mYQwmVuiGVpKBZ31WtUcLE2k5LDT9PFjTpjUDAtNOIIA0y0npEkxr75yfHzYVegBAA9qW9yUz/c b5oU9zeqkNttWComBz09bO9ADwNF1WKfpjUdxMfKiz8TAkuXmpYC3onOsUdD+R5BJFJtfHo2D9u 8GA+vyeBaWN3DGKwJVA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Define an enum to determine the register number for the mapping from AArch32 and AArch64 registers. This allows for a more flexible use of the register mappings. Signed-off-by: Steffen Eiden --- arch/arm64/include/asm/ptrace.h | 60 ++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrac= e.h index 39582511ad72..6f5b79ee1f3f 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -104,26 +104,48 @@ #define COMPAT_USER_SZ 296 =20 /* Architecturally defined mapping between AArch32 and AArch64 registers */ +enum { + __compat_fp =3D 11, + __compat_sp =3D 13, + __compat_lr =3D 14, + __compat_sp_hyp =3D 15, + __compat_lr_irq =3D 16, + __compat_sp_irq =3D 17, + __compat_lr_svc =3D 18, + __compat_sp_svc =3D 19, + __compat_lr_abt =3D 20, + __compat_sp_abt =3D 21, + __compat_lr_und =3D 22, + __compat_sp_und =3D 23, + __compat_r8_fiq =3D 24, + __compat_r9_fiq =3D 25, + __compat_r10_fi =3D 26, + __compat_r11_fi =3D 27, + __compat_r12_fi =3D 28, + __compat_sp_fiq =3D 29, + __compat_lr_fiq =3D 30, +}; + #define compat_usr(x) regs[(x)] -#define compat_fp regs[11] -#define compat_sp regs[13] -#define compat_lr regs[14] -#define compat_sp_hyp regs[15] -#define compat_lr_irq regs[16] -#define compat_sp_irq regs[17] -#define compat_lr_svc regs[18] -#define compat_sp_svc regs[19] -#define compat_lr_abt regs[20] -#define compat_sp_abt regs[21] -#define compat_lr_und regs[22] -#define compat_sp_und regs[23] -#define compat_r8_fiq regs[24] -#define compat_r9_fiq regs[25] -#define compat_r10_fiq regs[26] -#define compat_r11_fiq regs[27] -#define compat_r12_fiq regs[28] -#define compat_sp_fiq regs[29] -#define compat_lr_fiq regs[30] +#define compat_fp regs[__compat_fp] +#define compat_sp regs[__compat_sp] +#define compat_lr regs[__compat_lr] +#define compat_sp_hyp regs[__compat_sp_hyp] +#define compat_lr_irq regs[__compat_lr_irq] +#define compat_sp_irq regs[__compat_sp_irq] +#define compat_lr_svc regs[__compat_lr_svc] +#define compat_sp_svc regs[__compat_sp_svc] +#define compat_lr_abt regs[__compat_lr_ab] +#define compat_sp_abt regs[__compat_sp_abt] +#define compat_lr_und regs[__compat_lr_und] +#define compat_sp_und regs[__compat_sp_und] +#define compat_r8_fiq regs[__compat_r8_fiq] +#define compat_r9_fiq regs[__compat_r9_fiq] +#define compat_r10_fiq regs[__compat_r10_fi] +#define compat_r11_fiq regs[__compat_r11_fi] +#define compat_r12_fiq regs[__compat_r12_fi] +#define compat_sp_fiq regs[__compat_sp_fiq] +#define compat_lr_fiq regs[__compat_lr_fiq] =20 static inline unsigned long compat_psr_to_pstate(const unsigned long psr) { --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 03340403EA5; Fri, 31 Jul 2026 13:09:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503376; cv=none; b=pdV8kfhGtfFIerOOE4FCSxW3MTge1Lq8StYD5ltD2Mrh9jABCvC4XWDx0RwKZL054gDV517L5rDbj3WjxWVg9aWiv2FVGpk7xmZnA+sbe9aO7BzoYVNPAL/pCXxTbSHEnIU5BWdGaYy7leZVMz9SF+ku3yOnG4ebEXOClVMXj6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503376; c=relaxed/simple; bh=pKMG+pTcDQXZZx0j8Jl/6Zx3cxV7TbzRslaJ1873Kb8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cgsn9EY29FDMlRpJrmMat0Rqin0fD51MHHC7adMBgBDxPFN1hQS07Ed12oj/ZOAvGQ4/w28sTQOS2a3VjDTEyghhwx/NO6+4hSYTLU7qHZSTu+m+Vj1OzT6UVA7gDxeJpiRGJVLPdlIaRANgGnDOMiYXcF24slaUpdD/hQD86KU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=nnXwXRUP; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="nnXwXRUP" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlxVG4072948; Fri, 31 Jul 2026 13:09:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=sKaPD0GBm7OH0DCkp gRZ2wPwwuBU/2nK/HFJ1bUGeuo=; b=nnXwXRUP7sRH+EWC3uySZA6pmYM24upOb 0Vi3AF3nqP9HuDMbztDiB5yHVHNVzL1484X8ZXyvFz+lei5kzpzAOvYMrdK10ztx zBWQ9teJLylM2J8ho44zmvLFZn0+pF8ttjszQUT3h5YWYa4Cm79O+YGJbEfkVAud W7vNLJg4bDkdaAiK0ZRrNhDbdySPTK917cHouYtXFeOOotr8+QSBP897Iwrdv7kD wZpHBYIjF/D/MzT9TiNxO6/h4tMS+5Z7iz9OphbKzTJ9iZjcHT/RGpC4+p0Ox5B1 NH0HLPX8nVDs+78Qrp/zHP/9W0FoYnxBeCrLUpniuQsCp4/Dp/Shw== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2n1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:13 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCQEIF026841; Fri, 31 Jul 2026 13:09:12 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn9pgqtbk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD95UI30671174 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:06 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D88B520043; Fri, 31 Jul 2026 13:09:05 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7639C20040; Fri, 31 Jul 2026 13:09:05 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:05 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 06/31] arm64/sysreg: Convert SPSR_ELx to automatic register generation Date: Fri, 31 Jul 2026 15:08:34 +0200 Message-ID: <20260731130902.654679-7-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: xFdaPvHbcxmvcTa5fx8PWhhYQoO9bVy_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX5FhqiuiFNHwS xc6pQWhH8BztvNld/+e56OZ/FkVF6UBV7FNKNmRZwV/BSrPuCrS0vffb9QTxjUyATIDCHGC8dnl F04oclHAybrauRLwLW+vyRGDwTOncoN8yE/lkd5I/tkoVXc6v5EPIkx9YDHZ1nBwIjVLU2L7vEb EqsurKMzt9ppgUnrsvtqDLx3f+cw34BIxMjMQ5pNB3YaaVNFCIyvjmwD1WEJsItbFjr/OrOUZQI qsCLPJ5qhYs39TuwAXpZKcNr1Kna8RSz4ngPJdE3T93+g+4Klkhvi6T14hOGWfzXDTuI9h9tHRV VXrU7YWoXRAaBTICGN3X/m7+1fiBQDFw2s5DJUoHhssAWbGeMYsKFboITGkcG+4FJ7DjM1+gqPg 7E6pt6TMqVtK3IzfzFlpFUCS5AW5epXR5iSGuZ8HVfiWZxuDswMkXAvNVUsrTvR8J5V1Ms6Daxb lWyx8yH2MckH2cF2TtA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX70latcCQcgs2 JHPvvOBsjvUAqz4qc+YzoSvHdk/iVJMcQVjnyUP7ot6LnBaPdXVnbhfxdelkF4kLjTtD0JNEnSF /G3zxN3v/pjnQ84cSCAh2uNmmaCI4mA= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e7a cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=ABWHSbNOgyVrhIrjGdkA:9 X-Proofpoint-GUID: g9BRLfpZhitxLMLYmPoF67pJ-rYYvlPn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Convert SPSR_EL{1, 2, 12} to automatic register generation as per DDIO616 2026-06. No functional change. Signed-off-by: Steffen Eiden --- arch/arm64/include/asm/sysreg.h | 3 -- arch/arm64/tools/sysreg | 72 +++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 4bfdac9401bd..1aa601c95188 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -295,7 +295,6 @@ #define SYS_APGAKEYLO_EL1 sys_reg(3, 0, 2, 3, 0) #define SYS_APGAKEYHI_EL1 sys_reg(3, 0, 2, 3, 1) =20 -#define SYS_SPSR_EL1 sys_reg(3, 0, 4, 0, 0) #define SYS_ELR_EL1 sys_reg(3, 0, 4, 0, 1) =20 #define SYS_ICC_PMR_EL1 sys_reg(3, 0, 4, 6, 0) @@ -518,7 +517,6 @@ #define SYS_VTTBR_EL2 sys_reg(3, 4, 2, 1, 0) =20 #define SYS_HAFGRTR_EL2 sys_reg(3, 4, 3, 1, 6) -#define SYS_SPSR_EL2 sys_reg(3, 4, 4, 0, 0) #define SYS_ELR_EL2 sys_reg(3, 4, 4, 0, 1) #define SYS_SP_EL1 sys_reg(3, 4, 4, 1, 0) #define SYS_SPSR_irq sys_reg(3, 4, 4, 3, 0) @@ -604,7 +602,6 @@ #define SYS_BRBCR_EL12 sys_reg(2, 5, 9, 0, 0) #define SYS_TTBR0_EL12 sys_reg(3, 5, 2, 0, 0) #define SYS_TTBR1_EL12 sys_reg(3, 5, 2, 0, 1) -#define SYS_SPSR_EL12 sys_reg(3, 5, 4, 0, 0) #define SYS_ELR_EL12 sys_reg(3, 5, 4, 0, 1) #define SYS_AFSR0_EL12 sys_reg(3, 5, 5, 1, 0) #define SYS_AFSR1_EL12 sys_reg(3, 5, 5, 1, 1) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 7cb61aca3797..2a4b94e8c62f 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -401,6 +401,78 @@ Res0 3:1 Field 0 SO EndSysreg =20 +Sysreg SPSR_EL1 3 0 4 0 0 +Res0 63:37 +Field 36 UNIJ +Res0 35:34 +Field 33 PPEND +Res0 32 +Field 31 N +Field 30 Z +Field 29 C +Field 28 V +Field 27 Q +Field 26:25 IT01 +Field 24 DIT +Field 23 SSBS +Field 22 PAN +Field 21 SS +Field 20 IL +Field 19:16 GE +Field 15:10 IT27 +Field 9 E +Field 8 A +Field 7 I +Field 6 F +Field 5 T +Field 4 M4 +Enum 3:0 M + 0b0000 EL0 + 0b0100 EL1t + 0b0101 EL1h + 0b1000 EL1tnv + 0b1001 EL1hnv +EndEnum +EndSysreg + +Sysreg SPSR_EL2 3 4 4 0 0 +Res0 63:37 +Field 36 UNIJ +Res0 35:34 +Field 33 PPEND +Res0 32 +Field 31 N +Field 30 Z +Field 29 C +Field 28 V +Field 27 Q +Field 26:25 IT01 +Field 24 DIT +Field 23 SSBS +Field 22 PAN +Field 21 SS +Field 20 IL +Field 19:16 GE +Field 15:10 IT27 +Field 9 E +Field 8 A +Field 7 I +Field 6 F +Field 5 T +Field 4 M4 +Enum 3:0 M + 0b0000 EL0 + 0b0100 EL1t + 0b0101 EL1h + 0b1000 EL2t + 0b1001 EL3h +EndEnum +EndSysreg + +Sysreg SPSR_EL12 3 5 4 0 0 +Mapping SPSR_EL1 +EndSysreg + Sysreg ID_PFR0_EL1 3 0 0 1 0 Res0 63:32 UnsignedEnum 31:28 RAS --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 DF71E429CD7; Fri, 31 Jul 2026 13:09:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503379; cv=none; b=GOBF33bOtgz2dqMR9ZnexjqyUY6yNm/QZJlA+KStK9ivznqv7qjnkfVaX20txMmEpJaLG7t8J8Um2lxrhL2i4IRobPVGbI7RqHppwITALiGOvXEazvh8cj8G9NaYKL6+9Gxs//DNi7OnzZeWZLy9zEBH5QJA5TVRp6bqk12nZ6g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503379; c=relaxed/simple; bh=aeo2wApd+x8gpgXJYqHavG5qdPfAkooWU7ZK+sY/xv8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tSvFIJ6Bc2Q4WfVzhQhIADBwkuQUoDijZf53j1DjMsPaGJDX9iIuV64OJvuJRVHf5doW6mbLOcU0Z5u4bFh8ikoIlTUrSxnblJflefCEKlh9t1OPez8c9ObGQuqW2lS1P4fKB60MQanVrtlUIM3Z/p/ygDyCwxGURYBjuGwF+p8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=CRc3lcUZ; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="CRc3lcUZ" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBm1Xq4073015; Fri, 31 Jul 2026 13:09:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=jkfOij6lz6C1BXqgF fxHnThsvpcJBEfqQj9SCtiulu8=; b=CRc3lcUZZHFEr3ii2TOnWZHtWZ2Hwu7oz mJfayQUcFQgAzTrJScvlrfqGy/BUSwXgV1BlU64d8QFULE9kk4VFawRKQ9HuADe1 HFMcnBEIe4hfNdw3QxqQNmW+TUz+MYt5mOg+oT+mAsg+zFou6ejfNPrY1/MHsB15 HN5GjqOxAqVRfs44bk0tGLhcpHJ42NgG2cH0FqPq/Wl0tBTMvfn4/WWKbf9YvgPf oC76RZLB9qBWZKTwBCj2Opyh13AOGbtmcnFp7a2uzjr6CUxsnLbgW6ELy5szF+r0 5UHwY4Myd2SHv4n4+W9/MkLdEcHVFoJugxEWDyN3ByuV6ckG51KIg== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2n4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:14 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuMcs012670; Fri, 31 Jul 2026 13:09:13 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8fkg07x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:13 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD96gx42926470 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:06 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F56520040; Fri, 31 Jul 2026 13:09:06 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DF46D2004B; Fri, 31 Jul 2026 13:09:05 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:05 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 07/31] KVM: arm64: Access elements of vcpu_gp_regs individually Date: Fri, 31 Jul 2026 15:08:35 +0200 Message-ID: <20260731130902.654679-8-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: Y0IFm64B4MSYgLgMgy5REkWBQIx2a0W- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX1AP9b492oSU9 pJtPxrj4koGhYaHQ00Qwn2YYfVBfopAI0E5BQoHxuGlYpwsTLFDtPivTiYcAnzWuXNCackjlifT llYMhlPY3Tm2Kp492VQcIL4xdH7wIxHgyXEt8sAxdFpLflvCZmZhDsTDLiTcIC/OhyOoN3uYW4j cszg6Sc/z872KNvkD3MXE6rkWawybI3f81JbA0hoFnnSyUt5flJMekL3kPA+8nK703uM55HIGTw ACWF6GX+LCwdXTT2797uB1kzEx6j0uZ/fKb33vzDCg16ElK/J+7vthUQs/WOLiHQnBbEenwNZGQ 6/c3ghF+JC/ISlPs9vqladHida+MvHpf6QrKTZB/VAd6031JA4NwKqNAkUFzZJoTxhKxLZ4Gtzz S4wtFoH4WMPseVIhLb3yAUn58lQMk+L2K/w9fqTcMWSvHACVdgGooh3FidGz7PVroa30vW9D5Sc VCnfLQCPZmr+pTDTU5g== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXxUXi41x3Pec3 7ipdz3j0xnlRGHStnATg1SMtQGX4H2cVneK1vGCDHD6fNmqK8+AxqgtmJwBBLxhR8+MX3KcRqBE sq0AlYLY6goBmLUcPuxk3ZoEBTWPtOs= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e7b cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=u9TCuROiSGUiZ2HIOOsA:9 X-Proofpoint-GUID: T2PHQVFGXqHBcEOgizWcBx3pKTc0kniu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" While for arm64 the members of vcpu_gp_regs are allocated continuous this is not necessarily true for other architectures implementing ARM. Let vcpu_gp_regs() no longer return the address of the user_pt_regs in the vcpu context but the address of the gp-register array field in the user_pt_reg struct. Note, this change semantically excludes pc from the GPRs. No functional change. Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Signed-off-by: Steffen Eiden --- arch/arm64/include/asm/kvm_emulate.h | 8 ++++---- arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/kvm/hyp/exception.c | 4 ++-- arch/arm64/kvm/hyp/include/hyp/adjust_pc.h | 4 ++-- arch/arm64/kvm/hyp/include/hyp/switch.h | 4 ++-- arch/arm64/kvm/reset.c | 6 ++++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/= kvm_emulate.h index 5bf3d7e1d92c..c5b30d334e79 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -133,12 +133,12 @@ static inline void vcpu_set_vsesr(struct kvm_vcpu *vc= pu, u64 vsesr) =20 static __always_inline unsigned long *vcpu_pc(const struct kvm_vcpu *vcpu) { - return (unsigned long *)&vcpu_gp_regs(vcpu)->pc; + return (unsigned long *)&vcpu->arch.ctxt.regs.pc; } =20 static __always_inline unsigned long *vcpu_cpsr(const struct kvm_vcpu *vcp= u) { - return (unsigned long *)&vcpu_gp_regs(vcpu)->pstate; + return (unsigned long *)&vcpu->arch.ctxt.regs.pstate; } =20 static __always_inline bool vcpu_mode_is_32bit(const struct kvm_vcpu *vcpu) @@ -167,14 +167,14 @@ static inline void vcpu_set_thumb(struct kvm_vcpu *vc= pu) static __always_inline unsigned long vcpu_get_reg(const struct kvm_vcpu *v= cpu, u8 reg_num) { - return (reg_num =3D=3D 31) ? 0 : vcpu_gp_regs(vcpu)->regs[reg_num]; + return (reg_num =3D=3D 31) ? 0 : vcpu_gp_regs(vcpu)[reg_num]; } =20 static __always_inline void vcpu_set_reg(struct kvm_vcpu *vcpu, u8 reg_num, unsigned long val) { if (reg_num !=3D 31) - vcpu_gp_regs(vcpu)->regs[reg_num] =3D val; + vcpu_gp_regs(vcpu)[reg_num] =3D val; } =20 static inline bool vcpu_is_el2_ctxt(const struct kvm_cpu_context *ctxt) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index bae2c4f92ef5..1094a5997fc2 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -1152,7 +1152,7 @@ struct kvm_vcpu_arch { #define vcpu_clear_on_unsupported_cpu(vcpu) \ vcpu_clear_flag(vcpu, ON_UNSUPPORTED_CPU) =20 -#define vcpu_gp_regs(v) (&(v)->arch.ctxt.regs) +#define vcpu_gp_regs(v) ((v)->arch.ctxt.regs.regs) =20 /* * Only use __vcpu_sys_reg/ctxt_sys_reg if you know you want the diff --git a/arch/arm64/kvm/hyp/exception.c b/arch/arm64/kvm/hyp/exception.c index bef40ddb16db..9e63c4aebb29 100644 --- a/arch/arm64/kvm/hyp/exception.c +++ b/arch/arm64/kvm/hyp/exception.c @@ -292,12 +292,12 @@ static void enter_exception32(struct kvm_vcpu *vcpu, = u32 mode, u32 vect_offset) switch(mode) { case PSR_AA32_MODE_ABT: __vcpu_write_spsr_abt(vcpu, host_spsr_to_spsr32(spsr)); - vcpu_gp_regs(vcpu)->compat_lr_abt =3D return_address; + vcpu_gp_regs(vcpu)[__compat_lr_abt] =3D return_address; break; =20 case PSR_AA32_MODE_UND: __vcpu_write_spsr_und(vcpu, host_spsr_to_spsr32(spsr)); - vcpu_gp_regs(vcpu)->compat_lr_und =3D return_address; + vcpu_gp_regs(vcpu)[__compat_lr_und] =3D return_address; break; } =20 diff --git a/arch/arm64/kvm/hyp/include/hyp/adjust_pc.h b/arch/arm64/kvm/hy= p/include/hyp/adjust_pc.h index 4fdfeabefeb4..a049983bd5c3 100644 --- a/arch/arm64/kvm/hyp/include/hyp/adjust_pc.h +++ b/arch/arm64/kvm/hyp/include/hyp/adjust_pc.h @@ -33,11 +33,11 @@ static inline void kvm_skip_instr(struct kvm_vcpu *vcpu) static inline void __kvm_skip_instr(struct kvm_vcpu *vcpu) { *vcpu_pc(vcpu) =3D read_sysreg_el2(SYS_ELR); - vcpu_gp_regs(vcpu)->pstate =3D read_sysreg_el2(SYS_SPSR); + *vcpu_cpsr(vcpu) =3D read_sysreg_el2(SYS_SPSR); =20 kvm_skip_instr(vcpu); =20 - write_sysreg_el2(vcpu_gp_regs(vcpu)->pstate, SYS_SPSR); + write_sysreg_el2(*vcpu_cpsr(vcpu), SYS_SPSR); write_sysreg_el2(*vcpu_pc(vcpu), SYS_ELR); } =20 diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/i= nclude/hyp/switch.h index 4bf624a49591..fc1fdc99d82c 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -451,7 +451,7 @@ static inline bool kvm_hyp_handle_mops(struct kvm_vcpu = *vcpu, u64 *exit_code) u64 spsr; =20 *vcpu_pc(vcpu) =3D read_sysreg_el2(SYS_ELR); - arm64_mops_reset_regs(vcpu_gp_regs(vcpu), vcpu->arch.fault.esr_el2); + arm64_mops_reset_regs(&vcpu->arch.ctxt.regs, vcpu->arch.fault.esr_el2); write_sysreg_el2(*vcpu_pc(vcpu), SYS_ELR); =20 /* @@ -896,7 +896,7 @@ static inline void synchronize_vcpu_pstate(struct kvm_v= cpu *vcpu) /* * Check for the conditions of Cortex-A510's #2077057. When these occur * SPSR_EL2 can't be trusted, but isn't needed either as it is - * unchanged from the value in vcpu_gp_regs(vcpu)->pstate. + * unchanged from the value in vcpu_cpsr(vcpu). * Are we single-stepping the guest, and took a PAC exception from the * active-not-pending state? */ diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index b963fd975aac..be829fa6f130 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -218,13 +218,15 @@ void kvm_reset_vcpu(struct kvm_vcpu *vcpu) pstate =3D VCPU_RESET_PSTATE_EL1; =20 /* Reset core registers */ - memset(vcpu_gp_regs(vcpu), 0, sizeof(*vcpu_gp_regs(vcpu))); + memset(vcpu_gp_regs(vcpu), 0, sizeof(vcpu_gp_regs(vcpu))); + *vcpu_pc(vcpu) =3D 0; + vcpu->arch.ctxt.regs.sp =3D 0; memset(&vcpu->arch.ctxt.fp_regs, 0, sizeof(vcpu->arch.ctxt.fp_regs)); vcpu->arch.ctxt.spsr_abt =3D 0; vcpu->arch.ctxt.spsr_und =3D 0; vcpu->arch.ctxt.spsr_irq =3D 0; vcpu->arch.ctxt.spsr_fiq =3D 0; - vcpu_gp_regs(vcpu)->pstate =3D pstate; + *vcpu_cpsr(vcpu) =3D pstate; =20 /* Reset system registers */ kvm_reset_sys_regs(vcpu); --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 980F43D954C; Fri, 31 Jul 2026 13:09:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503377; cv=none; b=GZuHxFjopxZgnLjPx8rk6Yd+ndB/F1MyDfLe37TMFodDGhCwUk5JsbAfR1PLqjXwaMmbM6s7uP/vW0dfvwkGEayya3n7fLEwFY0ahkiDJQ/AM28FvuTDYgdOmmyHZSn/rVeIfH9JRT4sSfi5jQOFYS034QhqFeQjL6Qh/lq203Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503377; c=relaxed/simple; bh=JysW97/ictCpGa07RUlRkYQTLq+CRkk62RbjYIjip78=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HjERT94SjxL4R+Cr0gdGZOlOyVB9t7FjVglaiCwBf7uq3DEeGwZGxgrP0OUmtUEhZHjyYC6aQp9rWrXmbHVRboRwn7QhdasHAVkdZW2fti0zRWk/QAVQDgSo+PBorWEMmlIWKS051GTVm3Pv/ZuU3Z8R+GyPo1kE5qHS/IlZqag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=KWmwsSIE; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="KWmwsSIE" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBm4351673730; Fri, 31 Jul 2026 13:09:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=++2yDEooBFXzRyqVR Sc5NfxarIlFMDsaciIwunFSEx0=; b=KWmwsSIEc0iI10hODKQ2+ucrOzt+4f2ig TjBivg3TWeciidePX1VM25HV6sGXgQDrJz9NZKkVsA4cFe0IpcoLLDGshfQHONF0 W5Q4s1x8PG0UgpEMWgbgdpO0GiEc8vLqcriuUIKVWiyMgz7PsVBa4TnrkxsxGgdw GHdWWV4H5ge2GlaIPnAjb/tlAaPv7MylSWfXD0CsfTaABJwfI3yUNYpDWbDvaclU Huz6zoij/1FRJyNxZoaKdhpy2hlncE8KLhq4Vvhu0y1o8wiOmThyMWCaYHKEQtpB GRYQZ9dfTiv8t8wk4Hsd1SjGBs/vVze8WHKxOxw+5XD4flSWExhwA== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmv0p43ba-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:14 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuSYm023624; Fri, 31 Jul 2026 13:09:13 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fna5yfqfe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:13 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD96mq42926472 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:06 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B79692004B; Fri, 31 Jul 2026 13:09:06 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5546020043; Fri, 31 Jul 2026 13:09:06 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:06 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 08/31] KVM: arm64: Use accessor functions for gprs during reset Date: Fri, 31 Jul 2026 15:08:36 +0200 Message-ID: <20260731130902.654679-9-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX0QAdzB75Y1WE Taq8ZQ75yBbraXp21yiwXVmFCl3sMYyzWdVnkhtLn46azr5MKElVMxbQjYr2atFq2PTOltTk+HK WoZnBJyv585LM0kX9sLrvH5QYAKEWzY= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXwP/iCHNpHOgj czh06d5vcDiJeBIvppVFrRlZXOHdeRGnuNIpW0XuG6g9cJrwQpghoxe3TD7Y+ZARtDRDCPwyYK3 94fL/1jg7IiKFhOiYSKEnJEpN3iGyIEMjrxtbyN7BLg5jzUu2BLAuidwX5DdxfrG7XM8DY0xqKh gV297x2McFEFP6c3pXwnaFaNSrLh1WfRG3nvNH94XCHoHoQ5IB7JzdrczK3R/DHyK2YK42gKctu L6uayeADBODuZNH8MnuCI6bOyAyjbz2PTzv2rJrgnWRVJf3B4qy/WYSeP9pLNgdTQ9XMIh7a5D0 oXMYQMCywl9jj9tJxjdh8Trwpfb7z5Nbdp8XEm6o7bi+cN7XycJk4NIxlM/cqtoMUHwTeiRPbk4 a7DAaLewef6ClcF6GN1BBKbxULGLQ/NHoLS3FRTfm2GRIdSKesm9BLGyPVfcBQ1dCFUs5kejXt8 LtHXnxogPrbM+3IxwUA== X-Authority-Analysis: v=2.4 cv=b5WCJNGx c=1 sm=1 tr=0 ts=6a6c9e7a cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=dzpCTpBDPQWyiwp5enEA:9 X-Proofpoint-GUID: zz6EdyXBgL3bNPU6Ga2tU3Zd15LtZfXs X-Proofpoint-ORIG-GUID: LFszcd7hW5vyEdsgN9-5JmusaO2F5j0R X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 adultscore=0 malwarescore=0 impostorscore=0 bulkscore=0 phishscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Instead of accessing the value directly use assessor function that abstract the actual location of the register values. Enable other KVM implementations to reuse this code. No functional changes. Signed-off-by: Steffen Eiden --- arch/arm64/include/asm/kvm_emulate.h | 5 +++++ arch/arm64/include/asm/kvm_host.h | 6 ++++++ arch/arm64/kvm/guest.c | 16 ++++++++-------- arch/arm64/kvm/reset.c | 2 +- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/= kvm_emulate.h index c5b30d334e79..4ef4a77aaa8e 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -141,6 +141,11 @@ static __always_inline unsigned long *vcpu_cpsr(const = struct kvm_vcpu *vcpu) return (unsigned long *)&vcpu->arch.ctxt.regs.pstate; } =20 +static __always_inline unsigned long *vcpu_sp_el0(const struct kvm_vcpu *v= cpu) +{ + return (unsigned long *)&vcpu->arch.ctxt.regs.sp; +} + static __always_inline bool vcpu_mode_is_32bit(const struct kvm_vcpu *vcpu) { return !!(*vcpu_cpsr(vcpu) & PSR_MODE32_BIT); diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 1094a5997fc2..4a23d3662d6b 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -1183,6 +1183,12 @@ static inline u64 *___ctxt_sys_reg(const struct kvm_= cpu_context *ctxt, int r) =20 #define ctxt_sys_reg(c,r) (*__ctxt_sys_reg(c,r)) =20 +#define kvm_vcpu_get_sp_el1(__vcpu) (__ctxt_sys_reg(&(__vcpu)->arch.ctxt, = SP_EL1)) +#define kvm_vcpu_get_vreg(__vcpu, _n) (&(__vcpu)->arch.ctxt.fp_regs.vregs[= _n]) +#define kvm_vcpu_get_vregs(__vcpu) (&(__vcpu)->arch.ctxt.fp_regs.vregs) +#define kvm_vcpu_get_fpsr(__vcpu) (&(__vcpu)->arch.ctxt.fp_regs.fpsr) +#define kvm_vcpu_get_fpcr(__vcpu) (&(__vcpu)->arch.ctxt.fp_regs.fpcr) + u64 kvm_vcpu_apply_reg_masks(const struct kvm_vcpu *, enum vcpu_sysreg, u6= 4); =20 #define __vcpu_assign_sys_reg(v, r, val) \ diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index b01d6622b872..02eca05ef572 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -134,19 +134,19 @@ static void *core_reg_addr(struct kvm_vcpu *vcpu, con= st struct kvm_one_reg *reg) KVM_REG_ARM_CORE_REG(regs.regs[30]): off -=3D KVM_REG_ARM_CORE_REG(regs.regs[0]); off /=3D 2; - return &vcpu->arch.ctxt.regs.regs[off]; + return &vcpu_gp_regs(vcpu)[off]; =20 case KVM_REG_ARM_CORE_REG(regs.sp): - return &vcpu->arch.ctxt.regs.sp; + return vcpu_sp_el0(vcpu); =20 case KVM_REG_ARM_CORE_REG(regs.pc): - return &vcpu->arch.ctxt.regs.pc; + return vcpu_pc(vcpu); =20 case KVM_REG_ARM_CORE_REG(regs.pstate): - return &vcpu->arch.ctxt.regs.pstate; + return vcpu_cpsr(vcpu); =20 case KVM_REG_ARM_CORE_REG(sp_el1): - return __ctxt_sys_reg(&vcpu->arch.ctxt, SP_EL1); + return kvm_vcpu_get_sp_el1(vcpu); =20 case KVM_REG_ARM_CORE_REG(elr_el1): return __ctxt_sys_reg(&vcpu->arch.ctxt, ELR_EL1); @@ -170,13 +170,13 @@ static void *core_reg_addr(struct kvm_vcpu *vcpu, con= st struct kvm_one_reg *reg) KVM_REG_ARM_CORE_REG(fp_regs.vregs[31]): off -=3D KVM_REG_ARM_CORE_REG(fp_regs.vregs[0]); off /=3D 4; - return &vcpu->arch.ctxt.fp_regs.vregs[off]; + return kvm_vcpu_get_vreg(vcpu, off); =20 case KVM_REG_ARM_CORE_REG(fp_regs.fpsr): - return &vcpu->arch.ctxt.fp_regs.fpsr; + return kvm_vcpu_get_fpsr(vcpu); =20 case KVM_REG_ARM_CORE_REG(fp_regs.fpcr): - return &vcpu->arch.ctxt.fp_regs.fpcr; + return kvm_vcpu_get_fpcr(vcpu); =20 default: return NULL; diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index be829fa6f130..ea8cac173a0b 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -220,7 +220,7 @@ void kvm_reset_vcpu(struct kvm_vcpu *vcpu) /* Reset core registers */ memset(vcpu_gp_regs(vcpu), 0, sizeof(vcpu_gp_regs(vcpu))); *vcpu_pc(vcpu) =3D 0; - vcpu->arch.ctxt.regs.sp =3D 0; + *vcpu_sp_el0(vcpu) =3D 0; memset(&vcpu->arch.ctxt.fp_regs, 0, sizeof(vcpu->arch.ctxt.fp_regs)); vcpu->arch.ctxt.spsr_abt =3D 0; vcpu->arch.ctxt.spsr_und =3D 0; --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 2DEDB4279EA; Fri, 31 Jul 2026 13:09:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503378; cv=none; b=dc1AExzzbB8u7Lxd4k/62UOZTZ16Rj5gzTyRc9tBQh29ay7RyY8LpvwICozS84ZN3ZfXuJafnPbRtZZynVx3iSwY+kYzncfFPL85AOHs7mfdIaCeiBCISc3nuqDP29JXj98YyDRv7++wo0+8pVCWZK/y+bEsaJc14yq3i3p/YVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503378; c=relaxed/simple; bh=YEmXceg41cFp11o5IjVL5XnaauVN30QdPQhSCi+K/qg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PuiSTZVn+7u9U3I/PKXw1IoZ77sUqzZuY7opYPswifllv76DLCLFzViPafdKZcrt9XggvGGWEX5PdN08cT2vuNwtEbmdOQ1TInoyhOaRt4QbyW5LAFF5uQuZFLKhl0z2rMW9ZxyBtsoD4q1yLDP2fIMNZ1EscVRHs8REuOVz/Nc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=Y4h3eeFZ; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Y4h3eeFZ" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBm3EK4073668; Fri, 31 Jul 2026 13:09:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=wAx6cg4X8Yvm9/y43 nGkEkCLxuVsjsZZ6IGp3mpgH0Y=; b=Y4h3eeFZKsE8c/TEA7oYdCG0kICPpfDyu z+K1D6BMpn4osn8sRj7o/cj6YIp1iJqIyQ/qnSOqW1r+EBpeHONuv3CV4ErQ9AZz gqQCp0D6IT+zgQuz4TLeyPtr+MB6Jzk87K5zwk+3dA5VnUDrTq1kfs2cciraJjA6 40F7wQHsF8fKwzTKKOqJW72j7s9ijNWBvrfPPOvcJ2qG5RkJaGuM7hUNrFDPe5Xe CXsVDs2RHTX1lBy1dIYC1L/Et8loPb0RVfrkfauOv0aAXpM+heytsS4ylWtgjINA 6CJ/aeRUsJVRXx0F2Y037ME6MhqszfMlbWfsCA+pnp+W/9TXb507Q== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2nc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:15 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuOoC021058; Fri, 31 Jul 2026 13:09:14 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn7fqr55q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:14 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD97EJ28901790 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:07 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 29BE920040; Fri, 31 Jul 2026 13:09:07 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BE42B2004D; Fri, 31 Jul 2026 13:09:06 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:06 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 09/31] KVM: arm64: Refactor core-reset into a separate function Date: Fri, 31 Jul 2026 15:08:37 +0200 Message-ID: <20260731130902.654679-10-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: qVJbrzEBut6CJjyhF5av3W4r_Aw8RDXK X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXxJVuI9ry72Ua uAMZEMpZ+ptFaxKGRhuJ1IEVXcuyVi3n0/1W3ub0ZaaJXNAFZkUjcxFdc38lTZPyea3mHJUMu8s 3Cj49eSPY5z/cYwaHY4uICUEYIW2EOCnqX795xFvzLeKoMHXEAktEWPn3aCcp55l0t3UKJ9PBat pBKM7lU2QhWNw1/bPIUzTmDA9vhek3aQCqZXU2Qsu+1IZB9Uxp3xTpgcLNTeGIkDmW53pQoRf5w i21zo5C6ZpFM1RcuMIMxS3MilYBUAMzO3VDHvpsQc7f3E0qvtSU5BMxBeW57GxDdGrGWknIne1h RqubIa/QGxsbf9r48VvdO8dUjTzsxItfB98+F+xPXbkbdGIRL8vuS+GcUkKPzvoURnTcdDLStYk nRmiAcH4bT242psN8wFdJ52XMpQhq/mQnyoj/m8xCsRmpFhXdT9FBoPS4v+LWiCIc9jDk3LJke5 YerOWNveXei2CXPfjmA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX7cTmf35y+q0E zBaNmzIWotXdfTWUQQYadwy/aRcadt89ronQd/6JQOGr9rbjDSMsA70Ifv4WKgFHddr4kwFUwRs RNUQwmlP1Jjflqek/W2CeVQ1a5FFkmE= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e7c cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=F8MYsyl7xEsdMw5BvxkA:9 X-Proofpoint-GUID: VEHAphmfyHStG09vxDfCw8DqFZ_xu2TA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Move the reset of the arm core register into a separate function for later reuse. No functional change. Signed-off-by: Steffen Eiden --- arch/arm64/kvm/reset.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index ea8cac173a0b..727abbff2b6a 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -169,6 +169,30 @@ static void kvm_vcpu_reset_sve(struct kvm_vcpu *vcpu) memset(vcpu->arch.sve_state, 0, vcpu_sve_state_size(vcpu)); } =20 +static void kvm_reset_vcpu_core_regs(struct kvm_vcpu *vcpu) +{ + u32 pstate; + + if (vcpu_el1_is_32bit(vcpu)) + pstate =3D VCPU_RESET_PSTATE_SVC; + else if (vcpu_has_nv(vcpu)) + pstate =3D VCPU_RESET_PSTATE_EL2; + else + pstate =3D VCPU_RESET_PSTATE_EL1; + + memset(vcpu_gp_regs(vcpu), 0, sizeof(vcpu_gp_regs(vcpu))); + *vcpu_pc(vcpu) =3D 0; + *vcpu_sp_el0(vcpu) =3D 0; + memset(kvm_vcpu_get_vregs(vcpu), 0, sizeof(*kvm_vcpu_get_vregs(vcpu))); + memset(kvm_vcpu_get_fpsr(vcpu), 0, sizeof(*kvm_vcpu_get_fpsr(vcpu))); + memset(kvm_vcpu_get_fpcr(vcpu), 0, sizeof(*kvm_vcpu_get_fpcr(vcpu))); + vcpu->arch.ctxt.spsr_abt =3D 0; + vcpu->arch.ctxt.spsr_und =3D 0; + vcpu->arch.ctxt.spsr_irq =3D 0; + vcpu->arch.ctxt.spsr_fiq =3D 0; + *vcpu_cpsr(vcpu) =3D pstate; +} + /** * kvm_reset_vcpu - sets core registers and sys_regs to reset value * @vcpu: The VCPU pointer @@ -191,7 +215,6 @@ void kvm_reset_vcpu(struct kvm_vcpu *vcpu) { struct vcpu_reset_state reset_state; bool loaded; - u32 pstate; =20 spin_lock(&vcpu->arch.mp_state_lock); reset_state =3D vcpu->arch.reset_state; @@ -210,23 +233,8 @@ void kvm_reset_vcpu(struct kvm_vcpu *vcpu) kvm_vcpu_reset_sve(vcpu); } =20 - if (vcpu_el1_is_32bit(vcpu)) - pstate =3D VCPU_RESET_PSTATE_SVC; - else if (vcpu_has_nv(vcpu)) - pstate =3D VCPU_RESET_PSTATE_EL2; - else - pstate =3D VCPU_RESET_PSTATE_EL1; - /* Reset core registers */ - memset(vcpu_gp_regs(vcpu), 0, sizeof(vcpu_gp_regs(vcpu))); - *vcpu_pc(vcpu) =3D 0; - *vcpu_sp_el0(vcpu) =3D 0; - memset(&vcpu->arch.ctxt.fp_regs, 0, sizeof(vcpu->arch.ctxt.fp_regs)); - vcpu->arch.ctxt.spsr_abt =3D 0; - vcpu->arch.ctxt.spsr_und =3D 0; - vcpu->arch.ctxt.spsr_irq =3D 0; - vcpu->arch.ctxt.spsr_fiq =3D 0; - *vcpu_cpsr(vcpu) =3D pstate; + kvm_reset_vcpu_core_regs(vcpu); =20 /* Reset system registers */ kvm_reset_sys_regs(vcpu); --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 E8FF842DFF5; Fri, 31 Jul 2026 13:09:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503383; cv=none; b=d/SpJXqMxGKDVoGem4rB5NbiZtNIurSPuoluXUOgRbdHMsEE6Sm25o1/JtraN+0D7jwZ8Ar9HtGFFnJ8fTnf2UWDDUF1W5gycSjtgFFELN5AyoJ/8eNpZmnzShkRk0gcOXdeZz8hCOhhFQOjptZKVW7VekNMM0c993/wr94Uhws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503383; c=relaxed/simple; bh=bT2VAim9nPTUmRy0y+g1ie7DdKvxUu69Iys7Xq3d2IQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B4JN+QpyWIK0Pvdr3Wl1Hxc7LQs4XTxVj06/KnGe0J0T9RBOzyBeQWWjsfqRcjua17gi5XkE4e7GlMFAgzswA0lk7EoGJitWwSea+GGoaF0Fx/Kxj7qNQ5EfWKSrg5UF+2nIUtpW+k+kpaJm6haFZlUG+sBFaegwXZVWD//4BXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=fh6QLlNd; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="fh6QLlNd" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBm9AF1671732; Fri, 31 Jul 2026 13:09:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=pLfR4PknkK0B2DHzN DYzQZRzuf7xrRVnikz3SrnDfmY=; b=fh6QLlNd5JFOaJSwaIQVHP6lDf0zZLT9a fCpJ6SmXWdOodl2x/uYfG4h9/0ogXR4T1pRJUESGByEdsDMFyAKNQYMrbOlfm/Ii NrMoTh/nXNTC2glrodjQkH6NTZt35Vkn6y2sGjXcuz0XrXy0tNRbCN47t8wO0FTU lBOuTJcDYAg+INOOb8FJKyCFX2L7+Lzx0PWPE655/SqBuMlHVyEnrxQxYCaTArfg FxUHI8XWSsqUYmYBzqWjE2KILONlEKbq9laJbFXh1PEJT5RTtBLDXbyn2ZyvGxzb 7obq6F5x5fjPDYeFkEoIzxwxBpdxpGgdEWjhqZai4LrWU1wiAjtgg== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuyjm3vg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:17 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCQEfW026835; Fri, 31 Jul 2026 13:09:16 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn9pgqtbq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:15 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD97Vn28901792 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:07 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 917FA20040; Fri, 31 Jul 2026 13:09:07 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 302BB2004B; Fri, 31 Jul 2026 13:09:07 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:07 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 10/31] arm64: Prepare sharing arm64 headers with s390 Date: Fri, 31 Jul 2026 15:08:38 +0200 Message-ID: <20260731130902.654679-11-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX2eJw/fiNewsM Yls4UqKBZ4Nkcf7HU6UYBzrI4tv/S3HW2+UdZSqlMV/Zq6IxaC0gSZGAU3UUvhOhsqZHZe9fQ28 svxfE1CPAM7SEUtDokCT6evTIkY/6gQ= X-Proofpoint-GUID: NtIJFbUyn--iL_wXaWoDIxBrkb9yjPRo X-Proofpoint-ORIG-GUID: B8kbB1CfCkO0oPOaBFXJ-wBn_TT1LSHy X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX2uL3drOmh+xp 4EEk/h3pFI8LRvQrclVEcEyfOtwXmi3k9LtBdxnG+SOMfaDbcLwgVMfX3TxP+e9IEl9NWISVFpq 9f5FYuv9TiS/RgoAvdnsxOHWhyqYrNyg1M/FMtxkouu6FuCwVK8cC8ZhH7G4+rM5LrfBb07okc1 ORIwF5QA2VU+ZWNzF1FMnrOGOzLTxQuVWOK8pKZQM5UdoxTQgjRn5//JH/OXOCpcwpl6hbdhtOv 5nCrSwCy+gNN7Dvgelz4/X14LTV5iS9AwK/2WJda9+BeaHAc0NK+icKpmG6fRvLSycBjP7JldEx rSLF5Lh97d8dqS4AigsosCBXDRq65Q8HQs+K8CPQ3fByhChuYXOmeUNI6Uq6JgqL4qGUnzhYarh J2pN1HZsaJMa+m6rudMza9MyS640FifGVhQ+FMTm30ftvuZd5NguB0XNPTuQE+6ImHnJqMVeAFF XH5cnmU4KHRYHFPppgg== X-Authority-Analysis: v=2.4 cv=X5Vi7mTe c=1 sm=1 tr=0 ts=6a6c9e7d cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=CvB7ObVER1VTR8-vp5wA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Prepare the sharing of arm64 headers with s390 by moving a few definitions inside headers to reduce the number of shared markers. Clean up some includes to further streamline the sharing of headers. No functional change. Signed-off-by: Steffen Eiden --- arch/arm64/include/asm/esr.h | 4 +- arch/arm64/include/asm/kvm_arm.h | 5 ++- arch/arm64/include/asm/kvm_emulate.h | 5 ++- arch/arm64/include/asm/kvm_host.h | 59 ++++++++++++++-------------- arch/arm64/include/asm/sysreg.h | 2 +- 5 files changed, 39 insertions(+), 36 deletions(-) diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index f816f5d77f1a..da085c83b57e 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -7,7 +7,7 @@ #ifndef __ASM_ESR_H #define __ASM_ESR_H =20 -#include +#include #include =20 #define ESR_ELx_EC_UNKNOWN UL(0x00) @@ -435,7 +435,7 @@ #define ESR_ELx_IT_GCSPOPX 7 =20 #ifndef __ASSEMBLER__ -#include +#include =20 static inline unsigned long esr_brk_comment(unsigned long esr) { diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_= arm.h index 3f9233b5a130..a99d8de99961 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -7,10 +7,11 @@ #ifndef __ARM64_KVM_ARM_H__ #define __ARM64_KVM_ARM_H__ =20 +#include +#include +#include #include -#include #include -#include =20 /* * Because I'm terribly lazy and that repainting the whole of the KVM diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/= kvm_emulate.h index 4ef4a77aaa8e..45b3f98f0c7e 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -44,11 +44,12 @@ enum exception_type { bool kvm_condition_valid32(const struct kvm_vcpu *vcpu); void kvm_skip_instr32(struct kvm_vcpu *vcpu); =20 +int kvm_inject_dabt_excl_atomic(struct kvm_vcpu *vcpu, u64 addr); +int kvm_inject_serror_esr(struct kvm_vcpu *vcpu, u64 esr); + void kvm_inject_undefined(struct kvm_vcpu *vcpu); void kvm_inject_sync(struct kvm_vcpu *vcpu, u64 esr); -int kvm_inject_serror_esr(struct kvm_vcpu *vcpu, u64 esr); int kvm_inject_sea(struct kvm_vcpu *vcpu, bool iabt, u64 addr); -int kvm_inject_dabt_excl_atomic(struct kvm_vcpu *vcpu, u64 addr); void kvm_inject_size_fault(struct kvm_vcpu *vcpu); =20 static inline int kvm_inject_sea_dabt(struct kvm_vcpu *vcpu, u64 addr) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 4a23d3662d6b..875fc7c3366b 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -56,6 +56,36 @@ #define KVM_REQ_MAP_L1_VNCR_EL2 KVM_ARCH_REQ(10) #define KVM_REQ_VGIC_PROCESS_UPDATE KVM_ARCH_REQ(11) =20 +/* + * If we encounter a data abort without valid instruction syndrome + * information, report this to user space. User space can (and + * should) opt in to this feature if KVM_CAP_ARM_NISV_TO_USER is + * supported. + */ +#define KVM_ARCH_FLAG_RETURN_NISV_IO_ABORT_TO_USER 0 +/* Memory Tagging Extension enabled for the guest */ +#define KVM_ARCH_FLAG_MTE_ENABLED 1 +/* At least one vCPU has ran in the VM */ +#define KVM_ARCH_FLAG_HAS_RAN_ONCE 2 +/* The vCPU feature set for the VM is configured */ +#define KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED 3 +/* PSCI SYSTEM_SUSPEND enabled for the guest */ +#define KVM_ARCH_FLAG_SYSTEM_SUSPEND_ENABLED 4 +/* VM counter offset */ +#define KVM_ARCH_FLAG_VM_COUNTER_OFFSET 5 +/* Timer PPIs made immutable */ +#define KVM_ARCH_FLAG_TIMER_PPIS_IMMUTABLE 6 +/* Initial ID reg values loaded */ +#define KVM_ARCH_FLAG_ID_REGS_INITIALIZED 7 +/* Fine-Grained UNDEF initialised */ +#define KVM_ARCH_FLAG_FGU_INITIALIZED 8 +/* SVE exposed to guest */ +#define KVM_ARCH_FLAG_GUEST_HAS_SVE 9 +/* MIDR_EL1, REVIDR_EL1, and AIDR_EL1 are writable from userspace */ +#define KVM_ARCH_FLAG_WRITABLE_IMP_ID_REGS 10 +/* Unhandled SEAs are taken to userspace */ +#define KVM_ARCH_FLAG_EXIT_SEA 11 + #define KVM_DIRTY_LOG_MANUAL_CAPS (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE |= \ KVM_DIRTY_LOG_INITIALLY_SET) =20 @@ -338,35 +368,6 @@ struct kvm_arch { /* Protects VM-scoped configuration data */ struct mutex config_lock; =20 - /* - * If we encounter a data abort without valid instruction syndrome - * information, report this to user space. User space can (and - * should) opt in to this feature if KVM_CAP_ARM_NISV_TO_USER is - * supported. - */ -#define KVM_ARCH_FLAG_RETURN_NISV_IO_ABORT_TO_USER 0 - /* Memory Tagging Extension enabled for the guest */ -#define KVM_ARCH_FLAG_MTE_ENABLED 1 - /* At least one vCPU has ran in the VM */ -#define KVM_ARCH_FLAG_HAS_RAN_ONCE 2 - /* The vCPU feature set for the VM is configured */ -#define KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED 3 - /* PSCI SYSTEM_SUSPEND enabled for the guest */ -#define KVM_ARCH_FLAG_SYSTEM_SUSPEND_ENABLED 4 - /* VM counter offset */ -#define KVM_ARCH_FLAG_VM_COUNTER_OFFSET 5 - /* Timer PPIs made immutable */ -#define KVM_ARCH_FLAG_TIMER_PPIS_IMMUTABLE 6 - /* Initial ID reg values loaded */ -#define KVM_ARCH_FLAG_ID_REGS_INITIALIZED 7 - /* Fine-Grained UNDEF initialised */ -#define KVM_ARCH_FLAG_FGU_INITIALIZED 8 - /* SVE exposed to guest */ -#define KVM_ARCH_FLAG_GUEST_HAS_SVE 9 - /* MIDR_EL1, REVIDR_EL1, and AIDR_EL1 are writable from userspace */ -#define KVM_ARCH_FLAG_WRITABLE_IMP_ID_REGS 10 - /* Unhandled SEAs are taken to userspace */ -#define KVM_ARCH_FLAG_EXIT_SEA 11 unsigned long flags; =20 /* VM-wide vCPU feature set */ diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index 1aa601c95188..ab205f9db94a 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -1263,6 +1263,6 @@ FIELD_PREP(reg##_##field##_MASK, \ SYS_FIELD_VALUE(reg, field, val)) =20 -#endif +#endif /* __ASSEMBLER__ */ =20 #endif /* __ASM_SYSREG_H */ --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 60D5B42C4E7; Fri, 31 Jul 2026 13:09:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503381; cv=none; b=HYWbq3uuWT3crqB7fOK6THd4cwNirVkTrrpl7m+8OLEZth+ixuE1hqdYyXoz+1CjPxIzZMPOwUBrw/YZ1mU071qcdxG6w6nz0Rs7t/Wr1ZRZFs3F+OQQlzgIwQhaiHTpHgVqgiZGHC21i84YioyKS3HWdN6sVMJjE4lSp3J1dMc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503381; c=relaxed/simple; bh=1W/chHOqQVadHOqUZeI7qs6czBNrT6DbZxvqcU+qpf0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aDQWai5pPwte7jfcNf+gCcnNjNNegmOh3/MfymMJgEI81ozVp2k8WKjW/B8Phv5fZdUQGiYbRZcnhPhXvsNIq7e06ola1ApRAoRacUhT8dRIYW2Hq65Ne+n0K4ATOXv5fkYzMzL5I8xqFQXuD6kSL2dOeXOVQbdfGpJZp8/0JWk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=HzloxzMR; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="HzloxzMR" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlisB1670385; Fri, 31 Jul 2026 13:09:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=CRKafAl1YCGglDpLB BWC3R12VQMpxpT46hTg5kd0Yaw=; b=HzloxzMRlg50TxI4f1wPDrfJeAeNA6iRo hmOPwwcSnAmnPypXUJZWQRk/0lZFyuJe2hilFHA76PcBM+ORD4lB6jCbLhpGPGhT KKKc19AEQWXUwZdhGguHXekSw3QTaxoLRglWozXIb/Wd4K6CpJscDLAiKZWOMt75 3jopQHS9lxak42udAln+pXhBEaqFlk9wK4AzF3gQSOjgn2SKEc1oXWUDxsmt7MlV e9g9vAY0eblrIhD2xplBqU5yq8lAivpORABNSrYWgWcouSqFlJ00QVtWMMki531S nQ0LHKidEXohd5sSS+MM5AoQzs9F9d7R2eeRe4vltrgozgETQGZ6w== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuyjm3vc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:15 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuQ20021776; Fri, 31 Jul 2026 13:09:14 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn7uwg43f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:14 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD98Pd14483870 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:08 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0C73820040; Fri, 31 Jul 2026 13:09:08 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 97F9A20043; Fri, 31 Jul 2026 13:09:07 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:07 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 11/31] arm64: Share arm64 headers with s390 Date: Fri, 31 Jul 2026 15:08:39 +0200 Message-ID: <20260731130902.654679-12-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX7dow1tM7qOqw GEThlMmbxHxT8Ti1PeHjMrGbqVTjJkpb0tnFSlhaYSPy1X/YZaE/7E26quFgFIDunzatbKLaAS9 dHYIGOuF5c1v6qbA61LDZn6zO6lIJ+o= X-Proofpoint-GUID: uJSoaiyv9d_bp1DO16XGqZJaG87ztMP5 X-Proofpoint-ORIG-GUID: XgXIOgRBgtsEEVArMM-0wUP3l1DCv6iI X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXyQjSyuHBt/mX 8Roi1wkI/G+AxNM45Zzk544EJm13b6LtjnxR7MzNuPZYer2PRHxUeI9a4WYbvGgi1foBg2Vw1Ei n3mqqfgubNSSxTeGkQiscu46HXdQyuNRZiamupjqboPR/N8rCbBz0ngGGTjDjj649/GQxgsmemd XRWUBQLyNuSnqTezaVGDc7Er8HLQXJaxcF/v5uv5NG0Keef4gjS2O1m1qITZg+G+3045PEJrJA1 h6ZB8NPChkYKNJW5nK+BNQ8N8+d2NuhHtuJn5tAayWh1bdA/tKcyrHgyO/hxA5OuanityFhPvbR uiHE3ncsgJ5IIWQo3zaCYMgntZFYAdaJW5PIqdVxYfH5iliUHBNJXBdNIyhBB1bdPPFksIUTJI1 rSHTzJWfIpLPwROu4KJ4/jwcPLGiBlefq0OYRyaCd3PAKjUQqbaXuupincvIzhJ4QPB5ISVyKTQ wCGBb1m58iN/uR5DfyA== X-Authority-Analysis: v=2.4 cv=X5Vi7mTe c=1 sm=1 tr=0 ts=6a6c9e7b cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=7CQSdrXTAAAA:8 a=6P2ef70na_-CBmQj_eQA:9 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Allow sharing of arm64 headers with s390 by marking the shared regions or add a comment that the whole file is shared. The shared regions are marked with: #define ARM64_S390_COMMON /* insert shared definitions here */ #endif /* ARM64_S390_COMMON */ The preprocessor symbol ARM64_S390_COMMON is always defined for arm64. No functional change. Signed-off-by: Steffen Eiden --- arch/arm64/Makefile | 2 ++ arch/arm64/include/asm/brk-imm.h | 1 + arch/arm64/include/asm/esr.h | 1 + arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/include/asm/kvm_emulate.h | 15 +++++++++++++++ arch/arm64/include/asm/kvm_host.h | 20 ++++++++++++++++++++ arch/arm64/include/asm/ptrace.h | 4 ++++ arch/arm64/include/asm/sysreg.h | 15 +++++++++++++++ 8 files changed, 59 insertions(+) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 6b005c8fef70..1cd7cd94a855 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -43,7 +43,9 @@ CC_FLAGS_NO_FPU :=3D -mgeneral-regs-only KBUILD_CFLAGS +=3D $(CC_FLAGS_NO_FPU) \ $(compat_vdso) $(cc_has_k_constraint) KBUILD_CFLAGS +=3D $(call cc-disable-warning, psabi) +KBUILD_CFLAGS +=3D -DARM64_S390_COMMON KBUILD_AFLAGS +=3D $(compat_vdso) +KBUILD_AFLAGS +=3D -DARM64_S390_COMMON =20 ifeq ($(call rustc-min-version, 108500),y) KBUILD_RUSTFLAGS +=3D --target=3Daarch64-unknown-none-softfloat diff --git a/arch/arm64/include/asm/brk-imm.h b/arch/arm64/include/asm/brk-= imm.h index beb42c62b6ac..dd2d153dc0d8 100644 --- a/arch/arm64/include/asm/brk-imm.h +++ b/arch/arm64/include/asm/brk-imm.h @@ -2,6 +2,7 @@ /* * Copyright (C) 2012 ARM Ltd. */ +/* Whole file is shared with s390 */ =20 #ifndef __ASM_BRK_IMM_H #define __ASM_BRK_IMM_H diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index da085c83b57e..2cb73bde7346 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -3,6 +3,7 @@ * Copyright (C) 2013 - ARM Ltd * Author: Marc Zyngier */ +/* Whole file is shared with s390 */ =20 #ifndef __ASM_ESR_H #define __ASM_ESR_H diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_= arm.h index a99d8de99961..cc4175176f94 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -3,6 +3,7 @@ * Copyright (C) 2012,2013 - ARM Ltd * Author: Marc Zyngier */ +/* Whole file is shared with s390 */ =20 #ifndef __ARM64_KVM_ARM_H__ #define __ARM64_KVM_ARM_H__ diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/= kvm_emulate.h index 45b3f98f0c7e..2dac665ccfd1 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -47,6 +47,7 @@ void kvm_skip_instr32(struct kvm_vcpu *vcpu); int kvm_inject_dabt_excl_atomic(struct kvm_vcpu *vcpu, u64 addr); int kvm_inject_serror_esr(struct kvm_vcpu *vcpu, u64 esr); =20 +#ifdef ARM64_S390_COMMON void kvm_inject_undefined(struct kvm_vcpu *vcpu); void kvm_inject_sync(struct kvm_vcpu *vcpu, u64 esr); int kvm_inject_sea(struct kvm_vcpu *vcpu, bool iabt, u64 addr); @@ -62,6 +63,8 @@ static inline int kvm_inject_sea_iabt(struct kvm_vcpu *vc= pu, u64 addr) return kvm_inject_sea(vcpu, true, addr); } =20 +#endif /* ARM64_S390_COMMON */ + static inline int kvm_inject_serror(struct kvm_vcpu *vcpu) { /* @@ -165,6 +168,7 @@ static inline void vcpu_set_thumb(struct kvm_vcpu *vcpu) *vcpu_cpsr(vcpu) |=3D PSR_AA32_T_BIT; } =20 +#ifdef ARM64_S390_COMMON /* * vcpu_get_reg and vcpu_set_reg should always be passed a register number * coming from a read of ESR_EL2. Otherwise, it may give the wrong result = on @@ -183,6 +187,8 @@ static __always_inline void vcpu_set_reg(struct kvm_vcp= u *vcpu, u8 reg_num, vcpu_gp_regs(vcpu)[reg_num] =3D val; } =20 +#endif /* ARM64_S390_COMMON */ + static inline bool vcpu_is_el2_ctxt(const struct kvm_cpu_context *ctxt) { switch (ctxt->regs.pstate & (PSR_MODE32_BIT | PSR_MODE_MASK)) { @@ -366,6 +372,7 @@ static inline u64 kvm_vcpu_get_disr(const struct kvm_vc= pu *vcpu) return vcpu->arch.fault.disr_el1; } =20 +#ifdef ARM64_S390_COMMON static inline u32 kvm_vcpu_hvc_get_imm(const struct kvm_vcpu *vcpu) { return kvm_vcpu_get_esr(vcpu) & ESR_ELx_xVC_IMM_MASK; @@ -443,6 +450,8 @@ static __always_inline u8 kvm_vcpu_trap_get_fault(const= struct kvm_vcpu *vcpu) return kvm_vcpu_get_esr(vcpu) & ESR_ELx_FSC; } =20 +#endif /* ARM64_S390_COMMON */ + static inline bool kvm_vcpu_trap_is_permission_fault(const struct kvm_vcpu *vcpu) { @@ -483,6 +492,7 @@ static __always_inline int kvm_vcpu_sys_get_rt(struct k= vm_vcpu *vcpu) return ESR_ELx_SYS64_ISS_RT(esr); } =20 +#ifdef ARM64_S390_COMMON static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu) { if (kvm_vcpu_abt_iss1tw(vcpu)) { @@ -507,6 +517,8 @@ static inline bool kvm_is_write_fault(struct kvm_vcpu *= vcpu) return kvm_vcpu_dabt_iswrite(vcpu); } =20 +#endif /* ARM64_S390_COMMON */ + static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu) { return __vcpu_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK; @@ -542,6 +554,7 @@ static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu) return vcpu_read_sys_reg(vcpu, r) & bit; } =20 +#ifdef ARM64_S390_COMMON static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu, unsigned long data, unsigned int len) @@ -617,6 +630,8 @@ static __always_inline void kvm_incr_pc(struct kvm_vcpu= *vcpu) vcpu_set_flag((v), e); \ } while (0) =20 +#endif /* ARM64_S390_COMMON */ + /* * Returns a 'sanitised' view of CPTR_EL2, translating from nVHE to the VHE * format if E2H isn't set. diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 875fc7c3366b..83fefceed952 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -39,6 +39,7 @@ =20 #define KVM_MAX_VCPUS VGIC_V3_MAX_CPUS =20 +#ifdef ARM64_S390_COMMON #define KVM_VCPU_MAX_FEATURES 9 #define KVM_VCPU_VALID_FEATURES (BIT(KVM_VCPU_MAX_FEATURES) - 1) =20 @@ -86,6 +87,8 @@ /* Unhandled SEAs are taken to userspace */ #define KVM_ARCH_FLAG_EXIT_SEA 11 =20 +#endif /* ARM64_S390_COMMON */ + #define KVM_DIRTY_LOG_MANUAL_CAPS (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE |= \ KVM_DIRTY_LOG_INITIALLY_SET) =20 @@ -832,6 +835,8 @@ extern s64 kvm_nvhe_sym(hyp_physvirt_offset); extern u64 kvm_nvhe_sym(hyp_cpu_logical_map)[NR_CPUS]; #define hyp_cpu_logical_map CHOOSE_NVHE_SYM(hyp_cpu_logical_map) =20 +#ifdef ARM64_S390_COMMON + struct vcpu_reset_state { unsigned long pc; unsigned long r0; @@ -839,6 +844,8 @@ struct vcpu_reset_state { bool reset; }; =20 +#endif /* ARM64_S390_COMMON */ + struct vncr_tlb; =20 struct kvm_vcpu_arch { @@ -948,6 +955,7 @@ struct kvm_vcpu_arch { pid_t pid; }; =20 +#ifdef ARM64_S390_COMMON /* * Each 'flag' is composed of a comma-separated triplet: * @@ -1099,6 +1107,8 @@ struct kvm_vcpu_arch { /* KVM is currently emulating an L2 to L1 exception */ #define IN_NESTED_EXCEPTION __vcpu_single_flag(sflags, BIT(9)) =20 +#endif /* ARM64_S390_COMMON */ + #define vcpu_sve_max_vq(vcpu) sve_vq_from_vl((vcpu)->arch.sve_max_vl) =20 #define vcpu_sve_zcr_elx(vcpu) \ @@ -1240,6 +1250,7 @@ struct kvm_vcpu_stat { u64 exits; }; =20 +#ifdef ARM64_S390_COMMON unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu); int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices); int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); @@ -1248,6 +1259,8 @@ int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const stru= ct kvm_one_reg *reg); unsigned long kvm_arm_num_sys_reg_descs(struct kvm_vcpu *vcpu); int kvm_arm_copy_sys_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindic= es); =20 +#endif /* ARM64_S390_COMMON */ + int __kvm_arm_vcpu_get_events(struct kvm_vcpu *vcpu, struct kvm_vcpu_events *events); =20 @@ -1326,6 +1339,7 @@ int __init populate_nv_trap_config(void); =20 void kvm_calculate_traps(struct kvm_vcpu *vcpu); =20 +#ifdef ARM64_S390_COMMON /* MMIO helpers */ void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data); unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len); @@ -1333,6 +1347,8 @@ unsigned long kvm_mmio_read_buf(const void *buf, unsi= gned int len); int kvm_handle_mmio_return(struct kvm_vcpu *vcpu); int io_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa); =20 +#endif /* ARM64_S390_COMMON */ + /* * Returns true if a Performance Monitoring Interrupt (PMI), a.k.a. perf e= vent, * arrived in guest context. For arm64, any event that arrives while a vC= PU is @@ -1530,11 +1546,15 @@ static inline bool __vcpu_has_feature(const struct = kvm_arch *ka, int feature) return test_bit(feature, ka->vcpu_features); } =20 +#ifdef ARM64_S390_COMMON + #define kvm_vcpu_has_feature(k, f) __vcpu_has_feature(&(k)->arch, (f)) #define vcpu_has_feature(v, f) __vcpu_has_feature(&(v)->kvm->arch, (f)) =20 #define kvm_vcpu_initialized(v) vcpu_get_flag(v, VCPU_INITIALIZED) =20 +#endif /* ARM64_S390_COMMON */ + int kvm_trng_call(struct kvm_vcpu *vcpu); #ifdef CONFIG_KVM extern phys_addr_t hyp_mem_base; diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrac= e.h index 6f5b79ee1f3f..bb16a9894a5a 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -28,6 +28,8 @@ =20 #define GIC_PRIO_PSR_I_SET GICV3_PRIO_PSR_I_SET =20 +#ifdef ARM64_S390_COMMON + /* Additional SPSR bits not exposed in the UABI */ #define PSR_MODE_THREAD_BIT (1 << 0) #define PSR_IL_BIT (1 << 20) @@ -68,6 +70,8 @@ #define PSR_AA32_IT_MASK 0x0600fc00 /* If-Then execution state mask */ #define PSR_AA32_GE_MASK 0x000f0000 =20 +#endif /* ARM64_S390_COMMON */ + #ifdef CONFIG_CPU_BIG_ENDIAN #define PSR_AA32_ENDSTATE PSR_AA32_E_BIT #else diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysre= g.h index ab205f9db94a..1c5c4df260be 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -16,6 +16,8 @@ =20 #include =20 +#ifdef ARM64_S390_COMMON + /* * ARMv8 ARM reserves the following encoding for system registers: * (Ref: ARMv8 ARM, Section: "System instruction class encoding overview", @@ -50,6 +52,8 @@ #define sys_reg_CRm(id) (((id) >> CRm_shift) & CRm_mask) #define sys_reg_Op2(id) (((id) >> Op2_shift) & Op2_mask) =20 +#endif /* ARM64_S390_COMMON */ + #ifndef CONFIG_BROKEN_GAS_INST =20 #ifdef __ASSEMBLER__ @@ -123,6 +127,8 @@ #define GSB_SYS_BARRIER_INSN __SYS_BARRIER_INSN(1, 0, 12, 0, 0, 31) #define GSB_ACK_BARRIER_INSN __SYS_BARRIER_INSN(1, 0, 12, 0, 1, 31) =20 +#ifdef ARM64_S390_COMMON + /* Data cache zero operations */ #define SYS_DC_ISW sys_insn(1, 0, 7, 6, 2) #define SYS_DC_IGSW sys_insn(1, 0, 7, 6, 4) @@ -832,6 +838,8 @@ #define SCTLR_ELx_A (BIT(1)) #define SCTLR_ELx_M (BIT(0)) =20 +#endif /* ARM64_S390_COMMON */ + #ifdef CONFIG_CPU_BIG_ENDIAN #define ENDIAN_SET_EL2 SCTLR_ELx_EE #else @@ -866,6 +874,7 @@ SCTLR_EL1_LSMAOE | SCTLR_EL1_nTLSMD | SCTLR_EL1_EIS | \ SCTLR_EL1_TSCXT | SCTLR_EL1_EOS) =20 +#ifdef ARM64_S390_COMMON /* MAIR_ELx memory attributes (used by Linux) */ #define MAIR_ATTR_DEVICE_nGnRnE UL(0x00) #define MAIR_ATTR_DEVICE_nGnRE UL(0x04) @@ -1102,6 +1111,8 @@ #define GICV5_GICR_CDNMIA_TYPE_MASK GENMASK_ULL(31, 29) #define GICV5_GICR_CDNMIA_ID_MASK GENMASK_ULL(23, 0) =20 +#endif /* ARM64_S390_COMMON */ + #define gicr_insn(insn) read_sysreg_s(GICV5_OP_GICR_##insn) #define gic_insn(v, insn) write_sysreg_s(v, GICV5_OP_GIC_##insn) =20 @@ -1251,6 +1262,8 @@ par; \ }) =20 +#ifdef ARM64_S390_COMMON + #define SYS_FIELD_VALUE(reg, field, val) reg##_##field##_##val =20 #define SYS_FIELD_GET(reg, field, val) \ @@ -1263,6 +1276,8 @@ FIELD_PREP(reg##_##field##_MASK, \ SYS_FIELD_VALUE(reg, field, val)) =20 +#endif /* ARM64_S390_COMMON */ + #endif /* __ASSEMBLER__ */ =20 #endif /* __ASM_SYSREG_H */ --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 209F042A177; Fri, 31 Jul 2026 13:14:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503679; cv=none; b=pAAh2/Uhi0eyKTgHsD2I5x6uFtmM81vv9NqzkOJI3+yHv2wkxN5SMFZVVnbbN9zCVFaNtzJpwDJ1O18HTbkc8q/hlN/6a13BxMV4dsuvCDSUbjOxROM6PJXa2NvJ60QFGwotWcNeikyrPdripq1srny7bYTOMpM6+m3wf+lFZu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503679; c=relaxed/simple; bh=vdXyTqv4qXpLDME2RJzZVuyGraK2dpbvqxVBzH4pu9g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HbZLHY/Lk4ttIgvrGv0zZabFdqO8WfXUclYN46gWo5tGruuLIkvp9t6806Ys488xnkfHWxmkkgW2Q3ozHRyiKzHfs3dFlyCnt9+QVAM48mU+SkkAJzDcavM2jm9nf7XyyAEu0L/chVkLwwnbFp5QN0S+YkKNTOG0KzGnvR9L/RA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=Zfes3yUW; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Zfes3yUW" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBla644072612; Fri, 31 Jul 2026 13:09:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=1/xOCkp5iDdXe5GGs BNc+oEhFgymoyW2Cj8PXaz0Di0=; b=Zfes3yUWdwaeYR8sAF4bvsVo7n5aCovdU qRhR31nlXJRxAyN+3I3Nb1EusiTnyIk+q9Dcg+ETnPqy2MBp5JBxNU2DPVi82Qw4 0nwUCyXuaYlxQbHzNqb/Xmtu5aVSpg/R8iznA/nhVY/KmTJZH6tVE33CaJjpNxfF BmdarVuatHsA0rCH2/ALRZ61gxki3d2lephMbrG8pveGbL60CUuk4yiPy6Pz2m5N o6wEM53FUVTtjx1vg1UnAVo1sF9hNVKOMQX8PJOOSeMjwdQDBacF8i++Bsp6TcDH /BFafDI+I6IyAo2pTf1W7BVX7Qc2l08rYSFYro26RTGbnFq8E+CWg== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2nd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:15 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuQRH021067; Fri, 31 Jul 2026 13:09:14 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn7fqr55p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:14 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD98FA13697516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:08 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 73B5020040; Fri, 31 Jul 2026 13:09:08 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 135AF2004D; Fri, 31 Jul 2026 13:09:08 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:08 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 12/31] KVM: arm64: Share arm64 code with s390 Date: Fri, 31 Jul 2026 15:08:40 +0200 Message-ID: <20260731130902.654679-13-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: GxRtDljKq8W5UUiA-eAH7IuRcTBNEvOj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXxqRw+0fp+R2P HSWZBk0vdjhN9SkZAV8kyt6HkqxuNzHb7A35aBy3WJofjWFC9GKAAS4rXIBrSITs6L/pO0lbc4m qSpbKOzZ1xkc04qFgFpj/t3f0BBbfrm7cfxQJmyR+0WFQlt2dUePhHOCLhHq8J9+Us4hEgVdW0H JzZ3bZtzR1AblEIfXYrryT8m8lMB/UAyBVQGd2FbjaidfY00k5sr67uNLjt0WtVhc6i2SYDMGXO DCrhzy0xeN+vJqWViz5WLcY28Ow6L57YB+BIr85DxlVmf4oqFLQQqfmG9vMHe3OPDpQZDIj3ohH Im42q2eW6CuOEEZ8lQhPiIlVd1em2tKnDMkzy1HKqHWeLzjgb94304fztjZGxI/VK3z1cQ4RuLl 5OC37cPv1jVCS3WsJmCY/1VdTTgl54TbVXQU1G6aLs5iGbW+0LdBHVP0/iGyHsAx+YUp9bed8/U 0ZofTpc8P+4sqTs2YLw== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX1LtABwy1h6Ur pAeqp1OGnSZF2yw0GfQX7u5DjYhjignzpazyGlxbW8rvGdh2dvedQH1GRSh4tiXJzfjzMtKVUGD DbUOTed+u5biQ5qMnRjXEzKpS9lccUk= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e7c cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=UDcn1B_FrKOTVnIrxN8A:9 X-Proofpoint-GUID: Sierdj-3VJiQGB9DfCYGxN405rhWcDxv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Mark functions that s390 can use to implement arm on s390 as shared functions. No functional change. Signed-off-by: Steffen Eiden --- arch/arm64/kvm/arm.c | 3 +++ arch/arm64/kvm/guest.c | 6 ++++++ arch/arm64/kvm/handle_exit.c | 6 ++++++ arch/arm64/kvm/mmio.c | 2 ++ arch/arm64/kvm/reset.c | 6 ++++++ 5 files changed, 23 insertions(+) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 9a6c72a18672..2d2e7498be88 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1593,6 +1593,7 @@ static unsigned long system_supported_vcpu_features(v= oid) return features; } =20 +#ifdef ARM64_S390_COMMON static int kvm_vcpu_init_check_features(struct kvm_vcpu *vcpu, const struct kvm_vcpu_init *init) { @@ -1641,6 +1642,8 @@ static bool kvm_vcpu_init_changed(struct kvm_vcpu *vc= pu, KVM_VCPU_MAX_FEATURES); } =20 +#endif /* ARM64_S390_COMMON */ + static int kvm_setup_vcpu(struct kvm_vcpu *vcpu) { struct kvm *kvm =3D vcpu->kvm; diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index 02eca05ef572..df1f78ff1044 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -62,6 +62,7 @@ const struct kvm_stats_header kvm_vcpu_stats_header =3D { sizeof(kvm_vcpu_stats_desc), }; =20 +#ifdef ARM64_S390_COMMON static bool core_reg_offset_is_vreg(u64 off) { return off >=3D KVM_REG_ARM_CORE_REG(fp_regs.vregs) && @@ -306,6 +307,8 @@ static int set_core_reg(struct kvm_vcpu *vcpu, const st= ruct kvm_one_reg *reg) return err; } =20 +#endif /* ARM64_S390_COMMON */ + #define vq_word(vq) (((vq) - SVE_VQ_MIN) / 64) #define vq_mask(vq) ((u64)1 << ((vq) - SVE_VQ_MIN) % 64) #define vq_present(vqs, vq) (!!((vqs)[vq_word(vq)] & vq_mask(vq))) @@ -543,6 +546,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu,= struct kvm_regs *regs) return -EINVAL; } =20 +#ifdef ARM64_S390_COMMON static int copy_core_reg_indices(const struct kvm_vcpu *vcpu, u64 __user *uindices) { @@ -591,6 +595,8 @@ static unsigned long num_core_regs(const struct kvm_vcp= u *vcpu) return copy_core_reg_indices(vcpu, NULL); } =20 +#endif /* ARM64_S390_COMMON */ + static unsigned long num_sve_regs(const struct kvm_vcpu *vcpu) { const unsigned int slices =3D vcpu_sve_slices(vcpu); diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 54aedf93c78b..d511af145ee6 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -213,6 +213,7 @@ static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu) return 0; } =20 +#ifdef ARM64_S390_COMMON static int kvm_handle_unknown_ec(struct kvm_vcpu *vcpu) { u64 esr =3D kvm_vcpu_get_esr(vcpu); @@ -224,6 +225,8 @@ static int kvm_handle_unknown_ec(struct kvm_vcpu *vcpu) return 1; } =20 +#endif /* ARM64_S390_COMMON */ + /* * Guest access to SVE registers should be routed to this handler only * when the system doesn't support SVE. @@ -404,6 +407,7 @@ static exit_handle_fn arm_exit_handlers[] =3D { [ESR_ELx_EC_GCS] =3D kvm_handle_gcs, }; =20 +#ifdef ARM64_S390_COMMON static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu) { u64 esr =3D kvm_vcpu_get_esr(vcpu); @@ -439,6 +443,8 @@ static int handle_trap_exceptions(struct kvm_vcpu *vcpu) return handled; } =20 +#endif /* ARM64_S390_COMMON */ + /* * Return > 0 to return to guest, < 0 on error, 0 (and set exit_reason) on * proper exit to userspace. diff --git a/arch/arm64/kvm/mmio.c b/arch/arm64/kvm/mmio.c index d1c3a352d5a2..5161102da507 100644 --- a/arch/arm64/kvm/mmio.c +++ b/arch/arm64/kvm/mmio.c @@ -10,6 +10,7 @@ =20 #include "trace.h" =20 +#ifdef ARM64_S390_COMMON void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data) { void *datap =3D NULL; @@ -258,3 +259,4 @@ int io_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fau= lt_ipa) run->exit_reason =3D KVM_EXIT_MMIO; return 0; } +#endif /* ARM64_S390_COMMON */ diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index 727abbff2b6a..81d9f0faede2 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -34,6 +34,7 @@ static u32 __ro_after_init kvm_ipa_limit; unsigned int __ro_after_init kvm_host_sve_max_vl; =20 +#ifdef ARM64_S390_COMMON /* * ARMv8 Reset Values */ @@ -46,6 +47,8 @@ unsigned int __ro_after_init kvm_host_sve_max_vl; #define VCPU_RESET_PSTATE_SVC (PSR_AA32_MODE_SVC | PSR_AA32_A_BIT | \ PSR_AA32_I_BIT | PSR_AA32_F_BIT) =20 +#endif /* ARM64_S390_COMMON */ + unsigned int __ro_after_init kvm_sve_max_vl; =20 int __init kvm_arm_init_sve(void) @@ -169,6 +172,7 @@ static void kvm_vcpu_reset_sve(struct kvm_vcpu *vcpu) memset(vcpu->arch.sve_state, 0, vcpu_sve_state_size(vcpu)); } =20 +#ifdef ARM64_S390_COMMON static void kvm_reset_vcpu_core_regs(struct kvm_vcpu *vcpu) { u32 pstate; @@ -193,6 +197,8 @@ static void kvm_reset_vcpu_core_regs(struct kvm_vcpu *v= cpu) *vcpu_cpsr(vcpu) =3D pstate; } =20 +#endif /* ARM64_S390_COMMON */ + /** * kvm_reset_vcpu - sets core registers and sys_regs to reset value * @vcpu: The VCPU pointer --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 C959C437878; Fri, 31 Jul 2026 13:09:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503392; cv=none; b=WPRUnZbcRDOlC9zJJyTvBw+udGKnxC7oIFB3+aly8oBoQDVdq/1aFEQ5FSP5OTaSa0EvzuAV6e5/f/O9rigG49wroThHpXrGSaG7LToMFBdD53O2XYwgYGC9M2sTncrGs1E/hao5FCrmVWFpMd82KOF0flenKcNFz/UFOl3rLOw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503392; c=relaxed/simple; bh=iMexrA5Kb59QNGGH617MljeUhGQY5mqGD9WgJ2sP0Cc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UpZ22MneBegjGy40dj6VBrATeB/NcWzGYY9kjNpQaIwzfn8Pm+rluTn1Ci9ijhwjXHpVY0TmSBSw8pd5Ax5FJrt8gvbJiaAK5N5nEId5WM6bKotzlaRv+QkhP8XsjtXskPDtaX2s1i3wnx7h5QT3ciSXvTn605LF7H9Kq7Dila4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=HZjZnvDq; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="HZjZnvDq" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlgD94072746; Fri, 31 Jul 2026 13:09:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=EB744O2esC+l2WBO/ aKRIzFssTb90gPpXLvNk5GwHM4=; b=HZjZnvDqvdkmdfonCSTfvCq1/GHE1jYRF Luyfz45YEW7sdxjPknBKUBU4sig77PdQUPemtMshdZIyybwnaOT1feNYwNfTYUvb VCMWWgfqWHjTSrUnerwZ/VbjG00wfQLKB/6rtBzBASN+fNFZuqjno080c3P5lRYJ xDdBJIvnjff5KIeM5fS8rye6ONoVbInu6rCcyJfYqrZYnWoavDAz05bFk5T79jbx bVUdSirR1LmS1/i575kUmjSS5olDzBz7r8GtNTSMuu++DuogWYQ84fTEyUqoaRFL ny3H1VOVpqPw2LASIpnxZF8mMNz4XgfcEDlN/vGKbamw6ol1w1X/A== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2ns-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:19 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuL1Q026432; Fri, 31 Jul 2026 13:09:18 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8yhqw7a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:17 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD992845547844 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:09 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EDC4E20040; Fri, 31 Jul 2026 13:09:08 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7B48220043; Fri, 31 Jul 2026 13:09:08 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:08 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 13/31] KVM: s390: Prepare moving KVM/s390 to arch/s390/kvm/s390 Date: Fri, 31 Jul 2026 15:08:41 +0200 Message-ID: <20260731130902.654679-14-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: 9UvrrbbNj6FHbo6oclT5WdqLt39VnBx- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXwHbol/DxlkzS UMjlTHwcA2gpVYG+wLYm0HsX6aTW0ja5yvZHX+ghqrWqYFurq5KVF+X0O5dGfzls8j8xGIuWeVk dVhaYQ/BQYd4QKuwB4rl2L/d2o0rTsH/fU87Vmd4roQfLFcsCNsW77xyOco0ty5ARputZkmjass CWFtBplbT3FQCFY7eJw6Lq0pMlIoIEd5w0htmQpPmlH+Cfd+zAlhxJyOOW3/xCg5hfQQ6SJuOFO EZrPMbUmfQXW/IJ6HYCEHigF5WuyiOgHyKNRCnrAusQlkAp8DaA8jKDZmKPaXNhYLEsQbivjs1I Ouz1igMtqBYNVdpJFw4JJBr7a3GF3ymQoyYIHf+4l4IUCum2If7ELIVPMNF1SqW4TvRNZmkeSGF WrIdNnBk+Q7c4z6crY6QYn6WmcMEYa1/xN7IYqTfmYLrqTtZnBZA9t9nekiGkSwAbpaxWCoQXCV ezxdWfkGRMcUr4ZZcZA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX0A8+PjNWPZlB 5g/SFxFQmTE/n4ckuGI3ZzK2e9jrKtXN8dsfhE/b8lW1x/a+8h5QylygU75JIaE6ssOROOVUbnr nYu0suZkuvZWYZk4q/SJmkzSvnXtN5g= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e80 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=UdqBhROR4sx79BYIaikA:9 X-Proofpoint-GUID: PlFpoo9i57pZx0JwMT41cYd2p-Ele3Mf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Lay the groundwork for moving the native KVM/s390 to s390/kvm/s390 to allow for a second KVM module. Move all the kvm_host definitions to _s390 postfixed headers. Prepare local header include guards for a new location. Move gamp related tracing into a separate file. While at it, rename the main KVM/s390 files from s390-kvm.{c,h} to just s390.{c,h} to match the naming scheme of other architectures. Cleanup the KVM/s390 makefile. No functional change. Signed-off-by: Steffen Eiden --- arch/s390/include/asm/kvm_host.h | 779 +----------------- .../asm/{kvm_host.h =3D> kvm_host_s390.h} | 6 +- ...kvm_host_types.h =3D> kvm_host_s390_types.h} | 6 +- arch/s390/include/asm/kvm_host_types.h | 347 +------- arch/s390/kvm/Kconfig | 4 +- arch/s390/kvm/Makefile | 4 +- arch/s390/kvm/dat.h | 6 +- arch/s390/kvm/diag.c | 2 +- arch/s390/kvm/faultin.c | 3 +- arch/s390/kvm/faultin.h | 6 +- arch/s390/kvm/gaccess.c | 2 +- arch/s390/kvm/gaccess.h | 2 +- arch/s390/kvm/gmap.c | 2 +- arch/s390/kvm/gmap.h | 6 +- arch/s390/kvm/guestdbg.c | 2 +- arch/s390/kvm/intercept.c | 2 +- arch/s390/kvm/interrupt.c | 2 +- arch/s390/kvm/pci.c | 2 +- arch/s390/kvm/priv.c | 2 +- arch/s390/kvm/pv.c | 2 +- arch/s390/kvm/{kvm-s390.c =3D> s390.c} | 2 +- arch/s390/kvm/{kvm-s390.h =3D> s390.h} | 2 +- arch/s390/kvm/sigp.c | 2 +- arch/s390/kvm/trace-gmap.h | 46 ++ arch/s390/kvm/trace.h | 14 - arch/s390/kvm/vsie.c | 2 +- 26 files changed, 87 insertions(+), 1168 deletions(-) copy arch/s390/include/asm/{kvm_host.h =3D> kvm_host_s390.h} (99%) copy arch/s390/include/asm/{kvm_host_types.h =3D> kvm_host_s390_types.h} (= 98%) rename arch/s390/kvm/{kvm-s390.c =3D> s390.c} (99%) rename arch/s390/kvm/{kvm-s390.h =3D> s390.h} (99%) create mode 100644 arch/s390/kvm/trace-gmap.h diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost.h index c172f9b212d1..e76ceee11ef5 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -1,783 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* - * definition for kernel virtual machines on s390 - * - * Copyright IBM Corp. 2008, 2018 - * - * Author(s): Carsten Otte - */ - =20 #ifndef ASM_KVM_HOST_H #define ASM_KVM_HOST_H =20 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define KVM_HAVE_MMU_RWLOCK -#define KVM_MAX_VCPUS 255 - -#define KVM_INTERNAL_MEM_SLOTS 1 - -/* - * These seem to be used for allocating ->chip in the routing table, which= we - * don't use. 1 is as small as we can get to reduce the needed memory. If = we - * need to look at ->chip later on, we'll need to revisit this. - */ -#define KVM_NR_IRQCHIPS 1 -#define KVM_IRQCHIP_NUM_PINS 1 -#define KVM_HALT_POLL_NS_DEFAULT 50000 - -/* s390-specific vcpu->requests bit members */ -#define KVM_REQ_ENABLE_IBS KVM_ARCH_REQ(0) -#define KVM_REQ_DISABLE_IBS KVM_ARCH_REQ(1) -#define KVM_REQ_ICPT_OPEREXC KVM_ARCH_REQ(2) -#define KVM_REQ_START_MIGRATION KVM_ARCH_REQ(3) -#define KVM_REQ_STOP_MIGRATION KVM_ARCH_REQ(4) -#define KVM_REQ_VSIE_RESTART KVM_ARCH_REQ(5) -#define KVM_REQ_REFRESH_GUEST_PREFIX \ - KVM_ARCH_REQ_FLAGS(6, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) - -struct kvm_vcpu_stat { - struct kvm_vcpu_stat_generic generic; - u64 exit_userspace; - u64 exit_null; - u64 exit_external_request; - u64 exit_io_request; - u64 exit_external_interrupt; - u64 exit_stop_request; - u64 exit_validity; - u64 exit_instruction; - u64 exit_pei; - u64 halt_no_poll_steal; - u64 instruction_lctl; - u64 instruction_lctlg; - u64 instruction_stctl; - u64 instruction_stctg; - u64 exit_program_interruption; - u64 exit_instr_and_program; - u64 exit_operation_exception; - u64 deliver_ckc; - u64 deliver_cputm; - u64 deliver_external_call; - u64 deliver_emergency_signal; - u64 deliver_service_signal; - u64 deliver_virtio; - u64 deliver_stop_signal; - u64 deliver_prefix_signal; - u64 deliver_restart_signal; - u64 deliver_program; - u64 deliver_io; - u64 deliver_machine_check; - u64 exit_wait_state; - u64 inject_ckc; - u64 inject_cputm; - u64 inject_external_call; - u64 inject_emergency_signal; - u64 inject_mchk; - u64 inject_pfault_init; - u64 inject_program; - u64 inject_restart; - u64 inject_set_prefix; - u64 inject_stop_signal; - u64 instruction_epsw; - u64 instruction_gs; - u64 instruction_io_other; - u64 instruction_lpsw; - u64 instruction_lpswe; - u64 instruction_lpswey; - u64 instruction_pfmf; - u64 instruction_ptff; - u64 instruction_sck; - u64 instruction_sckpf; - u64 instruction_stidp; - u64 instruction_spx; - u64 instruction_stpx; - u64 instruction_stap; - u64 instruction_iske; - u64 instruction_ri; - u64 instruction_rrbe; - u64 instruction_sske; - u64 instruction_ipte_interlock; - u64 instruction_stsi; - u64 instruction_stfl; - u64 instruction_tb; - u64 instruction_tpi; - u64 instruction_tprot; - u64 instruction_tsch; - u64 instruction_sie; - u64 instruction_essa; - u64 instruction_sthyi; - u64 instruction_sigp_sense; - u64 instruction_sigp_sense_running; - u64 instruction_sigp_external_call; - u64 instruction_sigp_emergency; - u64 instruction_sigp_cond_emergency; - u64 instruction_sigp_start; - u64 instruction_sigp_stop; - u64 instruction_sigp_stop_store_status; - u64 instruction_sigp_store_status; - u64 instruction_sigp_store_adtl_status; - u64 instruction_sigp_arch; - u64 instruction_sigp_prefix; - u64 instruction_sigp_restart; - u64 instruction_sigp_init_cpu_reset; - u64 instruction_sigp_cpu_reset; - u64 instruction_sigp_unknown; - u64 instruction_diagnose_10; - u64 instruction_diagnose_44; - u64 instruction_diagnose_9c; - u64 diag_9c_ignored; - u64 diag_9c_forward; - u64 instruction_diagnose_258; - u64 instruction_diagnose_308; - u64 instruction_diagnose_500; - u64 instruction_diagnose_other; - u64 pfault_sync; - u64 signal_exits; -}; - -#define PGM_OPERATION 0x01 -#define PGM_PRIVILEGED_OP 0x02 -#define PGM_EXECUTE 0x03 -#define PGM_PROTECTION 0x04 -#define PGM_ADDRESSING 0x05 -#define PGM_SPECIFICATION 0x06 -#define PGM_DATA 0x07 -#define PGM_FIXED_POINT_OVERFLOW 0x08 -#define PGM_FIXED_POINT_DIVIDE 0x09 -#define PGM_DECIMAL_OVERFLOW 0x0a -#define PGM_DECIMAL_DIVIDE 0x0b -#define PGM_HFP_EXPONENT_OVERFLOW 0x0c -#define PGM_HFP_EXPONENT_UNDERFLOW 0x0d -#define PGM_HFP_SIGNIFICANCE 0x0e -#define PGM_HFP_DIVIDE 0x0f -#define PGM_SEGMENT_TRANSLATION 0x10 -#define PGM_PAGE_TRANSLATION 0x11 -#define PGM_TRANSLATION_SPEC 0x12 -#define PGM_SPECIAL_OPERATION 0x13 -#define PGM_OPERAND 0x15 -#define PGM_TRACE_TABEL 0x16 -#define PGM_VECTOR_PROCESSING 0x1b -#define PGM_SPACE_SWITCH 0x1c -#define PGM_HFP_SQUARE_ROOT 0x1d -#define PGM_PC_TRANSLATION_SPEC 0x1f -#define PGM_AFX_TRANSLATION 0x20 -#define PGM_ASX_TRANSLATION 0x21 -#define PGM_LX_TRANSLATION 0x22 -#define PGM_EX_TRANSLATION 0x23 -#define PGM_PRIMARY_AUTHORITY 0x24 -#define PGM_SECONDARY_AUTHORITY 0x25 -#define PGM_LFX_TRANSLATION 0x26 -#define PGM_LSX_TRANSLATION 0x27 -#define PGM_ALET_SPECIFICATION 0x28 -#define PGM_ALEN_TRANSLATION 0x29 -#define PGM_ALE_SEQUENCE 0x2a -#define PGM_ASTE_VALIDITY 0x2b -#define PGM_ASTE_SEQUENCE 0x2c -#define PGM_EXTENDED_AUTHORITY 0x2d -#define PGM_LSTE_SEQUENCE 0x2e -#define PGM_ASTE_INSTANCE 0x2f -#define PGM_STACK_FULL 0x30 -#define PGM_STACK_EMPTY 0x31 -#define PGM_STACK_SPECIFICATION 0x32 -#define PGM_STACK_TYPE 0x33 -#define PGM_STACK_OPERATION 0x34 -#define PGM_ASCE_TYPE 0x38 -#define PGM_REGION_FIRST_TRANS 0x39 -#define PGM_REGION_SECOND_TRANS 0x3a -#define PGM_REGION_THIRD_TRANS 0x3b -#define PGM_SECURE_STORAGE_ACCESS 0x3d -#define PGM_NON_SECURE_STORAGE_ACCESS 0x3e -#define PGM_SECURE_STORAGE_VIOLATION 0x3f -#define PGM_MONITOR 0x40 -#define PGM_PER 0x80 -#define PGM_CRYPTO_OPERATION 0x119 - -/* irq types in ascend order of priorities */ -enum irq_types { - IRQ_PEND_SET_PREFIX =3D 0, - IRQ_PEND_RESTART, - IRQ_PEND_SIGP_STOP, - IRQ_PEND_IO_ISC_7, - IRQ_PEND_IO_ISC_6, - IRQ_PEND_IO_ISC_5, - IRQ_PEND_IO_ISC_4, - IRQ_PEND_IO_ISC_3, - IRQ_PEND_IO_ISC_2, - IRQ_PEND_IO_ISC_1, - IRQ_PEND_IO_ISC_0, - IRQ_PEND_VIRTIO, - IRQ_PEND_PFAULT_DONE, - IRQ_PEND_PFAULT_INIT, - IRQ_PEND_EXT_HOST, - IRQ_PEND_EXT_SERVICE, - IRQ_PEND_EXT_SERVICE_EV, - IRQ_PEND_EXT_TIMING, - IRQ_PEND_EXT_CPU_TIMER, - IRQ_PEND_EXT_CLOCK_COMP, - IRQ_PEND_EXT_EXTERNAL, - IRQ_PEND_EXT_EMERGENCY, - IRQ_PEND_EXT_MALFUNC, - IRQ_PEND_EXT_IRQ_KEY, - IRQ_PEND_MCHK_REP, - IRQ_PEND_PROG, - IRQ_PEND_SVC, - IRQ_PEND_MCHK_EX, - IRQ_PEND_COUNT -}; - -/* We have 2M for virtio device descriptor pages. Smallest amount of - * memory per page is 24 bytes (1 queue), so (2048*1024) / 24 =3D 87381 - */ -#define KVM_S390_MAX_VIRTIO_IRQS 87381 - -/* - * Repressible (non-floating) machine check interrupts - * subclass bits in MCIC - */ -#define MCHK_EXTD_BIT 58 -#define MCHK_DEGR_BIT 56 -#define MCHK_WARN_BIT 55 -#define MCHK_REP_MASK ((1UL << MCHK_DEGR_BIT) | \ - (1UL << MCHK_EXTD_BIT) | \ - (1UL << MCHK_WARN_BIT)) - -/* Exigent machine check interrupts subclass bits in MCIC */ -#define MCHK_SD_BIT 63 -#define MCHK_PD_BIT 62 -#define MCHK_EX_MASK ((1UL << MCHK_SD_BIT) | (1UL << MCHK_PD_BIT)) - -#define IRQ_PEND_EXT_MASK ((1UL << IRQ_PEND_EXT_IRQ_KEY) | \ - (1UL << IRQ_PEND_EXT_CLOCK_COMP) | \ - (1UL << IRQ_PEND_EXT_CPU_TIMER) | \ - (1UL << IRQ_PEND_EXT_MALFUNC) | \ - (1UL << IRQ_PEND_EXT_EMERGENCY) | \ - (1UL << IRQ_PEND_EXT_EXTERNAL) | \ - (1UL << IRQ_PEND_EXT_TIMING) | \ - (1UL << IRQ_PEND_EXT_HOST) | \ - (1UL << IRQ_PEND_EXT_SERVICE) | \ - (1UL << IRQ_PEND_EXT_SERVICE_EV) | \ - (1UL << IRQ_PEND_VIRTIO) | \ - (1UL << IRQ_PEND_PFAULT_INIT) | \ - (1UL << IRQ_PEND_PFAULT_DONE)) - -#define IRQ_PEND_IO_MASK ((1UL << IRQ_PEND_IO_ISC_0) | \ - (1UL << IRQ_PEND_IO_ISC_1) | \ - (1UL << IRQ_PEND_IO_ISC_2) | \ - (1UL << IRQ_PEND_IO_ISC_3) | \ - (1UL << IRQ_PEND_IO_ISC_4) | \ - (1UL << IRQ_PEND_IO_ISC_5) | \ - (1UL << IRQ_PEND_IO_ISC_6) | \ - (1UL << IRQ_PEND_IO_ISC_7)) - -#define IRQ_PEND_MCHK_MASK ((1UL << IRQ_PEND_MCHK_REP) | \ - (1UL << IRQ_PEND_MCHK_EX)) - -#define IRQ_PEND_EXT_II_MASK ((1UL << IRQ_PEND_EXT_CPU_TIMER) | \ - (1UL << IRQ_PEND_EXT_CLOCK_COMP) | \ - (1UL << IRQ_PEND_EXT_EMERGENCY) | \ - (1UL << IRQ_PEND_EXT_EXTERNAL) | \ - (1UL << IRQ_PEND_EXT_SERVICE) | \ - (1UL << IRQ_PEND_EXT_SERVICE_EV)) - -struct kvm_s390_interrupt_info { - struct list_head list; - u64 type; - union { - struct kvm_s390_io_info io; - struct kvm_s390_ext_info ext; - struct kvm_s390_pgm_info pgm; - struct kvm_s390_emerg_info emerg; - struct kvm_s390_extcall_info extcall; - struct kvm_s390_prefix_info prefix; - struct kvm_s390_stop_info stop; - struct kvm_s390_mchk_info mchk; - }; -}; - -struct kvm_s390_irq_payload { - struct kvm_s390_io_info io; - struct kvm_s390_ext_info ext; - struct kvm_s390_pgm_info pgm; - struct kvm_s390_emerg_info emerg; - struct kvm_s390_extcall_info extcall; - struct kvm_s390_prefix_info prefix; - struct kvm_s390_stop_info stop; - struct kvm_s390_mchk_info mchk; -}; - -struct kvm_s390_local_interrupt { - spinlock_t lock; - DECLARE_BITMAP(sigp_emerg_pending, KVM_MAX_VCPUS); - struct kvm_s390_irq_payload irq; - unsigned long pending_irqs; -}; - -#define FIRQ_LIST_IO_ISC_0 0 -#define FIRQ_LIST_IO_ISC_1 1 -#define FIRQ_LIST_IO_ISC_2 2 -#define FIRQ_LIST_IO_ISC_3 3 -#define FIRQ_LIST_IO_ISC_4 4 -#define FIRQ_LIST_IO_ISC_5 5 -#define FIRQ_LIST_IO_ISC_6 6 -#define FIRQ_LIST_IO_ISC_7 7 -#define FIRQ_LIST_PFAULT 8 -#define FIRQ_LIST_VIRTIO 9 -#define FIRQ_LIST_COUNT 10 -#define FIRQ_CNTR_IO 0 -#define FIRQ_CNTR_SERVICE 1 -#define FIRQ_CNTR_VIRTIO 2 -#define FIRQ_CNTR_PFAULT 3 -#define FIRQ_MAX_COUNT 4 - -/* mask the AIS mode for a given ISC */ -#define AIS_MODE_MASK(isc) (0x80 >> isc) - -#define KVM_S390_AIS_MODE_ALL 0 -#define KVM_S390_AIS_MODE_SINGLE 1 - -struct kvm_s390_float_interrupt { - unsigned long pending_irqs; - unsigned long masked_irqs; - spinlock_t lock; - struct list_head lists[FIRQ_LIST_COUNT]; - int counters[FIRQ_MAX_COUNT]; - struct kvm_s390_mchk_info mchk; - struct kvm_s390_ext_info srv_signal; - int last_sleep_cpu; - spinlock_t ais_lock; - u8 simm; - u8 nimm; -}; - -struct kvm_hw_wp_info_arch { - unsigned long addr; - unsigned long phys_addr; - int len; - char *old_data; -}; - -struct kvm_hw_bp_info_arch { - unsigned long addr; - int len; -}; - -/* - * Only the upper 16 bits of kvm_guest_debug->control are arch specific. - * Further KVM_GUESTDBG flags which an be used from userspace can be found= in - * arch/s390/include/uapi/asm/kvm.h - */ -#define KVM_GUESTDBG_EXIT_PENDING 0x10000000 - -#define guestdbg_enabled(vcpu) \ - (vcpu->guest_debug & KVM_GUESTDBG_ENABLE) -#define guestdbg_sstep_enabled(vcpu) \ - (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) -#define guestdbg_hw_bp_enabled(vcpu) \ - (vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP) -#define guestdbg_exit_pending(vcpu) (guestdbg_enabled(vcpu) && \ - (vcpu->guest_debug & KVM_GUESTDBG_EXIT_PENDING)) - -#define KVM_GUESTDBG_VALID_MASK \ - (KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_SINGLESTEP |\ - KVM_GUESTDBG_USE_HW_BP | KVM_GUESTDBG_EXIT_PENDING) - -struct kvm_guestdbg_info_arch { - unsigned long cr0; - unsigned long cr9; - unsigned long cr10; - unsigned long cr11; - struct kvm_hw_bp_info_arch *hw_bp_info; - struct kvm_hw_wp_info_arch *hw_wp_info; - int nr_hw_bp; - int nr_hw_wp; - unsigned long last_bp; -}; - -struct kvm_s390_pv_vcpu { - u64 handle; - unsigned long stor_base; -}; - -struct kvm_vcpu_arch { - struct kvm_s390_sie_block *sie_block; - /* if vsie is active, currently executed shadow sie control block */ - struct kvm_s390_sie_block *vsie_block; - unsigned int host_acrs[NUM_ACRS]; - struct gs_cb *host_gscb; - struct kvm_s390_local_interrupt local_int; - struct hrtimer ckc_timer; - struct kvm_s390_pgm_info pgm; - struct gmap *gmap; - struct kvm_guestdbg_info_arch guestdbg; - unsigned long pfault_token; - unsigned long pfault_select; - unsigned long pfault_compare; - bool cputm_enabled; - /* - * The seqcount protects updates to cputm_start and sie_block.cputm, - * this way we can have non-blocking reads with consistent values. - * Only the owning VCPU thread (vcpu->cpu) is allowed to change these - * values and to start/stop/enable/disable cpu timer accounting. - */ - seqcount_t cputm_seqcount; - __u64 cputm_start; - bool gs_enabled; - bool skey_enabled; - /* Indicator if the access registers have been loaded from guest */ - bool acrs_loaded; - struct kvm_s390_pv_vcpu pv; - union diag318_info diag318_info; - struct kvm_s390_mmu_cache *mc; -}; - -struct kvm_vm_stat { - struct kvm_vm_stat_generic generic; - u64 inject_io; - u64 io_390_adapter_map; - u64 io_390_adapter_unmap; - u64 io_390_inatomic; - u64 io_flic_inject_airq; - u64 io_set_adapter_int; - u64 io_390_inatomic_no_inject; - u64 inject_float_mchk; - u64 inject_pfault_done; - u64 inject_service_signal; - u64 inject_virtio; - u64 aen_forward; - u64 gmap_shadow_create; - u64 gmap_shadow_reuse; - u64 gmap_shadow_r1_entry; - u64 gmap_shadow_r2_entry; - u64 gmap_shadow_r3_entry; - u64 gmap_shadow_sg_entry; - u64 gmap_shadow_pg_entry; -}; - -struct kvm_arch_memory_slot { -}; - -struct s390_map_info { - struct list_head list; - __u64 guest_addr; - __u64 addr; - struct page *page; - /* - * True if the page is long-term pinned. False if long-term pinning - * failed and this entry exists only to preserve MAP/UNMAP symmetry. - */ - bool pinned; -}; - -struct s390_io_adapter { - unsigned int id; - int isc; - bool maskable; - bool masked; - bool swap; - bool suppressible; - spinlock_t maps_lock; - struct list_head maps; - unsigned int nr_maps; -}; - -#define MAX_S390_IO_ADAPTERS ((MAX_ISC + 1) * 8) -#define MAX_S390_ADAPTER_MAPS 256 - -/* maximum size of facilities and facility mask is 2k bytes */ -#define S390_ARCH_FAC_LIST_SIZE_BYTE (1<<11) -#define S390_ARCH_FAC_LIST_SIZE_U64 \ - (S390_ARCH_FAC_LIST_SIZE_BYTE / sizeof(u64)) -#define S390_ARCH_FAC_MASK_SIZE_BYTE S390_ARCH_FAC_LIST_SIZE_BYTE -#define S390_ARCH_FAC_MASK_SIZE_U64 \ - (S390_ARCH_FAC_MASK_SIZE_BYTE / sizeof(u64)) - -struct kvm_s390_cpu_model { - /* facility mask supported by kvm & hosting machine */ - __u64 fac_mask[S390_ARCH_FAC_MASK_SIZE_U64]; - struct kvm_s390_vm_cpu_subfunc subfuncs; - /* facility list requested by guest (in dma page) */ - __u64 *fac_list; - u64 cpuid; - unsigned short ibc; - /* subset of available UV-features for pv-guests enabled by user space */ - struct kvm_s390_vm_cpu_uv_feat uv_feat_guest; -}; - -#define S390_ARCH_FAC_FORMAT_2 2 -struct kvm_s390_flcb2 { - union { - struct { - u8 reserved0[7]; - u8 length; - }; - u64 header_val; - }; - u64 facilities[S390_ARCH_FAC_LIST_SIZE_U64]; -}; - -typedef int (*crypto_hook)(struct kvm_vcpu *vcpu); - -struct kvm_s390_crypto { - struct kvm_s390_crypto_cb *crycb; - struct rw_semaphore pqap_hook_rwsem; - crypto_hook *pqap_hook; - __u32 crycbd; - __u8 aes_kw; - __u8 dea_kw; - __u8 apie; -}; - -#define APCB0_MASK_SIZE 1 -struct kvm_s390_apcb0 { - __u64 apm[APCB0_MASK_SIZE]; /* 0x0000 */ - __u64 aqm[APCB0_MASK_SIZE]; /* 0x0008 */ - __u64 adm[APCB0_MASK_SIZE]; /* 0x0010 */ - __u64 reserved18; /* 0x0018 */ -}; - -#define APCB1_MASK_SIZE 4 -struct kvm_s390_apcb1 { - __u64 apm[APCB1_MASK_SIZE]; /* 0x0000 */ - __u64 aqm[APCB1_MASK_SIZE]; /* 0x0020 */ - __u64 adm[APCB1_MASK_SIZE]; /* 0x0040 */ - __u64 reserved60[4]; /* 0x0060 */ -}; - -struct kvm_s390_crypto_cb { - struct kvm_s390_apcb0 apcb0; /* 0x0000 */ - __u8 reserved20[0x0048 - 0x0020]; /* 0x0020 */ - __u8 dea_wrapping_key_mask[24]; /* 0x0048 */ - __u8 aes_wrapping_key_mask[32]; /* 0x0060 */ - struct kvm_s390_apcb1 apcb1; /* 0x0080 */ -}; - -struct kvm_s390_gisa { - union { - struct { /* common to all formats */ - u32 next_alert; - u8 ipm; - u8 reserved01[2]; - u8 iam; - }; - struct { /* format 0 */ - u32 next_alert; - u8 ipm; - u8 reserved01; - u8 : 6; - u8 g : 1; - u8 c : 1; - u8 iam; - u8 reserved02[4]; - u32 airq_count; - } g0; - struct { /* format 1 */ - u32 next_alert; - u8 ipm; - u8 simm; - u8 nimm; - u8 iam; - u8 aism[8]; - u8 : 6; - u8 g : 1; - u8 c : 1; - u8 reserved03[11]; - u32 airq_count; - } g1; - struct { - u64 word[4]; - } u64; - }; -}; - -struct kvm_s390_gib { - u32 alert_list_origin; - u32 reserved01; - u8:5; - u8 nisc:3; - u8 reserved03[3]; - u32 reserved04[5]; -}; - -/* - * sie_page2 has to be allocated as DMA because fac_list, crycb and - * gisa need 31bit addresses in the sie control block. - */ -struct sie_page2 { - __u64 fac_list[S390_ARCH_FAC_LIST_SIZE_U64]; /* 0x0000 */ - struct kvm_s390_crypto_cb crycb; /* 0x0800 */ - struct kvm_s390_gisa gisa; /* 0x0900 */ - struct kvm *kvm; /* 0x0920 */ - u8 reserved928[0x1000 - 0x928]; /* 0x0928 */ -}; - -struct vsie_page; - -struct kvm_s390_vsie { - struct mutex mutex; - struct radix_tree_root addr_to_page; - int page_count; - int next; - struct vsie_page *pages[KVM_MAX_VCPUS]; -}; - -struct kvm_s390_gisa_iam { - u8 mask; - spinlock_t ref_lock; - u32 ref_count[MAX_ISC + 1]; -}; - -struct kvm_s390_gisa_interrupt { - struct kvm_s390_gisa *origin; - struct kvm_s390_gisa_iam alert; - struct hrtimer timer; - u64 expires; - DECLARE_BITMAP(kicked_mask, KVM_MAX_VCPUS); -}; - -struct kvm_s390_pv { - u64 handle; - u64 guest_len; - unsigned long stor_base; - void *stor_var; - bool dumping; - void *set_aside; - struct list_head need_cleanup; - struct mmu_notifier mmu_notifier; - /* Protects against concurrent import-like operations */ - struct mutex import_lock; -}; - -struct kvm_s390_mmu_cache; - -struct kvm_arch { - struct esca_block *sca; - debug_info_t *dbf; - struct kvm_s390_float_interrupt float_int; - struct kvm_device *flic; - struct gmap *gmap; - unsigned long mem_limit; - int css_support; - int use_irqchip; - int use_cmma; - int use_pfmfi; - int use_skf; - int use_zpci_interp; - int user_cpu_state_ctrl; - int user_sigp; - int user_stsi; - int user_instr0; - int user_operexec; - int allow_vsie_esamode; - struct s390_io_adapter *adapters[MAX_S390_IO_ADAPTERS]; - wait_queue_head_t ipte_wq; - int ipte_lock_count; - struct mutex ipte_mutex; - spinlock_t start_stop_lock; - struct sie_page2 *sie_page2; - struct kvm_s390_cpu_model model; - struct kvm_s390_crypto crypto; - struct kvm_s390_vsie vsie; - u8 epdx; - u64 epoch; - int migration_mode; - atomic64_t cmma_dirty_pages; - /* subset of available cpu features enabled by user space */ - DECLARE_BITMAP(cpu_feat, KVM_S390_VM_CPU_FEAT_NR_BITS); - /* indexed by vcpu_idx */ - DECLARE_BITMAP(idle_mask, KVM_MAX_VCPUS); - struct kvm_s390_gisa_interrupt gisa_int; - struct kvm_s390_pv pv; - struct list_head kzdev_list; - spinlock_t kzdev_list_lock; - struct kvm_s390_mmu_cache *mc; -}; - -#define KVM_HVA_ERR_BAD (-1UL) -#define KVM_HVA_ERR_RO_BAD (-2UL) - -static inline bool kvm_is_error_hva(unsigned long addr) -{ - return IS_ERR_VALUE(addr); -} - -#define ASYNC_PF_PER_VCPU 64 -struct kvm_arch_async_pf { - unsigned long pfault_token; -}; - -bool kvm_arch_can_dequeue_async_page_present(struct kvm_vcpu *vcpu); - -void kvm_arch_async_page_ready(struct kvm_vcpu *vcpu, - struct kvm_async_pf *work); - -bool kvm_arch_async_page_not_present(struct kvm_vcpu *vcpu, - struct kvm_async_pf *work); - -void kvm_arch_async_page_present(struct kvm_vcpu *vcpu, - struct kvm_async_pf *work); - -static inline void kvm_arch_async_page_present_queued(struct kvm_vcpu *vcp= u) {} - -void kvm_arch_crypto_clear_masks(struct kvm *kvm); -void kvm_arch_crypto_set_masks(struct kvm *kvm, unsigned long *apm, - unsigned long *aqm, unsigned long *adm); - -#define SIE64_RETURN_NORMAL 0 -#define SIE64_RETURN_MCCK 1 - -int __sie64a(phys_addr_t sie_block_phys, struct kvm_s390_sie_block *sie_bl= ock, u64 *rsa, - unsigned long gasce); - -static inline int sie64a(struct kvm_s390_sie_block *sie_block, u64 *rsa, u= nsigned long gasce) -{ - return __sie64a(virt_to_phys(sie_block), sie_block, rsa, gasce); -} - -extern char sie_exit; - -bool kvm_s390_pv_is_protected(struct kvm *kvm); -bool kvm_s390_pv_cpu_is_protected(struct kvm_vcpu *vcpu); - -extern int kvm_s390_enter_exit_sie(struct kvm_s390_sie_block *scb, - u64 *gprs, unsigned long gasce); - -extern int kvm_s390_gisc_register(struct kvm *kvm, u32 gisc); -extern int kvm_s390_gisc_unregister(struct kvm *kvm, u32 gisc); - -bool kvm_s390_is_gpa_in_memslot(struct kvm *kvm, gpa_t gpa); - -static inline void kvm_arch_free_memslot(struct kvm *kvm, - struct kvm_memory_slot *slot) {} -static inline void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen) {} -static inline void kvm_arch_flush_shadow_all(struct kvm *kvm) {} -static inline void kvm_arch_flush_shadow_memslot(struct kvm *kvm, - struct kvm_memory_slot *slot) {} -static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {} -static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {} - -#define __KVM_HAVE_ARCH_VM_FREE -void kvm_arch_free_vm(struct kvm *kvm); - -struct zpci_kvm_hook { - int (*kvm_register)(void *opaque, struct kvm *kvm); - void (*kvm_unregister)(void *opaque); -}; - -extern struct zpci_kvm_hook zpci_kvm_hook; +#include =20 -#endif +#endif /* ASM_KVM_HOST_H */ diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost_s390.h similarity index 99% copy from arch/s390/include/asm/kvm_host.h copy to arch/s390/include/asm/kvm_host_s390.h index c172f9b212d1..3c592e4bb883 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host_s390.h @@ -8,8 +8,8 @@ */ =20 =20 -#ifndef ASM_KVM_HOST_H -#define ASM_KVM_HOST_H +#ifndef ASM_KVM_HOST_S390_H +#define ASM_KVM_HOST_S390_H =20 #include #include @@ -780,4 +780,4 @@ struct zpci_kvm_hook { =20 extern struct zpci_kvm_hook zpci_kvm_hook; =20 -#endif +#endif /* ASM_KVM_HOST_S390_H */ diff --git a/arch/s390/include/asm/kvm_host_types.h b/arch/s390/include/asm= /kvm_host_s390_types.h similarity index 98% copy from arch/s390/include/asm/kvm_host_types.h copy to arch/s390/include/asm/kvm_host_s390_types.h index 3f50942bdfe6..5cf746095bfd 100644 --- a/arch/s390/include/asm/kvm_host_types.h +++ b/arch/s390/include/asm/kvm_host_s390_types.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ =20 -#ifndef _ASM_KVM_HOST_TYPES_H -#define _ASM_KVM_HOST_TYPES_H +#ifndef _ASM_KVM_HOST_S390_TYPES_H +#define _ASM_KVM_HOST_S390_TYPES_H =20 #include #include @@ -344,4 +344,4 @@ struct sie_page { __u8 reserved700[2304]; /* 0x0700 */ }; =20 -#endif /* _ASM_KVM_HOST_TYPES_H */ +#endif /* _ASM_KVM_HOST_S390_TYPES_H */ diff --git a/arch/s390/include/asm/kvm_host_types.h b/arch/s390/include/asm= /kvm_host_types.h index 3f50942bdfe6..e5bdba07cab0 100644 --- a/arch/s390/include/asm/kvm_host_types.h +++ b/arch/s390/include/asm/kvm_host_types.h @@ -1,347 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ =20 -#ifndef _ASM_KVM_HOST_TYPES_H -#define _ASM_KVM_HOST_TYPES_H +#ifndef ASM_KVM_HOST_TYPES_H +#define ASM_KVM_HOST_TYPES_H =20 -#include -#include +#include =20 -#define KVM_S390_BSCA_CPU_SLOTS 64 -#define KVM_S390_ESCA_CPU_SLOTS 248 - -#define SIGP_CTRL_C 0x80 -#define SIGP_CTRL_SCN_MASK 0x3f - -union bsca_sigp_ctrl { - __u8 value; - struct { - __u8 c : 1; - __u8 r : 1; - __u8 scn : 6; - }; -}; - -union esca_sigp_ctrl { - __u16 value; - struct { - __u8 c : 1; - __u8 reserved: 7; - __u8 scn; - }; -}; - -struct esca_entry { - union esca_sigp_ctrl sigp_ctrl; - __u16 reserved1[3]; - __u64 sda; - __u64 reserved2[6]; -}; - -struct bsca_entry { - __u8 reserved0; - union bsca_sigp_ctrl sigp_ctrl; - __u16 reserved[3]; - __u64 sda; - __u64 reserved2[2]; -}; - -union ipte_control { - unsigned long val; - struct { - unsigned long k : 1; - unsigned long kh : 31; - unsigned long kg : 32; - }; -}; - -/* - * Utility is defined as two bytes but having it four bytes wide - * generates more efficient code. Since the following bytes are - * reserved this makes no functional difference. - */ -union sca_utility { - __u32 val; - struct { - __u32 mtcr : 1; - __u32 : 31; - }; -}; - -struct bsca_block { - union ipte_control ipte_control; - __u64 reserved[5]; - __u64 mcn; - union sca_utility utility; - __u8 reserved2[4]; - struct bsca_entry cpu[KVM_S390_BSCA_CPU_SLOTS]; -}; - -struct esca_block { - union ipte_control ipte_control; - __u64 reserved1[6]; - union sca_utility utility; - __u8 reserved2[4]; - __u64 mcn[4]; - __u64 reserved3[20]; - struct esca_entry cpu[KVM_S390_ESCA_CPU_SLOTS]; -}; - -/* - * This struct is used to store some machine check info from lowcore - * for machine checks that happen while the guest is running. - * This info in host's lowcore might be overwritten by a second machine - * check from host when host is in the machine check's high-level handling. - * The size is 24 bytes. - */ -struct mcck_volatile_info { - __u64 mcic; - __u64 failing_storage_address; - __u32 ext_damage_code; - __u32 reserved; -}; - -#define CR0_INITIAL_MASK (CR0_UNUSED_56 | CR0_INTERRUPT_KEY_SUBMASK | \ - CR0_MEASUREMENT_ALERT_SUBMASK) -#define CR14_INITIAL_MASK (CR14_UNUSED_32 | CR14_UNUSED_33 | \ - CR14_EXTERNAL_DAMAGE_SUBMASK) - -#define SIDAD_SIZE_MASK 0xff -#define sida_addr(sie_block) phys_to_virt((sie_block)->sidad & PAGE_MASK) -#define sida_size(sie_block) \ - ((((sie_block)->sidad & SIDAD_SIZE_MASK) + 1) * PAGE_SIZE) - -#define CPUSTAT_STOPPED 0x80000000 -#define CPUSTAT_WAIT 0x10000000 -#define CPUSTAT_ECALL_PEND 0x08000000 -#define CPUSTAT_STOP_INT 0x04000000 -#define CPUSTAT_IO_INT 0x02000000 -#define CPUSTAT_EXT_INT 0x01000000 -#define CPUSTAT_RUNNING 0x00800000 -#define CPUSTAT_RETAINED 0x00400000 -#define CPUSTAT_TIMING_SUB 0x00020000 -#define CPUSTAT_SIE_SUB 0x00010000 -#define CPUSTAT_RRF 0x00008000 -#define CPUSTAT_SLSV 0x00004000 -#define CPUSTAT_SLSR 0x00002000 -#define CPUSTAT_ZARCH 0x00000800 -#define CPUSTAT_MCDS 0x00000100 -#define CPUSTAT_KSS 0x00000200 -#define CPUSTAT_SM 0x00000080 -#define CPUSTAT_IBS 0x00000040 -#define CPUSTAT_GED2 0x00000010 -#define CPUSTAT_G 0x00000008 -#define CPUSTAT_GED 0x00000004 -#define CPUSTAT_J 0x00000002 -#define CPUSTAT_P 0x00000001 - -struct kvm_s390_sie_block { - atomic_t cpuflags; /* 0x0000 */ - __u32 : 1; /* 0x0004 */ - __u32 prefix : 19; - __u32 ibc : 12; - __u8 reserved08[4]; /* 0x0008 */ -#define PROG_IN_SIE (1<<0) - __u32 prog0c; /* 0x000c */ - union { - __u8 reserved10[16]; /* 0x0010 */ - struct { - __u64 pv_handle_cpu; - __u64 pv_handle_config; - }; - }; -#define PROG_BLOCK_SIE (1<<0) -#define PROG_REQUEST (1<<1) - atomic_t prog20; /* 0x0020 */ - __u8 reserved24[4]; /* 0x0024 */ - __u64 cputm; /* 0x0028 */ - __u64 ckc; /* 0x0030 */ - __u64 epoch; /* 0x0038 */ - __u32 svcc; /* 0x0040 */ -#define LCTL_CR0 0x8000 -#define LCTL_CR6 0x0200 -#define LCTL_CR9 0x0040 -#define LCTL_CR10 0x0020 -#define LCTL_CR11 0x0010 -#define LCTL_CR14 0x0002 - __u16 lctl; /* 0x0044 */ - __s16 icpua; /* 0x0046 */ -#define ICTL_OPEREXC 0x80000000 -#define ICTL_PINT 0x20000000 -#define ICTL_LPSW 0x00400000 -#define ICTL_STCTL 0x00040000 -#define ICTL_ISKE 0x00004000 -#define ICTL_SSKE 0x00002000 -#define ICTL_RRBE 0x00001000 -#define ICTL_TPROT 0x00000200 - __u32 ictl; /* 0x0048 */ -#define ECA_CEI 0x80000000 -#define ECA_IB 0x40000000 -#define ECA_SIGPI 0x10000000 -#define ECA_MVPGI 0x01000000 -#define ECA_AIV 0x00200000 -#define ECA_VX 0x00020000 -#define ECA_PROTEXCI 0x00002000 -#define ECA_APIE 0x00000008 -#define ECA_SII 0x00000001 - __u32 eca; /* 0x004c */ -#define ICPT_INST 0x04 -#define ICPT_PROGI 0x08 -#define ICPT_INSTPROGI 0x0C -#define ICPT_EXTREQ 0x10 -#define ICPT_EXTINT 0x14 -#define ICPT_IOREQ 0x18 -#define ICPT_WAIT 0x1c -#define ICPT_VALIDITY 0x20 -#define ICPT_STOP 0x28 -#define ICPT_OPEREXC 0x2C -#define ICPT_PARTEXEC 0x38 -#define ICPT_IOINST 0x40 -#define ICPT_KSS 0x5c -#define ICPT_MCHKREQ 0x60 -#define ICPT_INT_ENABLE 0x64 -#define ICPT_PV_INSTR 0x68 -#define ICPT_PV_NOTIFY 0x6c -#define ICPT_PV_PREF 0x70 - __u8 icptcode; /* 0x0050 */ - __u8 icptstatus; /* 0x0051 */ - __u16 ihcpu; /* 0x0052 */ - __u8 reserved54; /* 0x0054 */ -#define IICTL_CODE_NONE 0x00 -#define IICTL_CODE_MCHK 0x01 -#define IICTL_CODE_EXT 0x02 -#define IICTL_CODE_IO 0x03 -#define IICTL_CODE_RESTART 0x04 -#define IICTL_CODE_SPECIFICATION 0x10 -#define IICTL_CODE_OPERAND 0x11 - __u8 iictl; /* 0x0055 */ - __u16 ipa; /* 0x0056 */ - __u32 ipb; /* 0x0058 */ - __u32 scaoh; /* 0x005c */ -#define FPF_BPBC 0x20 - __u8 fpf; /* 0x0060 */ -#define ECB_GS 0x40 -#define ECB_TE 0x10 -#define ECB_SPECI 0x08 -#define ECB_SRSI 0x04 -#define ECB_HOSTPROTINT 0x02 -#define ECB_PTF 0x01 - __u8 ecb; /* 0x0061 */ -#define ECB2_CMMA 0x80 -#define ECB2_IEP 0x20 -#define ECB2_PFMFI 0x08 -#define ECB2_ESCA 0x04 -#define ECB2_ZPCI_LSI 0x02 - __u8 ecb2; /* 0x0062 */ -#define ECB3_AISI 0x20 -#define ECB3_AISII 0x10 -#define ECB3_DEA 0x08 -#define ECB3_AES 0x04 -#define ECB3_RI 0x01 - __u8 ecb3; /* 0x0063 */ -#define ESCA_SCAOL_MASK ~0x3fU - __u32 scaol; /* 0x0064 */ - __u8 sdf; /* 0x0068 */ - __u8 epdx; /* 0x0069 */ - __u8 cpnc; /* 0x006a */ - __u8 reserved6b; /* 0x006b */ - __u32 todpr; /* 0x006c */ -#define GISA_FORMAT1 0x00000001 - __u32 gd; /* 0x0070 */ - __u8 reserved74[12]; /* 0x0074 */ - __u64 mso; /* 0x0080 */ - __u64 msl; /* 0x0088 */ - psw_t gpsw; /* 0x0090 */ - __u64 gg14; /* 0x00a0 */ - __u64 gg15; /* 0x00a8 */ - __u8 reservedb0[8]; /* 0x00b0 */ -#define HPID_KVM 0x4 -#define HPID_VSIE 0x5 - __u8 hpid; /* 0x00b8 */ - __u8 reservedb9[7]; /* 0x00b9 */ - union { - struct { - __u32 eiparams; /* 0x00c0 */ - __u16 extcpuaddr; /* 0x00c4 */ - __u16 eic; /* 0x00c6 */ - }; - __u64 mcic; /* 0x00c0 */ - } __packed; - __u32 reservedc8; /* 0x00c8 */ - union { - struct { - __u16 pgmilc; /* 0x00cc */ - __u16 iprcc; /* 0x00ce */ - }; - __u32 edc; /* 0x00cc */ - } __packed; - union { - struct { - __u32 dxc; /* 0x00d0 */ - __u16 mcn; /* 0x00d4 */ - __u8 perc; /* 0x00d6 */ - __u8 peratmid; /* 0x00d7 */ - }; - __u64 faddr; /* 0x00d0 */ - } __packed; - __u64 peraddr; /* 0x00d8 */ - __u8 eai; /* 0x00e0 */ - __u8 peraid; /* 0x00e1 */ - __u8 oai; /* 0x00e2 */ - __u8 armid; /* 0x00e3 */ - __u8 reservede4[4]; /* 0x00e4 */ - union { - __u64 tecmc; /* 0x00e8 */ - struct { - __u16 subchannel_id; /* 0x00e8 */ - __u16 subchannel_nr; /* 0x00ea */ - __u32 io_int_parm; /* 0x00ec */ - __u32 io_int_word; /* 0x00f0 */ - }; - } __packed; - __u8 reservedf4[8]; /* 0x00f4 */ -#define CRYCB_FORMAT_MASK 0x00000003 -#define CRYCB_FORMAT0 0x00000000 -#define CRYCB_FORMAT1 0x00000001 -#define CRYCB_FORMAT2 0x00000003 - __u32 crycbd; /* 0x00fc */ - __u64 gcr[16]; /* 0x0100 */ - union { - __u64 gbea; /* 0x0180 */ - __u64 sidad; - }; - __u8 reserved188[8]; /* 0x0188 */ - __u64 sdnxo; /* 0x0190 */ - __u8 reserved198[8]; /* 0x0198 */ - __u32 fac; /* 0x01a0 */ - __u8 reserved1a4[20]; /* 0x01a4 */ - __u64 cbrlo; /* 0x01b8 */ - __u8 reserved1c0[8]; /* 0x01c0 */ -#define ECD_HOSTREGMGMT 0x20000000 -#define ECD_MEF 0x08000000 -#define ECD_ETOKENF 0x02000000 -#define ECD_ECC 0x00200000 -#define ECD_HMAC 0x00004000 - __u32 ecd; /* 0x01c8 */ - __u8 reserved1cc[18]; /* 0x01cc */ - __u64 pp; /* 0x01de */ - __u8 reserved1e6[2]; /* 0x01e6 */ - __u64 itdba; /* 0x01e8 */ - __u64 riccbd; /* 0x01f0 */ - __u64 gvrd; /* 0x01f8 */ -} __packed __aligned(512); - -struct kvm_s390_itdb { - __u8 data[256]; -}; - -struct sie_page { - struct kvm_s390_sie_block sie_block; - struct mcck_volatile_info mcck_info; /* 0x0200 */ - __u8 reserved218[360]; /* 0x0218 */ - __u64 pv_grregs[16]; /* 0x0380 */ - __u8 reserved400[512]; /* 0x0400 */ - struct kvm_s390_itdb itdb; /* 0x0600 */ - __u8 reserved700[2304]; /* 0x0700 */ -}; - -#endif /* _ASM_KVM_HOST_TYPES_H */ +#endif /* ASM_KVM_HOST_TYPES_H */ diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index 8d3ee17a1bcb..e9d2ca797907 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -18,7 +18,7 @@ if VIRTUALIZATION =20 config KVM def_tristate y - prompt "Kernel-based Virtual Machine (KVM) support" + prompt "Kernel-based Virtual Machine (KVM) support (s390)" select HAVE_KVM_CPU_RELAX_INTERCEPT select KVM_ASYNC_PF select KVM_ASYNC_PF_SYNC @@ -32,7 +32,7 @@ config KVM select KVM_MMU_LOCKLESS_AGING select KVM_GENERIC_PRE_FAULT_MEMORY help - Support hosting paravirtualized guest machines using the SIE + Support hosting paravirtualized s390 guest machines using the SIE virtualization capability on the mainframe. This should work on any 64bit machine. =20 diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index dac9d53b23d8..961de97b8e80 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -5,9 +5,9 @@ =20 include $(srctree)/virt/kvm/Makefile.kvm =20 -ccflags-y :=3D -Ivirt/kvm -Iarch/s390/kvm +ccflags-y :=3D -I$(src) =20 -kvm-y +=3D kvm-s390.o intercept.o interrupt.o priv.o sigp.o +kvm-y +=3D s390.o intercept.o interrupt.o priv.o sigp.o kvm-y +=3D diag.o gaccess.o guestdbg.o vsie.o pv.o kvm-y +=3D dat.o gmap.o faultin.o =20 diff --git a/arch/s390/kvm/dat.h b/arch/s390/kvm/dat.h index fad605305e05..711ae2f96107 100644 --- a/arch/s390/kvm/dat.h +++ b/arch/s390/kvm/dat.h @@ -6,8 +6,8 @@ * Author(s): Claudio Imbrenda */ =20 -#ifndef __KVM_S390_DAT_H -#define __KVM_S390_DAT_H +#ifndef ARCH_KVM_GMAP_DAT_H +#define ARCH_KVM_GMAP_DAT_H =20 #include #include @@ -975,4 +975,4 @@ static inline bool crste_is_ucas(union crste crste) return is_pmd(crste) && crste.h.i && crste.h.fc0.tl =3D=3D 1 && crste.h.f= c =3D=3D 0; } =20 -#endif /* __KVM_S390_DAT_H */ +#endif /* ARCH_KVM_GMAP_DAT_H */ diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index d89d1c381522..700d9b7b68bc 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c @@ -12,7 +12,7 @@ #include #include #include -#include "kvm-s390.h" +#include "s390.h" #include "trace.h" #include "trace-s390.h" #include "gaccess.h" diff --git a/arch/s390/kvm/faultin.c b/arch/s390/kvm/faultin.c index fee80047bd94..740415d494de 100644 --- a/arch/s390/kvm/faultin.c +++ b/arch/s390/kvm/faultin.c @@ -9,10 +9,11 @@ #include =20 #include "gmap.h" -#include "trace.h" #include "faultin.h" =20 bool kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu); +#define CREATE_TRACE_POINTS +#include "trace-gmap.h" =20 /* * kvm_s390_faultin_gfn() - handle a dat fault. diff --git a/arch/s390/kvm/faultin.h b/arch/s390/kvm/faultin.h index f86176d2769c..f343b6fb6f16 100644 --- a/arch/s390/kvm/faultin.h +++ b/arch/s390/kvm/faultin.h @@ -6,8 +6,8 @@ * Author(s): Claudio Imbrenda */ =20 -#ifndef __KVM_S390_FAULTIN_H -#define __KVM_S390_FAULTIN_H +#ifndef ARCH_KVM_GMAP_FAULTIN_H +#define ARCH_KVM_GMAP_FAULTIN_H =20 #include =20 @@ -89,4 +89,4 @@ static inline int kvm_s390_get_guest_pages(struct kvm *kv= m, struct guest_fault * #define kvm_s390_array_needs_retry_safe(kvm, seq, array) \ kvm_s390_multiple_faults_need_retry(kvm, seq, array, ARRAY_SIZE(array), f= alse) =20 -#endif /* __KVM_S390_FAULTIN_H */ +#endif /* ARCH_KVM_GMAP_FAULTIN_H */ diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c index 36102b2727fb..2a4b2525329a 100644 --- a/arch/s390/kvm/gaccess.c +++ b/arch/s390/kvm/gaccess.c @@ -17,7 +17,7 @@ #include #include #include -#include "kvm-s390.h" +#include "s390.h" #include "dat.h" #include "gmap.h" #include "gaccess.h" diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/gaccess.h index b5385cec60f4..ef922b3b4990 100644 --- a/arch/s390/kvm/gaccess.h +++ b/arch/s390/kvm/gaccess.h @@ -14,7 +14,7 @@ #include #include #include -#include "kvm-s390.h" +#include "s390.h" =20 /** * kvm_s390_real_to_abs - convert guest real address to guest absolute add= ress diff --git a/arch/s390/kvm/gmap.c b/arch/s390/kvm/gmap.c index 8abb4f55b306..9ae55a1d6f09 100644 --- a/arch/s390/kvm/gmap.c +++ b/arch/s390/kvm/gmap.c @@ -21,7 +21,7 @@ =20 #include "dat.h" #include "gmap.h" -#include "kvm-s390.h" +#include "s390.h" #include "faultin.h" =20 static inline bool kvm_s390_is_in_sie(struct kvm_vcpu *vcpu) diff --git a/arch/s390/kvm/gmap.h b/arch/s390/kvm/gmap.h index 39938d363ec9..c54c35e47d6d 100644 --- a/arch/s390/kvm/gmap.h +++ b/arch/s390/kvm/gmap.h @@ -7,8 +7,8 @@ * Claudio Imbrenda */ =20 -#ifndef ARCH_KVM_S390_GMAP_H -#define ARCH_KVM_S390_GMAP_H +#ifndef ARCH_KVM_GMAP_GMAP_H +#define ARCH_KVM_GMAP_GMAP_H =20 #include "dat.h" =20 @@ -330,4 +330,4 @@ static inline bool gmap_is_shadow_valid(struct gmap *sg= , union asce asce, int ed return sg->guest_asce.val =3D=3D asce.val && sg->edat_level =3D=3D edat_l= evel; } =20 -#endif /* ARCH_KVM_S390_GMAP_H */ +#endif /* ARCH_KVM_GMAP_GMAP_H */ diff --git a/arch/s390/kvm/guestdbg.c b/arch/s390/kvm/guestdbg.c index 69835e1d4f20..c880ebbdef2f 100644 --- a/arch/s390/kvm/guestdbg.c +++ b/arch/s390/kvm/guestdbg.c @@ -8,7 +8,7 @@ */ #include #include -#include "kvm-s390.h" +#include "s390.h" #include "gaccess.h" =20 /* diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c index 1980df61ef30..ca1205dfac8b 100644 --- a/arch/s390/kvm/intercept.c +++ b/arch/s390/kvm/intercept.c @@ -17,7 +17,7 @@ #include #include =20 -#include "kvm-s390.h" +#include "s390.h" #include "gaccess.h" #include "trace.h" #include "trace-s390.h" diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 7514d9e2403c..cdbbfca211b1 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -29,7 +29,7 @@ #include #include #include -#include "kvm-s390.h" +#include "s390.h" #include "gaccess.h" #include "trace-s390.h" #include "pci.h" diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c index 50f5ec79600e..82892e1e03d9 100644 --- a/arch/s390/kvm/pci.c +++ b/arch/s390/kvm/pci.c @@ -14,7 +14,7 @@ #include #include #include "pci.h" -#include "kvm-s390.h" +#include "s390.h" =20 struct zpci_aift *aift; =20 diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c index ad0ddc433a73..21479f0a5e5a 100644 --- a/arch/s390/kvm/priv.c +++ b/arch/s390/kvm/priv.c @@ -26,7 +26,7 @@ #include #include #include "gaccess.h" -#include "kvm-s390.h" +#include "s390.h" #include "trace.h" #include "gmap.h" =20 diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c index 1beacc841ca8..f6e03e9d371a 100644 --- a/arch/s390/kvm/pv.c +++ b/arch/s390/kvm/pv.c @@ -18,7 +18,7 @@ #include #include #include -#include "kvm-s390.h" +#include "s390.h" #include "dat.h" #include "gaccess.h" #include "gmap.h" diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/s390.c similarity index 99% rename from arch/s390/kvm/kvm-s390.c rename to arch/s390/kvm/s390.c index 150b5dd2170e..f1962cf61cc1 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/s390.c @@ -50,7 +50,7 @@ #include #include #include -#include "kvm-s390.h" +#include "s390.h" #include "gaccess.h" #include "gmap.h" #include "faultin.h" diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/s390.h similarity index 99% rename from arch/s390/kvm/kvm-s390.h rename to arch/s390/kvm/s390.h index 6d2842fb71a3..e144ca2e6d5e 100644 --- a/arch/s390/kvm/kvm-s390.h +++ b/arch/s390/kvm/s390.h @@ -452,7 +452,7 @@ void kvm_s390_vsie_destroy(struct kvm *kvm); int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu); int kvm_s390_handle_sigp_pei(struct kvm_vcpu *vcpu); =20 -/* implemented in kvm-s390.c */ +/* implemented in s390.c */ int kvm_s390_try_set_tod_clock(struct kvm *kvm, const struct kvm_s390_vm_t= od_clock *gtod); int kvm_s390_store_status_unloaded(struct kvm_vcpu *vcpu, unsigned long ad= dr); int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr); diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c index 55c34cb35428..131b3371ef4f 100644 --- a/arch/s390/kvm/sigp.c +++ b/arch/s390/kvm/sigp.c @@ -14,7 +14,7 @@ #include #include #include "gaccess.h" -#include "kvm-s390.h" +#include "s390.h" #include "trace.h" =20 static int __sigp_sense(struct kvm_vcpu *vcpu, struct kvm_vcpu *dst_vcpu, diff --git a/arch/s390/kvm/trace-gmap.h b/arch/s390/kvm/trace-gmap.h new file mode 100644 index 000000000000..c139b4ef75f6 --- /dev/null +++ b/arch/s390/kvm/trace-gmap.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#if !defined(GMAP_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +#define GMAP_TRACE_KVM_H + +#include + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_PATH . +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE trace-gmap + +#define __KVM_FIELDS \ + __field(unsigned long, pswmask) \ + __field(unsigned long, pswaddr) +#define __KVM_ASSIGN ({\ + __entry->pswmask =3D vcpu->arch.sie_block->gpsw.mask; \ + __entry->pswaddr =3D vcpu->arch.sie_block->gpsw.addr; \ + }) +#define __KVM_PRINT \ + __entry->pswmask,\ + __entry->pswaddr + +TRACE_EVENT(kvm_s390_major_guest_pfault, + TP_PROTO(struct kvm_vcpu *vcpu), + TP_ARGS(vcpu), + + TP_STRUCT__entry( + __field(int, id) + __KVM_FIELDS + ), + + TP_fast_assign( + __entry->id =3D vcpu->vcpu_id; + __KVM_ASSIGN + ), + TP_printk("%02d[%016lx-%016lx]: major fault, maybe applicable for pfa= ult", + __entry->id, + __KVM_PRINT + ) + ); + +#endif /* GMAP_TRACE_KVM_H */ + +/* This part must be outside protection */ +#include diff --git a/arch/s390/kvm/trace.h b/arch/s390/kvm/trace.h index aa419eb6a0c8..97774fe09a85 100644 --- a/arch/s390/kvm/trace.h +++ b/arch/s390/kvm/trace.h @@ -45,20 +45,6 @@ TRACE_EVENT(kvm_s390_skey_related_inst, VCPU_TP_PRINTK("%s", "storage key related instruction") ); =20 -TRACE_EVENT(kvm_s390_major_guest_pfault, - TP_PROTO(VCPU_PROTO_COMMON), - TP_ARGS(VCPU_ARGS_COMMON), - - TP_STRUCT__entry( - VCPU_FIELD_COMMON - ), - - TP_fast_assign( - VCPU_ASSIGN_COMMON - ), - VCPU_TP_PRINTK("%s", "major fault, maybe applicable for pfault") - ); - TRACE_EVENT(kvm_s390_pfault_init, TP_PROTO(VCPU_PROTO_COMMON, long pfault_token), TP_ARGS(VCPU_ARGS_COMMON, pfault_token), diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index eea24562e7db..c4a03b310fea 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -23,7 +23,7 @@ #include #include #include -#include "kvm-s390.h" +#include "s390.h" #include "gaccess.h" #include "gmap.h" =20 --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 6C0F6403AFA; Fri, 31 Jul 2026 13:09:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503378; cv=none; b=Tb6uqT7piBJ1ixqWw7Whp1vyGEunCP6QevHM6gdu4N0pJ6c9RXrVpmuFJqGkjLv2+iujIJtBfWQg4yMmSFiE2/jAIDGixIUIEBjQThC/YbCei7BtsKcQuegSXabe/D33j06e24GpoKxx2el8K0+LQ7CPpcLE2P1URdA/kHzIc/Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503378; c=relaxed/simple; bh=TbJkPNq6nSUjmk/9eF0wRX32lUads1IXfsDTs4oMCFE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eHx+OfX1ciZ2NNY6qQgJeMzA78ipH5HpW0jojyFu7qV69mXioP6+O1VLEKqS8B4KkVW+EJc4f381AKfgntFSWfof60pQtpUR2Y7/fnqN27gm5mjp737ls2LkhP/fNhxiDXyumuCVW3IxKUwTIhY0HHtFAyKshfgOtp4sTUGmTAc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=KG03/Ptm; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="KG03/Ptm" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlo7D1765817; Fri, 31 Jul 2026 13:09:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=WE1juuDRkDodrIk7Y 44eGv6k6mTFRgrA6xPVXKZnMYQ=; b=KG03/PtmcZ43ULcYkKz1owBTDd+uZy7ne wFUo9Qt0m6FclAunIUGb+Q2r6wPw4UVEGhNOP4mOI9262X3qhAeeQptrKNGZ0mpY mUQ6GN+FoGByXo3L1ULdh++vMVC4bmPbMauydLwlJ68JAKbYrcnu2DHLzEGOPtai +2o1CxFnVI/4/3dUyE6f0SwX87g72gluISDZM6tQO49Qbi+aXVwD1Uh83m22VJsT qG0y/lmyYFGHY+RRIBRNLP7n0Plx5ac7Kru/oz0ilEeHk7Z4V88VBEnXu6zdnJer L//1kWqAtuXlYLTQ9VeWQNDUMa85tTf6OJrgzIi7mvaadtY1+A9Gw== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmv0y565f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:16 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCQFoT026851; Fri, 31 Jul 2026 13:09:15 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn9pgqtbp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:15 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD990A45547846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:09 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 68BB520040; Fri, 31 Jul 2026 13:09:09 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 008CA2004B; Fri, 31 Jul 2026 13:09:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:08 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 14/31] KVM: s390: Move s390 kvm code into a subdirectory Date: Fri, 31 Jul 2026 15:08:42 +0200 Message-ID: <20260731130902.654679-15-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: OXx-ERYv_mekzpbcxk_sG9OJzMeuOsOy X-Proofpoint-ORIG-GUID: tvHpK62mCDGhVprRE-Opo9ziqTSElVIH X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXwTpT8ffdJ5SU DZDtDfXH1jnN6fOnDVGWFTyyiw0shqfTM3xih1fqHT5KogCcH1yWJn5PDWFrWHWpza+IHi9W3b3 s0pCzYeEXAb+0R47p10Fbw+LP8P1eHs= X-Authority-Analysis: v=2.4 cv=dYuwG3Xe c=1 sm=1 tr=0 ts=6a6c9e7d cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=VwQbUJbxAAAA:8 a=_XZOIuALDOYOogwKVDcA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX7CI6EXPQstl0 6L2U6aS6FYMg5I0rprUGeGR4qGo4/Cznl8rLM9ZCc+kFYAh9OBwbbfG/uMPwyzuNX6NaMQSPtRY Qgzo+YoAwledBoNfgbG5n93JUb5Dh2kuMQW6qD8a17zwfTNWmg1OQ6ou5groc9UQcDTE4KF+vmE +MWKmTOiQSIB8tdWRaBVthuv3jwui70AM9m5BjUK4P6xMzRNZ1m59EEWZcuBLIWEWklKKUUskev dvRAdSXzo7Vfo147ZGRipWmyCSL9O2EeV3YwC1NuHAhQDFdcM11wfkCJz5f7j2mgKmci7MkdMDy I7OQMS0UxS51944NbRqEw32GOHWtGkVMv9OhPiSfYKsL/cfNV0zf1KHsK2dGCnLRv91ioUkBfF9 XrV4ZaouCHlLWECxfDJpUIoVx0jXEy6vVnbXs89C6b7Ay6YmCJy83aVQbtrrgrRcsbdYvKQQkcF vl1w1iWJPyGns/JAJcg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Move all the code required to run s390 KVM guests on s390 to a s390 subdirectory. Move gmap related code into a gmap directory to later share gmap code between KVM implementations. Update S390 VFIO-PCI MAINTAINERS filepath. No functional change. Signed-off-by: Steffen Eiden --- MAINTAINERS | 2 +- arch/s390/kvm/Kconfig | 37 +-------------------------- arch/s390/kvm/Makefile | 11 +------- arch/s390/kvm/gmap/Makefile | 5 ++++ arch/s390/kvm/{ =3D> gmap}/dat.c | 0 arch/s390/kvm/{ =3D> gmap}/dat.h | 0 arch/s390/kvm/{ =3D> gmap}/faultin.c | 0 arch/s390/kvm/{ =3D> gmap}/faultin.h | 0 arch/s390/kvm/{ =3D> gmap}/gmap.c | 0 arch/s390/kvm/{ =3D> gmap}/gmap.h | 0 arch/s390/kvm/{ =3D> gmap}/trace-gmap.h | 2 +- arch/s390/kvm/{ =3D> s390}/Kconfig | 18 ------------- arch/s390/kvm/{ =3D> s390}/Makefile | 9 +++---- arch/s390/kvm/{ =3D> s390}/diag.c | 0 arch/s390/kvm/{ =3D> s390}/gaccess.c | 0 arch/s390/kvm/{ =3D> s390}/gaccess.h | 0 arch/s390/kvm/{ =3D> s390}/guestdbg.c | 0 arch/s390/kvm/{ =3D> s390}/intercept.c | 0 arch/s390/kvm/{ =3D> s390}/interrupt.c | 0 arch/s390/kvm/{ =3D> s390}/pci.c | 0 arch/s390/kvm/{ =3D> s390}/pci.h | 0 arch/s390/kvm/{ =3D> s390}/priv.c | 0 arch/s390/kvm/{ =3D> s390}/pv.c | 0 arch/s390/kvm/{ =3D> s390}/s390.c | 0 arch/s390/kvm/{ =3D> s390}/s390.h | 0 arch/s390/kvm/{ =3D> s390}/sigp.c | 0 arch/s390/kvm/{ =3D> s390}/trace-s390.h | 0 arch/s390/kvm/{ =3D> s390}/trace.h | 0 arch/s390/kvm/{ =3D> s390}/vsie.c | 0 29 files changed, 13 insertions(+), 71 deletions(-) create mode 100644 arch/s390/kvm/gmap/Makefile rename arch/s390/kvm/{ =3D> gmap}/dat.c (100%) rename arch/s390/kvm/{ =3D> gmap}/dat.h (100%) rename arch/s390/kvm/{ =3D> gmap}/faultin.c (100%) rename arch/s390/kvm/{ =3D> gmap}/faultin.h (100%) rename arch/s390/kvm/{ =3D> gmap}/gmap.c (100%) rename arch/s390/kvm/{ =3D> gmap}/gmap.h (100%) rename arch/s390/kvm/{ =3D> gmap}/trace-gmap.h (96%) copy arch/s390/kvm/{ =3D> s390}/Kconfig (71%) copy arch/s390/kvm/{ =3D> s390}/Makefile (65%) rename arch/s390/kvm/{ =3D> s390}/diag.c (100%) rename arch/s390/kvm/{ =3D> s390}/gaccess.c (100%) rename arch/s390/kvm/{ =3D> s390}/gaccess.h (100%) rename arch/s390/kvm/{ =3D> s390}/guestdbg.c (100%) rename arch/s390/kvm/{ =3D> s390}/intercept.c (100%) rename arch/s390/kvm/{ =3D> s390}/interrupt.c (100%) rename arch/s390/kvm/{ =3D> s390}/pci.c (100%) rename arch/s390/kvm/{ =3D> s390}/pci.h (100%) rename arch/s390/kvm/{ =3D> s390}/priv.c (100%) rename arch/s390/kvm/{ =3D> s390}/pv.c (100%) rename arch/s390/kvm/{ =3D> s390}/s390.c (100%) rename arch/s390/kvm/{ =3D> s390}/s390.h (100%) rename arch/s390/kvm/{ =3D> s390}/sigp.c (100%) rename arch/s390/kvm/{ =3D> s390}/trace-s390.h (100%) rename arch/s390/kvm/{ =3D> s390}/trace.h (100%) rename arch/s390/kvm/{ =3D> s390}/vsie.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 0d7987278c07..c7ef6c0163a9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23918,7 +23918,7 @@ R: Eric Farman L: linux-s390@vger.kernel.org L: kvm@vger.kernel.org S: Supported -F: arch/s390/kvm/pci* +F: arch/s390/kvm/s390/pci* F: drivers/vfio/pci/vfio_pci_zdev.c F: include/uapi/linux/vfio_zdev.h =20 diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index e9d2ca797907..51646b067935 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -16,41 +16,6 @@ menuconfig VIRTUALIZATION =20 if VIRTUALIZATION =20 -config KVM - def_tristate y - prompt "Kernel-based Virtual Machine (KVM) support (s390)" - select HAVE_KVM_CPU_RELAX_INTERCEPT - select KVM_ASYNC_PF - select KVM_ASYNC_PF_SYNC - select KVM_COMMON - select HAVE_KVM_IRQCHIP - select HAVE_KVM_IRQ_ROUTING - select HAVE_KVM_INVALID_WAKEUPS - select HAVE_KVM_NO_POLL - select KVM_VFIO - select VIRT_XFER_TO_GUEST_WORK - select KVM_MMU_LOCKLESS_AGING - select KVM_GENERIC_PRE_FAULT_MEMORY - help - Support hosting paravirtualized s390 guest machines using the SIE - virtualization capability on the mainframe. This should work - on any 64bit machine. - - This module provides access to the hardware capabilities through - a character device node named /dev/kvm. - - To compile this as a module, choose M here: the module - will be called kvm. - - If unsure, say N. - -config KVM_S390_UCONTROL - bool "Userspace controlled virtual machines" - depends on KVM - help - Allow CAP_SYS_ADMIN users to create KVM virtual machines that are - controlled by userspace. - - If unsure, say N. +source "arch/s390/kvm/s390/Kconfig" =20 endif # VIRTUALIZATION diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index 961de97b8e80..a4e3875b5bdd 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -3,13 +3,4 @@ # # Copyright IBM Corp. 2008 =20 -include $(srctree)/virt/kvm/Makefile.kvm - -ccflags-y :=3D -I$(src) - -kvm-y +=3D s390.o intercept.o interrupt.o priv.o sigp.o -kvm-y +=3D diag.o gaccess.o guestdbg.o vsie.o pv.o -kvm-y +=3D dat.o gmap.o faultin.o - -kvm-$(CONFIG_VFIO_PCI_ZDEV_KVM) +=3D pci.o -obj-$(CONFIG_KVM) +=3D kvm.o +obj-$(CONFIG_KVM) +=3D s390/ diff --git a/arch/s390/kvm/gmap/Makefile b/arch/s390/kvm/gmap/Makefile new file mode 100644 index 000000000000..21967ed88877 --- /dev/null +++ b/arch/s390/kvm/gmap/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + +GMAP ?=3D ../gmap + +kvm-y +=3D $(GMAP)/dat.o $(GMAP)/gmap.o $(GMAP)/faultin.o diff --git a/arch/s390/kvm/dat.c b/arch/s390/kvm/gmap/dat.c similarity index 100% rename from arch/s390/kvm/dat.c rename to arch/s390/kvm/gmap/dat.c diff --git a/arch/s390/kvm/dat.h b/arch/s390/kvm/gmap/dat.h similarity index 100% rename from arch/s390/kvm/dat.h rename to arch/s390/kvm/gmap/dat.h diff --git a/arch/s390/kvm/faultin.c b/arch/s390/kvm/gmap/faultin.c similarity index 100% rename from arch/s390/kvm/faultin.c rename to arch/s390/kvm/gmap/faultin.c diff --git a/arch/s390/kvm/faultin.h b/arch/s390/kvm/gmap/faultin.h similarity index 100% rename from arch/s390/kvm/faultin.h rename to arch/s390/kvm/gmap/faultin.h diff --git a/arch/s390/kvm/gmap.c b/arch/s390/kvm/gmap/gmap.c similarity index 100% rename from arch/s390/kvm/gmap.c rename to arch/s390/kvm/gmap/gmap.c diff --git a/arch/s390/kvm/gmap.h b/arch/s390/kvm/gmap/gmap.h similarity index 100% rename from arch/s390/kvm/gmap.h rename to arch/s390/kvm/gmap/gmap.h diff --git a/arch/s390/kvm/trace-gmap.h b/arch/s390/kvm/gmap/trace-gmap.h similarity index 96% rename from arch/s390/kvm/trace-gmap.h rename to arch/s390/kvm/gmap/trace-gmap.h index c139b4ef75f6..78559298932c 100644 --- a/arch/s390/kvm/trace-gmap.h +++ b/arch/s390/kvm/gmap/trace-gmap.h @@ -6,7 +6,7 @@ =20 #undef TRACE_SYSTEM #define TRACE_SYSTEM kvm -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH ../gmap #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace-gmap =20 diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/s390/Kconfig similarity index 71% copy from arch/s390/kvm/Kconfig copy to arch/s390/kvm/s390/Kconfig index e9d2ca797907..62d65de3878d 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/s390/Kconfig @@ -1,20 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -# -# KVM configuration -# -source "virt/kvm/Kconfig" - -menuconfig VIRTUALIZATION - def_bool y - prompt "KVM" - help - Say Y here to get to see options for using your Linux host to run other - operating systems inside virtual machines (guests). - This option alone does not add any kernel code. - - If you say N, all options in this submenu will be skipped and disabled. - -if VIRTUALIZATION =20 config KVM def_tristate y @@ -52,5 +36,3 @@ config KVM_S390_UCONTROL controlled by userspace. =20 If unsure, say N. - -endif # VIRTUALIZATION diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/s390/Makefile similarity index 65% copy from arch/s390/kvm/Makefile copy to arch/s390/kvm/s390/Makefile index 961de97b8e80..de7deb81e655 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/s390/Makefile @@ -1,15 +1,14 @@ # SPDX-License-Identifier: GPL-2.0 -# Makefile for kernel virtual machines on s390 -# -# Copyright IBM Corp. 2008 =20 +KVM :=3D ../../../../virt/kvm include $(srctree)/virt/kvm/Makefile.kvm +include $(srctree)/arch/s390/kvm/gmap/Makefile =20 -ccflags-y :=3D -I$(src) +ccflags-y :=3D -I$(src) -I$(srctree)/arch/s390/kvm/gmap =20 kvm-y +=3D s390.o intercept.o interrupt.o priv.o sigp.o kvm-y +=3D diag.o gaccess.o guestdbg.o vsie.o pv.o -kvm-y +=3D dat.o gmap.o faultin.o =20 kvm-$(CONFIG_VFIO_PCI_ZDEV_KVM) +=3D pci.o + obj-$(CONFIG_KVM) +=3D kvm.o diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/s390/diag.c similarity index 100% rename from arch/s390/kvm/diag.c rename to arch/s390/kvm/s390/diag.c diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/s390/gaccess.c similarity index 100% rename from arch/s390/kvm/gaccess.c rename to arch/s390/kvm/s390/gaccess.c diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/s390/gaccess.h similarity index 100% rename from arch/s390/kvm/gaccess.h rename to arch/s390/kvm/s390/gaccess.h diff --git a/arch/s390/kvm/guestdbg.c b/arch/s390/kvm/s390/guestdbg.c similarity index 100% rename from arch/s390/kvm/guestdbg.c rename to arch/s390/kvm/s390/guestdbg.c diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/s390/intercept.c similarity index 100% rename from arch/s390/kvm/intercept.c rename to arch/s390/kvm/s390/intercept.c diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/s390/interrupt.c similarity index 100% rename from arch/s390/kvm/interrupt.c rename to arch/s390/kvm/s390/interrupt.c diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/s390/pci.c similarity index 100% rename from arch/s390/kvm/pci.c rename to arch/s390/kvm/s390/pci.c diff --git a/arch/s390/kvm/pci.h b/arch/s390/kvm/s390/pci.h similarity index 100% rename from arch/s390/kvm/pci.h rename to arch/s390/kvm/s390/pci.h diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/s390/priv.c similarity index 100% rename from arch/s390/kvm/priv.c rename to arch/s390/kvm/s390/priv.c diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/s390/pv.c similarity index 100% rename from arch/s390/kvm/pv.c rename to arch/s390/kvm/s390/pv.c diff --git a/arch/s390/kvm/s390.c b/arch/s390/kvm/s390/s390.c similarity index 100% rename from arch/s390/kvm/s390.c rename to arch/s390/kvm/s390/s390.c diff --git a/arch/s390/kvm/s390.h b/arch/s390/kvm/s390/s390.h similarity index 100% rename from arch/s390/kvm/s390.h rename to arch/s390/kvm/s390/s390.h diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/s390/sigp.c similarity index 100% rename from arch/s390/kvm/sigp.c rename to arch/s390/kvm/s390/sigp.c diff --git a/arch/s390/kvm/trace-s390.h b/arch/s390/kvm/s390/trace-s390.h similarity index 100% rename from arch/s390/kvm/trace-s390.h rename to arch/s390/kvm/s390/trace-s390.h diff --git a/arch/s390/kvm/trace.h b/arch/s390/kvm/s390/trace.h similarity index 100% rename from arch/s390/kvm/trace.h rename to arch/s390/kvm/s390/trace.h diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/s390/vsie.c similarity index 100% rename from arch/s390/kvm/vsie.c rename to arch/s390/kvm/s390/vsie.c --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 5387F43802C; Fri, 31 Jul 2026 13:09:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503391; cv=none; b=JpR+VY6BqVj9LFVPJ//fA3FyII+dMcQf5kyN48Aw80miIJ1E7MBURekgtsuMnz4E0ax9tmd1+S35wUPegYyojXDJtRKYnHW3FxBTYhFOq0PKbCNzywzVZpduogmpGPjdWivk4z7IcXYlZPtv2mVf9lfdotiqC7YQmVs8RVs+yzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503391; c=relaxed/simple; bh=/oV3eyAK1cbDRvPx+9LLhErywekKRVFgqAm/mn95++o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pOf2PIaVKjJu6PECjf/a2lb+M6gtwYisRUrfNu1TIJkB7MtkbsB+3Vt0ZojDuwh4XxxpqXtiLtA95JS3gGa6U5bs+Ss+D/5v7qFUZvAgGFAnDk/qDu/cT9QRzCcnGkjhXFcUEskFObcb/jrqIuS1q+3wYltdG8OEz2ZTsQOIBDI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=qFTtpzD3; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="qFTtpzD3" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlp3I4072850; Fri, 31 Jul 2026 13:09:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=ULOvOfwPtEGE5jko2 /sd8TtxH5WeGPHpTOCc3jzGCp4=; b=qFTtpzD3IvJQ8IeMvAmQ1VU097nqA1tAp qDykny4ajHJv/fEruSEeTanO5tiDys8C3qYn6y8a4Jqci28dS1TMmCkjNT6ZVhFu 7Es+osIL/3eNfoRbsNz1NeYG0yelNMGlge6j6yBd+jWqa/lb6b0NFASX9kIRk544 bKoaBsAHTjWQuISrTRaJxkmrIvBd2eAPFwIWC6BjRxLhFS43nf1x72rHyPLRK7KB lS3RsbhITp/to7gGmVqWHxARJwjEIXbU0qt58Q6WYp8QLKKZ8llVVgfy/TFnYFwK fk05qSPeXcGjct3BiXaysr+0GnX4vo0M67KOkK3JSQtxb5sC1eiFg== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2nr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:19 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuJNx012649; Fri, 31 Jul 2026 13:09:18 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8fkg083-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:17 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD99uI32309732 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:10 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D753420040; Fri, 31 Jul 2026 13:09:09 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6FE7620043; Fri, 31 Jul 2026 13:09:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:09 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 15/31] KVM: s390: Guard KVM/s390 behind CONFIG_KVM_S390 Date: Fri, 31 Jul 2026 15:08:43 +0200 Message-ID: <20260731130902.654679-16-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: AdgRE-4qQiWoRXdX6o5TOetxKhjuFY8_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX8hbOS3QFyNA4 USdAdosr8iih8XYi+vcVvd6G3VZMovBu5qDTUZ3gJmxOEleqRkrhGTGA0aELoBUdaJBxMzczWmq 7wpBNnWamHbOg1BDCUpttWkNLntUX0gv/yGzq8QtkkgYKVxVAJpZeQQDikbqCvNzU+2PSRAe0c3 PTdDkqJ7DYwfhDZJwzYGR+CAd+N/SBL+Z2QJatRPZyhsNfjyiKYEP6UmciEks9fRhDEhNsEm1pr oCdjrhjNzcSD5ao+R0LgOoOLaSetK6CFEnI8rjAbwwh2qVp7tXd6jr0kdzUkYItRg3rwB8cMz0C xErqR5U8/veUbHLQhTQ0HMG1oyWEYRsRFbdNg1IxxvC9PTZCPKAVAN7SgyVnEyznP3GEQc/PhYe juGzBwytUeq8gQea+H9N4ZtUTqGuAoVkBOir2TFB2xVo+3ivp+Vqj8nnl6ah8k30qk6ZM/8JW3G 0mLDYf1YDuciBNdmVwQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX2B/EdPQp8nF9 W3Hurp+3y89WVtRjWsDBZk+eFeVVI+9qrT0hvq/as40OyQBQWJDruDONkbUAUt5esVDrATsA5ZN fCGudHoDglFM8pyrKO4jzAW6/7ZGQMI= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e7f cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=TDxLvxBx8DFaYtTTU-YA:9 X-Proofpoint-GUID: iYp1v1CtsQuSW0cyCdHoeyIWgXvvAbLT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" To allow for a second KVM Module guard KVM/s390 behind CONIG_KVM_S390 instead of CONFIG_KVM and turn CONFIG_KVM on if selected. Signed-off-by: Steffen Eiden --- arch/s390/Kconfig | 2 +- arch/s390/boot/ipl_parm.c | 2 +- arch/s390/boot/uv.c | 2 +- arch/s390/configs/debug_defconfig | 2 +- arch/s390/configs/defconfig | 2 +- arch/s390/kernel/early.c | 2 +- arch/s390/kernel/entry.S | 10 +++++----- arch/s390/kernel/perf_event.c | 2 +- arch/s390/kvm/Kconfig | 3 +++ arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/s390/Kconfig | 5 +++-- arch/s390/kvm/s390/Makefile | 2 +- include/linux/kvm_host.h | 2 +- 13 files changed, 21 insertions(+), 17 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 84404e6778d5..b2eaa2000b10 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -834,7 +834,7 @@ config VFIO_CCW config VFIO_AP def_tristate n prompt "VFIO support for AP devices" - depends on KVM + depends on KVM_S390 depends on VFIO depends on AP select VFIO_MDEV diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c index 6bc950b92be7..b8906ba7e5e8 100644 --- a/arch/s390/boot/ipl_parm.c +++ b/arch/s390/boot/ipl_parm.c @@ -300,7 +300,7 @@ void parse_boot_command_line(void) stack_protector_debug =3D 1; #endif =20 -#if IS_ENABLED(CONFIG_KVM) +#if IS_ENABLED(CONFIG_KVM_S390) if (!strcmp(param, "prot_virt")) { rc =3D kstrtobool(val, &enabled); if (!rc && enabled) diff --git a/arch/s390/boot/uv.c b/arch/s390/boot/uv.c index 4568e8f81dac..f7b68bdcedc1 100644 --- a/arch/s390/boot/uv.c +++ b/arch/s390/boot/uv.c @@ -26,7 +26,7 @@ void uv_query_info(void) if (uv_call(0, (uint64_t)&uvcb) && uvcb.header.rc !=3D UVC_RC_MORE_DATA) return; =20 - if (IS_ENABLED(CONFIG_KVM)) { + if (IS_ENABLED(CONFIG_KVM_S390)) { memcpy(uv_info.inst_calls_list, uvcb.inst_calls_list, sizeof(uv_info.ins= t_calls_list)); uv_info.uv_base_stor_len =3D uvcb.uv_base_stor_len; uv_info.guest_base_stor_len =3D uvcb.conf_base_phys_stor_len; diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_de= fconfig index 54637be87fb7..e9ad718a9408 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -63,7 +63,7 @@ CONFIG_IOMMUFD=3Dy CONFIG_CMM=3Dm CONFIG_APPLDATA_BASE=3Dy CONFIG_S390_HYPFS_FS=3Dy -CONFIG_KVM=3Dm +CONFIG_KVM_S390=3Dm CONFIG_KVM_S390_UCONTROL=3Dy CONFIG_S390_UNWIND_SELFTEST=3Dm CONFIG_S390_KPROBES_SANITY_TEST=3Dm diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index 5f5114a253cf..327ab4a3933c 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -61,7 +61,7 @@ CONFIG_IOMMUFD=3Dy CONFIG_CMM=3Dm CONFIG_APPLDATA_BASE=3Dy CONFIG_S390_HYPFS_FS=3Dy -CONFIG_KVM=3Dm +CONFIG_KVM_S390=3Dm CONFIG_S390_UNWIND_SELFTEST=3Dm CONFIG_S390_KPROBES_SANITY_TEST=3Dm CONFIG_S390_MODULES_SANITY_TEST=3Dm diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index b27239c03d79..464f8918d447 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -57,7 +57,7 @@ decompressor_handled_param(cmma); decompressor_handled_param(relocate_lowcore); decompressor_handled_param(bootdebug); __decompressor_handled_param(debug_alternative, debug-alternative); -#if IS_ENABLED(CONFIG_KVM) +#if IS_ENABLED(CONFIG_KVM_S390) decompressor_handled_param(prot_virt); #endif =20 diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 79a45efae23d..9572620fcaa6 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -113,7 +113,7 @@ _LPP_OFFSET =3D __LC_LPP "jnz .+8; .insn rrf,0xb2e80000,0,0,13,0", ALT_SPEC(82) .endm =20 -#if IS_ENABLED(CONFIG_KVM) +#if IS_ENABLED(CONFIG_KVM_S390) .macro SIEEXIT sie_control,lowcore lg %r9,\sie_control # get control block pointer ni __SIE_PROG0C+3(%r9),0xfe # no longer in SIE @@ -184,7 +184,7 @@ EXPORT_SYMBOL(__WARN_trap) =20 #endif /* CONFIG_BUG && CONFIG_CC_HAS_ASM_IMMEDIATE_STRINGS */ =20 -#if IS_ENABLED(CONFIG_KVM) +#if IS_ENABLED(CONFIG_KVM_S390) /* * __sie64a calling convention: * %r2 pointer to sie control block phys @@ -315,7 +315,7 @@ SYM_CODE_START(pgm_check_handler) xgr %r10,%r10 tmhh %r8,0x0001 # coming from user space? jo 3f # -> fault in user space -#if IS_ENABLED(CONFIG_KVM) +#if IS_ENABLED(CONFIG_KVM_S390) lg %r11,__LC_CURRENT(%r13) tm __TI_sie(%r11),0xff jz 1f @@ -397,7 +397,7 @@ SYM_CODE_START(\name) lmg %r8,%r9,\lc_old_psw(%r13) tmhh %r8,0x0001 # interrupting from user ? jnz 1f -#if IS_ENABLED(CONFIG_KVM) +#if IS_ENABLED(CONFIG_KVM_S390) lg %r10,__LC_CURRENT(%r13) tm __TI_sie(%r10),0xff jz 0f @@ -475,7 +475,7 @@ SYM_CODE_START(mcck_int_handler) jnz .Lmcck_user TSTMSK __LC_MCCK_CODE(%r13),MCCK_CODE_PSW_IA_VALID jno .Lmcck_panic -#if IS_ENABLED(CONFIG_KVM) +#if IS_ENABLED(CONFIG_KVM_S390) lg %r10,__LC_CURRENT(%r13) tm __TI_sie(%r10),0xff jz .Lmcck_user diff --git a/arch/s390/kernel/perf_event.c b/arch/s390/kernel/perf_event.c index 606750bae508..6441746b8e72 100644 --- a/arch/s390/kernel/perf_event.c +++ b/arch/s390/kernel/perf_event.c @@ -37,7 +37,7 @@ static bool is_in_guest(struct pt_regs *regs) { if (user_mode(regs)) return false; -#if IS_ENABLED(CONFIG_KVM) +#if IS_ENABLED(CONFIG_KVM_S390) return instruction_pointer(regs) =3D=3D (unsigned long) &sie_exit; #else return false; diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index 51646b067935..f8d4a9a38dae 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -16,6 +16,9 @@ menuconfig VIRTUALIZATION =20 if VIRTUALIZATION =20 +config KVM + tristate + source "arch/s390/kvm/s390/Kconfig" =20 endif # VIRTUALIZATION diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index a4e3875b5bdd..c43d7dffca13 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -3,4 +3,4 @@ # # Copyright IBM Corp. 2008 =20 -obj-$(CONFIG_KVM) +=3D s390/ +obj-$(CONFIG_KVM_S390) +=3D s390/ diff --git a/arch/s390/kvm/s390/Kconfig b/arch/s390/kvm/s390/Kconfig index 62d65de3878d..bacfa1a48446 100644 --- a/arch/s390/kvm/s390/Kconfig +++ b/arch/s390/kvm/s390/Kconfig @@ -1,12 +1,13 @@ # SPDX-License-Identifier: GPL-2.0 =20 -config KVM +config KVM_S390 def_tristate y prompt "Kernel-based Virtual Machine (KVM) support (s390)" select HAVE_KVM_CPU_RELAX_INTERCEPT select KVM_ASYNC_PF select KVM_ASYNC_PF_SYNC select KVM_COMMON + select KVM select HAVE_KVM_IRQCHIP select HAVE_KVM_IRQ_ROUTING select HAVE_KVM_INVALID_WAKEUPS @@ -30,7 +31,7 @@ config KVM =20 config KVM_S390_UCONTROL bool "Userspace controlled virtual machines" - depends on KVM + depends on KVM_S390 help Allow CAP_SYS_ADMIN users to create KVM virtual machines that are controlled by userspace. diff --git a/arch/s390/kvm/s390/Makefile b/arch/s390/kvm/s390/Makefile index de7deb81e655..354cb4c52635 100644 --- a/arch/s390/kvm/s390/Makefile +++ b/arch/s390/kvm/s390/Makefile @@ -11,4 +11,4 @@ kvm-y +=3D diag.o gaccess.o guestdbg.o vsie.o pv.o =20 kvm-$(CONFIG_VFIO_PCI_ZDEV_KVM) +=3D pci.o =20 -obj-$(CONFIG_KVM) +=3D kvm.o +obj-$(CONFIG_KVM_S390) +=3D kvm.o diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 7a5e2797db7f..050aca8a8ff4 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1541,7 +1541,7 @@ void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu); void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu); bool kvm_vcpu_wake_up(struct kvm_vcpu *vcpu); =20 -#ifndef CONFIG_S390 +#ifndef CONFIG_KVM_S390 void __kvm_vcpu_kick(struct kvm_vcpu *vcpu, bool wait); =20 static inline void kvm_vcpu_kick(struct kvm_vcpu *vcpu) --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 4BED142CB00; Fri, 31 Jul 2026 13:09:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503381; cv=none; b=efJAyR9DazQe5GesRDOHeROZfRUc4bRyJjdZE6qN7kawzTNPlp6uvCYOXjXGKaJdIdTddu1pDLop3MWzfzYWujDqTC5fiScs0DWCBvZ26G4pDwC0UEWT+AzSV5U1DApRwUXvLp3uxPXtr97gxPoPmLHoY+Eqf14iYkZi12bO+1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503381; c=relaxed/simple; bh=s/VHK3l4V/opXyxmvjHVQQyx6bMLTnHI1mFNxF8QCQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ows1PLJo1dXMxD6UR6Zvs4SXgeDVcFWN4yvIiKvRNt4IFKQFji5IUtDitwkzc4ZRb3UI8TK2zaL+nUo5i53924af1qit2GfR0jqdAJ07tH4PnzXOic+HZG+IixepQVqjKZGD5iQajqhb+rkW11ru+mfCu6401wg/0kuhSb7PX8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=lYFH91c3; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="lYFH91c3" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBmUqC1732345; Fri, 31 Jul 2026 13:09:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=pxBQDzcefpvTkc6N8 16N8JcNplQq+L7zx85iUJorX5Q=; b=lYFH91c3Q49AJZxfK0CP9omslwsrhUr5L pcHOi1WIYDZs17D38EtC6J8/yhVrM7I9U1Ib0QTUO8BkUq64ejdhH8ZnPADNMFXM 4D2qL70u/XaTy6n9giH1QJqxh4dR900ZwscnuzwLQ8nShwIkZA92fTlQEvMuMFME Tx1TiBS2RGWuSGR0yS+PXtzVAWxF5QzN6QOy841w9ZOhwhQr5pDuhmjC9R/HIdap bal4z5IfY75faVbMWVwwOAPl9WK/ENCwVHdHxberpREoZrVJlarO+5VCCYvE9PBN R39p2+qtnhIVVDEDiCTa3jcynEbBCnmIPSFJE6TqbA3wkRbt1RnkQ== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuw7w4kt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:17 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuLc6023579; Fri, 31 Jul 2026 13:09:16 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fna5yfqfj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:16 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9Akw32637358 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:10 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4A36F20040; Fri, 31 Jul 2026 13:09:10 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DE2142004B; Fri, 31 Jul 2026 13:09:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:09 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 16/31] KVM: s390: Move PGM code definitions to asm/kvm_host.h Date: Fri, 31 Jul 2026 15:08:44 +0200 Message-ID: <20260731130902.654679-17-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: cU7S3y4KSk2SIDvEgrsO8afsPJQL_AIn X-Proofpoint-ORIG-GUID: a2lqMBN7jYHmnRoNghA6BeDvM0XIgTvb X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX7B4GY8RGThkQ URj2Jneu56iseBIK2qgNknpnHN0nx5XYYBOf14Wg/wOV09EVsUSxQGTG2r3/hAgjH5XiFfcOKhz hJybZNDp4QUiaqgEVXgLnRN2os1+7EoM5bpViIOafovR57xI0gE9oqmz2iKBJ8j9H2e0eHXlQE5 2iMJzipC0QUomQ8SWcD6dqTf2WzIe1THoAgZWQtB8di6C8KFuM3qDL0u4U6WcyQb+ddCa32bxJQ Ww5Ym3EqkUUce/gcn3026MMTeigmADZvRpGUpXqg2Hn+/GOgRxfwGxO4HjwkSwwnI1Jz7SLZStD QvLCRtFF/fbkodJ/FMFLYZ2UsGo0zlJzurgoEbylCAMYYMG8lmP024Hifw+V4zNgpMkD1XFzoDH ie4Y3LBfy1BmZHOaYpqE2+jOs8ScSpAm0bQ4nVdXYWbp68XO0sWxJ3efTmsEsWnr9sHWBYHfk/i xqAMpkar3cUXF7Z+GUg== X-Authority-Analysis: v=2.4 cv=SKFykuvH c=1 sm=1 tr=0 ts=6a6c9e7e cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=TiwjLMfUdNF-F4zQeIEA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX+h51CXDNeRl6 dc8fzXFh8PPy2q4DIvhSzsZy4Hw0z5I35A21sy3ZAnLN+S7sxUj+jf0j0CIPy45kb9FyuWGACXL BGAFxw0b1lkvUa1Fojf64ziw6LMUapA= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Move the PGM definitions from kvm_host_s390.h (back) to kvm_host.h so they can be used by a second KVM implementation. No functional change. Signed-off-by: Steffen Eiden --- arch/s390/include/asm/kvm_host.h | 57 +++++++++++++++++++++++++++ arch/s390/include/asm/kvm_host_s390.h | 57 --------------------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost.h index e76ceee11ef5..147325978225 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -5,4 +5,61 @@ =20 #include =20 +#define PGM_OPERATION 0x01 +#define PGM_PRIVILEGED_OP 0x02 +#define PGM_EXECUTE 0x03 +#define PGM_PROTECTION 0x04 +#define PGM_ADDRESSING 0x05 +#define PGM_SPECIFICATION 0x06 +#define PGM_DATA 0x07 +#define PGM_FIXED_POINT_OVERFLOW 0x08 +#define PGM_FIXED_POINT_DIVIDE 0x09 +#define PGM_DECIMAL_OVERFLOW 0x0a +#define PGM_DECIMAL_DIVIDE 0x0b +#define PGM_HFP_EXPONENT_OVERFLOW 0x0c +#define PGM_HFP_EXPONENT_UNDERFLOW 0x0d +#define PGM_HFP_SIGNIFICANCE 0x0e +#define PGM_HFP_DIVIDE 0x0f +#define PGM_SEGMENT_TRANSLATION 0x10 +#define PGM_PAGE_TRANSLATION 0x11 +#define PGM_TRANSLATION_SPEC 0x12 +#define PGM_SPECIAL_OPERATION 0x13 +#define PGM_OPERAND 0x15 +#define PGM_TRACE_TABEL 0x16 +#define PGM_VECTOR_PROCESSING 0x1b +#define PGM_SPACE_SWITCH 0x1c +#define PGM_HFP_SQUARE_ROOT 0x1d +#define PGM_PC_TRANSLATION_SPEC 0x1f +#define PGM_AFX_TRANSLATION 0x20 +#define PGM_ASX_TRANSLATION 0x21 +#define PGM_LX_TRANSLATION 0x22 +#define PGM_EX_TRANSLATION 0x23 +#define PGM_PRIMARY_AUTHORITY 0x24 +#define PGM_SECONDARY_AUTHORITY 0x25 +#define PGM_LFX_TRANSLATION 0x26 +#define PGM_LSX_TRANSLATION 0x27 +#define PGM_ALET_SPECIFICATION 0x28 +#define PGM_ALEN_TRANSLATION 0x29 +#define PGM_ALE_SEQUENCE 0x2a +#define PGM_ASTE_VALIDITY 0x2b +#define PGM_ASTE_SEQUENCE 0x2c +#define PGM_EXTENDED_AUTHORITY 0x2d +#define PGM_LSTE_SEQUENCE 0x2e +#define PGM_ASTE_INSTANCE 0x2f +#define PGM_STACK_FULL 0x30 +#define PGM_STACK_EMPTY 0x31 +#define PGM_STACK_SPECIFICATION 0x32 +#define PGM_STACK_TYPE 0x33 +#define PGM_STACK_OPERATION 0x34 +#define PGM_ASCE_TYPE 0x38 +#define PGM_REGION_FIRST_TRANS 0x39 +#define PGM_REGION_SECOND_TRANS 0x3a +#define PGM_REGION_THIRD_TRANS 0x3b +#define PGM_SECURE_STORAGE_ACCESS 0x3d +#define PGM_NON_SECURE_STORAGE_ACCESS 0x3e +#define PGM_SECURE_STORAGE_VIOLATION 0x3f +#define PGM_MONITOR 0x40 +#define PGM_PER 0x80 +#define PGM_CRYPTO_OPERATION 0x119 + #endif /* ASM_KVM_HOST_H */ diff --git a/arch/s390/include/asm/kvm_host_s390.h b/arch/s390/include/asm/= kvm_host_s390.h index 3c592e4bb883..9e4d7ed53078 100644 --- a/arch/s390/include/asm/kvm_host_s390.h +++ b/arch/s390/include/asm/kvm_host_s390.h @@ -150,63 +150,6 @@ struct kvm_vcpu_stat { u64 signal_exits; }; =20 -#define PGM_OPERATION 0x01 -#define PGM_PRIVILEGED_OP 0x02 -#define PGM_EXECUTE 0x03 -#define PGM_PROTECTION 0x04 -#define PGM_ADDRESSING 0x05 -#define PGM_SPECIFICATION 0x06 -#define PGM_DATA 0x07 -#define PGM_FIXED_POINT_OVERFLOW 0x08 -#define PGM_FIXED_POINT_DIVIDE 0x09 -#define PGM_DECIMAL_OVERFLOW 0x0a -#define PGM_DECIMAL_DIVIDE 0x0b -#define PGM_HFP_EXPONENT_OVERFLOW 0x0c -#define PGM_HFP_EXPONENT_UNDERFLOW 0x0d -#define PGM_HFP_SIGNIFICANCE 0x0e -#define PGM_HFP_DIVIDE 0x0f -#define PGM_SEGMENT_TRANSLATION 0x10 -#define PGM_PAGE_TRANSLATION 0x11 -#define PGM_TRANSLATION_SPEC 0x12 -#define PGM_SPECIAL_OPERATION 0x13 -#define PGM_OPERAND 0x15 -#define PGM_TRACE_TABEL 0x16 -#define PGM_VECTOR_PROCESSING 0x1b -#define PGM_SPACE_SWITCH 0x1c -#define PGM_HFP_SQUARE_ROOT 0x1d -#define PGM_PC_TRANSLATION_SPEC 0x1f -#define PGM_AFX_TRANSLATION 0x20 -#define PGM_ASX_TRANSLATION 0x21 -#define PGM_LX_TRANSLATION 0x22 -#define PGM_EX_TRANSLATION 0x23 -#define PGM_PRIMARY_AUTHORITY 0x24 -#define PGM_SECONDARY_AUTHORITY 0x25 -#define PGM_LFX_TRANSLATION 0x26 -#define PGM_LSX_TRANSLATION 0x27 -#define PGM_ALET_SPECIFICATION 0x28 -#define PGM_ALEN_TRANSLATION 0x29 -#define PGM_ALE_SEQUENCE 0x2a -#define PGM_ASTE_VALIDITY 0x2b -#define PGM_ASTE_SEQUENCE 0x2c -#define PGM_EXTENDED_AUTHORITY 0x2d -#define PGM_LSTE_SEQUENCE 0x2e -#define PGM_ASTE_INSTANCE 0x2f -#define PGM_STACK_FULL 0x30 -#define PGM_STACK_EMPTY 0x31 -#define PGM_STACK_SPECIFICATION 0x32 -#define PGM_STACK_TYPE 0x33 -#define PGM_STACK_OPERATION 0x34 -#define PGM_ASCE_TYPE 0x38 -#define PGM_REGION_FIRST_TRANS 0x39 -#define PGM_REGION_SECOND_TRANS 0x3a -#define PGM_REGION_THIRD_TRANS 0x3b -#define PGM_SECURE_STORAGE_ACCESS 0x3d -#define PGM_NON_SECURE_STORAGE_ACCESS 0x3e -#define PGM_SECURE_STORAGE_VIOLATION 0x3f -#define PGM_MONITOR 0x40 -#define PGM_PER 0x80 -#define PGM_CRYPTO_OPERATION 0x119 - /* irq types in ascend order of priorities */ enum irq_types { IRQ_PEND_SET_PREFIX =3D 0, --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 B581B4307BC; Fri, 31 Jul 2026 13:09:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503385; cv=none; b=IXJ6Qt1o4ohzrpSjnIkSe21xK3nhh0joxNpztdBM5eJaNfQcB2/x/MJLjqSXeuqDorISUu1DPVKdAVskVAyObZGXdcHI/sX1pyoQI44begRp2obelzmWEFYxfCVSXFGK7W/lUo8QZkDzYq5soW1evCkcdjLvTYm3fugLCwV5jus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503385; c=relaxed/simple; bh=k8qWIPC+nf2zNigosgflpfUb+to9u7y5psEgmPKnBKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VyeadlY1OrmFvhvy1p4GJS3GrRw3yntv1RiIS7HoKSDFPR7KD7kLRHrFiHZ94PsoT2N2xm6lvBkRltpqf3MjGxE4XyRnQmuxjL+NkiW1utba0rI1DI6h0P8G8yyOJBzJUUYlThFldLgl787qKu2SINFuxJGNBeenwkCH3gNwuLM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=dFOyKlqi; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="dFOyKlqi" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBmC6r1732219; Fri, 31 Jul 2026 13:09:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=QWZn+Q7nTgF3D3UTi WJxf4taxphpUYdOHuAoPhIH858=; b=dFOyKlqiu58NU2/rTKKiRexgYxW2AtdSB nLTsqI2CEWOJg5MkeKuBj2++/JWzCt+/M3c2O6a5VHMD1YyznSxGUDlSkl8wsxKz pNslJl4zA0p9spEE3/cZw0w3wM8OXG2R/qDxVmJmUTHiJuOS2+64nmpdKxUhZDDn moJhWzrfMpeXdAnpT49oGWWFcZK2gEEX5bDZzOtDxLHabLhDrZ1irguLggnZTAo2 la2q7jt9uCO8JL667B/vqYgkdrGaB+rOt7mzfJGQ9/CpdHaMml8Nld7kr1rr2h7+ Ng8mQDjzJSIso7Qu1sCENvqRKL93J89p7v0GODWaluTfxtmacLjEQ== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuw7w4ky-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:19 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuHVr026404; Fri, 31 Jul 2026 13:09:17 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8yhqw79-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:17 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9AfT32637360 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:10 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BA19920040; Fri, 31 Jul 2026 13:09:10 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 506C120043; Fri, 31 Jul 2026 13:09:10 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:10 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 17/31] KVM: s390: Prepare gmap for a second KVM implementation Date: Fri, 31 Jul 2026 15:08:45 +0200 Message-ID: <20260731130902.654679-18-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: X-sIKNlfr6TaEdkBYNs_EZgl62fvN4od X-Proofpoint-ORIG-GUID: 5DovtgPzdI6E0CuIWomXw-E0L6r-RNeF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX1JatzVhlt1qY 7MtsgWG7Jt9pJw/C9s77rDhe8FKKfCmHkQhBIPXcabuol6lNsfCzdY8E9rwO3KmCZPjHrP4eIBp +JYc7GP6k1m5qv3lYHDxi6nU62D5r3BPaqZVhqJwE3POw/OO5acXWLlkIeTsPTjNgBiVjSw5RLM 20TwdVra8tIzlD9a4DN/WiPWbt1XyhK5CuHz8w+fgHoEdinkEboUoztHsD5mb0E9pG7AIlsJnmx GhYC+udvoSb9A4hZcpYv6ac5w+vozbNMsZ/6AZc9P7mVMYYhewHiX2jMs15f2q8vKJ5glyKI1/n sOfp8nh6WNfnTb0r4e6O9874Kzjf0T7zkG7o2031RbkStovMc/8KB0D65WpRYkordFz7DMntG1z iZswK7dRO+NcdFeeAQ2fwPHSxXl1la0PZI9iVBhjE+/jLhgDKr2MAbKOThjE9eXcwHwPNLFeRMm JN9Eh65MKBzUw8LUAXw== X-Authority-Analysis: v=2.4 cv=SKFykuvH c=1 sm=1 tr=0 ts=6a6c9e7f cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=_uJ2qFJvUlpRL0NV2hwA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX2EF4VS/hhWJc gvmGI0wGW+ztU3qdYCRDm4gTf7sIR+BsgK6P8IYI0llm9NKoUXFp6B1/JEImq/41CySjx+2IVfy MzMO6FHR8u3dUcCNK2Wfkygy140D0Yc= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Refactor gmap code such that a second s390 (host) KVM implementation can use the gmap code as well. Move mmu code from s390 to gmap so the other KVM implementation can use it as well. No functional change. Signed-off-by: Steffen Eiden --- arch/s390/kvm/gmap/Makefile | 2 +- arch/s390/kvm/gmap/kvm_mmu.c | 131 +++++++++++++++++++++++++++++++++++ arch/s390/kvm/gmap/kvm_mmu.h | 18 +++++ arch/s390/kvm/s390/s390.c | 111 ++--------------------------- arch/s390/kvm/s390/s390.h | 11 +++ 5 files changed, 168 insertions(+), 105 deletions(-) create mode 100644 arch/s390/kvm/gmap/kvm_mmu.c create mode 100644 arch/s390/kvm/gmap/kvm_mmu.h diff --git a/arch/s390/kvm/gmap/Makefile b/arch/s390/kvm/gmap/Makefile index 21967ed88877..02b797f63ffb 100644 --- a/arch/s390/kvm/gmap/Makefile +++ b/arch/s390/kvm/gmap/Makefile @@ -2,4 +2,4 @@ =20 GMAP ?=3D ../gmap =20 -kvm-y +=3D $(GMAP)/dat.o $(GMAP)/gmap.o $(GMAP)/faultin.o +kvm-y +=3D $(GMAP)/dat.o $(GMAP)/gmap.o $(GMAP)/faultin.o $(GMAP)/kvm_mmu.o diff --git a/arch/s390/kvm/gmap/kvm_mmu.c b/arch/s390/kvm/gmap/kvm_mmu.c new file mode 100644 index 000000000000..40fee79eb71f --- /dev/null +++ b/arch/s390/kvm/gmap/kvm_mmu.c @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +#include "s390.h" +#include "gmap.h" +#include "dat.h" +#include "kvm_mmu.h" + +/* + * Get (and clear) the dirty memory log for a memory slot. + */ +int s390_kvm_mmu_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) +{ + int r; + unsigned long n; + struct kvm_memory_slot *memslot; + int is_dirty; + + if (kvm_is_ucontrol(kvm)) + return -EINVAL; + + mutex_lock(&kvm->slots_lock); + + r =3D -EINVAL; + if (log->slot >=3D KVM_USER_MEM_SLOTS) + goto out; + + r =3D kvm_get_dirty_log(kvm, log, &is_dirty, &memslot); + if (r) + goto out; + + /* Clear the dirty log */ + if (is_dirty) { + n =3D kvm_dirty_bitmap_bytes(memslot); + memset(memslot->dirty_bitmap, 0, n); + } + r =3D 0; +out: + mutex_unlock(&kvm->slots_lock); + return r; +} + +int s390_kvm_mmu_prepare_memory_region(struct kvm *kvm, + const struct kvm_memory_slot *old, + struct kvm_memory_slot *new, + enum kvm_mr_change change) +{ + if (kvm_is_ucontrol(kvm) && new && new->id < KVM_USER_MEM_SLOTS) + return -EINVAL; + + /* When we are protected, we should not change the memory slots */ + if (kvm_s390_pv_get_handle(kvm)) + return -EINVAL; + + if (change !=3D KVM_MR_DELETE && change !=3D KVM_MR_FLAGS_ONLY) { + /* + * A few sanity checks. The memory in userland is ok to be + * fragmented into various different vmas. It is okay to mmap() + * and munmap() stuff in this slot after doing this call at any + * time. + */ + if (new->userspace_addr & ~PAGE_MASK) + return -EINVAL; + if ((new->base_gfn + new->npages) * PAGE_SIZE > kvm->arch.mem_limit) + return -EINVAL; + if (!asce_contains_gfn(kvm->arch.gmap->asce, new->base_gfn + new->npages= - 1)) + return -EINVAL; + } + + if (!kvm_s390_is_migration_mode(kvm)) + return 0; + + /* + * Turn off migration mode when: + * - userspace creates a new memslot with dirty logging off, + * - userspace modifies an existing memslot (MOVE or FLAGS_ONLY) and + * dirty logging is turned off. + * Migration mode expects dirty page logging being enabled to store + * its dirty bitmap. + */ + if (change !=3D KVM_MR_DELETE && + !(new->flags & KVM_MEM_LOG_DIRTY_PAGES)) + WARN(kvm_s390_vm_stop_migration(kvm), + "Failed to stop migration mode"); + + return 0; +} + +void s390_kvm_mmu_commit_memory_region(struct kvm *kvm, + struct kvm_memory_slot *old, + const struct kvm_memory_slot *new, + enum kvm_mr_change change) +{ + struct kvm_s390_mmu_cache *mc =3D NULL; + int rc =3D 0; + + if (change =3D=3D KVM_MR_FLAGS_ONLY) + return; + + mc =3D kvm_s390_new_mmu_cache(); + if (!mc) { + rc =3D -ENOMEM; + goto out; + } + + scoped_guard(write_lock, &kvm->mmu_lock) { + switch (change) { + case KVM_MR_DELETE: + rc =3D dat_delete_slot(mc, kvm->arch.gmap->asce, old->base_gfn, old->np= ages); + break; + case KVM_MR_MOVE: + rc =3D dat_delete_slot(mc, kvm->arch.gmap->asce, old->base_gfn, old->np= ages); + if (rc) + break; + fallthrough; + case KVM_MR_CREATE: + rc =3D dat_create_slot(mc, kvm->arch.gmap->asce, new->base_gfn, new->np= ages); + break; + case KVM_MR_FLAGS_ONLY: + break; + default: + WARN(1, "Unknown KVM MR CHANGE: %d\n", change); + } + } +out: + if (rc) + pr_warn("failed to commit memory region\n"); + kvm_s390_free_mmu_cache(mc); +} diff --git a/arch/s390/kvm/gmap/kvm_mmu.h b/arch/s390/kvm/gmap/kvm_mmu.h new file mode 100644 index 000000000000..4167eaec8f6f --- /dev/null +++ b/arch/s390/kvm/gmap/kvm_mmu.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef ARCH_KVM_GMAP_MMU_H +#define ARCH_KVM_GMAP_MMU_H + +#include + +int s390_kvm_mmu_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log); +int s390_kvm_mmu_prepare_memory_region(struct kvm *kvm, + const struct kvm_memory_slot *old, + struct kvm_memory_slot *new, + enum kvm_mr_change change); +void s390_kvm_mmu_commit_memory_region(struct kvm *kvm, + struct kvm_memory_slot *old, + const struct kvm_memory_slot *new, + enum kvm_mr_change change); + +#endif /* ARCH_KVM_GMAP_MMU_H */ diff --git a/arch/s390/kvm/s390/s390.c b/arch/s390/kvm/s390/s390.c index f1962cf61cc1..87d4b25bc849 100644 --- a/arch/s390/kvm/s390/s390.c +++ b/arch/s390/kvm/s390/s390.c @@ -55,6 +55,7 @@ #include "gmap.h" #include "faultin.h" #include "pci.h" +#include "kvm_mmu.h" =20 #define CREATE_TRACE_POINTS #include "trace.h" @@ -746,33 +747,7 @@ static void sca_del_vcpu(struct kvm_vcpu *vcpu); int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) { - int r; - unsigned long n; - struct kvm_memory_slot *memslot; - int is_dirty; - - if (kvm_is_ucontrol(kvm)) - return -EINVAL; - - mutex_lock(&kvm->slots_lock); - - r =3D -EINVAL; - if (log->slot >=3D KVM_USER_MEM_SLOTS) - goto out; - - r =3D kvm_get_dirty_log(kvm, log, &is_dirty, &memslot); - if (r) - goto out; - - /* Clear the dirty log */ - if (is_dirty) { - n =3D kvm_dirty_bitmap_bytes(memslot); - memset(memslot->dirty_bitmap, 0, n); - } - r =3D 0; -out: - mutex_unlock(&kvm->slots_lock); - return r; + return s390_kvm_mmu_get_dirty_log(kvm, log); } =20 static void icpt_operexc_on_all_vcpus(struct kvm *kvm) @@ -1268,7 +1243,7 @@ static int kvm_s390_vm_start_migration(struct kvm *kv= m) * Must be called with kvm->slots_lock to avoid races with ourselves, * kvm_s390_vm_start_migration() and kvm_s390_get_cmma_bits(). */ -static int kvm_s390_vm_stop_migration(struct kvm *kvm) +int kvm_s390_vm_stop_migration(struct kvm *kvm) { /* migration mode already disabled */ if (!kvm->arch.migration_mode) @@ -5753,45 +5728,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, struct kvm_memory_slot *new, enum kvm_mr_change change) { - if (kvm_is_ucontrol(kvm) && new && new->id < KVM_USER_MEM_SLOTS) - return -EINVAL; - - /* When we are protected, we should not change the memory slots */ - if (kvm_s390_pv_get_handle(kvm)) - return -EINVAL; - - if (change !=3D KVM_MR_DELETE && change !=3D KVM_MR_FLAGS_ONLY) { - /* - * A few sanity checks. The memory in userland is ok to be - * fragmented into various different vmas. It is okay to mmap() - * and munmap() stuff in this slot after doing this call at any - * time. - */ - if (new->userspace_addr & ~PAGE_MASK) - return -EINVAL; - if ((new->base_gfn + new->npages) * PAGE_SIZE > kvm->arch.mem_limit) - return -EINVAL; - if (!asce_contains_gfn(kvm->arch.gmap->asce, new->base_gfn + new->npages= - 1)) - return -EINVAL; - } - - if (!kvm->arch.migration_mode) - return 0; - - /* - * Turn off migration mode when: - * - userspace creates a new memslot with dirty logging off, - * - userspace modifies an existing memslot (MOVE or FLAGS_ONLY) and - * dirty logging is turned off. - * Migration mode expects dirty page logging being enabled to store - * its dirty bitmap. - */ - if (change !=3D KVM_MR_DELETE && - !(new->flags & KVM_MEM_LOG_DIRTY_PAGES)) - WARN(kvm_s390_vm_stop_migration(kvm), - "Failed to stop migration mode"); - - return 0; + return s390_kvm_mmu_prepare_memory_region(kvm, old, new, change); } =20 void kvm_arch_commit_memory_region(struct kvm *kvm, @@ -5799,42 +5736,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, const struct kvm_memory_slot *new, enum kvm_mr_change change) { - struct kvm_s390_mmu_cache *mc =3D NULL; - int rc =3D 0; - - if (change =3D=3D KVM_MR_FLAGS_ONLY) - return; - - mc =3D kvm_s390_new_mmu_cache(); - if (!mc) { - rc =3D -ENOMEM; - goto out; - } - - scoped_guard(write_lock, &kvm->mmu_lock) { - switch (change) { - case KVM_MR_DELETE: - rc =3D dat_delete_slot(mc, kvm->arch.gmap->asce, old->base_gfn, old->np= ages); - break; - case KVM_MR_MOVE: - rc =3D dat_delete_slot(mc, kvm->arch.gmap->asce, old->base_gfn, old->np= ages); - if (rc) - break; - fallthrough; - case KVM_MR_CREATE: - rc =3D dat_create_slot(mc, kvm->arch.gmap->asce, new->base_gfn, new->np= ages); - break; - case KVM_MR_FLAGS_ONLY: - break; - default: - WARN(1, "Unknown KVM MR CHANGE: %d\n", change); - } - } -out: - if (rc) - pr_warn("failed to commit memory region\n"); - kvm_s390_free_mmu_cache(mc); - return; + s390_kvm_mmu_commit_memory_region(kvm, old, new, change); } =20 /** @@ -5857,7 +5759,8 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, * * other error codes < 0 in case of other errors. * * otherwise a number > 0 of bytes that have been faulted in successfull= y. */ -long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, struct kvm_pre_= fault_memory *range) +long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, + struct kvm_pre_fault_memory *range) { struct guest_fault f =3D { .gfn =3D gpa_to_gfn(range->gpa), }; gpa_t end; diff --git a/arch/s390/kvm/s390/s390.h b/arch/s390/kvm/s390/s390.h index e144ca2e6d5e..9feb1fa66323 100644 --- a/arch/s390/kvm/s390/s390.h +++ b/arch/s390/kvm/s390/s390.h @@ -594,6 +594,11 @@ static inline bool kvm_s390_cur_gmap_fault_is_write(vo= id) return test_facility(75) && (current->thread.gmap_teid.fsi =3D=3D TEID_FS= I_STORE); } =20 +static __always_inline int kvm_s390_is_migration_mode(struct kvm *kvm) +{ + return kvm->arch.migration_mode; +} + /** * kvm_s390_vcpu_crypto_reset_all * @@ -624,4 +629,10 @@ void kvm_s390_vcpu_pci_enable_interp(struct kvm *kvm); */ extern unsigned int diag9c_forwarding_hz; =20 +/* + * Must be called with kvm->slots_lock to avoid races with ourselves and + * kvm_s390_vm_start_migration. + */ +int kvm_s390_vm_stop_migration(struct kvm *kvm); + #endif --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 59FA64399FB; Fri, 31 Jul 2026 13:09:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503395; cv=none; b=GbDN3YCp4/l72KPrIremqZywiLOJGEX0H3YI8kYQlbNjQvTI1tRj3PW3u1T7fnED8LlpsNzykuLEJX112hdnjGpf0SPzb1xTsc5QXYDAjCWOtXpWZ7EgMpSnsU+rgYV+Ng4gD8PpnFEyMw9ucDo4VC8qZsIamMLRacWT6JrldPs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503395; c=relaxed/simple; bh=foUWQGjWi+gaGptgegHNJEwZbgYd/JW/mjqzVHEMSak=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KxD+RMy+9iogx4GradGR+35K6xYGA/vyqdEl5jqVmoHSVaTlQNDcAQBrlAF+KgHdWMU95cf+7//XiO86HlRYsdZDqjNRqvfqkzDaPDe4Nj4rBDpq7/NfxeUzeKLSrNCum76ZnlInnn+dZm2t6PlX3XGfIOZGm6Fb54ApVJzFWpc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=gvN7AfJS; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="gvN7AfJS" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlYZD1765217; Fri, 31 Jul 2026 13:09:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=ILe1dRkZtRVAxMCaB VCcApvKGLuy0jK34rt6Fw2SQX8=; b=gvN7AfJS3RD+lY4yuFlTfX48jDrch2vRA /z5KTZuWBp4yeNnDJexyuhr4Qcn1SJqANq/FyYj39MgF02qarKJr8Qb1ua4kb6Tk gEYKCPth6Zx6TYopUWsFmbH1cQjQDMzvADlJs5s1xn6XnVbzMf9tHPim57zHj2lJ gzMdqFeOczRP5lps+LuCpO1qYJqFcHK+AqGQJlq99Qq6Pu5o22DbdtMBzCuQ7eiD M+eHKc0pApGBE0U8tla1b3dWUcq+COMf6K566Kso4+z57Tg3iIYy8KMkngQGpd71 DswvIJsnfC21hLeq9t6fnTVxAtXufbvUAt/UkD/fiIRU+VhpLvuZQ== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmv0y565u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:19 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuOHC021766; Fri, 31 Jul 2026 13:09:18 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn7uwg43k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:18 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9B1950135412 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:11 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3DFE020040; Fri, 31 Jul 2026 13:09:11 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C0FE52004B; Fri, 31 Jul 2026 13:09:10 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:10 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 18/31] KVM: s390: gmap: Move storage key and CMMA code to kvm/s390 Date: Fri, 31 Jul 2026 15:08:46 +0200 Message-ID: <20260731130902.654679-19-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: UTzjk0zZWBMJCe5Pdkkb4VzoktwNzmgy X-Proofpoint-ORIG-GUID: 6VLgfxXqWy4hl5ym2MEQa2k-NwaD8KMK X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX+nbagoTK28+T BMHKxMtKbRGau31xB0aLorxcwpeIY71hQJKCe6cgpw4PcDOrPIQrH9Ubll7kGA1V0DkWB2QV/Wc /ofXpOf2DxhwnqOo32Y9ssjfl229MUo= X-Authority-Analysis: v=2.4 cv=dYuwG3Xe c=1 sm=1 tr=0 ts=6a6c9e80 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=gLUulVKEJhMzuiw3ne4A:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX9vRKaqzcrjvU dDAytiDpHhIjH8AHrvEy1wsvUI94Q7dTNs3B5Tl1IrdmfN7RyOAT5TsnjTyAmeejpmE0FVphkwp tG51sheJQwHXG6i6ESEbT3RVw2NCN2aw63ll7xfLgbKoHy30csgCdXkyw4lnObuqhH5Jm4/LPlO aRgh55k4q3PqepvnDej411xvrpkA2vfG/SEyGDAwDes0do/JE1L6gqcPZooyLPen8TaY9RjIitN 2lBtPQz+tDjM32vi8Qos9Jr2i5gBRrKHXVS5pfJ3xkVEQEA6e8M21IUXwzRRnYAqW3mSXhpTyXn gkxwWdw0GBjT14TxPlAs5Z6bQuNbaEGwl3JM7F4+GNdxoF+799qwIrzqU8c/tzaoAoBccaWqk1j o0VN42N/wsJMQgO+4DK9hau0OvFsaPeMP/gP6tRYMnbncbzkMNoGX4x7EkrVWOR6HRPZS0Qli4R pgE+wMp4G833AZb+tpA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Extract storage key and CMMA functionality from kvm/gmap to kvm/s390. This enables other KVM implementations to use gmap without implementing storage key or CMMA handling which only makes sense for s390 guests. No functional changes. Signed-off-by: Steffen Eiden --- arch/s390/kvm/gmap/dat.c | 500 ----------------------------------- arch/s390/kvm/gmap/dat.h | 7 - arch/s390/kvm/gmap/gmap.c | 77 ------ arch/s390/kvm/gmap/gmap.h | 11 - arch/s390/kvm/s390/Makefile | 1 + arch/s390/kvm/s390/dat.c | 506 ++++++++++++++++++++++++++++++++++++ arch/s390/kvm/s390/gmap.c | 84 ++++++ arch/s390/kvm/s390/s390.h | 23 ++ 8 files changed, 614 insertions(+), 595 deletions(-) create mode 100644 arch/s390/kvm/s390/dat.c create mode 100644 arch/s390/kvm/s390/gmap.c diff --git a/arch/s390/kvm/gmap/dat.c b/arch/s390/kvm/gmap/dat.c index ed4259d17629..1ac6457de498 100644 --- a/arch/s390/kvm/gmap/dat.c +++ b/arch/s390/kvm/gmap/dat.c @@ -613,229 +613,6 @@ long _dat_walk_gfn_range(gfn_t start, gfn_t end, unio= n asce asce, return dat_crste_walk_range(start, min(end, asce_end(asce)), table, &walk= ); } =20 -int dat_get_storage_key(union asce asce, gfn_t gfn, union skey *skey) -{ - union crste *crstep; - union pgste pgste; - union pte *ptep; - int rc; - - skey->skey =3D 0; - rc =3D dat_entry_walk(NULL, gfn, asce, DAT_WALK_ANY, TABLE_TYPE_PAGE_TABL= E, &crstep, &ptep); - if (rc) - return rc; - - if (!ptep) { - union crste crste; - - crste =3D READ_ONCE(*crstep); - if (!crste.h.fc || !crste.s.fc1.pr) - return 0; - skey->skey =3D page_get_storage_key(large_crste_to_phys(crste, gfn)); - return 0; - } - pgste =3D pgste_get_lock(ptep); - if (ptep->h.i) { - skey->acc =3D pgste.acc; - skey->fp =3D pgste.fp; - } else { - skey->skey =3D page_get_storage_key(pte_origin(*ptep)); - } - skey->r |=3D pgste.gr; - skey->c |=3D pgste.gc; - pgste_set_unlock(ptep, pgste); - return 0; -} - -static void dat_update_ptep_sd(union pgste old, union pgste pgste, union p= te *ptep) -{ - if (pgste.acc !=3D old.acc || pgste.fp !=3D old.fp || pgste.gr !=3D old.g= r || pgste.gc !=3D old.gc) - __atomic64_or(_PAGE_SD, &ptep->val); -} - -int dat_set_storage_key(struct kvm_s390_mmu_cache *mc, union asce asce, gf= n_t gfn, - union skey skey, bool nq) -{ - union pgste pgste, old; - union crste *crstep; - union pte *ptep; - int rc; - - rc =3D dat_entry_walk(mc, gfn, asce, DAT_WALK_LEAF_ALLOC, TABLE_TYPE_PAGE= _TABLE, - &crstep, &ptep); - if (rc) - return rc; - - if (!ptep) { - page_set_storage_key(large_crste_to_phys(*crstep, gfn), skey.skey, !nq); - return 0; - } - - old =3D pgste_get_lock(ptep); - pgste =3D old; - - pgste.acc =3D skey.acc; - pgste.fp =3D skey.fp; - pgste.gc =3D skey.c; - pgste.gr =3D skey.r; - - if (!ptep->h.i) { - union skey old_skey; - - old_skey.skey =3D page_get_storage_key(pte_origin(*ptep)); - pgste.hc |=3D old_skey.c; - pgste.hr |=3D old_skey.r; - old_skey.c =3D old.gc; - old_skey.r =3D old.gr; - skey.r =3D 0; - skey.c =3D 0; - page_set_storage_key(pte_origin(*ptep), skey.skey, !nq); - } - - dat_update_ptep_sd(old, pgste, ptep); - pgste_set_unlock(ptep, pgste); - return 0; -} - -static bool page_cond_set_storage_key(phys_addr_t paddr, union skey skey, = union skey *oldkey, - bool nq, bool mr, bool mc) -{ - oldkey->skey =3D page_get_storage_key(paddr); - if (oldkey->acc =3D=3D skey.acc && oldkey->fp =3D=3D skey.fp && - (oldkey->r =3D=3D skey.r || mr) && (oldkey->c =3D=3D skey.c || mc)) - return false; - page_set_storage_key(paddr, skey.skey, !nq); - return true; -} - -int dat_cond_set_storage_key(struct kvm_s390_mmu_cache *mmc, union asce as= ce, gfn_t gfn, - union skey skey, union skey *oldkey, bool nq, bool mr, bool mc) -{ - union pgste pgste, old; - union crste *crstep; - union skey prev; - union pte *ptep; - int rc; - - rc =3D dat_entry_walk(mmc, gfn, asce, DAT_WALK_LEAF_ALLOC, TABLE_TYPE_PAG= E_TABLE, - &crstep, &ptep); - if (rc) - return rc; - - if (!ptep) - return page_cond_set_storage_key(large_crste_to_phys(*crstep, gfn), skey= , oldkey, - nq, mr, mc); - - old =3D pgste_get_lock(ptep); - pgste =3D old; - - rc =3D 1; - pgste.acc =3D skey.acc; - pgste.fp =3D skey.fp; - pgste.gc =3D skey.c; - pgste.gr =3D skey.r; - - if (!ptep->h.i) { - rc =3D page_cond_set_storage_key(pte_origin(*ptep), skey, &prev, nq, mr,= mc); - pgste.hc |=3D prev.c; - pgste.hr |=3D prev.r; - prev.c |=3D old.gc; - prev.r |=3D old.gr; - } else { - prev.acc =3D old.acc; - prev.fp =3D old.fp; - prev.c =3D old.gc; - prev.r =3D old.gr; - } - if (oldkey) - *oldkey =3D prev; - - dat_update_ptep_sd(old, pgste, ptep); - pgste_set_unlock(ptep, pgste); - return rc; -} - -int dat_reset_reference_bit(union asce asce, gfn_t gfn) -{ - union pgste pgste, old; - union crste *crstep; - union pte *ptep; - int rc; - - rc =3D dat_entry_walk(NULL, gfn, asce, DAT_WALK_ANY, TABLE_TYPE_PAGE_TABL= E, &crstep, &ptep); - if (rc) - return rc; - - if (!ptep) { - union crste crste =3D READ_ONCE(*crstep); - - if (!crste.h.fc || !crste.s.fc1.pr) - return 0; - return page_reset_referenced(large_crste_to_phys(*crstep, gfn)); - } - old =3D pgste_get_lock(ptep); - pgste =3D old; - - if (!ptep->h.i) { - rc =3D page_reset_referenced(pte_origin(*ptep)); - pgste.hr =3D rc >> 1; - } - rc |=3D (pgste.gr << 1) | pgste.gc; - pgste.gr =3D 0; - - dat_update_ptep_sd(old, pgste, ptep); - pgste_set_unlock(ptep, pgste); - return rc; -} - -static long dat_reset_skeys_pte(union pte *ptep, gfn_t gfn, gfn_t next, st= ruct dat_walk *walk) -{ - union pgste pgste; - - pgste =3D pgste_get_lock(ptep); - pgste.acc =3D 0; - pgste.fp =3D 0; - pgste.gr =3D 0; - pgste.gc =3D 0; - if (ptep->s.pr) - page_set_storage_key(pte_origin(*ptep), PAGE_DEFAULT_KEY, 1); - pgste_set_unlock(ptep, pgste); - - if (need_resched()) - return next; - return 0; -} - -static long dat_reset_skeys_crste(union crste *crstep, gfn_t gfn, gfn_t ne= xt, struct dat_walk *walk) -{ - phys_addr_t addr, end, origin =3D crste_origin_large(*crstep); - - if (!crstep->h.fc || !crstep->s.fc1.pr) - return 0; - - addr =3D ((max(gfn, walk->start) - gfn) << PAGE_SHIFT) + origin; - end =3D ((min(next, walk->end) - gfn) << PAGE_SHIFT) + origin; - while (ALIGN(addr + 1, _SEGMENT_SIZE) <=3D end) - addr =3D sske_frame(addr, PAGE_DEFAULT_KEY); - for ( ; addr < end; addr +=3D PAGE_SIZE) - page_set_storage_key(addr, PAGE_DEFAULT_KEY, 1); - - if (need_resched()) - return next; - return 0; -} - -long dat_reset_skeys(union asce asce, gfn_t start) -{ - const struct dat_walk_ops ops =3D { - .pte_entry =3D dat_reset_skeys_pte, - .pmd_entry =3D dat_reset_skeys_crste, - .pud_entry =3D dat_reset_skeys_crste, - }; - - return _dat_walk_gfn_range(start, asce_end(asce), asce, &ops, DAT_WALK_IG= N_HOLES, NULL); -} - struct slot_priv { unsigned long token; struct kvm_s390_mmu_cache *mc; @@ -1048,280 +825,3 @@ int dat_set_prefix_notif_bit(union asce asce, gfn_t = gfn) return 0; } =20 -/** - * dat_perform_essa() - Perform ESSA actions on the PGSTE. - * @asce: The asce to operate on. - * @gfn: The guest page frame to operate on. - * @orc: The specific action to perform, see the ESSA_SET_* macros. - * @state: The storage attributes to be returned to the guest. - * @dirty: Returns whether the function dirtied a previously clean entry. - * - * Context: Called with kvm->mmu_lock held. - * - * Return: - * * %1 if the page state has been altered and the page is to be added to = the CBRL - * * %0 if the page state has been altered, but the page is not to be adde= d to the CBRL - * * %-1 if the page state has not been altered and the page is not to be = added to the CBRL - */ -int dat_perform_essa(union asce asce, gfn_t gfn, int orc, union essa_state= *state, bool *dirty) -{ - union crste *crstep; - union pgste pgste; - union pte *ptep; - int res =3D 0; - - if (dat_entry_walk(NULL, gfn, asce, 0, TABLE_TYPE_PAGE_TABLE, &crstep, &p= tep)) { - *state =3D (union essa_state) { .exception =3D 1 }; - return -1; - } - - pgste =3D pgste_get_lock(ptep); - - *state =3D (union essa_state) { - .content =3D (ptep->h.i << 1) + (ptep->h.i && pgste.zero), - .nodat =3D pgste.nodat, - .usage =3D pgste.usage, - }; - - switch (orc) { - case ESSA_GET_STATE: - res =3D -1; - break; - case ESSA_SET_STABLE: - pgste.usage =3D PGSTE_GPS_USAGE_STABLE; - pgste.nodat =3D 0; - break; - case ESSA_SET_UNUSED: - pgste.usage =3D PGSTE_GPS_USAGE_UNUSED; - if (ptep->h.i) - res =3D 1; - break; - case ESSA_SET_VOLATILE: - pgste.usage =3D PGSTE_GPS_USAGE_VOLATILE; - if (ptep->h.i) - res =3D 1; - break; - case ESSA_SET_POT_VOLATILE: - if (!ptep->h.i) { - pgste.usage =3D PGSTE_GPS_USAGE_POT_VOLATILE; - } else if (pgste.zero) { - pgste.usage =3D PGSTE_GPS_USAGE_VOLATILE; - } else if (!pgste.gc) { - pgste.usage =3D PGSTE_GPS_USAGE_VOLATILE; - res =3D 1; - } - break; - case ESSA_SET_STABLE_RESIDENT: - pgste.usage =3D PGSTE_GPS_USAGE_STABLE; - /* - * Since the resident state can go away any time after this - * call, we will not make this page resident. We can revisit - * this decision if a guest will ever start using this. - */ - break; - case ESSA_SET_STABLE_IF_RESIDENT: - if (!ptep->h.i) - pgste.usage =3D PGSTE_GPS_USAGE_STABLE; - break; - case ESSA_SET_STABLE_NODAT: - pgste.usage =3D PGSTE_GPS_USAGE_STABLE; - pgste.nodat =3D 1; - break; - default: - WARN_ONCE(1, "Invalid ORC!"); - res =3D -1; - break; - } - /* If we are discarding a page, set it to logical zero. */ - pgste.zero =3D res =3D=3D 1; - if (orc > 0) { - *dirty =3D !pgste.cmma_d; - pgste.cmma_d =3D 1; - } - - pgste_set_unlock(ptep, pgste); - - return res; -} - -static long dat_reset_cmma_pte(union pte *ptep, gfn_t gfn, gfn_t next, str= uct dat_walk *walk) -{ - union pgste pgste; - - pgste =3D pgste_get_lock(ptep); - pgste.usage =3D 0; - pgste.nodat =3D 0; - pgste.cmma_d =3D 0; - pgste_set_unlock(ptep, pgste); - if (need_resched()) - return next; - return 0; -} - -long dat_reset_cmma(union asce asce, gfn_t start) -{ - const struct dat_walk_ops dat_reset_cmma_ops =3D { - .pte_entry =3D dat_reset_cmma_pte, - }; - - return _dat_walk_gfn_range(start, asce_end(asce), asce, &dat_reset_cmma_o= ps, - DAT_WALK_IGN_HOLES, NULL); -} - -struct dat_get_cmma_state { - gfn_t start; - gfn_t end; - unsigned int count; - u8 *values; - atomic64_t *remaining; -}; - -static long __dat_peek_cmma_pte(union pte *ptep, gfn_t gfn, gfn_t next, st= ruct dat_walk *walk) -{ - struct dat_get_cmma_state *state =3D walk->priv; - union pgste pgste; - - pgste =3D pgste_get_lock(ptep); - state->values[gfn - walk->start] =3D pgste.usage | (pgste.nodat << 6); - pgste_set_unlock(ptep, pgste); - state->end =3D next; - - return 0; -} - -static long __dat_peek_cmma_crste(union crste *crstep, gfn_t gfn, gfn_t ne= xt, struct dat_walk *walk) -{ - struct dat_get_cmma_state *state =3D walk->priv; - - if (crstep->h.i) - state->end =3D min(walk->end, next); - return 0; -} - -int dat_peek_cmma(gfn_t start, union asce asce, unsigned int *count, u8 *v= alues) -{ - const struct dat_walk_ops ops =3D { - .pte_entry =3D __dat_peek_cmma_pte, - .pmd_entry =3D __dat_peek_cmma_crste, - .pud_entry =3D __dat_peek_cmma_crste, - .p4d_entry =3D __dat_peek_cmma_crste, - .pgd_entry =3D __dat_peek_cmma_crste, - }; - struct dat_get_cmma_state state =3D { .values =3D values, }; - int rc; - - rc =3D _dat_walk_gfn_range(start, start + *count, asce, &ops, DAT_WALK_DE= FAULT, &state); - *count =3D state.end >=3D start ? state.end - start : 0; - /* Return success if at least one value was saved, otherwise an error. */ - return (rc =3D=3D -EFAULT && *count > 0) ? 0 : rc; -} - -static long __dat_get_cmma_pte(union pte *ptep, gfn_t gfn, gfn_t next, str= uct dat_walk *walk) -{ - struct dat_get_cmma_state *state =3D walk->priv; - union pgste pgste; - - if (state->start !=3D -1) { - if ((gfn - state->end) > KVM_S390_MAX_BIT_DISTANCE) - return 1; - if (gfn - state->start >=3D state->count) - return 1; - } - - if (!READ_ONCE(*pgste_of(ptep)).cmma_d) - return 0; - - pgste =3D pgste_get_lock(ptep); - if (pgste.cmma_d) { - if (state->start =3D=3D -1) - state->start =3D gfn; - pgste.cmma_d =3D 0; - atomic64_dec(state->remaining); - state->values[gfn - state->start] =3D pgste.usage | pgste.nodat << 6; - state->end =3D next; - } - pgste_set_unlock(ptep, pgste); - return 0; -} - -int dat_get_cmma(union asce asce, gfn_t *start, unsigned int *count, u8 *v= alues, atomic64_t *rem) -{ - const struct dat_walk_ops ops =3D { .pte_entry =3D __dat_get_cmma_pte, }; - struct dat_get_cmma_state state =3D { - .remaining =3D rem, - .values =3D values, - .count =3D *count, - .start =3D -1, - }; - - _dat_walk_gfn_range(*start, asce_end(asce), asce, &ops, DAT_WALK_IGN_HOLE= S, &state); - /* If no dirty pages were found, wrap around and continue searching */ - if (*start && state.start =3D=3D -1) - _dat_walk_gfn_range(0, *start, asce, &ops, DAT_WALK_IGN_HOLES, &state); - - if (state.start =3D=3D -1) { - *count =3D 0; - } else { - *count =3D state.end - state.start; - *start =3D state.start; - } - - return 0; -} - -struct dat_set_cmma_state { - unsigned long mask; - const u8 *bits; -}; - -static long __dat_set_cmma_pte(union pte *ptep, gfn_t gfn, gfn_t next, str= uct dat_walk *walk) -{ - struct dat_set_cmma_state *state =3D walk->priv; - union pgste pgste, tmp; - - tmp.val =3D (state->bits[gfn - walk->start] << 24) & state->mask; - - pgste =3D pgste_get_lock(ptep); - pgste.usage =3D tmp.usage; - pgste.nodat =3D tmp.nodat; - pgste_set_unlock(ptep, pgste); - - return 0; -} - -/** - * dat_set_cmma_bits() - Set CMMA bits for a range of guest pages. - * @mc: Cache used for allocations. - * @asce: The ASCE of the guest. - * @gfn: The guest frame of the fist page whose CMMA bits are to set. - * @count: How many pages need to be processed. - * @mask: Which PGSTE bits should be set. - * @bits: Points to an array with the CMMA attributes. - * - * This function sets the CMMA attributes for the given pages. If the input - * buffer has zero length, no action is taken, otherwise the attributes are - * set and the mm->context.uses_cmm flag is set. - * - * Each byte in @bits contains new values for bits 32-39 of the PGSTE. - * Currently, only the fields NT and US are applied. - * - * Return: %0 in case of success, a negative error value otherwise. - */ -int dat_set_cmma_bits(struct kvm_s390_mmu_cache *mc, union asce asce, gfn_= t gfn, - unsigned long count, unsigned long mask, const uint8_t *bits) -{ - const struct dat_walk_ops ops =3D { .pte_entry =3D __dat_set_cmma_pte, }; - struct dat_set_cmma_state state =3D { .mask =3D mask, .bits =3D bits, }; - union crste *crstep; - union pte *ptep; - gfn_t cur; - int rc; - - for (cur =3D ALIGN_DOWN(gfn, _PAGE_ENTRIES); cur < gfn + count; cur +=3D = _PAGE_ENTRIES) { - rc =3D dat_entry_walk(mc, cur, asce, DAT_WALK_ALLOC, TABLE_TYPE_PAGE_TAB= LE, - &crstep, &ptep); - if (rc) - return rc; - } - return _dat_walk_gfn_range(gfn, gfn + count, asce, &ops, DAT_WALK_IGN_HOL= ES, &state); -} diff --git a/arch/s390/kvm/gmap/dat.h b/arch/s390/kvm/gmap/dat.h index 711ae2f96107..e6fd201ec9b9 100644 --- a/arch/s390/kvm/gmap/dat.h +++ b/arch/s390/kvm/gmap/dat.h @@ -532,13 +532,6 @@ int dat_entry_walk(struct kvm_s390_mmu_cache *mc, gfn_= t gfn, union asce asce, in void dat_free_level(struct crst_table *table, bool owns_ptes); struct crst_table *dat_alloc_crst_sleepable(unsigned long init); int dat_set_asce_limit(struct kvm_s390_mmu_cache *mc, union asce *asce, in= t newtype); -int dat_get_storage_key(union asce asce, gfn_t gfn, union skey *skey); -int dat_set_storage_key(struct kvm_s390_mmu_cache *mc, union asce asce, gf= n_t gfn, - union skey skey, bool nq); -int dat_cond_set_storage_key(struct kvm_s390_mmu_cache *mmc, union asce as= ce, gfn_t gfn, - union skey skey, union skey *oldkey, bool nq, bool mr, bool mc); -int dat_reset_reference_bit(union asce asce, gfn_t gfn); -long dat_reset_skeys(union asce asce, gfn_t start); =20 unsigned long dat_get_ptval(struct page_table *table, struct ptval_param p= aram); void dat_set_ptval(struct page_table *table, struct ptval_param param, uns= igned long val); diff --git a/arch/s390/kvm/gmap/gmap.c b/arch/s390/kvm/gmap/gmap.c index 9ae55a1d6f09..c4ed40ea3475 100644 --- a/arch/s390/kvm/gmap/gmap.c +++ b/arch/s390/kvm/gmap/gmap.c @@ -945,39 +945,6 @@ void gmap_split_huge_pages(struct gmap *gmap) } while (start); } =20 -static int _gmap_enable_skeys(struct gmap *gmap) -{ - gfn_t start =3D 0; - int rc; - - if (uses_skeys(gmap)) - return 0; - - set_bit(GMAP_FLAG_USES_SKEYS, &gmap->flags); - rc =3D gmap_helper_disable_cow_sharing(); - if (rc) { - clear_bit(GMAP_FLAG_USES_SKEYS, &gmap->flags); - return rc; - } - - do { - scoped_guard(write_lock, &gmap->kvm->mmu_lock) - start =3D dat_reset_skeys(gmap->asce, start); - cond_resched(); - } while (start); - return 0; -} - -int gmap_enable_skeys(struct gmap *gmap) -{ - int rc; - - mmap_write_lock(gmap->kvm->mm); - rc =3D _gmap_enable_skeys(gmap); - mmap_write_unlock(gmap->kvm->mm); - return rc; -} - static long _destroy_pages_pte(union pte *ptep, gfn_t gfn, gfn_t next, str= uct dat_walk *walk) { if (!ptep->s.pr) @@ -1098,50 +1065,6 @@ int gmap_protect_rmap(struct kvm_s390_mmu_cache *mc,= struct gmap *sg, gfn_t p_gf return 0; } =20 -static long __set_cmma_clean_pte(union pte *ptep, gfn_t gfn, gfn_t next, s= truct dat_walk *walk) -{ - union pgste pgste; - - pgste =3D pgste_get_lock(ptep); - pgste.cmma_d =3D 0; - pgste_set_unlock(ptep, pgste); - - if (need_resched()) - return next; - return 0; -} - -static long __set_cmma_dirty_pte(union pte *ptep, gfn_t gfn, gfn_t next, s= truct dat_walk *walk) -{ - union pgste pgste; - - pgste =3D pgste_get_lock(ptep); - if (!pgste.cmma_d) - atomic64_inc(walk->priv); - pgste.cmma_d =3D 1; - pgste_set_unlock(ptep, pgste); - - if (need_resched()) - return next; - return 0; -} - -void _gmap_set_cmma_all(struct gmap *gmap, bool dirty) -{ - const struct dat_walk_ops ops =3D { - .pte_entry =3D dirty ? __set_cmma_dirty_pte : __set_cmma_clean_pte, - }; - gfn_t gfn =3D 0; - - do { - scoped_guard(read_lock, &gmap->kvm->mmu_lock) - gfn =3D _dat_walk_gfn_range(gfn, asce_end(gmap->asce), gmap->asce, &ops, - DAT_WALK_IGN_HOLES, - &gmap->kvm->arch.cmma_dirty_pages); - cond_resched(); - } while (gfn); -} - static void gmap_unshadow_level(struct gmap *sg, gfn_t r_gfn, int level) { unsigned long align =3D PAGE_SIZE; diff --git a/arch/s390/kvm/gmap/gmap.h b/arch/s390/kvm/gmap/gmap.h index c54c35e47d6d..c9cab8f60f62 100644 --- a/arch/s390/kvm/gmap/gmap.h +++ b/arch/s390/kvm/gmap/gmap.h @@ -104,7 +104,6 @@ int gmap_insert_rmap(struct kvm_s390_mmu_cache *mc, str= uct gmap *sg, gfn_t p_gfn gfn_t r_gfn, int level); int gmap_protect_rmap(struct kvm_s390_mmu_cache *mc, struct gmap *sg, gfn_= t p_gfn, gfn_t r_gfn, kvm_pfn_t pfn, int level, bool wr); -void _gmap_set_cmma_all(struct gmap *gmap, bool dirty); void _gmap_handle_vsie_unshadow_event(struct gmap *parent, gfn_t gfn); struct gmap *gmap_create_shadow(struct kvm_s390_mmu_cache *mc, struct gmap= *gmap, union asce asce, int edat_level); @@ -198,16 +197,6 @@ static inline bool pte_needs_unshadow(union pte oldpte= , union pte newpte, union return !newpte.h.p || !newpte.s.pr; } =20 -static inline void gmap_set_cmma_all_dirty(struct gmap *gmap) -{ - _gmap_set_cmma_all(gmap, true); -} - -static inline void gmap_set_cmma_all_clean(struct gmap *gmap) -{ - _gmap_set_cmma_all(gmap, false); -} - static inline union pgste _gmap_ptep_xchg(struct gmap *gmap, union pte *pt= ep, union pte newpte, union pgste pgste, gfn_t gfn, bool needs_lock) { diff --git a/arch/s390/kvm/s390/Makefile b/arch/s390/kvm/s390/Makefile index 354cb4c52635..1a1e8ce80400 100644 --- a/arch/s390/kvm/s390/Makefile +++ b/arch/s390/kvm/s390/Makefile @@ -8,6 +8,7 @@ ccflags-y :=3D -I$(src) -I$(srctree)/arch/s390/kvm/gmap =20 kvm-y +=3D s390.o intercept.o interrupt.o priv.o sigp.o kvm-y +=3D diag.o gaccess.o guestdbg.o vsie.o pv.o +kvm-y +=3D dat.o gmap.o =20 kvm-$(CONFIG_VFIO_PCI_ZDEV_KVM) +=3D pci.o =20 diff --git a/arch/s390/kvm/s390/dat.c b/arch/s390/kvm/s390/dat.c new file mode 100644 index 000000000000..ff2d6c1cf90e --- /dev/null +++ b/arch/s390/kvm/s390/dat.c @@ -0,0 +1,506 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include + +#include "s390.h" + +int dat_get_storage_key(union asce asce, gfn_t gfn, union skey *skey) +{ + union crste *crstep; + union pgste pgste; + union pte *ptep; + int rc; + + skey->skey =3D 0; + rc =3D dat_entry_walk(NULL, gfn, asce, DAT_WALK_ANY, TABLE_TYPE_PAGE_TABL= E, &crstep, &ptep); + if (rc) + return rc; + + if (!ptep) { + union crste crste; + + crste =3D READ_ONCE(*crstep); + if (!crste.h.fc || !crste.s.fc1.pr) + return 0; + skey->skey =3D page_get_storage_key(large_crste_to_phys(crste, gfn)); + return 0; + } + pgste =3D pgste_get_lock(ptep); + if (ptep->h.i) { + skey->acc =3D pgste.acc; + skey->fp =3D pgste.fp; + } else { + skey->skey =3D page_get_storage_key(pte_origin(*ptep)); + } + skey->r |=3D pgste.gr; + skey->c |=3D pgste.gc; + pgste_set_unlock(ptep, pgste); + return 0; +} + +static void dat_update_ptep_sd(union pgste old, union pgste pgste, union p= te *ptep) +{ + if (pgste.acc !=3D old.acc || pgste.fp !=3D old.fp || pgste.gr !=3D old.g= r || pgste.gc !=3D old.gc) + __atomic64_or(_PAGE_SD, &ptep->val); +} + +int dat_set_storage_key(struct kvm_s390_mmu_cache *mc, union asce asce, gf= n_t gfn, + union skey skey, bool nq) +{ + union pgste pgste, old; + union crste *crstep; + union pte *ptep; + int rc; + + rc =3D dat_entry_walk(mc, gfn, asce, DAT_WALK_LEAF_ALLOC, TABLE_TYPE_PAGE= _TABLE, + &crstep, &ptep); + if (rc) + return rc; + + if (!ptep) { + page_set_storage_key(large_crste_to_phys(*crstep, gfn), skey.skey, !nq); + return 0; + } + + old =3D pgste_get_lock(ptep); + pgste =3D old; + + pgste.acc =3D skey.acc; + pgste.fp =3D skey.fp; + pgste.gc =3D skey.c; + pgste.gr =3D skey.r; + + if (!ptep->h.i) { + union skey old_skey; + + old_skey.skey =3D page_get_storage_key(pte_origin(*ptep)); + pgste.hc |=3D old_skey.c; + pgste.hr |=3D old_skey.r; + old_skey.c =3D old.gc; + old_skey.r =3D old.gr; + skey.r =3D 0; + skey.c =3D 0; + page_set_storage_key(pte_origin(*ptep), skey.skey, !nq); + } + + dat_update_ptep_sd(old, pgste, ptep); + pgste_set_unlock(ptep, pgste); + return 0; +} + +static bool page_cond_set_storage_key(phys_addr_t paddr, union skey skey, = union skey *oldkey, + bool nq, bool mr, bool mc) +{ + oldkey->skey =3D page_get_storage_key(paddr); + if (oldkey->acc =3D=3D skey.acc && oldkey->fp =3D=3D skey.fp && + (oldkey->r =3D=3D skey.r || mr) && (oldkey->c =3D=3D skey.c || mc)) + return false; + page_set_storage_key(paddr, skey.skey, !nq); + return true; +} + +int dat_cond_set_storage_key(struct kvm_s390_mmu_cache *mmc, union asce as= ce, gfn_t gfn, + union skey skey, union skey *oldkey, bool nq, bool mr, bool mc) +{ + union pgste pgste, old; + union crste *crstep; + union skey prev; + union pte *ptep; + int rc; + + rc =3D dat_entry_walk(mmc, gfn, asce, DAT_WALK_LEAF_ALLOC, TABLE_TYPE_PAG= E_TABLE, + &crstep, &ptep); + if (rc) + return rc; + + if (!ptep) + return page_cond_set_storage_key(large_crste_to_phys(*crstep, gfn), skey= , oldkey, + nq, mr, mc); + + old =3D pgste_get_lock(ptep); + pgste =3D old; + + rc =3D 1; + pgste.acc =3D skey.acc; + pgste.fp =3D skey.fp; + pgste.gc =3D skey.c; + pgste.gr =3D skey.r; + + if (!ptep->h.i) { + rc =3D page_cond_set_storage_key(pte_origin(*ptep), skey, &prev, nq, mr,= mc); + pgste.hc |=3D prev.c; + pgste.hr |=3D prev.r; + prev.c |=3D old.gc; + prev.r |=3D old.gr; + } else { + prev.acc =3D old.acc; + prev.fp =3D old.fp; + prev.c =3D old.gc; + prev.r =3D old.gr; + } + if (oldkey) + *oldkey =3D prev; + + dat_update_ptep_sd(old, pgste, ptep); + pgste_set_unlock(ptep, pgste); + return rc; +} + +int dat_reset_reference_bit(union asce asce, gfn_t gfn) +{ + union pgste pgste, old; + union crste *crstep; + union pte *ptep; + int rc; + + rc =3D dat_entry_walk(NULL, gfn, asce, DAT_WALK_ANY, TABLE_TYPE_PAGE_TABL= E, &crstep, &ptep); + if (rc) + return rc; + + if (!ptep) { + union crste crste =3D READ_ONCE(*crstep); + + if (!crste.h.fc || !crste.s.fc1.pr) + return 0; + return page_reset_referenced(large_crste_to_phys(*crstep, gfn)); + } + old =3D pgste_get_lock(ptep); + pgste =3D old; + + if (!ptep->h.i) { + rc =3D page_reset_referenced(pte_origin(*ptep)); + pgste.hr =3D rc >> 1; + } + rc |=3D (pgste.gr << 1) | pgste.gc; + pgste.gr =3D 0; + + dat_update_ptep_sd(old, pgste, ptep); + pgste_set_unlock(ptep, pgste); + return rc; +} + +static long dat_reset_skeys_pte(union pte *ptep, gfn_t gfn, gfn_t next, st= ruct dat_walk *walk) +{ + union pgste pgste; + + pgste =3D pgste_get_lock(ptep); + pgste.acc =3D 0; + pgste.fp =3D 0; + pgste.gr =3D 0; + pgste.gc =3D 0; + if (ptep->s.pr) + page_set_storage_key(pte_origin(*ptep), PAGE_DEFAULT_KEY, 1); + pgste_set_unlock(ptep, pgste); + + if (need_resched()) + return next; + return 0; +} + +static long dat_reset_skeys_crste(union crste *crstep, gfn_t gfn, gfn_t ne= xt, struct dat_walk *walk) +{ + phys_addr_t addr, end, origin =3D crste_origin_large(*crstep); + + if (!crstep->h.fc || !crstep->s.fc1.pr) + return 0; + + addr =3D ((max(gfn, walk->start) - gfn) << PAGE_SHIFT) + origin; + end =3D ((min(next, walk->end) - gfn) << PAGE_SHIFT) + origin; + while (ALIGN(addr + 1, _SEGMENT_SIZE) <=3D end) + addr =3D sske_frame(addr, PAGE_DEFAULT_KEY); + for ( ; addr < end; addr +=3D PAGE_SIZE) + page_set_storage_key(addr, PAGE_DEFAULT_KEY, 1); + + if (need_resched()) + return next; + return 0; +} + +long dat_reset_skeys(union asce asce, gfn_t start) +{ + const struct dat_walk_ops ops =3D { + .pte_entry =3D dat_reset_skeys_pte, + .pmd_entry =3D dat_reset_skeys_crste, + .pud_entry =3D dat_reset_skeys_crste, + }; + + return _dat_walk_gfn_range(start, asce_end(asce), asce, &ops, DAT_WALK_IG= N_HOLES, NULL); +} + +/** + * dat_perform_essa() - Perform ESSA actions on the PGSTE. + * @asce: The asce to operate on. + * @gfn: The guest page frame to operate on. + * @orc: The specific action to perform, see the ESSA_SET_* macros. + * @state: The storage attributes to be returned to the guest. + * @dirty: Returns whether the function dirtied a previously clean entry. + * + * Context: Called with kvm->mmu_lock held. + * + * Return: + * * %1 if the page state has been altered and the page is to be added to = the CBRL + * * %0 if the page state has been altered, but the page is not to be adde= d to the CBRL + * * %-1 if the page state has not been altered and the page is not to be = added to the CBRL + */ +int dat_perform_essa(union asce asce, gfn_t gfn, int orc, union essa_state= *state, bool *dirty) +{ + union crste *crstep; + union pgste pgste; + union pte *ptep; + int res =3D 0; + + if (dat_entry_walk(NULL, gfn, asce, 0, TABLE_TYPE_PAGE_TABLE, &crstep, &p= tep)) { + *state =3D (union essa_state) { .exception =3D 1 }; + return -1; + } + + pgste =3D pgste_get_lock(ptep); + + *state =3D (union essa_state) { + .content =3D (ptep->h.i << 1) + (ptep->h.i && pgste.zero), + .nodat =3D pgste.nodat, + .usage =3D pgste.usage, + }; + + switch (orc) { + case ESSA_GET_STATE: + res =3D -1; + break; + case ESSA_SET_STABLE: + pgste.usage =3D PGSTE_GPS_USAGE_STABLE; + pgste.nodat =3D 0; + break; + case ESSA_SET_UNUSED: + pgste.usage =3D PGSTE_GPS_USAGE_UNUSED; + if (ptep->h.i) + res =3D 1; + break; + case ESSA_SET_VOLATILE: + pgste.usage =3D PGSTE_GPS_USAGE_VOLATILE; + if (ptep->h.i) + res =3D 1; + break; + case ESSA_SET_POT_VOLATILE: + if (!ptep->h.i) { + pgste.usage =3D PGSTE_GPS_USAGE_POT_VOLATILE; + } else if (pgste.zero) { + pgste.usage =3D PGSTE_GPS_USAGE_VOLATILE; + } else if (!pgste.gc) { + pgste.usage =3D PGSTE_GPS_USAGE_VOLATILE; + res =3D 1; + } + break; + case ESSA_SET_STABLE_RESIDENT: + pgste.usage =3D PGSTE_GPS_USAGE_STABLE; + /* + * Since the resident state can go away any time after this + * call, we will not make this page resident. We can revisit + * this decision if a guest will ever start using this. + */ + break; + case ESSA_SET_STABLE_IF_RESIDENT: + if (!ptep->h.i) + pgste.usage =3D PGSTE_GPS_USAGE_STABLE; + break; + case ESSA_SET_STABLE_NODAT: + pgste.usage =3D PGSTE_GPS_USAGE_STABLE; + pgste.nodat =3D 1; + break; + default: + WARN_ONCE(1, "Invalid ORC!"); + res =3D -1; + break; + } + /* If we are discarding a page, set it to logical zero. */ + pgste.zero =3D res =3D=3D 1; + if (orc > 0) { + *dirty =3D !pgste.cmma_d; + pgste.cmma_d =3D 1; + } + + pgste_set_unlock(ptep, pgste); + + return res; +} + +static long dat_reset_cmma_pte(union pte *ptep, gfn_t gfn, gfn_t next, str= uct dat_walk *walk) +{ + union pgste pgste; + + pgste =3D pgste_get_lock(ptep); + pgste.usage =3D 0; + pgste.nodat =3D 0; + pgste.cmma_d =3D 0; + pgste_set_unlock(ptep, pgste); + if (need_resched()) + return next; + return 0; +} + +long dat_reset_cmma(union asce asce, gfn_t start) +{ + const struct dat_walk_ops dat_reset_cmma_ops =3D { + .pte_entry =3D dat_reset_cmma_pte, + }; + + return _dat_walk_gfn_range(start, asce_end(asce), asce, &dat_reset_cmma_o= ps, + DAT_WALK_IGN_HOLES, NULL); +} + +struct dat_get_cmma_state { + gfn_t start; + gfn_t end; + unsigned int count; + u8 *values; + atomic64_t *remaining; +}; + +static long __dat_peek_cmma_pte(union pte *ptep, gfn_t gfn, gfn_t next, st= ruct dat_walk *walk) +{ + struct dat_get_cmma_state *state =3D walk->priv; + union pgste pgste; + + pgste =3D pgste_get_lock(ptep); + state->values[gfn - walk->start] =3D pgste.usage | (pgste.nodat << 6); + pgste_set_unlock(ptep, pgste); + state->end =3D next; + + return 0; +} + +static long __dat_peek_cmma_crste(union crste *crstep, gfn_t gfn, gfn_t ne= xt, struct dat_walk *walk) +{ + struct dat_get_cmma_state *state =3D walk->priv; + + if (crstep->h.i) + state->end =3D min(walk->end, next); + return 0; +} + +int dat_peek_cmma(gfn_t start, union asce asce, unsigned int *count, u8 *v= alues) +{ + const struct dat_walk_ops ops =3D { + .pte_entry =3D __dat_peek_cmma_pte, + .pmd_entry =3D __dat_peek_cmma_crste, + .pud_entry =3D __dat_peek_cmma_crste, + .p4d_entry =3D __dat_peek_cmma_crste, + .pgd_entry =3D __dat_peek_cmma_crste, + }; + struct dat_get_cmma_state state =3D { .values =3D values, }; + int rc; + + rc =3D _dat_walk_gfn_range(start, start + *count, asce, &ops, DAT_WALK_DE= FAULT, &state); + *count =3D state.end >=3D start ? state.end - start : 0; + /* Return success if at least one value was saved, otherwise an error. */ + return (rc =3D=3D -EFAULT && *count > 0) ? 0 : rc; +} + +static long __dat_get_cmma_pte(union pte *ptep, gfn_t gfn, gfn_t next, str= uct dat_walk *walk) +{ + struct dat_get_cmma_state *state =3D walk->priv; + union pgste pgste; + + if (state->start !=3D -1) { + if ((gfn - state->end) > KVM_S390_MAX_BIT_DISTANCE) + return 1; + if (gfn - state->start >=3D state->count) + return 1; + } + + if (!READ_ONCE(*pgste_of(ptep)).cmma_d) + return 0; + + pgste =3D pgste_get_lock(ptep); + if (pgste.cmma_d) { + if (state->start =3D=3D -1) + state->start =3D gfn; + pgste.cmma_d =3D 0; + atomic64_dec(state->remaining); + state->values[gfn - state->start] =3D pgste.usage | pgste.nodat << 6; + state->end =3D next; + } + pgste_set_unlock(ptep, pgste); + return 0; +} + +int dat_get_cmma(union asce asce, gfn_t *start, unsigned int *count, u8 *v= alues, atomic64_t *rem) +{ + const struct dat_walk_ops ops =3D { .pte_entry =3D __dat_get_cmma_pte, }; + struct dat_get_cmma_state state =3D { + .remaining =3D rem, + .values =3D values, + .count =3D *count, + .start =3D -1, + }; + + _dat_walk_gfn_range(*start, asce_end(asce), asce, &ops, DAT_WALK_IGN_HOLE= S, &state); + /* If no dirty pages were found, wrap around and continue searching */ + if (*start && state.start =3D=3D -1) + _dat_walk_gfn_range(0, *start, asce, &ops, DAT_WALK_IGN_HOLES, &state); + + if (state.start =3D=3D -1) { + *count =3D 0; + } else { + *count =3D state.end - state.start; + *start =3D state.start; + } + + return 0; +} + +struct dat_set_cmma_state { + unsigned long mask; + const u8 *bits; +}; + +static long __dat_set_cmma_pte(union pte *ptep, gfn_t gfn, gfn_t next, str= uct dat_walk *walk) +{ + struct dat_set_cmma_state *state =3D walk->priv; + union pgste pgste, tmp; + + tmp.val =3D (state->bits[gfn - walk->start] << 24) & state->mask; + + pgste =3D pgste_get_lock(ptep); + pgste.usage =3D tmp.usage; + pgste.nodat =3D tmp.nodat; + pgste_set_unlock(ptep, pgste); + + return 0; +} + +/** + * dat_set_cmma_bits() - Set CMMA bits for a range of guest pages. + * @mc: Cache used for allocations. + * @asce: The ASCE of the guest. + * @gfn: The guest frame of the fist page whose CMMA bits are to set. + * @count: How many pages need to be processed. + * @mask: Which PGSTE bits should be set. + * @bits: Points to an array with the CMMA attributes. + * + * This function sets the CMMA attributes for the given pages. If the input + * buffer has zero length, no action is taken, otherwise the attributes are + * set and the mm->context.uses_cmm flag is set. + * + * Each byte in @bits contains new values for bits 32-39 of the PGSTE. + * Currently, only the fields NT and US are applied. + * + * Return: %0 in case of success, a negative error value otherwise. + */ +int dat_set_cmma_bits(struct kvm_s390_mmu_cache *mc, union asce asce, gfn_= t gfn, + unsigned long count, unsigned long mask, const uint8_t *bits) +{ + const struct dat_walk_ops ops =3D { .pte_entry =3D __dat_set_cmma_pte, }; + struct dat_set_cmma_state state =3D { .mask =3D mask, .bits =3D bits, }; + union crste *crstep; + union pte *ptep; + gfn_t cur; + int rc; + + for (cur =3D ALIGN_DOWN(gfn, _PAGE_ENTRIES); cur < gfn + count; cur +=3D = _PAGE_ENTRIES) { + rc =3D dat_entry_walk(mc, cur, asce, DAT_WALK_ALLOC, TABLE_TYPE_PAGE_TAB= LE, + &crstep, &ptep); + if (rc) + return rc; + } + return _dat_walk_gfn_range(gfn, gfn + count, asce, &ops, DAT_WALK_IGN_HOL= ES, &state); +} diff --git a/arch/s390/kvm/s390/gmap.c b/arch/s390/kvm/s390/gmap.c new file mode 100644 index 000000000000..83def0ed2284 --- /dev/null +++ b/arch/s390/kvm/s390/gmap.c @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include "s390.h" + +static int _gmap_enable_skeys(struct gmap *gmap) +{ + gfn_t start =3D 0; + int rc; + + if (uses_skeys(gmap)) + return 0; + + set_bit(GMAP_FLAG_USES_SKEYS, &gmap->flags); + rc =3D gmap_helper_disable_cow_sharing(); + if (rc) { + clear_bit(GMAP_FLAG_USES_SKEYS, &gmap->flags); + return rc; + } + + do { + scoped_guard(write_lock, &gmap->kvm->mmu_lock) + start =3D dat_reset_skeys(gmap->asce, start); + cond_resched(); + } while (start); + return 0; +} + +int gmap_enable_skeys(struct gmap *gmap) +{ + int rc; + + mmap_write_lock(gmap->kvm->mm); + rc =3D _gmap_enable_skeys(gmap); + mmap_write_unlock(gmap->kvm->mm); + return rc; +} + +static long __set_cmma_clean_pte(union pte *ptep, gfn_t gfn, gfn_t next, s= truct dat_walk *walk) +{ + union pgste pgste; + + pgste =3D pgste_get_lock(ptep); + pgste.cmma_d =3D 0; + pgste_set_unlock(ptep, pgste); + + if (need_resched()) + return next; + return 0; +} + +static long __set_cmma_dirty_pte(union pte *ptep, gfn_t gfn, gfn_t next, s= truct dat_walk *walk) +{ + union pgste pgste; + + pgste =3D pgste_get_lock(ptep); + if (!pgste.cmma_d) + atomic64_inc(walk->priv); + pgste.cmma_d =3D 1; + pgste_set_unlock(ptep, pgste); + + if (need_resched()) + return next; + return 0; +} + +void _gmap_set_cmma_all(struct gmap *gmap, bool dirty) +{ + const struct dat_walk_ops ops =3D { + .pte_entry =3D dirty ? __set_cmma_dirty_pte : __set_cmma_clean_pte, + }; + gfn_t gfn =3D 0; + + do { + scoped_guard(read_lock, &gmap->kvm->mmu_lock) + gfn =3D _dat_walk_gfn_range(gfn, asce_end(gmap->asce), gmap->asce, &ops, + DAT_WALK_IGN_HOLES, + &gmap->kvm->arch.cmma_dirty_pages); + cond_resched(); + } while (gfn); +} + diff --git a/arch/s390/kvm/s390/s390.h b/arch/s390/kvm/s390/s390.h index 9feb1fa66323..c846b7c6be93 100644 --- a/arch/s390/kvm/s390/s390.h +++ b/arch/s390/kvm/s390/s390.h @@ -635,4 +635,27 @@ extern unsigned int diag9c_forwarding_hz; */ int kvm_s390_vm_stop_migration(struct kvm *kvm); =20 +/* implemented in dat.c */ +int dat_get_storage_key(union asce asce, gfn_t gfn, union skey *skey); +int dat_set_storage_key(struct kvm_s390_mmu_cache *mc, union asce asce, gf= n_t gfn, + union skey skey, bool nq); +int dat_cond_set_storage_key(struct kvm_s390_mmu_cache *mmc, union asce as= ce, gfn_t gfn, + union skey skey, union skey *oldkey, bool nq, bool mr, bool mc); +int dat_reset_reference_bit(union asce asce, gfn_t gfn); +long dat_reset_skeys(union asce asce, gfn_t start); + +/* implemented in gmap.c */ +int gmap_enable_skeys(struct gmap *gmap); +void _gmap_set_cmma_all(struct gmap *gmap, bool dirty); + +static inline void gmap_set_cmma_all_dirty(struct gmap *gmap) +{ + _gmap_set_cmma_all(gmap, true); +} + +static inline void gmap_set_cmma_all_clean(struct gmap *gmap) +{ + _gmap_set_cmma_all(gmap, false); +} + #endif --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 BC1A642C508; Fri, 31 Jul 2026 13:09:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503381; cv=none; b=jTnggUOY1eDuFEIKVgjRHojwJQHPT2Mkl8vuU0heCQONemkezI6s8AanZG4yBfWi66bqFkqaX5Zlj9QPoyFMrXBf6jZ1CaNdfp19SRdKrYFP0yO/4o6cOya3YvJVPPxFghQS/9mpMXlUm8Ukw5xdv+KfpIEy6Meq4ejmr1wpgKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503381; c=relaxed/simple; bh=BkUE/e4gfk1CRG0u7zBrEAc7F81M+RQXK1WK30UI+E0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FHJtbtN3pf5l3P7x8KCjAT78eMA+oHAyZHAm9WO6G6oL+oq14Tln0ALend0f5B6bKZ2CO/rRhGvwbgwZBkUHvvgShx1O8xF6ZGqZgDUG1EmUvjZ1BxOCH44UBI57wKHkMh8J8dRcYDFA1qKBPZZjdKvxQETg7DBzgDd3GWCAh94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=o6AMEJpr; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="o6AMEJpr" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBldjA1730400; Fri, 31 Jul 2026 13:09:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=JKmK/xOF2rYfFCDDz B9ScTAqZe25huI7PolZxZ5u69I=; b=o6AMEJprqgPDzsux1hABe4ojWcV1Kd0UG 4Vzm9vmaSHdAWr0JKXlk+5CQgYMBDhC7IdYvoQaZ1f3LuXHGOkp9hllRkHNRgG/L 5l8IIOiYHf9wu80iX3b6rOeZXiL+QLBvBj8oP8ndPkkEf61pTs1M/q/wpYywEupr r8fUMq8jh31Vtu8+MBMycLn0W7py0nyGAtVqAG4m1h8odsRjOQ5SMwC5siTgn7Go +XaPUmnT1xX46w4o3R7xYHa2gc2FRpcRrFURBeNoEipzTkgv/P+vLxNI2bg9pF5q VXypXN1zeHrJ5OlVeIxO961I34lqVixXxvr3VE86duV1ww6d/JAHQ== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuw7w4m0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:19 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCQEsY026828; Fri, 31 Jul 2026 13:09:18 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn9pgqtby-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:17 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9Bj250135414 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:11 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AB1FF20040; Fri, 31 Jul 2026 13:09:11 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 44AC320043; Fri, 31 Jul 2026 13:09:11 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:11 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 19/31] KVM: s390: gmap: Move prefix handling to kvm/s390 Date: Fri, 31 Jul 2026 15:08:47 +0200 Message-ID: <20260731130902.654679-20-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: jmbg_IUaJhgEWwTs7p6F0H2czEl_h1lr X-Proofpoint-ORIG-GUID: Wcl7-u5EVBgteko2dK6MwurjdXbtNLex X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX0Nd9DjaUMJq1 Zf6vtoNhpzjGnuAvELovmjR4zJz4sSvVIyfBNGDJcQbB4u6b2Vhzn5Ojz+nRH0ZTptioQiVIIz1 8WZy9lIzqwkc0atwgMM4GtXveRa+5JCpOEMhmPNmGvIL86xBugfrVVV1RvW1qJJH0uUBm2E/B45 AVEA+N9fYvrnL89u/sbGauQuvjHHR/1XbMMuaV4m1/z6hjfaAZ1U99UzTK5LqDPz/sBFRZvonJf Q8XmpkOYu2Oq4m8qz83mBSUfHxRXAoUV7S/AWHMc0CAl7cUS9hv4FVYDiVwVyWrQkEmgGy0nrIF 85qgiFDZYW4MsAxFOQUcNwVya7ilNJvedi7PmR/0QVBzCjrmCl+/VRliEQhtAKpLRHcS+90UPNx JkZ9pAlfRNM+9jZZLND2nqG8maKSW+tkSMO8kbZiTEQ1YU/6RgbjsbQoWmxjh5/ePy+8nJcnQOU g6rVTbDxveAeMkBrmiw== X-Authority-Analysis: v=2.4 cv=SKFykuvH c=1 sm=1 tr=0 ts=6a6c9e7f cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=4SwaMfgYKtkue4rGTFgA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX2SqBLmgj3JDN 4jwCnM55PiHBDB99DYBZCcdRcScyts97tkVyAA3exp7ysiuel1YbaD5lTj7/ziEVIV7QbmxIz/z 9SnDYvPgTzmtq8XL1AlZRUz0i/tko8k= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Move code handling prefix page tracking from kvm/gmap to kvm/s390. This enables other KVM implementations to use gmap without implementing prefix handling. The prefix tracking is turned on if KVM_S390_GUEST_HAS_PREFIX is defined. No functional changes. Signed-off-by: Steffen Eiden --- arch/s390/include/asm/kvm_host_s390.h | 2 ++ arch/s390/kvm/gmap/dat.c | 48 --------------------------- arch/s390/kvm/gmap/dat.h | 1 - arch/s390/kvm/gmap/gmap.c | 28 ---------------- arch/s390/kvm/gmap/gmap.h | 12 +------ arch/s390/kvm/gmap/prefix.h | 39 ++++++++++++++++++++++ arch/s390/kvm/s390/dat.c | 48 +++++++++++++++++++++++++++ arch/s390/kvm/s390/gmap.c | 29 ++++++++++++++++ 8 files changed, 119 insertions(+), 88 deletions(-) create mode 100644 arch/s390/kvm/gmap/prefix.h diff --git a/arch/s390/include/asm/kvm_host_s390.h b/arch/s390/include/asm/= kvm_host_s390.h index 9e4d7ed53078..cfd95df60130 100644 --- a/arch/s390/include/asm/kvm_host_s390.h +++ b/arch/s390/include/asm/kvm_host_s390.h @@ -32,6 +32,8 @@ =20 #define KVM_INTERNAL_MEM_SLOTS 1 =20 +#define KVM_S390_GUEST_HAS_PREFIX + /* * These seem to be used for allocating ->chip in the routing table, which= we * don't use. 1 is as small as we can get to reduce the needed memory. If = we diff --git a/arch/s390/kvm/gmap/dat.c b/arch/s390/kvm/gmap/dat.c index 1ac6457de498..6252a7cd81a8 100644 --- a/arch/s390/kvm/gmap/dat.c +++ b/arch/s390/kvm/gmap/dat.c @@ -777,51 +777,3 @@ bool dat_test_age_gfn(union asce asce, gfn_t start, gf= n_t end) return _dat_walk_gfn_range(start, end, asce, &test_age_ops, 0, NULL) > 0; } =20 -static long dat_set_pn_crste(union crste *crstep, gfn_t gfn, gfn_t next, s= truct dat_walk *walk) -{ - union crste newcrste, oldcrste; - int *n =3D walk->priv; - - do { - oldcrste =3D READ_ONCE(*crstep); - if (!oldcrste.h.fc || oldcrste.h.i || oldcrste.h.p) - return 0; - if (oldcrste.s.fc1.prefix_notif) - break; - newcrste =3D oldcrste; - newcrste.s.fc1.prefix_notif =3D 1; - } while (!dat_crstep_xchg_atomic(crstep, oldcrste, newcrste, gfn, walk->a= sce)); - *n =3D 2; - return 0; -} - -static long dat_set_pn_pte(union pte *ptep, gfn_t gfn, gfn_t next, struct = dat_walk *walk) -{ - int *n =3D walk->priv; - union pgste pgste; - - pgste =3D pgste_get_lock(ptep); - if (!ptep->h.i && !ptep->h.p) { - pgste.prefix_notif =3D 1; - *n +=3D 1; - } - pgste_set_unlock(ptep, pgste); - return 0; -} - -int dat_set_prefix_notif_bit(union asce asce, gfn_t gfn) -{ - static const struct dat_walk_ops ops =3D { - .pte_entry =3D dat_set_pn_pte, - .pmd_entry =3D dat_set_pn_crste, - .pud_entry =3D dat_set_pn_crste, - }; - - int n =3D 0; - - _dat_walk_gfn_range(gfn, gfn + 2, asce, &ops, DAT_WALK_IGN_HOLES, &n); - if (n !=3D 2) - return -EAGAIN; - return 0; -} - diff --git a/arch/s390/kvm/gmap/dat.h b/arch/s390/kvm/gmap/dat.h index e6fd201ec9b9..fb412bd07685 100644 --- a/arch/s390/kvm/gmap/dat.h +++ b/arch/s390/kvm/gmap/dat.h @@ -538,7 +538,6 @@ void dat_set_ptval(struct page_table *table, struct ptv= al_param param, unsigned =20 int dat_set_slot(struct kvm_s390_mmu_cache *mc, union asce asce, gfn_t sta= rt, gfn_t end, u16 type, u16 param); -int dat_set_prefix_notif_bit(union asce asce, gfn_t gfn); bool dat_test_age_gfn(union asce asce, gfn_t start, gfn_t end); =20 int dat_perform_essa(union asce asce, gfn_t gfn, int orc, union essa_state= *state, bool *dirty); diff --git a/arch/s390/kvm/gmap/gmap.c b/arch/s390/kvm/gmap/gmap.c index c4ed40ea3475..07915278ee98 100644 --- a/arch/s390/kvm/gmap/gmap.c +++ b/arch/s390/kvm/gmap/gmap.c @@ -24,11 +24,6 @@ #include "s390.h" #include "faultin.h" =20 -static inline bool kvm_s390_is_in_sie(struct kvm_vcpu *vcpu) -{ - return vcpu->arch.sie_block->prog0c & PROG_IN_SIE; -} - static int gmap_limit_to_type(gfn_t limit) { if (!limit) @@ -256,29 +251,6 @@ int s390_replace_asce(struct gmap *gmap) return 0; } =20 -bool _gmap_unmap_prefix(struct gmap *gmap, gfn_t gfn, gfn_t end, bool hint) -{ - struct kvm *kvm =3D gmap->kvm; - struct kvm_vcpu *vcpu; - gfn_t prefix_gfn; - unsigned long i; - - if (is_shadow(gmap)) - return false; - kvm_for_each_vcpu(i, vcpu, kvm) { - /* Match against both prefix pages */ - prefix_gfn =3D gpa_to_gfn(kvm_s390_get_prefix(vcpu)); - if (prefix_gfn < end && gfn <=3D prefix_gfn + 1) { - if (hint && kvm_s390_is_in_sie(vcpu)) - return false; - VCPU_EVENT(vcpu, 2, "gmap notifier for %llx-%llx", - gfn_to_gpa(gfn), gfn_to_gpa(end)); - kvm_s390_sync_request(KVM_REQ_REFRESH_GUEST_PREFIX, vcpu); - } - } - return true; -} - struct clear_young_pte_priv { struct gmap *gmap; bool young; diff --git a/arch/s390/kvm/gmap/gmap.h b/arch/s390/kvm/gmap/gmap.h index c9cab8f60f62..28ab585db7e1 100644 --- a/arch/s390/kvm/gmap/gmap.h +++ b/arch/s390/kvm/gmap/gmap.h @@ -11,6 +11,7 @@ #define ARCH_KVM_GMAP_GMAP_H =20 #include "dat.h" +#include "prefix.h" =20 /** * enum gmap_flags - Flags of a gmap. @@ -83,7 +84,6 @@ struct gmap_cache { for (pos =3D (head); n =3D pos ? pos->next : NULL, pos; pos =3D n) =20 int s390_replace_asce(struct gmap *gmap); -bool _gmap_unmap_prefix(struct gmap *gmap, gfn_t gfn, gfn_t end, bool hint= ); bool gmap_age_gfn(struct gmap *gmap, gfn_t start, gfn_t end); bool gmap_unmap_gfn_range(struct gmap *gmap, struct kvm_memory_slot *slot,= gfn_t start, gfn_t end); int gmap_try_fixup_minor(struct gmap *gmap, struct guest_fault *fault); @@ -157,16 +157,6 @@ static inline void gmap_handle_vsie_unshadow_event(str= uct gmap *parent, gfn_t gf _gmap_handle_vsie_unshadow_event(parent, gfn); } =20 -static inline bool gmap_mkold_prefix(struct gmap *gmap, gfn_t gfn, gfn_t e= nd) -{ - return _gmap_unmap_prefix(gmap, gfn, end, true); -} - -static inline bool gmap_unmap_prefix(struct gmap *gmap, gfn_t gfn, gfn_t e= nd) -{ - return _gmap_unmap_prefix(gmap, gfn, end, false); -} - /** * pte_needs_unshadow() -- Check if the pte operations triggers unshadowin= g. * @oldpte: the previous value for the guest pte. diff --git a/arch/s390/kvm/gmap/prefix.h b/arch/s390/kvm/gmap/prefix.h new file mode 100644 index 000000000000..f83b6c2c4afa --- /dev/null +++ b/arch/s390/kvm/gmap/prefix.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef ARCH_KVM_GMAP_PREFIX_H +#define ARCH_KVM_GMAP_PREFIX_H + +#include "asm/dat-bits.h" +#include +#include +#include + +struct gmap; +union asce; + +#ifdef KVM_S390_GUEST_HAS_PREFIX +bool _gmap_unmap_prefix(struct gmap *gmap, gfn_t gfn, gfn_t end, bool hint= ); +int dat_set_prefix_notif_bit(union asce asce, gfn_t gfn); +#else +static inline bool _gmap_unmap_prefix(struct gmap *gmap, gfn_t gfn, gfn_t = end, bool hint) +{ + return true; +} + +static inline int dat_set_prefix_notif_bit(union asce asce, gfn_t gfn) +{ + return 0; +} +#endif /* KVM_S390_GUEST_HAS_PREFIX */ + +static inline bool gmap_mkold_prefix(struct gmap *gmap, gfn_t gfn, gfn_t e= nd) +{ + return _gmap_unmap_prefix(gmap, gfn, end, true); +} + +static inline bool gmap_unmap_prefix(struct gmap *gmap, gfn_t gfn, gfn_t e= nd) +{ + return _gmap_unmap_prefix(gmap, gfn, end, false); +} + +#endif /* ARCH_KVM_GMAP_PREFIX_H */ diff --git a/arch/s390/kvm/s390/dat.c b/arch/s390/kvm/s390/dat.c index ff2d6c1cf90e..a56b1523e6e4 100644 --- a/arch/s390/kvm/s390/dat.c +++ b/arch/s390/kvm/s390/dat.c @@ -504,3 +504,51 @@ int dat_set_cmma_bits(struct kvm_s390_mmu_cache *mc, u= nion asce asce, gfn_t gfn, } return _dat_walk_gfn_range(gfn, gfn + count, asce, &ops, DAT_WALK_IGN_HOL= ES, &state); } + +static long dat_set_pn_crste(union crste *crstep, gfn_t gfn, gfn_t next, s= truct dat_walk *walk) +{ + union crste newcrste, oldcrste; + int *n =3D walk->priv; + + do { + oldcrste =3D READ_ONCE(*crstep); + if (!oldcrste.h.fc || oldcrste.h.i || oldcrste.h.p) + return 0; + if (oldcrste.s.fc1.prefix_notif) + break; + newcrste =3D oldcrste; + newcrste.s.fc1.prefix_notif =3D 1; + } while (!dat_crstep_xchg_atomic(crstep, oldcrste, newcrste, gfn, walk->a= sce)); + *n =3D 2; + return 0; +} + +static long dat_set_pn_pte(union pte *ptep, gfn_t gfn, gfn_t next, struct = dat_walk *walk) +{ + int *n =3D walk->priv; + union pgste pgste; + + pgste =3D pgste_get_lock(ptep); + if (!ptep->h.i && !ptep->h.p) { + pgste.prefix_notif =3D 1; + *n +=3D 1; + } + pgste_set_unlock(ptep, pgste); + return 0; +} + +int dat_set_prefix_notif_bit(union asce asce, gfn_t gfn) +{ + static const struct dat_walk_ops ops =3D { + .pte_entry =3D dat_set_pn_pte, + .pmd_entry =3D dat_set_pn_crste, + .pud_entry =3D dat_set_pn_crste, + }; + + int n =3D 0; + + _dat_walk_gfn_range(gfn, gfn + 2, asce, &ops, DAT_WALK_IGN_HOLES, &n); + if (n !=3D 2) + return -EAGAIN; + return 0; +} diff --git a/arch/s390/kvm/s390/gmap.c b/arch/s390/kvm/s390/gmap.c index 83def0ed2284..b744992f0af1 100644 --- a/arch/s390/kvm/s390/gmap.c +++ b/arch/s390/kvm/s390/gmap.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "s390.h" =20 static int _gmap_enable_skeys(struct gmap *gmap) @@ -82,3 +83,31 @@ void _gmap_set_cmma_all(struct gmap *gmap, bool dirty) } while (gfn); } =20 +static inline bool kvm_s390_is_in_sie(struct kvm_vcpu *vcpu) +{ + return vcpu->arch.sie_block->prog0c & PROG_IN_SIE; +} + +bool _gmap_unmap_prefix(struct gmap *gmap, gfn_t gfn, gfn_t end, bool hint) +{ + struct kvm *kvm =3D gmap->kvm; + struct kvm_vcpu *vcpu; + gfn_t prefix_gfn; + unsigned long i; + + if (is_shadow(gmap)) + return false; + kvm_for_each_vcpu(i, vcpu, kvm) { + /* Match against both prefix pages */ + prefix_gfn =3D gpa_to_gfn(kvm_s390_get_prefix(vcpu)); + if (prefix_gfn < end && gfn <=3D prefix_gfn + 1) { + if (hint && kvm_s390_is_in_sie(vcpu)) + return false; + VCPU_EVENT(vcpu, 2, "gmap notifier for %llx-%llx", + gfn_to_gpa(gfn), gfn_to_gpa(end)); + kvm_s390_sync_request(KVM_REQ_REFRESH_GUEST_PREFIX, vcpu); + } + } + return true; +} + --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 E27BC432BD8; Fri, 31 Jul 2026 13:09:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503386; cv=none; b=g7TxZpd6ONy6XlddSIUF5OCE5fs6ezlDE7ZTFUxQ/x7SgkfP0wrwMcMbobuTzT2enMGUJbqJA8+w97Ed4auOmyq/I3dWGibg3Vi96CPN8qNJjcMq8NMRcxlMpLdTRsc/fUcyV1JOAV9+NvOqf9SABPn8qseTxyH1OYuhgLzLSBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503386; c=relaxed/simple; bh=fPy6BToqWSVFi7Y8MD2LUMyFUKrIGQ+wREW0W/OqWns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uudBx+QD1aOM+idDvjiA8xsyZejPdDT8P3uQ6oSOHLzZjqNFulOnnfVR0hNc/9Ae+rTLV7UL/X7+F4ZDAM/ISADkUr4Q7WtO0ntuaNEqqiXSh2EfbU/ObDpkaXLYmgqWc0wZCmrwt9zsUAxvRov2pY8Man60B3g6Quu/ec6K/XI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=dNGUpXhf; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="dNGUpXhf" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBliK81672742; Fri, 31 Jul 2026 13:09:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=2gSaLBoMbRJk0858C Xqy4+SLu/lbitIoLn80Gt6/yDs=; b=dNGUpXhfOvRJGFuIelKol659hb+NjyKHT JxwlwSeV6G2SMSFPSWDmw9lc/4E10qIHwBcMO7+jlocWLZ9BbLpA/2FVhY3XiGDh 7cRSQEJU0XKpqBDiAYdRB6YPk1Q5VlUn0LT3aZk6ueamMWoGXBPQx8xi5Qu+AAjk Ypzuz8jwxDsILS/pmX9RYt8QncQUbe5Q8OQ7r4B44vNyZADcyB4zep493O0Zm7tN JzqqOK1WeQgyDyJZ4f5yx+4+RfLeAKTC2Z5DmMQ+3Az8LN36dfC2mGkn+0LQ2sHV WuxnxvqqUTg6OpQJ5WQTyOxz1u10ctyTPxwznglKTI3F0NM6UcRBA== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmv0p43bt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:19 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuf3N013237; Fri, 31 Jul 2026 13:09:19 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8fkg087-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:19 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9Cfg28705030 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:12 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 203A220040; Fri, 31 Jul 2026 13:09:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B1C852004B; Fri, 31 Jul 2026 13:09:11 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:11 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 20/31] KVM: s390: Prepare KVM/s390 for a second KVM module Date: Fri, 31 Jul 2026 15:08:48 +0200 Message-ID: <20260731130902.654679-21-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXxvu3QdrVnJRF G1P1zhJkRc4OD/4/VTO0jLV0BgY7D02WGhE7XIhLk6z6IiFWrx5Rz8WUDuHaWBt0QuzVQsP41sF tDxs5gCUrXO/xBS3qEfygF6DLKq6leU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX+1t/x45wPYxS OCe61xI9WFRYMNx1UG2XCYA/WpIHH9kcufgOKSBZa456PejCPHquUqb3UYhXlptxNYlY0w7Hf20 SVtg7OWzCywcCyvHtgOvXvffs4A+4MVWHbHzsFAA7Ad2ZeK+z9M1DBkav7cQuHOeO6KIQxyB/+5 z8Gz6UEjEuHmTBfEd6nfLNraf+O0mnAeWeFVNvnxQqOF7GvCJeWfTqc1gwfRStFIZMfLHZrBjo5 r2dyBNxTDYc+joCsQVG/nisg7cHyJxtSSLPUf7qF9QcDCFq6nqaHqbEbDnhvU5msW7dwyHaB2CL /9C1L1TPIN+11/9XP3sI/ze3KJmLg5gOzZ9GIeHManjeUst7zgFkSY/4fpCWY3e783BO64PCuc5 QY8W67R2VJvO+h9yibm2zvnfpZrEizBxWn9ZG3yr4YrdsyTPUAwEl8ySSKkqePvEzfuOvPMs/ke noJV2U9VGN/UXWoFPyQ== X-Authority-Analysis: v=2.4 cv=b5WCJNGx c=1 sm=1 tr=0 ts=6a6c9e80 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=m33X-YrdrFVFgJ0cfecA:9 X-Proofpoint-GUID: Edqq77U__IiVRQ6VD88KJjp55DSkAmU4 X-Proofpoint-ORIG-GUID: hQRBE-RHYqs791nT1usmcThQoNWi3Wbf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 adultscore=0 malwarescore=0 impostorscore=0 bulkscore=0 phishscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" The second KVM module will have a different Kconfig set. When both modules are compiled the Kconfig sets get merged and the native s390 KVM needs to implement functionality required by the respective config options. Ensure that s390-KVM will still compile by implementing a stub for kvm_arch_vcpu_run_pid_change if CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE is enabled and defining KVM_NO_MMIO to disable KVM_MMIO. Signed-off-by: Steffen Eiden --- arch/s390/include/asm/kvm_host_s390.h | 1 + arch/s390/kvm/s390/s390.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/arch/s390/include/asm/kvm_host_s390.h b/arch/s390/include/asm/= kvm_host_s390.h index cfd95df60130..c753dc816b02 100644 --- a/arch/s390/include/asm/kvm_host_s390.h +++ b/arch/s390/include/asm/kvm_host_s390.h @@ -29,6 +29,7 @@ =20 #define KVM_HAVE_MMU_RWLOCK #define KVM_MAX_VCPUS 255 +#define KVM_NO_MMIO =20 #define KVM_INTERNAL_MEM_SLOTS 1 =20 diff --git a/arch/s390/kvm/s390/s390.c b/arch/s390/kvm/s390/s390.c index 87d4b25bc849..0e43754d9cf5 100644 --- a/arch/s390/kvm/s390/s390.c +++ b/arch/s390/kvm/s390/s390.c @@ -5829,6 +5829,14 @@ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm= _gfn_range *range) return gmap_unmap_gfn_range(kvm->arch.gmap, range->slot, range->start, ra= nge->end); } =20 +#ifdef CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE +/* Make s390 compile if arm64-on-s390 is selected */ +int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) +{ + return 0; +} +#endif /* CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE */ + static inline unsigned long nonhyp_mask(int i) { unsigned int nonhyp_fai =3D (sclp.hmfai << i * 2) >> 30; --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 60A9C432E6E; Fri, 31 Jul 2026 13:09:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503387; cv=none; b=EmLx+TuPEsrL0jfIYj3vYunaufIRRJZzVyI4au0CArIQ3GMpKTtnZluASm01v66TKZ0AIoUf8IwyBDwDwPUb048GP/P9tUI3jiG0aHxeu/Qx6BCmd5EWL1ShrSOx2xeuuEePJl6pqJGxS2q3jPf0jV8a50eThKVeNdIjQnrUwSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503387; c=relaxed/simple; bh=F92ygwDq/Td6MZpSBCRtPhSZFM0iWRLbDMN7HxUPPRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ub5iwJ1+3Pn8co5rZL+ulwVChA2SNFu4A/AVeCEZ3psIRG5Zv44sUq27TXw9La2TZ+guhRXZTcWWiEtiiShod1UItntMMEJo+i2nsKMWOlYkdw6NyFbFBAsBo/QueCZrb7sPY9zwfEauk9FMLeouz8ioVQBSHMATXW5GeFKXjO4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=UZOfVeE8; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="UZOfVeE8" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlma11670624; Fri, 31 Jul 2026 13:09:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=FxG7on3EwKDJYza6h L7eelDxYAraMq9eELkm4Z/+4iY=; b=UZOfVeE8DHDThrbjB2dG54PwAWQxdOY0M q6h/RKdYFHI/HUcjiw9xRO8HC1edtG3VlPPYfFrtkpW0vlKwckAXomNH6IEEEOq3 609Ry+iRdj8QSuFZA0AqR09+LLDkeng/kVqoWLxfQy1SD17aOGi7h1Vf9D1k3ubB x1HkA9XnvdAawJP6BtVdlcUkqOEiYDhVMOJAgdSzX+Vvx5tUrXxoP19R+klsPNvz TUsg04yixTRxrROGxnK7oMezhOmwGpwwZp9dCRl1P9dT86l80IIqtHydRc0uhdEs LLDdAI1AAw+VHOq2f6cWZ82g3ikvbeHUtwAxUoNWN2zJNTl0kmytg== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuyjm3vy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:20 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCQEsa026828; Fri, 31 Jul 2026 13:09:19 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn9pgqtc5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:19 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9CuU28705032 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:12 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8C9EE20040; Fri, 31 Jul 2026 13:09:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2682E20043; Fri, 31 Jul 2026 13:09:12 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:12 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 21/31] s390: Use arm64 headers Date: Fri, 31 Jul 2026 15:08:49 +0200 Message-ID: <20260731130902.654679-22-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX6YxhyvNlzHPF teoQOuH37CVUCvIIynrCd7OaQarxkqYGuEBR2zX6DUA4JX63AfuFSCswJTJXWNm5I+FyZxOp3+5 0vJ6G980el5FoDT1p7MtqPzeqLXUEbo= X-Proofpoint-GUID: _IF5-tiNv4pjDVrnW_MxQxZLQIpM2EZA X-Proofpoint-ORIG-GUID: MJSOKd5j_rTVX3wlfBaqgYbFchkAIiNK X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX8ZOG0VIodXgS Sb2zaxsw14F5SQalgMhTvV2l7rE02kESXnwmXnuRX4XorTF33fH5EOrI7HVRa2GRGE08Lq8m+eh bq3gH7bAb9vFyc6gZyEs7TMG6Zfc+Z+6aMSifNMLoN8xOK5mhJtP/jM6oC4VMZjzGo41OpwH9/a xgLcQO9d6so1lgP0pDOIv3Wm+wJf+AXikLX23Vel65Zy0GikE3pXdxcmm65hDwOUe7S2OwsCIQb meUH/+rlDGJTEoAbNECDdSC0akxYXlwc1Od2MssmH8NJHvt49x646wARkScq619Ws7B77VurQSR 69HZYds7voA5+fZZzdPX+oEgyMYhi5sMSwZvNEvafq8nOx90hkRmwqyMbzvEfhWe2RavT1Ix56K K7G6GI6GWyLHZwPLVsYaL7Kp3R/BWcOPctETLOslbzD1EHBTWCNR1Q7snl28+FWaDtwn1MoC7Qw 0io82cOog97V92jhedg== X-Authority-Analysis: v=2.4 cv=X5Vi7mTe c=1 sm=1 tr=0 ts=6a6c9e80 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=ZhoKsAT7EqIUtuKD8d0A:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Introduce a flexible system for sharing ARM64 headers with s390 KVM. Selected arm64 headers or snippet of headers will be reachable by s390 code through asm/header.h. Add copy-arm64h.awk that detects ARM64_S390_COMMON markers and extracts marked section into a generated header consumable by s390. Falls back to full file copy when no markers are found. Transform copied includes by replacing '#include ' with '#include ' and similar for uapi headers to ensure correct path resolution on s390 and allow for a clear separation of s390 asm headers and arm64 asm headers. Integrate this extraction into the s390/kapi target, conditional on (the not yet existing) CONFIG_KVM_S390_ARM64. Signed-off-by: Steffen Eiden --- arch/s390/tools/Makefile | 10 +++- arch/s390/tools/Makefile.arm64h | 57 ++++++++++++++++++++++ arch/s390/tools/copy-arm64h-full.awk | 47 ++++++++++++++++++ arch/s390/tools/copy-arm64h.awk | 72 ++++++++++++++++++++++++++++ 4 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 arch/s390/tools/Makefile.arm64h create mode 100644 arch/s390/tools/copy-arm64h-full.awk create mode 100644 arch/s390/tools/copy-arm64h.awk diff --git a/arch/s390/tools/Makefile b/arch/s390/tools/Makefile index f2862364fb42..3e0f21b552da 100644 --- a/arch/s390/tools/Makefile +++ b/arch/s390/tools/Makefile @@ -3,12 +3,20 @@ # Makefile for s390 specific build tools # =20 +include $(srctree)/arch/s390/tools/Makefile.arm64h + kapi :=3D arch/$(ARCH)/include/generated/asm kapi-hdrs-y :=3D $(kapi)/facility-defs.h $(kapi)/dis-defs.h =20 +targets +=3D $(addprefix ../../../,$(kapi-hdrs-y)) +# Convert ARM64 absolute paths to relative before Kbuild adds $(obj)/ pref= ix +targets +=3D $(patsubst $(objtree)/%,../../../%,$(ARM64_TARGETS)) + +kapi-hdrs-$(CONFIG_KVM_ARM64) +=3D $(ARM64_TARGETS) + PHONY +=3D kapi =20 -kapi: $(kapi-hdrs-y) +kapi: $(kapi-hdrs-y) $(ARM64_TARGETS) =20 hostprogs +=3D gen_facilities hostprogs +=3D gen_opcode_table diff --git a/arch/s390/tools/Makefile.arm64h b/arch/s390/tools/Makefile.arm= 64h new file mode 100644 index 000000000000..8fbd9cb48695 --- /dev/null +++ b/arch/s390/tools/Makefile.arm64h @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Share ARM64 headers with s390 KVM +# + +arm64api :=3D $(objtree)/arch/$(ARCH)/include/generated/arm64 +arm64uapi :=3D $(objtree)/arch/$(ARCH)/include/generated/uapi/arm64 + +# List of ARM64 headers to share with s390 KVM +# Format: [uapi:]header.h or header-gen.h +# +# * header.h - from arch/arm64/include/asm/ to arm64/ +# * uapi:header.h - from arch/arm64/include/uapi/asm/ to uapi/arm64/ +# * header-gen.h - generated as header-gen.h from ARM64 header header.h +# If a header contains partial markers (#ifdef ARM64_S390_COMMON) only thi= s part will be copied. +# If the file does not contain any markers the whole file will be copied. +ARM64_SHARED_HEADERS :=3D \ + brk-imm.h \ + esr.h \ + kvm_arm.h \ + kvm_emulate-gen.h \ + kvm_host.h \ + ptrace-gen.h \ + sysreg-gen.h \ + uapi:hwcap.h \ + uapi:kvm.h \ + uapi:ptrace.h \ + uapi:sve_context.h \ + +quiet_cmd_gen_arm_hdr =3D GEN $@ + cmd_gen_arm_hdr =3D mkdir -p $(dir $@); \ + $(AWK) -f $(src)/copy-arm64h.awk $< > $@ || \ + $(AWK) -f $(src)/copy-arm64h-full.awk -v srcfile=3D"= $(subst $(srctree)/,,$(subst $(srctree)/../,,$<))" $< > $@ || \ + { echo "Error: Unbalanced ARM64_S390_COMMON markers in $<" >&2; rm= -f $@; exit 1; } + +arm64-type =3D $(firstword $(subst :, ,$(1))) +arm64-base =3D $(or $(word 2,$(subst :, ,$(1))),$(1)) +arm64-src-base =3D $(patsubst %-gen.h,%.h,$(call arm64-base,$(1))) + +arm64-src =3D $(srctree)/arch/arm64/include/$(if $(filter uapi,$(call arm6= 4-type,$(1))),uapi/)asm/$(call arm64-src-base,$(1)) +arm64-dst =3D $(objtree)/$(if $(filter uapi,$(call arm64-type,$(1))),$(arm= 64uapi),$(arm64api))/$(call arm64-base,$(1)) + +$(foreach hdr,$(ARM64_SHARED_HEADERS),\ + $(eval $(call arm64-dst,$(hdr)): $(call arm64-src,$(hdr)) $(src)/copy-arm= 64h.awk $(src)/copy-arm64h-full.awk)) + +ARM64_TARGETS :=3D $(sort $(foreach hdr,$(ARM64_SHARED_HEADERS),$(call arm= 64-dst,$(hdr)))) + +$(ARM64_TARGETS): + $(call cmd,gen_arm_hdr) + +quiet_cmd_gen_sysreg_arm64 =3D GEN $@ + cmd_gen_sysreg_arm64 =3D mkdir -p $(dir $@); $(AWK) -f $(srctree)/ar= ch/arm64/tools/gen-sysreg.awk $(srctree)/arch/arm64/tools/sysreg > $@ + +$(arm64api)/sysreg-defs.h: $(srctree)/arch/arm64/tools/gen-sysreg.awk $(sr= ctree)/arch/arm64/tools/sysreg FORCE + $(call if_changed,gen_sysreg_arm64) + +ARM64_TARGETS +=3D $(arm64api)/sysreg-defs.h diff --git a/arch/s390/tools/copy-arm64h-full.awk b/arch/s390/tools/copy-ar= m64h-full.awk new file mode 100644 index 000000000000..a6aaf9cc3332 --- /dev/null +++ b/arch/s390/tools/copy-arm64h-full.awk @@ -0,0 +1,47 @@ +#!/usr/bin/awk -f +# SPDX-License-Identifier: GPL-2.0 +# +# Process entire ARM64 headers for sharing with s390 KVM +# +# Usage: copy-arm64h-full.awk -v srcfile=3D +# +# This processes the entire file (unlike copy-arm64h.awk which only extrac= ts marked sections) + +BEGIN { + max_guard_line =3D 25 + guard_found =3D 0 + header_added =3D 0 +} + +# Find and process the include guard in the first few lines +NR <=3D max_guard_line && !guard_found && /^#ifndef [A-Z_0-9]+$/ { + guard_name =3D $2 + guard_found =3D 1 + print "/* This header was copied from " srcfile " */" + print "" + print + header_added =3D 1 + next +} + +# Transform include directives +/^#include +# +# Extracts all sections between start/end markers. If no markers found, si= gnals for fallback. +#TODO verification script or c file for arm to verify the ifdef things kee= p working +BEGIN { + # Constants + start_pattern =3D "^#ifdef ARM64_S390_COMMON$" + end_pattern =3D "^#endif \\/\\* ARM64_S390_COMMON \\*\\/$" + max_guard_line =3D 25 + + # State variables + copying =3D found_marker =3D 0 + guard_name =3D "" + file_header_done =3D 0 +} + +NR <=3D max_guard_line && !guard_name && /^#ifndef [A-Za-z0-9_]+$/ { + guard_name =3D $2 + filename =3D FILENAME + sub(/^.*arch\/arm64\//, "arch/arm64/", filename) + print "/*" + print " * This header was automatically generated from " filename + print " * Do not modify this file directly." + print " */" + print "#ifndef " guard_name + print "#define " guard_name + print "" + next +} + +NR > max_guard_line && !guard_name && !file_header_done { + print "error: no include guard found in first " max_guard_line " lines" >= "/dev/stderr" + file_header_done =3D 1 + exit 1 +} + +!guard_name { + print + next +} + +$0 ~ start_pattern { + if (copying) { exit 1 } + copying =3D found_marker =3D 1 + next +} + +guard_name && !found_marker { + next +} + +$0 ~ end_pattern { copying =3D 0; next } + +copying { + gsub(/#include To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 22/31] KVM: s390: Use arm64 code Date: Fri, 31 Jul 2026 15:08:50 +0200 Message-ID: <20260731130902.654679-23-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXwAxjK8Lo+q6H UC/AfHiSwgl3vOeUInJKCWSMx1BXop9xx09kbypF7SweTMr//cQNbCPm4mII4JGzqf8qxa67zX0 8R0X5m6WvuhBW9WtBB8YP8IjUc1EkAk= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXzLU2eIKeCq/0 bSkGOFsTVc1IKmTSkrwdtzAybu1+ytaBIu7qSa4dg9AiKew4D68FdA9EK1/xKmtO5WjZsY8NStp vnsBK8UoS8zbo9pv5v2NycW9KuD2mp9BVHzQ7au+uKG1MKTpfeGM39uX2jXB01VbcbJL+q0zXHg +M2VjYiNwZKS5kcExJKWsY/OIiY6QW0an/sxhx1KCVbzOnC0ieLKMvaBSlfdXluOF1Y/sAwPbWQ Hvb2oy4eyp2VZC8gbRRE3wcgwCS/tCY2/CT4eTfP0SuRGgChVJIFko6zaITgDTaDN120AlqaoxI 09Dnz4kSFvdBiU9cDbQqVGDO0ebwRAtgKahakDIqBEdjefLaX8M3DlZj+6v/jUh1TZt1zNnteNu Ibuknh1VffDSn8J+vB8HKjTCX4zX3GBt8amVho6Vo5pB14wb5vMjqXlzIXEqDIiTZlFPH9CQgrr SxZ/e9+v0WMo2oT8J5g== X-Authority-Analysis: v=2.4 cv=b5WCJNGx c=1 sm=1 tr=0 ts=6a6c9e80 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=x1b9RNJZmR4nZInT6RoA:9 X-Proofpoint-GUID: nv9ck2GP38yDoAVGrzpslhWy5N_xnxLM X-Proofpoint-ORIG-GUID: Ytdap5LU6bYXdkEVl1YPQqDbc4d6U32Z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 adultscore=0 malwarescore=0 impostorscore=0 bulkscore=0 phishscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Add the infrastructure to extract KVM/arm64 code into s390 at built time similar to the arm64 header sharing. Add copy-arm64c.awk hat detects ARM64_S390_COMMON markers and extracts marked section into an .inc file that can be consumed by arm on s390 host code. If no marker is found make will fail. To ensure that no code is consumed twice by accident a guard is added during file generation. A s390 C file wanting to consume such an inc file must first define __INCL_GEN_ARM_FILE otherwise the inc file will emit a compile error. Example: #define __INCL_GEN_ARM_FILE #include #undef __INCL_GEN_ARM_FILE Signed-off-by: Steffen Eiden --- arch/s390/kvm/arm64/.gitignore | 2 + arch/s390/kvm/arm64/Makefile.gen | 30 +++++++++++++ arch/s390/kvm/arm64/copy-arm64c.awk | 70 +++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 arch/s390/kvm/arm64/.gitignore create mode 100644 arch/s390/kvm/arm64/Makefile.gen create mode 100644 arch/s390/kvm/arm64/copy-arm64c.awk diff --git a/arch/s390/kvm/arm64/.gitignore b/arch/s390/kvm/arm64/.gitignore new file mode 100644 index 000000000000..bd9d90694676 --- /dev/null +++ b/arch/s390/kvm/arm64/.gitignore @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +generated/* diff --git a/arch/s390/kvm/arm64/Makefile.gen b/arch/s390/kvm/arm64/Makefil= e.gen new file mode 100644 index 000000000000..13a6ba44dce8 --- /dev/null +++ b/arch/s390/kvm/arm64/Makefile.gen @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Extracts ARM64 marked sections to .inc files that are included by main s= ource +# files + +# List of ARM64 C files to extract +ARM64_CFILES :=3D \ + arm.c \ + guest.c \ + reset.c \ + handle_exit.c \ + mmio.c \ + +quiet_cmd_extract_inc =3D GEN $@ + cmd_extract_inc =3D mkdir -p $(dir $@); \ + $(AWK) -f $(src)/copy-arm64c.awk $< > $@ || \ + { echo "Error: No or unbalanced ARM64_S390_COMMON = markers in $<" >&2; rm -f $@; exit 1; } + +$(obj)/generated/%.inc: $(srctree)/arch/arm64/kvm/%.c $(src)/copy-arm64c.a= wk FORCE + $(call if_changed,extract_inc) + +ARM64_INC_FILES :=3D $(foreach cfile,$(ARM64_CFILES),generated/$(basename = $(cfile)).inc) + +targets +=3D $(ARM64_INC_FILES) +clean-files +=3D generated/*.inc + +$(addprefix $(obj)/,$(kvm-arm64-obj)): $(addprefix $(obj)/,$(ARM64_INC_FIL= ES)) + +$(foreach cfile,$(basename $(ARM64_CFILES)),\ + $(eval $(obj)/$(cfile).o: $(obj)/generated/$(cfile).inc)) diff --git a/arch/s390/kvm/arm64/copy-arm64c.awk b/arch/s390/kvm/arm64/copy= -arm64c.awk new file mode 100644 index 000000000000..6c4fd1f08098 --- /dev/null +++ b/arch/s390/kvm/arm64/copy-arm64c.awk @@ -0,0 +1,70 @@ +#!/usr/bin/awk -f +# SPDX-License-Identifier: GPL-2.0 +# +# Extract marked sections from ARM64 C files for sharing with s390 KVM +# +# Usage: share-arm64-cfile.awk +# +# Extracts all sections between start/end markers. If no markers found, si= gnals failure. + +BEGIN { + # Constants + start_pattern =3D "^#ifdef ARM64_S390_COMMON$" + end_pattern =3D "^#endif /\\* ARM64_S390_COMMON \\*/$" + + # State variables + copying =3D found_marker =3D 0 + file_header_done =3D 0 +} + +!file_header_done { + if (/^\/\*/ || /^\/\/ SPDX-License-Identifier:/) { + print + next + } + if (/[[:space:]]\*([[:space:]]|$)/) { + print + next + } + if (/\*\//) { + print " *" + } else { + print "/*" + } + + filename =3D FILENAME + sub(/^.*arch\/arm64\//, "arch/arm64/", filename) + print " * This file was automatically generated from " filename + print " * Do not modify this file directly." + print " */" + print "" + print "#ifndef __INCL_GEN_ARM_FILE" + print "#error included .inc file w/o proper guard definition" + print "#undef __INCL_GEN_ARM_FILE" + print "#endif /* __INCL_GEN_ARM_FILE */" + print "" + + file_header_done =3D 1 +} + +$0 ~ start_pattern { + if (copying) { exit 1 } + copying =3D found_marker =3D 1 + next +} + +$0 ~ end_pattern { + copying =3D 0 + next +} + +copying { + gsub(/#include To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 23/31] s390: Introduce Start Arm Execution instruction Date: Fri, 31 Jul 2026 15:08:51 +0200 Message-ID: <20260731130902.654679-24-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: biXO83C_qemiC5yx8Kipdnn7HFfeJ6SF X-Proofpoint-ORIG-GUID: uyGX5-P6ZTM6NCouhgy_1AaBmDWw2i64 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX5EwN3xnTwPAk NedXGodRazNeBmw/US6vkhu2vWgb9A17RLPqeWWGkCwQ3pC0aiFErrYIQAieBidA1GZPAf8Udtm A3WVreRGLr9Mr6vZix4qkDJ0ZILFLMY5hBLAyRqW1t5lPwy5ghIL/p1/v8Xb2B/srPPYEN6jJYk L5hc/n9hmv4EdXmorIw8AMGOoWCzAv+SR+TQuMCOLvPphBDDZTsIM/cyFrbEVtRp/H+eQQlqmB0 0dRf89TU4o4KBS4nfcVlBpyTCXQVdpM69YyYbMiZaQunCs2n1dpyXVAOcA+zPFGLjDD3WhNKmZN U3FsgkQOVOeEN/k6rtjKFabW7ZuPDdN6Kce/38bB9fU6wCV3QELfOOcsLEcmFyJWb0iqDdr3uAz skzf3nFEuRJyHK6bU9+WckRjtNG886doG+xVPFY1ZzlJcWRnGoykvHr0uyP6XbIi5dnYLRm66Yp +kvVWBAmEuPvK73CEbg== X-Authority-Analysis: v=2.4 cv=SKFykuvH c=1 sm=1 tr=0 ts=6a6c9e82 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=D7HF9d94yUUfLUezzdoA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX+ujBLxpHjC90 9ahDjnuH5APiAV9DOfo+8oQzmSZmT8+EJnTw+COutjNo6xfeSjd5dBpDf1KhI9taqSF1oxxXKHi sIBD8VZlVfo4rZR2ORPckUGuRjomFoE= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" The Start Arm Execution (SAE) instruction is the centerpiece for executing arm64 (KVM) guests on s390. Its purpose is, similar to SIE, to enable accelerated execution of arm64 virtual machines. SAE expects the physical address of a control block as the only argument. The host is responsible to save & restore - GPRs 0-13 - access register 0-15 - breaking event register (BEAR) - vector/floating point registers between SAE executions to guarantee host consistency. GPRs and BEAR are save and restores in the asm functions. The other register are handled in within C code. Access registers are handled in a later patch and SVEs will be handled when they are introduced in a future series. Most arm64 registers are handled by a satellite block called save_area. Some registers, frequently used by hypervisors, are placed into the SAE control block itself. Enlighten asm/kvm_host_types.h for the new header variant. The new header is chosen instead of asm/kvm_host_s390_types.h if KVM_S390_ARM64 is defined. Co-developed-by: Andreas Grapentin Signed-off-by: Andreas Grapentin Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Signed-off-by: Steffen Eiden --- arch/s390/include/asm/asm-prototypes.h | 1 + arch/s390/include/asm/kvm_host_arm64_types.h | 118 +++++++++++++++++++ arch/s390/include/asm/kvm_host_types.h | 4 + arch/s390/include/asm/sae.h | 56 +++++++++ arch/s390/include/asm/stacktrace.h | 5 + arch/s390/kernel/asm-offsets.c | 1 + arch/s390/kernel/entry.S | 25 ++++ arch/s390/tools/opcodes.txt | 3 + 8 files changed, 213 insertions(+) create mode 100644 arch/s390/include/asm/kvm_host_arm64_types.h create mode 100644 arch/s390/include/asm/sae.h diff --git a/arch/s390/include/asm/asm-prototypes.h b/arch/s390/include/asm= /asm-prototypes.h index d4da4436d02b..faa2afb259a1 100644 --- a/arch/s390/include/asm/asm-prototypes.h +++ b/arch/s390/include/asm/asm-prototypes.h @@ -6,6 +6,7 @@ #include #include #include +#include #include =20 #endif /* _ASM_S390_PROTOTYPES_H */ diff --git a/arch/s390/include/asm/kvm_host_arm64_types.h b/arch/s390/inclu= de/asm/kvm_host_arm64_types.h new file mode 100644 index 000000000000..d112ca8c6bc1 --- /dev/null +++ b/arch/s390/include/asm/kvm_host_arm64_types.h @@ -0,0 +1,118 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef ASM_KVM_HOST_ARM64_TYPES_H +#define ASM_KVM_HOST_ARM64_TYPES_H + +#include +#include +#include +#include +#include + +struct kvm_sae_block { + u64 _0000[16]; /* 0x0000 */ +#define SAE_ICPTR_SPURIOUS 0x00 +#define SAE_ICPTR_VALIDITY 0x01 +#define SAE_ICPTR_HOST_ACCESS_EXCEPTION 0x02 +#define SAE_ICPTR_SYNCHRONOUS_EXCEPTION 0x03 +#define SAE_ICPTR_TIMER 0x04 +#define SAE_ICPTR_PE_INTERCOMM 0x05 +#define SAE_ICPTR_GUEST_ADDRESS_SIZE 0x06 +#define SAE_ICPTR_STOP 0x07 +#define SAE_ICPTR_SYSTEM_REGISTER 0x08 +#define SAE_ICPTR_PMU 0x09 +#define SAE_ICPTR_MAINTENANCE 0x0a + u8 icptr; /* 0x0080 */ + u8 _0081[7]; /* 0x0081 */ + u64 scad; /* 0x0088 */ + u64 _0090[16]; /* 0x00b0 */ + u32 cntp_ctl; /* 0x0110 */ + u32 cntv_ctl; /* 0x0114 */ + u8 irq_ctl; /* 0x0118 */ + u8 _0119[7]; /* 0x0119 */ + struct { + u64 ich_hcr_el2; /* 0x0120 */ + u64 ich_vmcr_el2; /* 0x0128 */ + u64 ich_ap0r0_el2; /* 0x0130 */ + u64 ich_ap1r0_el2; /* 0x0138 */ + u64 _0140[2]; /* 0x0140 */ + u64 ich_lrn_el2[4]; /* 0x0150 */ + u64 _0170[4]; /* 0x0170 */ + } ic_regs; + u64 _0190[12]; /* 0x0190 */ + u64 contextidr_el1; /* 0x01f0 */ + u32 wip; /* 0x01f8 */ + u32 _01fc; /* 0x01fc */ +#define SAE_SD_FORMAT_0 0x00 + u8 sdf; /* 0x0200 */ + u8 _0201[7]; /* 0x0201 */ + u64 mso; /* 0x0208 */ + u64 msl; /* 0x0210 */ + u64 hbasce; /* 0x0218 */ + u64 _0220; /* 0x0220 */ + u64 gpto; /* 0x0228 */ + u64 ic; /* 0x0230 */ + u64 ec; /* 0x0238 */ + u64 save_area; /* 0x0240 */ + u64 _0248[7]; /* 0x0248 */ + u8 _0280[6]; /* 0x0280 */ + u16 lrcpua; /* 0x0286 */ + u64 pstate; /* 0x0288 */ + u64 pc; /* 0x0290 */ + u64 sp_el0; /* 0x0298 */ + u64 sp_el1; /* 0x02a0 */ + u64 _02a8; /* 0x02a8 */ + u64 fpcr; /* 0x02b0 */ + u64 fpsr; /* 0x02b8 */ + u16 sve_pregs[16]; /* 0x02c0 */ + u16 sve_ffr; /* 0x02e0 */ + u8 _02e2[6]; /* 0x02e2 */ + u64 _02e8[3]; /* 0x02e8 */ + + u64 gpr[31]; /* 0x0300 */ + u64 _03f8; /* 0x03f8 */ + + union { + u64 icptd[8]; /* 0x0400 */ + /* validity-interception reason; icptr 0x01 */ + u16 vir; /* 0x0400 */ + /* host access interception details; icptr 0x02 */ + struct { + u64 esr_elz; /* 0x0400 */ + u8 _0408[6]; /* 0x0408 */ + u16 pic; /* 0x040e */ + union teid teid; /* 0x0410 */ + gva_t far_elz; /* 0x0418 */ + gva_t vaddr; /* 0x0420 */ + u64 suppl; /* 0x0428 */ + u8 gltl; /* 0x0430 */ + u8 _0431[7]; /* 0x0431 */ + u64 _0438; /* 0x0438 */ + } hai; + /* exception-interception details; icptr 0x03 */ + struct { + u64 esr_elz; /* 0x0400 */ + u64 _0408[2]; /* 0x0408 */ + gva_t far_elz; /* 0x0418 */ + } trap; + /* timer-interception reason; icptr 0x04 */ +#define SAE_IR_TIMER_ID_VIRT BIT(6) +#define SAE_IR_TIMER_ID_PHYS BIT(7) + u8 tir; /* 0x0400 */ + }; + u64 _0440[376]; /* 0x0440 */ +} __packed __aligned(PAGE_SIZE); +static_assert(sizeof(struct kvm_sae_block) =3D=3D PAGE_SIZE); + +struct kvm_sae_save_area { +#define SAE_SAVE_AREA_FORMAT_0 0x00 + u8 saf; /* 0x0000 */ + u8 _0001[5]; /* 0x0001 */ +#define SAE_SAS_VALID BIT(0) + u16 sas; /* 0x0006 */ + u64 sdo; /* 0x0008 */ + u64 _0010[2]; /* 0x0010 */ + u64 regs[508]; /* 0x0020 */ +} __packed __aligned(PAGE_SIZE); +static_assert(sizeof(struct kvm_sae_save_area) =3D=3D PAGE_SIZE); + +#endif /* ASM_KVM_HOST_ARM64_TYPES_H */ diff --git a/arch/s390/include/asm/kvm_host_types.h b/arch/s390/include/asm= /kvm_host_types.h index e5bdba07cab0..d308739ebcf5 100644 --- a/arch/s390/include/asm/kvm_host_types.h +++ b/arch/s390/include/asm/kvm_host_types.h @@ -3,6 +3,10 @@ #ifndef ASM_KVM_HOST_TYPES_H #define ASM_KVM_HOST_TYPES_H =20 +#ifdef KVM_S390_ARM64 +#include +#else #include +#endif /* KVM_S390_ARM64 */ =20 #endif /* ASM_KVM_HOST_TYPES_H */ diff --git a/arch/s390/include/asm/sae.h b/arch/s390/include/asm/sae.h new file mode 100644 index 000000000000..fe010a1a7729 --- /dev/null +++ b/arch/s390/include/asm/sae.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_S390_SAE_H +#define __ASM_S390_SAE_H + +#include "linux/linkage.h" +#include + +/* defined in arch/s390/kernel/entry.S */ +asmlinkage int __sae64a(phys_addr_t sae_block_phys); + +#ifndef __ASSEMBLER__ +#include +#include + +/** + * __sae64a() - Start Arm Execution + */ +static inline void sae64a(struct kvm_sae_block *sae_block) +{ + __sae64a(virt_to_phys(sae_block)); +} + +/** + * stiasrm() - STore and Invalidate Arm System Register Multiple + * @save_area: Pointer to SAE save area + * + * Store the guest system register to the save area. + * The values in the guest are not valid anymore.. + */ +static __always_inline void stiasrm(struct kvm_sae_save_area *save_area) +{ + asm volatile( + " .insn rre,0xb9a70000,%[r1],0\n" + : "+m"(*save_area) + : [r1] "a"(save_area) + ); +} + +/** + * lasrm() - Load Arm System Register Multiple + * + * @save_area: Pointer to SAE save area + * + * Load the system registers from save_area into the guest. + */ +static __always_inline void lasrm(struct kvm_sae_save_area *save_area) +{ + asm volatile( + " .insn rre,0xb9a60000,%[r1],0\n" + : + : "m"(*save_area), [r1] "a"(save_area) + ); +} + +#endif /* !__ASSEMBLER__ */ +#endif /* __ASM_S390_SAE_H */ diff --git a/arch/s390/include/asm/stacktrace.h b/arch/s390/include/asm/sta= cktrace.h index ac3606c3babe..2d332d7c8145 100644 --- a/arch/s390/include/asm/stacktrace.h +++ b/arch/s390/include/asm/stacktrace.h @@ -59,6 +59,7 @@ static inline bool on_stack(struct stack_info *info, struct stack_frame { union { unsigned long empty[9]; + /* SIE stack frame */ struct { unsigned long sie_control_block; unsigned long sie_savearea; @@ -68,6 +69,10 @@ struct stack_frame { unsigned long sie_guest_asce; unsigned long sie_irq; }; + /* SAE stack frame */ + struct { + unsigned long sae_bear; + }; }; unsigned long gprs[10]; unsigned long back_chain; diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c index f6dd2b67dcee..f9f9c2246074 100644 --- a/arch/s390/kernel/asm-offsets.c +++ b/arch/s390/kernel/asm-offsets.c @@ -70,6 +70,7 @@ int main(void) OFFSET(__SF_SIE_CONTROL_PHYS, stack_frame, sie_control_block_phys); OFFSET(__SF_SIE_GUEST_ASCE, stack_frame, sie_guest_asce); OFFSET(__SF_SIE_IRQ, stack_frame, sie_irq); + OFFSET(__SF_SAE_BEAR, stack_frame, sae_bear); DEFINE(STACK_FRAME_OVERHEAD, sizeof(struct stack_frame)); BLANK(); OFFSET(__SFUSER_BACKCHAIN, stack_frame_user, back_chain); diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 9572620fcaa6..248bea26921b 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -244,6 +244,31 @@ EXPORT_SYMBOL(__sie64a) EXPORT_SYMBOL(sie_exit) #endif =20 +#if IS_ENABLED(CONFIG_KVM_ARM64) +/* + * __sae64a calling convention: + * %r2 pointer to sae control block physical address + */ +SYM_FUNC_START(__sae64a) + stmg %r6,%r14,__SF_GPRS(%r15) # store kernel registers + STBEAR __SF_SAE_BEAR(%r15) # save breaking event address register + .insn rre,0xb9a50000,%r2,0 # Start Arm Execution +# Let the next instruction be NOP to avoid triggering a machine check +# and handling it in a guest as result of the instruction execution. + nopr 7 + LBEAR __SF_SAE_BEAR(%r15) # restore breaking event address register + lmg %r6,%r14,__SF_GPRS(%r15) # restore kernel registers + xgr %r0,%r0 # clear guest registers to + xgr %r1,%r1 # prevent speculative use + xgr %r3,%r3 + xgr %r2,%r2 + xgr %r4,%r4 + xgr %r5,%r5 + BR_EX %r14 +SYM_FUNC_END(__sae64a) +EXPORT_SYMBOL(__sae64a) +#endif + /* * SVC interrupt handler routine. System calls are synchronous events and * are entered with interrupts disabled. diff --git a/arch/s390/tools/opcodes.txt b/arch/s390/tools/opcodes.txt index def2659f6602..0e4773c94af0 100644 --- a/arch/s390/tools/opcodes.txt +++ b/arch/s390/tools/opcodes.txt @@ -594,6 +594,9 @@ b9a0 clp RRF_U0RR b9a1 tpei RRE_RR b9a2 ptf RRE_R0 b9a4 uvc RRF_URR +b9a5 sae RRE_R0 +b9a6 lasrm RRE_R0 +b9a7 stiasrm RRE_R0 b9aa lptea RRF_RURR2 b9ab essa RRF_U0RR b9ac irbm RRE_RR --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 20A5F42E8F8; Fri, 31 Jul 2026 13:09:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503391; cv=none; b=X1ntYdRYy2LNNI8PWoMynKwWBLNX7t5oCYJtqNitUJtILozzB1Q2au/5VoHKjNGqA+5k7skTKGw2sDkEUnRvL7fMxUK62r66R0uSpux3ip7gwPCxF4znkzNRUeeQGz4vhJSDp8dU4hB/vSKC4TkKKDcwyy/AqPQKMv1wmAXOtzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503391; c=relaxed/simple; bh=G+fRRpldavnc1QOvQNm8weWWQ4mweBMulUIrkJ7vhXo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pylho1ECaUdAXjMq5qFkIYjgTVe78tgIi6s145Lb96kDj59smzEfFWzx+cnRR1ZyCO+gi0xOkl6vIdFcPxQ9+UJ+4yIkdyDghfoHgX3kS0CIOX4/wdFOMoY1FHbO+b7Wqyu2tIBFs87OPlW1eDR6+d+bS8Ks6iJub+FjS3U32Hc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=nPsmNAWa; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="nPsmNAWa" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlr7Z4072858; Fri, 31 Jul 2026 13:09:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=nDNZ0Y1EzzuTrZHSG nW9UYWmDO1tIqtcoppyCQujSzk=; b=nPsmNAWaR9YDn8096Ub8sX/uVgpXTrIux DtbktwfJRH7geqMBTf39oiWiTCyx9hyFulw8kOSGzvJdobmbRTvTHpeDLckbJ5Jx fJjBSK+sInkzNyGdZ3qsK60d7P5lfYzBqgpBcSnrVoRzTcSE+7b4/MBH0iPqL1zk ErUXbLTcUQIzlbWdHuTsDbxVaiL0WNIS+YwezqqFuLiFwQqiaetkgmfWnF4KBMGQ YVlmO2B83xXxOlde6ogLaj7br56JOm4LfDiQ7ms5jkIrmyAZjMW3ukbHXPbRU0fp TD0IKV5lEy7ZKZoJlvd3RbtIqHy5OMsWchCz80Uld/tQb/qjusq4w== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2p6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:22 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuL1S026432; Fri, 31 Jul 2026 13:09:21 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8yhqw7j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:21 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9DCG42926488 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:14 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DBC9720040; Fri, 31 Jul 2026 13:09:13 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 72F9A2004B; Fri, 31 Jul 2026 13:09:13 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:13 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 24/31] KVM: s390: arm64: Introduce host definitions Date: Fri, 31 Jul 2026 15:08:52 +0200 Message-ID: <20260731130902.654679-25-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: ApPLEI_CdUyZZ8ZNzB2lLKVDhMF7uMg9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX6nQBhY2tHNUB QE5CqImmGH3GonjkmadeCl8xQdx1wvMH26bWX3o47H0V6wS4/qqenZQp598szNUXqu2FgsFsbSc LVTpXs2iNCV4toqoGZ+dnxlsKIl6jY/A2WbTPiqpKtgmRMmcUNXwsGTs+lWIamGvNufevZajGMN hz5Aw4YDRMdivbDygKN3SQw37FZKK8r4CapkOcCnYvdQPv9xzEBuZrQfuzy0jlncTTu7EkBP5VA ykDwqsYqXQf2fD4td2CKfaiGxxfJc7v6DxafY6kCwJPoddxwQEE5c/0Qdo2igSSjB17ku1+yMQZ bDdOITHFUYGWZmXP2NrhsZp8GPfUj/gSaXoJ0phPS9VRdj9YvGT6qr5UV2pHaca4ZJZpnmBHJBq eFhGbDchbf0pgebrBjv9jL6JQio4Xxk8fFZZPwcQeBD0U9x/hKupO3dzM2lQfoDdT7ouTXEkPs1 +esgRC0K/LLV9hf6tYA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXxAjKdKN0f+kk yO1J697EJ8riLEO1GyBXJEJedcyLfs+6X12/Ei2LHBOHXaFmkm/qPSEAmonvF9VyOKDl/KwEQhK xQaqn5iTU5eg5Yj/uJ9qXNg0EByyPZ4= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e83 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=GIHSpwNkk6YbMCLEwLsA:9 X-Proofpoint-GUID: wZFZqCa2Qxfq9iHYIPVsPjg7cISbkCUH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Add all basic definitions the arm on s390 KVM host requires. Including, but not limited to, struct kvm*arch definitions, various functions (to be implemented in the following patches), and various defines required to run arm64 guests. Enlighten asm/kvm_host.h for the new header variant. The new header is chosen instead of asm/kvm_host_s390.h if KVM_S390_ARM64 is defined. Co-developed-by: Andreas Grapentin Signed-off-by: Andreas Grapentin Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Signed-off-by: Steffen Eiden --- arch/s390/include/asm/kvm.h | 6 + arch/s390/include/asm/kvm_host.h | 9 + arch/s390/include/asm/kvm_host_arm64.h | 224 +++++++++++++++++++++++++ arch/s390/kernel/entry.S | 3 - 4 files changed, 239 insertions(+), 3 deletions(-) create mode 100644 arch/s390/include/asm/kvm.h create mode 100644 arch/s390/include/asm/kvm_host_arm64.h diff --git a/arch/s390/include/asm/kvm.h b/arch/s390/include/asm/kvm.h new file mode 100644 index 000000000000..aeb11dc631d5 --- /dev/null +++ b/arch/s390/include/asm/kvm.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifdef KVM_S390_ARM64 +#include +#else +#include +#endif diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost.h index 147325978225..cd6d572883ab 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -3,7 +3,16 @@ #ifndef ASM_KVM_HOST_H #define ASM_KVM_HOST_H =20 +#ifdef KVM_S390_ARM64 +#include +#else #include +#endif + +static inline bool kvm_arch_pmi_in_guest(struct kvm_vcpu *vcpu) +{ + return false; +} =20 #define PGM_OPERATION 0x01 #define PGM_PRIVILEGED_OP 0x02 diff --git a/arch/s390/include/asm/kvm_host_arm64.h b/arch/s390/include/asm= /kvm_host_arm64.h new file mode 100644 index 000000000000..956ae6636597 --- /dev/null +++ b/arch/s390/include/asm/kvm_host_arm64.h @@ -0,0 +1,224 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef ASM_KVM_HOST_ARM64_H +#define ASM_KVM_HOST_ARM64_H + +#include + +#include +#include + +#define vcpu_gp_regs(v) ((v)->arch.sae_block.gpr) + +#include +#include + +#include + +#define KVM_HAVE_MMU_RWLOCK +#define KVM_MAX_VCPUS 1 +#define KVM_S390_ARM64_IMPL_FEATURES \ + (BIT(KVM_ARM_VCPU_PTRAUTH_ADDRESS) | BIT(KVM_ARM_VCPU_PTRAUTH_GENERIC)) + +#define KVM_HALT_POLL_NS_DEFAULT 50000 + +/* Minimal (=3Dno) vgic definitions */ +#define KVM_IRQCHIP_NUM_PINS 1 +#define irqchip_in_kernel(_k) false + +#define __ctxt_sys_reg(ctx, reg) NULL +struct kvm_cpu_context { + /* + * These are just for 32 bit, which we don't have, making them RES0. + * They are exposed to user space. + */ + u64 spsr_abt; + u64 spsr_und; + u64 spsr_irq; + u64 spsr_fiq; + + __vector128 __aligned(16) vregs[32]; +}; + +struct kvm_vcpu_arch { + struct kvm_sae_block sae_block; + struct kvm_sae_save_area save_area; + struct kvm_cpu_context ctxt; + + u32 host_acrs[NUM_ACRS]; + + /* Hypervisor Configuration Register */ + u64 hcr_elz; + + /* Configuration flags, set once and for all before the vcpu can run */ + u8 cflags; + + /* Input flags to the hypervisor code, potentially cleared after use */ + u8 iflags; + + /* State flags for kernel bookkeeping, unused by the hypervisor code */ + u8 sflags; + + /* + * Don't run the guest (internal implementation need). + * + * Contrary to the flags above, this is set/cleared outside of + * a vcpu context, and thus cannot be mixed with the flags + * themselves (or the flag accesses need to be made atomic). + */ + bool pause; + + /* vcpu power state */ + struct kvm_mp_state mp_state; + /* lock for mp_state & reset_state.reset */ + spinlock_t mp_state_lock; + + /* vcpu reset state */ + struct vcpu_reset_state reset_state; + + /* GMAP */ + struct gmap *gmap; + struct kvm_s390_mmu_cache *mc; + + void *debugfs_state_data; +}; + +struct kvm_vcpu_stat { + struct kvm_vcpu_stat_generic generic; + /* ARM64 stats */ + u64 hvc_exit_stat; + u64 wfe_exit_stat; + u64 wfi_exit_stat; + u64 mmio_exit_user; + u64 mmio_exit_kernel; + u64 signal_exits; + u64 exits; + /* GMAP stats */ + u64 pfault_sync; +}; + +#define kvm_vcpu_get_sp_el1(__vcpu) (&((__vcpu)->arch.sae_block.sp_el1)) +#define kvm_vcpu_get_vreg(__vcpu, _off) (&(__vcpu)->arch.ctxt.vregs[_off]) +#define kvm_vcpu_get_vregs(__vcpu) (&(__vcpu)->arch.ctxt.vregs) +#define kvm_vcpu_get_fpsr(__vcpu) (&(__vcpu)->arch.sae_block.fpsr) +#define kvm_vcpu_get_fpcr(__vcpu) (&(__vcpu)->arch.sae_block.fpcr) + +#define _vcpu_get_flag(v, flagset, ...) \ + __vcpu_get_flag(&(v)->arch.flagset, __VA_ARGS__) +#define _vcpu_set_flag(v, flagset, ...) \ + __vcpu_set_flag(&(v)->arch.flagset, __VA_ARGS__) +#define _vcpu_clear_flag(v, flagset, ...) \ + __vcpu_clear_flag(&(v)->arch.flagset, __VA_ARGS__) +#define _vcpu_test_and_clear_flag(v, flagset, ...) \ + __vcpu_test_and_clear_flag(&(v)->arch.flagset, __VA_ARGS__) + +#define kvm_has_mte(_kvm) false +#define vcpu_has_sve(_vcpu) false +#define vcpu_has_ptrauth(_vcpu) false + +struct kvm_arch_memory_slot { +}; + +struct kvm_arch { + struct gmap *gmap; + u64 guest_phys_size; + + /* VM-wide vCPU feature set */ + unsigned long flags; + + /* Protects VM-scoped configuration data */ + struct mutex config_lock; + + debug_info_t *dbf; + + DECLARE_BITMAP(vcpu_features, KVM_VCPU_MAX_FEATURES); + + unsigned long mem_limit; +}; + +static inline bool __vcpu_has_feature(const struct kvm_arch *ka, int featu= re) +{ + return test_bit(feature, ka->vcpu_features); +} + +struct kvm_vm_stat { + struct kvm_vm_stat_generic generic; +}; + +static inline bool system_has_full_ptr_auth(void) +{ + return true; +} + +#define kvm_vm_is_protected(_kvm) false +#define vcpu_is_protected(_vcpu) false + +#define vcpu_is_loaded(_vcpu) ((_vcpu)->cpu !=3D -1) + +#define KVM_HVA_ERR_BAD -1UL +#define KVM_HVA_ERR_RO_BAD -2UL + +#define kvm_phys_size(__kvm) ((__kvm)->arch.guest_phys_size) +static inline bool kvm_is_error_hva(unsigned long addr) +{ + return IS_ERR_VALUE(addr); +} + +u32 get_kvm_ipa_limit(void); + +/* unused, but required functions */ +static inline void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memor= y_slot *slot) {} +static inline void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen) {} +static inline void kvm_arch_flush_shadow_all(struct kvm *kvm) {} +static inline void kvm_arch_flush_shadow_memslot(struct kvm *kvm, struct k= vm_memory_slot *slot) {} +static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {} +static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {} +static inline void kvm_arch_sync_events(struct kvm *kvm) {} +static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} +static inline void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, + struct kvm_memory_slot *slot, + gfn_t gfn_offset, + unsigned long mask) {} + +int kvm_handle_guest_abort(struct kvm_vcpu *vcpu); + +/* arm64 guests do not use async-pf. Defined because Kbuild requires it as= s390 kvm turns it on. */ +#define ASYNC_PF_PER_VCPU 0 +struct kvm_arch_async_pf { + unsigned long pfault_token; +}; + +#define __unsupp_async_call(fn) WARN_ONCE(true, "async not supported on kv= m-arm64 %s", fn) + +static inline bool kvm_arch_can_dequeue_async_page_present(struct kvm_vcpu= *vcpu) +{ + __unsupp_async_call(__func__); + return false; +}; + +static inline void kvm_arch_async_page_ready(struct kvm_vcpu *vcpu, + struct kvm_async_pf *work) +{ + __unsupp_async_call(__func__); +}; + +static inline bool kvm_arch_async_page_not_present(struct kvm_vcpu *vcpu, + struct kvm_async_pf *work) +{ + __unsupp_async_call(__func__); + return false; +}; + +static inline void kvm_arch_async_page_present(struct kvm_vcpu *vcpu, + struct kvm_async_pf *work) +{ + __unsupp_async_call(__func__); +}; + +static inline void kvm_arch_async_page_present_queued(struct kvm_vcpu *vcp= u) +{ + __unsupp_async_call(__func__); +}; + +#define kvm_supports_32bit_el0() false + +#endif /* ASM_KVM_HOST_ARM64_H */ diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 248bea26921b..4e5b499b3540 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -253,9 +253,6 @@ SYM_FUNC_START(__sae64a) stmg %r6,%r14,__SF_GPRS(%r15) # store kernel registers STBEAR __SF_SAE_BEAR(%r15) # save breaking event address register .insn rre,0xb9a50000,%r2,0 # Start Arm Execution -# Let the next instruction be NOP to avoid triggering a machine check -# and handling it in a guest as result of the instruction execution. - nopr 7 LBEAR __SF_SAE_BEAR(%r15) # restore breaking event address register lmg %r6,%r14,__SF_GPRS(%r15) # restore kernel registers xgr %r0,%r0 # clear guest registers to --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 B22CE432BDE; Fri, 31 Jul 2026 13:09:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503389; cv=none; b=usYSyXIMWbQH4FhdezlWrhZie85zeIqA2mX9rTwlLjJ14XjtIFpY4Rswd3Mm0OPXcOvdFtVqzgT8HvlnMFU+aBB8xkiBl3HjKEitoWrWwFgcxm1UhRHy6itxH2Jta+AUu1pnG5rGKQRjwbCGaCa0uAmVfS2Kemxbqo+SIqO3d2Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503389; c=relaxed/simple; bh=Pos6nmaUPNL3lxQa1N0CrZuoNDmpENnoUchtZV26rK8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=otr826ufhTjSowt22xMUGleDq1Zno3BQ7qMZHRipCXADCWt0DTawHEDPy1kgeGpLrKlcdEh/qKPefTMrJZkKqoQAHaSKQ78yVjXlsU1wyXjtX3fNS3K2+sh48Q29ZmUzxy8RaturpbG0P0d2om3PUjJiVRZKbaiy0BHCMSTNnhQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=OLQOSbBO; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="OLQOSbBO" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBm6QB1731999; Fri, 31 Jul 2026 13:09:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=Zocp9/JW8snOJaLwF hMIVmepe7GtTtK1uYzpqfqDF+c=; b=OLQOSbBO3SyCtgVfdMs34Pr/cj/5Oru+i 9p84jI6dE4tsqgexWx5auaSok8RWXSvmT4KHIGayB8BX8KkWzsfy7Ir5RHZdERi1 y7GCND+naEF3mR0CWyr1Ih3xJQitA5vsHrdXRZmOW+xzhPH4bQix9GVf0GnOgBFa WvTUEO8qSGXznlmpjCU85x0rfJ2Y8MNtxoz7tRfbjbL66yR/XnUwxekAY0z0toHE 0rY0QBHai4S2riuOISSgjkGNNCxern4OGIIzqVsmAoCt9f/zsn4/moykwkq14ZeB 90u9yj9cxJ8GtDI+BKIsolsKRd/4boXn6pCxjmwn882iQV67z6mAw== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuw7w4mg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:24 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuI68012635; Fri, 31 Jul 2026 13:09:23 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8fkg08b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:22 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9EEs32309542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:14 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 500CD20040; Fri, 31 Jul 2026 13:09:14 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E298820043; Fri, 31 Jul 2026 13:09:13 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:13 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 25/31] s390/hwcaps: Report SAE support as hwcap Date: Fri, 31 Jul 2026 15:08:53 +0200 Message-ID: <20260731130902.654679-26-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: yRsL3s7jocKRH7G7Ute6S3Xxu1VBu3bv X-Proofpoint-ORIG-GUID: AcdARCuc8L7EJt5e9_PwsTOxk9j9WtGN X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX3NKTKAiweY/I uR62reel/qsp0JqjMv1BzFLlopHYAW6zjqgyPAPI5g47xHFELr4w/HpjaUTL8FibSbOv18RkwMH uSugGgCYROsG+9xDP1HIBgc8fp07RixW0F6Hsycba4N79m7dlTQqsaULhOU0g6pMHrTiN+uNspX k6M1kFgv/GM5y8bxWP1xMyYYZOD0QNoTt43ddsEEWCxH85SIw20vd762yKSuTd9cFofNk4EI9yf svSE/HwRv4HncdgvPfe68gCp69Ccwe2FH8vwOATPi+GGFufY7F95OsirPVB8QHJ+0SyOp6qfgEv wuqxt5raWbYBhe9R/NghW4ExieqrIWstGd+ocG85w7g4K2/E6BbeMwwWONsuFGrXIMUuFgcHTGe FOl6ttfFSs7n3CPjcx0J99Ih8gszdga4Ah1NaAo1o/2zTbs8ou6yNcxqpKhcQd3x1sh9UUrwxuk cSWS0nw6/K1bQcMX0wg== X-Authority-Analysis: v=2.4 cv=SKFykuvH c=1 sm=1 tr=0 ts=6a6c9e84 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=MMtvGDNtdIwsdepEW5QA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXyKKl41jsvbh/ R03uUdRF5kQyVNx7CUG2LEEQMX9cYooIBPb0HQBAnW7blf+86bxTmnJazBf/Qf7/0nxlUyE00kG CP+Kern7T7mowbytgwVwyOWc8KdgQ98= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" From: Hendrik Brueckner Report SAE support as hwcap (and /proc/cpuinfo) Signed-off-by: Hendrik Brueckner Reviewed-by: Steffen Eiden Signed-off-by: Steffen Eiden Reviewed-by: Janosch Frank --- arch/s390/include/asm/elf.h | 2 ++ arch/s390/include/asm/sclp.h | 5 ++++- arch/s390/kernel/processor.c | 3 +++ drivers/s390/char/sclp_early.c | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h index bb63fa4d20bb..ad3108ecfb07 100644 --- a/arch/s390/include/asm/elf.h +++ b/arch/s390/include/asm/elf.h @@ -123,6 +123,7 @@ enum { HWCAP_NR_NNPA =3D 20, HWCAP_NR_PCI_MIO =3D 21, HWCAP_NR_SIE =3D 22, + HWCAP_NR_SAE =3D 23, HWCAP_NR_MAX }; =20 @@ -150,6 +151,7 @@ enum { #define HWCAP_NNPA BIT(HWCAP_NR_NNPA) #define HWCAP_PCI_MIO BIT(HWCAP_NR_PCI_MIO) #define HWCAP_SIE BIT(HWCAP_NR_SIE) +#define HWCAP_SAE BIT(HWCAP_NR_SAE) =20 /* * These are used to set parameters in the core dumps. diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h index f2d490558054..f669569cf78d 100644 --- a/arch/s390/include/asm/sclp.h +++ b/arch/s390/include/asm/sclp.h @@ -53,7 +53,9 @@ struct sclp_core_entry { u8 siif : 1; u8 sigpif : 1; u8 : 3; - u8 reserved2[3]; + u8 aef: 1; + u8 : 7; + u8 reserved2[2]; u8 : 2; u8 ib : 1; u8 cei : 1; @@ -106,6 +108,7 @@ struct sclp_info { unsigned char has_aeni : 1; unsigned char has_aisi : 1; unsigned char has_astfleie2 : 1; + unsigned char has_aef : 1; unsigned int ibc; unsigned int mtid; unsigned int mtid_cp; diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c index e33a3eccda56..6da55a158027 100644 --- a/arch/s390/kernel/processor.c +++ b/arch/s390/kernel/processor.c @@ -150,6 +150,7 @@ static void show_cpu_summary(struct seq_file *m, void *= v) [HWCAP_NR_NNPA] =3D "nnpa", [HWCAP_NR_PCI_MIO] =3D "pcimio", [HWCAP_NR_SIE] =3D "sie", + [HWCAP_NR_SAE] =3D "sae", }; int i, cpu; =20 @@ -254,6 +255,8 @@ static int __init setup_hwcaps(void) /* virtualization support */ if (sclp.has_sief2) elf_hwcap |=3D HWCAP_SIE; + if (sclp.has_aef) + elf_hwcap |=3D HWCAP_SAE; =20 return 0; } diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c index 22dd797e6229..e58d24b95bd1 100644 --- a/drivers/s390/char/sclp_early.c +++ b/drivers/s390/char/sclp_early.c @@ -96,6 +96,7 @@ static void __init sclp_early_facilities_detect(void) sclp.has_ib =3D cpue->ib; sclp.has_cei =3D cpue->cei; sclp.has_skey =3D cpue->skey; + sclp.has_aef =3D cpue->aef; break; } =20 --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 B35CF43078B; Fri, 31 Jul 2026 13:09:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503386; cv=none; b=a5fM2agSWoLq7Eix5XUZHZ6cHUAypIiW4El/sbqm+W7PH084FqoPSEwgJghvu63e2mNAdf0V0RvB6/Le4DVscCsL1kf93pKDW0ZQJkFLGAH0KymoRQynE/70/xXfocVxaanJeucUxF/gQ5IYYeaMbzGPF3jlHjQmo4nWkLMbnhA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503386; c=relaxed/simple; bh=QeN/dVsBYu1PpvTDcnbwL/bgoYazhHgGwQfqHM85wMI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bzqFD+pWkgFimeUslFYBC1PES7kjdbfWK2UtF9JzYXWhoiY35Hd4IJXU0/t3uIzak54NPU92HjlB7q4TiIQcZjAnC0nN2YRIXZDxtb4wrGaoa5tzLsfF32eGzQuhY0AyYEKtitFu3451NxkN2m23Py1XjyHVqBEXlxYNe92vjCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=Qb6YQ/7s; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Qb6YQ/7s" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlhfZ1670366; Fri, 31 Jul 2026 13:09:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=GKbbFOvINxKNwNvuj FCoMbtxWQXvW5tCYzYMDrhF8e8=; b=Qb6YQ/7sWnaTKBnAKTvsRnLgP+RA2JTvU lCdq+Shxo8T+1JDoYF6XRR6GMLOT1+VhbKsxJhBO0v0gBBtK4VQoEcD9zMef66PT 1HACsnuuBMKg1RnUh7YL+qVgOqbcp+Zy0MGlmc/fJOhOHcXg0vcSnD3IgcSI9gVQ E5TEc+f38Xh/Rnwd4BS1ao0g9gd0FPJ0ycL4F0rC+WYs/9oTEYgTgkPPGfiUS928 4a45jTnUBb3ekH8yJXLweATsfaYWVE/Q+TMRH8CK4atYg4yogviB3hlTqfbUfFlE RgI477B/r7gqy8rz8CSqy/AiRD/1cqs/hEW4swglt92IS+tfyK3bw== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuyjm3w5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:21 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuIsA021736; Fri, 31 Jul 2026 13:09:21 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn7uwg43p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:20 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9EuW32309544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:14 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BE7CF20043; Fri, 31 Jul 2026 13:09:14 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 56B7A2004B; Fri, 31 Jul 2026 13:09:14 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:14 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 26/31] KVM: s390: Add basic arm64 kvm module Date: Fri, 31 Jul 2026 15:08:54 +0200 Message-ID: <20260731130902.654679-27-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX2L8+mRKtEoQy XlXooGQQ9Ws2eluXkPb7bYA/EG77ZXPQMIxkHyOYBSxzJtJKIWCuhxVPAZvGrAOxGVDM76Ww+JF 7PF7+u88FjcvnKiYvvWEOZ24qmmQpBk= X-Proofpoint-GUID: zl0ppmbdcrmMEJzoeurH8XNhQKrFsWe- X-Proofpoint-ORIG-GUID: 5YUfC37jybVk_09KXoUdzw4P36yLjbC_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX/H7jB6ug+Nxc FOEXElie/o18OaR1Wx3tr4pJEKGPsuuW33WNEWGFuq/TolHyume+eOgOW8k4E7uBC0A5BoxyFQx xVjIhRWBcKGCV3LnDhnlQbgFPDe7OUwUOrKtyHhUhLlYcf9JUm89Jzn2zfc+IHX4m5l/GsQuNCA EyGiMLlXE0lx2ZjnBZUtqROXjzlKj/PRUZg900GLCanqDh24VIkwHM/yI/9Ge0Gpq6DqZ/+uduX jD5OhTNJkWXE63PBoiec8uXvr/wguHjYsUw+sM11d24c6fqzZH0PHNp91q0X70ZlhDq2H4iVeNg F3GzHuWXT/cLUpFTp1nMkkQZa+VEnLFNoMvvV6hwYzcGJLDlcv79LTxx/KzF8KNfIut+ytcFbWa Jl+xQiwz9xPiZXS3FElpp7TVLUSkRmrqP6ZS0jQK1dKhFpKVMvk+2Uxg3Whd7PFR2N/nX/1IVGA NJqGY24c6wpKqipxwrw== X-Authority-Analysis: v=2.4 cv=X5Vi7mTe c=1 sm=1 tr=0 ts=6a6c9e82 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=36xwF7fJQ_K8JzKkrRgA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Add basic code for the new arm64 on s390 KVM implementation. Add kernel module boilerplate code and trivial functions. Add tracing scaffolding. Signed-off-by: Steffen Eiden --- arch/s390/kvm/arm64/arm.c | 157 ++++++++++++++++++++++++++++++++++++ arch/s390/kvm/arm64/arm.h | 7 ++ arch/s390/kvm/arm64/guest.c | 92 +++++++++++++++++++++ arch/s390/kvm/arm64/trace.h | 18 +++++ 4 files changed, 274 insertions(+) create mode 100644 arch/s390/kvm/arm64/arm.c create mode 100644 arch/s390/kvm/arm64/arm.h create mode 100644 arch/s390/kvm/arm64/guest.c create mode 100644 arch/s390/kvm/arm64/trace.h diff --git a/arch/s390/kvm/arm64/arm.c b/arch/s390/kvm/arm64/arm.c new file mode 100644 index 000000000000..8e17b7eef813 --- /dev/null +++ b/arch/s390/kvm/arm64/arm.c @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0 + +#define KMSG_COMPONENT "kvm-s390-arm64" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + +#include +#include +#include +#include + +#include "arm.h" + +#define CREATE_TRACE_POINTS +#include "trace.h" + +static unsigned long system_supported_vcpu_features(void); + +#define __INCL_GEN_ARM_FILE +#include "generated/arm.inc" +#undef __INCL_GEN_ARM_FILE + +int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) +{ + int ret; + + switch (ext) { + case KVM_CAP_NR_VCPUS: + case KVM_CAP_MAX_VCPUS: + case KVM_CAP_MAX_VCPU_ID: + ret =3D KVM_MAX_VCPUS; + break; + case KVM_CAP_ARM_VM_IPA_SIZE: + ret =3D get_kvm_ipa_limit(); + break; + case KVM_CAP_IOEVENTFD: + ret =3D 1; + break; + default: + ret =3D 0; + } + + return ret; +} + +static u64 kvm_max_guest_address(void) +{ + u64 max_addr; + + if (sclp.hamax =3D=3D U64_MAX) + max_addr =3D TASK_SIZE_MAX; + else + max_addr =3D min_t(u64, TASK_SIZE_MAX, sclp.hamax); + return ALIGN_DOWN(max_addr + 1, 1 << 30) - 1; +} + +vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) +{ + return VM_FAULT_SIGBUS; +} + +long kvm_arch_dev_ioctl(struct file *filp, + unsigned int ioctl, unsigned long arg) +{ + return -EINVAL; +} + +u32 get_kvm_ipa_limit(void) +{ + return fls64(kvm_max_guest_address() + 1) - 1; +} + +int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id) +{ + return 0; +} + +void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) +{ +} + +int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, + struct kvm_mp_state *mp_state) +{ + *mp_state =3D READ_ONCE(vcpu->arch.mp_state); + return 0; +} + +int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, + struct kvm_mp_state *mp_state) +{ + return -EINVAL; +} + +int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) +{ + return 0; +} + +static unsigned long system_supported_vcpu_features(void) +{ + unsigned long features =3D KVM_S390_ARM64_IMPL_FEATURES; + + return features; +} + +bool kvm_arch_irqchip_in_kernel(struct kvm *kvm) +{ + return false; +} + +int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, + int irq_source_id, int level, bool line_status) +{ + return -EINVAL; +} + +int kvm_set_routing_entry(struct kvm *kvm, + struct kvm_kernel_irq_routing_entry *e, + const struct kvm_irq_routing_entry *ue) +{ + return -EINVAL; +} + +int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) +{ + return 0; +} + +#ifdef CONFIG_HAVE_KVM_NO_POLL +__weak bool kvm_arch_no_poll(struct kvm_vcpu *vcpu) +{ + return false; +} +#endif + +long kvm_arch_vcpu_unlocked_ioctl(struct file *filp, unsigned int ioctl, + unsigned long arg) +{ + return -ENOIOCTLCMD; +} + +static int __init kvm_s390_arm64_init(void) +{ + if (!sclp.has_aef) + return -ENXIO; + + return kvm_init_with_dev(sizeof(struct kvm_vcpu), 0, THIS_MODULE, + KVM_DEV_NAME, MISC_DYNAMIC_MINOR); +} + +static __exit void kvm_s390_arm64_exit(void) +{ + kvm_exit(); +} + +module_init(kvm_s390_arm64_init); +module_exit(kvm_s390_arm64_exit); diff --git a/arch/s390/kvm/arm64/arm.h b/arch/s390/kvm/arm64/arm.h new file mode 100644 index 000000000000..a3db254462c0 --- /dev/null +++ b/arch/s390/kvm/arm64/arm.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef ARCH_S390_KVM_ARM64_H +#define ARCH_S390_KVM_ARM64_H + +#define KVM_DEV_NAME "kvm-arm64" + +#endif /* ARCH_S390_KVM_ARM64_H */ diff --git a/arch/s390/kvm/arm64/guest.c b/arch/s390/kvm/arm64/guest.c new file mode 100644 index 000000000000..fd6442d9e4f4 --- /dev/null +++ b/arch/s390/kvm/arm64/guest.c @@ -0,0 +1,92 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include + +#include +#include + +#include "guest.h" + +#define __INCL_GEN_ARM_FILE +#include "generated/guest.inc" +#undef __INCL_GEN_ARM_FILE + +const struct kvm_stats_desc kvm_vm_stats_desc[] =3D { + KVM_GENERIC_VM_STATS() +}; + +const struct kvm_stats_header kvm_vm_stats_header =3D { + .name_size =3D KVM_STATS_NAME_SIZE, + .num_desc =3D ARRAY_SIZE(kvm_vm_stats_desc), + .id_offset =3D sizeof(struct kvm_stats_header), + .desc_offset =3D sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE, + .data_offset =3D sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE + + sizeof(kvm_vm_stats_desc), +}; + +const struct kvm_stats_desc kvm_vcpu_stats_desc[] =3D { + KVM_GENERIC_VCPU_STATS(), + /* ARM64 stats */ + STATS_DESC_COUNTER(VCPU, hvc_exit_stat), + STATS_DESC_COUNTER(VCPU, wfe_exit_stat), + STATS_DESC_COUNTER(VCPU, wfi_exit_stat), + STATS_DESC_COUNTER(VCPU, mmio_exit_user), + STATS_DESC_COUNTER(VCPU, mmio_exit_kernel), + STATS_DESC_COUNTER(VCPU, signal_exits), + STATS_DESC_COUNTER(VCPU, exits), + /* GMAP stats */ + STATS_DESC_COUNTER(VCPU, pfault_sync), +}; + +const struct kvm_stats_header kvm_vcpu_stats_header =3D { + .name_size =3D KVM_STATS_NAME_SIZE, + .num_desc =3D ARRAY_SIZE(kvm_vcpu_stats_desc), + .id_offset =3D sizeof(struct kvm_stats_header), + .desc_offset =3D sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE, + .data_offset =3D sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE + + sizeof(kvm_vcpu_stats_desc), +}; + +int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *r= egs) +{ + return -EINVAL; +} + +int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *r= egs) +{ + return -EINVAL; +} + +int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, + struct kvm_sregs *sregs) +{ + return -EINVAL; +} + +int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, + struct kvm_sregs *sregs) +{ + return -EINVAL; +} + +int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) +{ + return -EINVAL; +} + +int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) +{ + return -EINVAL; +} + +int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, + struct kvm_translation *tr) +{ + return -EINVAL; +} + +int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, + struct kvm_guest_debug *dbg) +{ + return -EINVAL; +} diff --git a/arch/s390/kvm/arm64/trace.h b/arch/s390/kvm/arm64/trace.h new file mode 100644 index 000000000000..3a5dcd039c13 --- /dev/null +++ b/arch/s390/kvm/arm64/trace.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#if !defined(KVM_ARM64_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +#define KVM_ARM64_TRACE_KVM_H + +#include + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm + +#endif /* KVM_ARM64_TRACE_KVM_H */ + +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE trace + +/* This part must be outside protection */ +#include --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 8C6DA437479; Fri, 31 Jul 2026 13:09:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503390; cv=none; b=VhkcHWVOQbVkOBJ+nDYPHqjrxecui98DB/vaVUAqb0pVfTSgc6daFulo7ddr3M/EB9caW1HxvrdFdUmUVvAohqjzlT+a/GJrreszxmA3yjrw3ensHhgeSOQaoGKXEC++v0t9gZXY24acMqgFIpqK5n88TTUvIlSlVZx+Q2NfrdU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503390; c=relaxed/simple; bh=ld7BUcMoOwh9V+yhJl9PZx76dO3q4UmbfU8y6dNclAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qgd/0MczTZybb44Ce5rr+wgI6vJwAFBOjRO7hrcwA126QPPC4qI7Do54669RCaxaASBh0wfeU2F6YOE8St/BfJkPOYQ4qK0Yg2uPZbqsFR+0eW97QW0nEEwAQSsN74ojYmVHbMt25U+LTRvj9NhrHOMoWVqQqk2OS3rCmyQzpwE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=ooQ+oTCq; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="ooQ+oTCq" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBmNVr4074123; Fri, 31 Jul 2026 13:09:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=h2+waxdEvTNIqlbAD ePHLSFBRTAz1IY4S1NyMs1J5x0=; b=ooQ+oTCqUWnwb0fjXX7SZnTLIFYJ9jOYX QnalYhXciKV8OeuXSxmIt51g/Xsa2Fybm3Kq2854llWPUC2oltxeZp5xmjI/+9fb NaXzMRDkQSOjFwr9Kz2Bzu3HPdOtmxZt/tM2IbYHykEuRjCYWuGsa2++0+6iTNvY oL9loEyjmBBMndqvZJ5TfaEFTgHr6u6wAlA2RfMdQp38ErenYAXqGYhHbL9hkllg 4drB6+aN1FGPboHGRH2p4GinxAAnIqICCaCFuCZ4pVCLZn4LQdXnYFJ2gJm3+UWI cSfiSfjEWoMEgGu4VwXLve8+SKi5nnZPcjpRFxPyLvStYvGRBWNcQ== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2p8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:23 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuL9i021043; Fri, 31 Jul 2026 13:09:21 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn7fqr562-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:21 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9Fjf29819576 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:15 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3B91A20040; Fri, 31 Jul 2026 13:09:15 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C85AF2004D; Fri, 31 Jul 2026 13:09:14 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:14 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 27/31] KVM: s390: arm64: Implement required functions Date: Fri, 31 Jul 2026 15:08:55 +0200 Message-ID: <20260731130902.654679-28-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: Cxzd3_uRKTTRyixBU45-D-BgLuqyw3D7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX32uxRSJoWVx+ DVUfCpiNr+9xgpel3PqmlR6DPzHAaBuhjE/41BHe3yqB00yXAaKRSpo4pE+yUhzIKO3flzinckD h9NXmJaJ4P1gV/cxdFZ9cqlFG44SpUXe9Gaq1hRBFgS6qrWX0Cr0sKWKmic8e1Z1XFcW6odg3gR XAVVMC+arZfLIYQgiWSbdOcOR2yQSPGhoOdaUr35Vx+22VYxs/ypyKsSBzV7RCu5O6ykKWmyfwQ tJf2y+Xyg5TifeXuRgg8WxX7u6Ja40dn7kIkdmruTXhplRXkGMN4UmopHI4qpzdgrcg/nicLqSY DB+AZ0YTnC7Bs+CTvfVMf1rI7PF9/wtoGVPdqjR7MXZARHN73l+a0SqeiMfl7/QGvJIK+KGEPmu mApRBQIwLJsDxQmMZs50farGUIyPUmgPlFN2M+OSp/enyJ+cQFxGkN2+AhYN2QrIGTEvTKnRgx2 06VYVNxMDce/qgmMzTw== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXwndo019t3Dks SkF4y+F/NOiB4M5xU80WLXTO+S/tJIQMwI5xQArAwRdAFuDqeE5PRo5VPRNPCF2wWQwO2ti9mT/ AUWG+XBy9BxawUpxREWMK9PUOnZ4Khg= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e83 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=FvtiEy3qvhp2I5fuxrcA:9 X-Proofpoint-GUID: uEEY0HOeUFHCpCP4HXysKM0OeTjNPaus X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Implement the mostly trivial functions that the shared arm64 (kvm) code & headers oblige s390 to implement. Implement a very basic smccc handler that (non-compliantly) is just able to stop a vcpu. Signed-off-by: Steffen Eiden --- arch/s390/include/arm64/kvm_emulate.h | 102 ++++++++++++++++++++++++++ arch/s390/include/arm64/kvm_nested.h | 11 +++ arch/s390/include/arm64/ptrace.h | 11 +++ arch/s390/include/arm64/sysreg.h | 13 ++++ arch/s390/kvm/arm64/handle_exit.c | 98 +++++++++++++++++++++++++ arch/s390/kvm/arm64/inject_fault.c | 21 ++++++ 6 files changed, 256 insertions(+) create mode 100644 arch/s390/include/arm64/kvm_emulate.h create mode 100644 arch/s390/include/arm64/kvm_nested.h create mode 100644 arch/s390/include/arm64/ptrace.h create mode 100644 arch/s390/include/arm64/sysreg.h create mode 100644 arch/s390/kvm/arm64/handle_exit.c create mode 100644 arch/s390/kvm/arm64/inject_fault.c diff --git a/arch/s390/include/arm64/kvm_emulate.h b/arch/s390/include/arm6= 4/kvm_emulate.h new file mode 100644 index 000000000000..c02a6fdeb9ab --- /dev/null +++ b/arch/s390/include/arm64/kvm_emulate.h @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __S390_ARM64_KVM_EMULATE_H__ +#define __S390_ARM64_KVM_EMULATE_H__ + +#include +#include +#include + +#include +#include + +static __always_inline unsigned long *vcpu_pc(const struct kvm_vcpu *vcpu) +{ + return (unsigned long *)&vcpu->arch.sae_block.pc; +} + +static __always_inline unsigned long *vcpu_cpsr(const struct kvm_vcpu *vcp= u) +{ + return (unsigned long *)&vcpu->arch.sae_block.pstate; +} + +static __always_inline unsigned long *vcpu_sp_el0(const struct kvm_vcpu *v= cpu) +{ + return (unsigned long *)&vcpu->arch.sae_block.sp_el0; +} + +static __always_inline bool vcpu_mode_is_32bit(const struct kvm_vcpu *vcpu) +{ + return false; +} + +static __always_inline u64 kvm_vcpu_get_esr(const struct kvm_vcpu *vcpu) +{ + return vcpu->arch.sae_block.hai.esr_elz; +} + +static inline unsigned long *vcpu_hcr(struct kvm_vcpu *vcpu) +{ + return (unsigned long *)&vcpu->arch.hcr_elz; +} + +static __always_inline unsigned long kvm_vcpu_get_hfar(const struct kvm_vc= pu *vcpu) +{ + return vcpu->arch.sae_block.hai.far_elz; +} + +static __always_inline phys_addr_t kvm_vcpu_get_fault_ipa(const struct kvm= _vcpu *vcpu) +{ + return vcpu->arch.sae_block.hai.teid.addr * PAGE_SIZE; +} + +static inline u16 kvm_vcpu_fault_pic(const struct kvm_vcpu *vcpu) +{ + return vcpu->arch.sae_block.hai.pic & PGM_INT_CODE_MASK; +} + +static __always_inline +bool kvm_vcpu_trap_is_permission_fault(const struct kvm_vcpu *vcpu) +{ + return kvm_vcpu_fault_pic(vcpu) =3D=3D PGM_PROTECTION; +} + +static __always_inline bool kvm_condition_valid(const struct kvm_vcpu *vcp= u) +{ + return true; +} + +static __always_inline bool vcpu_el1_is_32bit(struct kvm_vcpu *vcpu) +{ + return false; +} + +static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu) +{ + return false; +} + +static inline int kvm_vcpu_abt_gltl(struct kvm_vcpu *vcpu) +{ + return vcpu->arch.sae_block.hai.gltl; +} + +static inline bool vcpu_mode_priv(const struct kvm_vcpu *vcpu) +{ + u32 mode =3D *vcpu_cpsr(vcpu) & PSR_MODE_MASK; + + return mode !=3D PSR_MODE_EL0t; +} + +static inline void kvm_skip_instr(struct kvm_vcpu *vcpu) +{ + *vcpu_pc(vcpu) +=3D 4; + *vcpu_cpsr(vcpu) &=3D ~PSR_BTYPE_MASK; + + /* advance the singlestep state machine */ + *vcpu_cpsr(vcpu) &=3D ~SPSR_EL1_SS; +} + +#include + +#endif /* __S390_ARM64_KVM_EMULATE_H__ */ diff --git a/arch/s390/include/arm64/kvm_nested.h b/arch/s390/include/arm64= /kvm_nested.h new file mode 100644 index 000000000000..e950b1a10c41 --- /dev/null +++ b/arch/s390/include/arm64/kvm_nested.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef ASM_KVM_NESTED_H +#define ASM_KVM_NESTED_H + +static inline bool vcpu_has_nv(const struct kvm_vcpu *vcpu) +{ + return false; +} + +#endif /* ASM_KVM_NESTED_H */ diff --git a/arch/s390/include/arm64/ptrace.h b/arch/s390/include/arm64/ptr= ace.h new file mode 100644 index 000000000000..449b85582c97 --- /dev/null +++ b/arch/s390/include/arm64/ptrace.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __S390_ARM64_PTRACE_H__ +#define __S390_ARM64_PTRACE_H__ + +#include +#include + +#include + +#endif /* __S390_ARM64_PTRACE_H__ */ diff --git a/arch/s390/include/arm64/sysreg.h b/arch/s390/include/arm64/sys= reg.h new file mode 100644 index 000000000000..ac6b638fef56 --- /dev/null +++ b/arch/s390/include/arm64/sysreg.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __S390_ARM64_SYSREG_H__ +#define __S390_ARM64_SYSREG_H__ + +#include +#include +#include +#include + +#include + +#endif /* __S390_ARM64_SYSREG_H__ */ diff --git a/arch/s390/kvm/arm64/handle_exit.c b/arch/s390/kvm/arm64/handle= _exit.c new file mode 100644 index 000000000000..b00653bf97da --- /dev/null +++ b/arch/s390/kvm/arm64/handle_exit.c @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include + +#include +#include + +typedef int (*exit_handle_fn)(struct kvm_vcpu *); +exit_handle_fn arm_exit_handlers[ESR_ELx_EC_MAX + 1]; + +#define __INCL_GEN_ARM_FILE +#include "generated/handle_exit.inc" +#undef __INCL_GEN_ARM_FILE + +#define PSCI_0_2_FN_SYSTEM_OFF 0x84000008 +#define PSCI_RET_NOT_SUPPORTED -1 +#define PSCI_RET_INTERNAL_FAILURE -6 +/* + * Temporary smc/hvc handler. Non-compliant implementation (features missi= ng). + * Implements only system off so that test programs are able to end their = execution + */ +static int kvm_smccc_call_handler(struct kvm_vcpu *vcpu) +{ + u32 func_id =3D vcpu_get_reg(vcpu, 0); + u64 val =3D PSCI_RET_NOT_SUPPORTED; + int ret =3D 1; + + if (func_id =3D=3D PSCI_0_2_FN_SYSTEM_OFF) { + scoped_guard(spinlock, &vcpu->arch.mp_state_lock) { + WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_STOPPED); + } + kvm_make_all_cpus_request(vcpu->kvm, KVM_REQ_SLEEP); + memset(&vcpu->run->system_event, 0, + sizeof(vcpu->run->system_event)); + vcpu->run->system_event.type =3D KVM_SYSTEM_EVENT_SHUTDOWN; + vcpu->run->system_event.ndata =3D 1; + vcpu->run->system_event.data[0] =3D 0; + vcpu->run->exit_reason =3D KVM_EXIT_SYSTEM_EVENT; + val =3D PSCI_RET_INTERNAL_FAILURE; + ret =3D 0; + } + vcpu_set_reg(vcpu, 0, val); + + return ret; +} + +static int handle_hvc(struct kvm_vcpu *vcpu) +{ + vcpu->stat.hvc_exit_stat++; + return kvm_smccc_call_handler(vcpu); +} + +exit_handle_fn arm_exit_handlers[] =3D { + [0 ... ESR_ELx_EC_MAX] =3D kvm_handle_unknown_ec, + [ESR_ELx_EC_HVC64] =3D handle_hvc, +}; + +/* manually copied from arch/arm64/kernel/traps.c */ +static const char * const esr_class_str[] =3D { + [0 ... ESR_ELx_EC_MAX] =3D "UNRECOGNIZED EC", + [ESR_ELx_EC_UNKNOWN] =3D "Unknown/Uncategorized", + [ESR_ELx_EC_WFx] =3D "WFI/WFE", + [ESR_ELx_EC_FP_ASIMD] =3D "ASIMD", + [ESR_ELx_EC_PAC] =3D "PAC", + [ESR_ELx_EC_BTI] =3D "BTI", + [ESR_ELx_EC_ILL] =3D "PSTATE.IL", + [ESR_ELx_EC_SVC64] =3D "SVC (AArch64)", + [ESR_ELx_EC_HVC64] =3D "HVC (AArch64)", + [ESR_ELx_EC_SMC64] =3D "SMC (AArch64)", + [ESR_ELx_EC_SYS64] =3D "MSR/MRS (AArch64)", + [ESR_ELx_EC_SVE] =3D "SVE", + [ESR_ELx_EC_ERET] =3D "ERET/ERETAA/ERETAB", + [ESR_ELx_EC_FPAC] =3D "FPAC", + [ESR_ELx_EC_SME] =3D "SME", + [ESR_ELx_EC_IMP_DEF] =3D "EL3 IMP DEF", + [ESR_ELx_EC_IABT_LOW] =3D "IABT (lower EL)", + [ESR_ELx_EC_IABT_CUR] =3D "IABT (current EL)", + [ESR_ELx_EC_PC_ALIGN] =3D "PC Alignment", + [ESR_ELx_EC_DABT_LOW] =3D "DABT (lower EL)", + [ESR_ELx_EC_DABT_CUR] =3D "DABT (current EL)", + [ESR_ELx_EC_SP_ALIGN] =3D "SP Alignment", + [ESR_ELx_EC_MOPS] =3D "MOPS", + [ESR_ELx_EC_FP_EXC64] =3D "FP (AArch64)", + [ESR_ELx_EC_GCS] =3D "Guarded Control Stack", + [ESR_ELx_EC_SERROR] =3D "SError", + [ESR_ELx_EC_BREAKPT_LOW] =3D "Breakpoint (lower EL)", + [ESR_ELx_EC_BREAKPT_CUR] =3D "Breakpoint (current EL)", + [ESR_ELx_EC_SOFTSTP_LOW] =3D "Software Step (lower EL)", + [ESR_ELx_EC_SOFTSTP_CUR] =3D "Software Step (current EL)", + [ESR_ELx_EC_WATCHPT_LOW] =3D "Watchpoint (lower EL)", + [ESR_ELx_EC_WATCHPT_CUR] =3D "Watchpoint (current EL)", + [ESR_ELx_EC_BRK64] =3D "BRK (AArch64)", +}; + +const char *esr_get_class_string(unsigned long esr) +{ + return esr_class_str[ESR_ELx_EC(esr)]; +} diff --git a/arch/s390/kvm/arm64/inject_fault.c b/arch/s390/kvm/arm64/injec= t_fault.c new file mode 100644 index 000000000000..425dbeaa421c --- /dev/null +++ b/arch/s390/kvm/arm64/inject_fault.c @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include + +/** + * kvm_inject_undefined - inject an undefined instruction into the guest + * @vcpu: The vCPU in which to inject the exception + * + * It is assumed that this code is called from the VCPU thread and that the + * VCPU therefore is not currently executing guest code. + */ +void kvm_inject_undefined(struct kvm_vcpu *vcpu) +{ + /* Stub until s390 supports arm64 sysregs TODO sysregs*/ +} + +int kvm_inject_sea(struct kvm_vcpu *vcpu, bool iabt, u64 addr) +{ + /* Stub until s390 supports arm64 sysregs TODO sysregs*/ + return 1; +} --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 9EBCA436BEB; Fri, 31 Jul 2026 13:09:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503389; cv=none; b=Lo4kld8eulQuK7meWLzVKUR8sQdg2ToQQyKjQpDfbgJ1H2g+G2jTmXCa9rAtX68Fd7y8QuOtXlUYffQKbHLp+KYPjBFXqtRD/pjCuWgTZmaPWQrRreOmXJ36NgcHgR1Tj+oC2SJW+Cm8xNEnzUhgDi+qnHWlqalmNcG+pnTmISk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503389; c=relaxed/simple; bh=U5u8pYFuHc/djL1v1FJKF9JUCL7PuXIG+oJyyfvuIeI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L1VNCVmXVuTOHsT1lFonD4hkFJv8owDqGGBM97zI5wAAfeYowsX6SAy5Yhmx8zrMpAyV+YC3UQ8XhchBv7NS0wa8kb7dM0n87DNiraZ3Go9k+rFEFz6RQNRuKGvu0sgYG5GUunCpDjHB572vCIXzE69a116QGcHvdPV4v8zv+X8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=frDF2RPB; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="frDF2RPB" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlqkH1672879; Fri, 31 Jul 2026 13:09:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=+/cIZB99tNNHsA1yP m1ALPIKiBsU5KwAtU/YTeR4q00=; b=frDF2RPBBz5k1cn79IGSJoBwch4nkqZHF qzVnxn/GX4Wv2En/6kUmLLbdACK3ZIEm4A/4buvktOH+GzdjqrtynCzaUcnup4gX dda9VxZfPJD/tAA2ih8XrJmtnVNUWJd82mXHHOxymEc/S+zt87CLOsQn+2P1CWm0 92NYyQLNGg9dbVS01N2fLjcrrd0DK2P1cn0z0tSxx1l5KXarKopc/cxf6RkkHlfV 37UcsEotXgq8tQFBmxzW5KiCPfL1NkyDEejub8hnfNdCFPJQ6ybBiPY00XTDAC5t KCnE6jjvMRGmmu33eO4wuvDQcZ+x0MblSFeX9LnPN4d6C+V8wrrcA== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmv0p43c9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:23 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCQEsc026828; Fri, 31 Jul 2026 13:09:22 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn9pgqtca-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:22 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9FEL29819580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:15 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AAA1220040; Fri, 31 Jul 2026 13:09:15 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 423ED2004B; Fri, 31 Jul 2026 13:09:15 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:15 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 28/31] KVM: s390: arm64: Implement vm/vcpu create destroy. Date: Fri, 31 Jul 2026 15:08:56 +0200 Message-ID: <20260731130902.654679-29-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX1FOtXYcI6HXT 2+DdQkpg+3PacJfvEGZSQFmpyzSmZWY1idioaDe7UfVq7IIEVVh5hfyG6Fb/PcR4RFXzZkypdF1 7cBsNIEwQFKIiFPa8XC7sw4kXvqfNXs= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXzN8c3D7I/mjq HXLG7BRqy6TQBstTuYn1Io8Eyr29hNs51eMbMlCI/vutykHzppl6pnuc5qKJcKnAiB0aKHwct6M LKTFhaF+mhIEaCf8LrrIQyvzrLwvQ5eVOJL7S4YgdAlELft0f4Ld1NuWiKT7bYO2fWnxym5BED4 Brh6/7LaJnQOI9M0iLcgrHYUmzqMqTBjbRDVi4ZECR/Q+u6RfYsYGi5YTZjZZarjZa82dXMk6Sq 6CtR1vcdA3Ge2j9PIIRbRGE1PgUSKba/sHhFESS1OFd7ii9yQu5atu2bqzFPSt5XelfoIx0CMzP O/pKuE+C17mnLq+fMV0aUjnei9ai7Oitz9YTl/Qc7sLZRL+G2uUcoI9L1BQ6OWhWNy3TIuXXR54 ehgdKmI55DR+VKC/PrZxDtQVd5KfXmCaZ63jjnr5aYJkXp6XwETGR8/zdsbNq5YFr8HDxcVsblV ujJ6CPFs9l8qtrZBq2A== X-Authority-Analysis: v=2.4 cv=b5WCJNGx c=1 sm=1 tr=0 ts=6a6c9e84 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=uRPWEXon6BnYHkcjmioA:9 X-Proofpoint-GUID: -Z1VWjTKO5cBi3O0Cb_o2bfVtFLKZPNC X-Proofpoint-ORIG-GUID: xIiEXqAYNsDd4VJaRvEDx8vBg--tVMqf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 adultscore=0 malwarescore=0 impostorscore=0 bulkscore=0 phishscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Implement init and destroy IOCTLS for vcpu and vm. Implement arch vm IOCTL. Use s390 gmap and gmap plumbing. Co-developed-by: Janosch Frank Signed-off-by: Janosch Frank Co-developed-by: Andreas Grapentin Signed-off-by: Andreas Grapentin Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Signed-off-by: Steffen Eiden --- arch/s390/kvm/arm64/arm.c | 195 ++++++++++++++++++++++++++++++++ arch/s390/kvm/arm64/arm.h | 51 +++++++++ arch/s390/kvm/gmap/faultin.c | 5 + arch/s390/kvm/gmap/gmap.c | 4 + arch/s390/kvm/gmap/kvm_mmu.c | 4 + arch/s390/kvm/gmap/trace-gmap.h | 13 +++ 6 files changed, 272 insertions(+) diff --git a/arch/s390/kvm/arm64/arm.c b/arch/s390/kvm/arm64/arm.c index 8e17b7eef813..3f1bbbf38abe 100644 --- a/arch/s390/kvm/arm64/arm.c +++ b/arch/s390/kvm/arm64/arm.c @@ -8,6 +8,9 @@ #include #include =20 +#include +#include + #include "arm.h" =20 #define CREATE_TRACE_POINTS @@ -19,6 +22,8 @@ static unsigned long system_supported_vcpu_features(void); #include "generated/arm.inc" #undef __INCL_GEN_ARM_FILE =20 +#define KVM_PHYS_SHIFT (40) + int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) { int ret; @@ -53,6 +58,83 @@ static u64 kvm_max_guest_address(void) return ALIGN_DOWN(max_addr + 1, 1 << 30) - 1; } =20 +static int kvm_gmap_init(struct kvm *kvm) +{ + struct crst_table *table; + + kvm->arch.gmap =3D gmap_new(kvm, gpa_to_gfn(kvm->arch.guest_phys_size)); + + if (!kvm->arch.gmap) + return -ENOMEM; + + /* arm64 (on s390) do not have pfault */ + clear_bit(GMAP_FLAG_PFAULT_ENABLED, &kvm->arch.gmap->flags); + set_bit(GMAP_FLAG_ALLOW_HPAGE_1M, &kvm->arch.gmap->flags); + + table =3D dereference_asce(kvm->arch.gmap->asce); + crst_table_init((void *)table, _CRSTE_HOLE(table->crstes[0].h.tt).val); + + return 0; +} + +static int kvm_vm_type_ipa_size_shift(unsigned long type) +{ + int phys_shift; + + phys_shift =3D KVM_VM_TYPE_ARM_IPA_SIZE(type); + if (phys_shift) { + if (phys_shift > get_kvm_ipa_limit() || + phys_shift < ARM64_MIN_PARANGE_BITS) + return -EINVAL; + } else { + phys_shift =3D KVM_PHYS_SHIFT; + if (phys_shift > get_kvm_ipa_limit()) { + pr_warn_once("%s using unsupported default IPA limit\n", + current->comm); + return -EINVAL; + } + } + + return phys_shift; +} + +int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) +{ + char debug_name[32]; + int ret; + + if (type & ~KVM_VM_TYPE_ARM_IPA_SIZE_MASK) + return -EINVAL; + + ret =3D kvm_vm_type_ipa_size_shift(type); + if (ret < 0) + return ret; + kvm->arch.guest_phys_size =3D 1UL << ret; + + mutex_init(&kvm->arch.config_lock); + bitmap_zero(kvm->arch.vcpu_features, KVM_VCPU_MAX_FEATURES); + + snprintf(debug_name, sizeof(debug_name), "kvm-arm64-%u-%u", + current->pid, get_random_u32()); + kvm->arch.dbf =3D debug_register(debug_name, 32, 1, 7 * sizeof(long)); + if (!kvm->arch.dbf) + return -ENOMEM; + debug_register_view(kvm->arch.dbf, &debug_sprintf_view); + + ret =3D kvm_gmap_init(kvm); + if (ret) + goto out_err; + kvm->arch.mem_limit =3D kvm_max_guest_address(); + + VM_EVENT(kvm, 3, "vm created with type %lu", type); + return 0; + +out_err: + debug_unregister(kvm->arch.dbf); + + return ret; +} + vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) { return VM_FAULT_SIGBUS; @@ -64,6 +146,13 @@ long kvm_arch_dev_ioctl(struct file *filp, return -EINVAL; } =20 +void kvm_arch_destroy_vm(struct kvm *kvm) +{ + kvm_destroy_vcpus(kvm); + debug_unregister(kvm->arch.dbf); + kvm->arch.gmap =3D gmap_put(kvm->arch.gmap); +} + u32 get_kvm_ipa_limit(void) { return fls64(kvm_max_guest_address() + 1) - 1; @@ -74,10 +163,41 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned = int id) return 0; } =20 +int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) +{ + struct kvm_sae_block *sae_block =3D &vcpu->arch.sae_block; + + spin_lock_init(&vcpu->arch.mp_state_lock); + + /* Force users to call KVM_ARM_VCPU_INIT */ + vcpu_clear_flag(vcpu, VCPU_INITIALIZED); + + vcpu->arch.mc =3D kvm_s390_new_mmu_cache(); + if (!vcpu->arch.mc) + return -ENOMEM; + + sae_block->hbasce =3D vcpu->kvm->arch.gmap->asce.val; + sae_block->mso =3D 0L; + sae_block->msl =3D kvm_max_guest_address(); + + VM_EVENT(vcpu->kvm, 3, + "create cpu %d at 0x%p, sae block at 0x%p, satellite at 0x%p", + vcpu->vcpu_id, vcpu, &vcpu->arch.sae_block, + &vcpu->arch.save_area); + return 0; +} + void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) { } =20 +void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) +{ + kvm_s390_free_mmu_cache(vcpu->arch.mc); + + VCPU_EVENT(vcpu, 3, "%s", "free cpu"); +} + int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, struct kvm_mp_state *mp_state) { @@ -103,6 +223,81 @@ static unsigned long system_supported_vcpu_features(vo= id) return features; } =20 +int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, + struct kvm_dirty_log *log) +{ + return s390_kvm_mmu_get_dirty_log(kvm, log); +} + +bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) +{ + scoped_guard(read_lock, &kvm->mmu_lock) + return gmap_age_gfn(kvm->arch.gmap, range->start, range->end); +} + +void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *mems= lot) +{ + gfn_t last_gfn =3D memslot->base_gfn + memslot->npages; + + scoped_guard(read_lock, &kvm->mmu_lock) + gmap_sync_dirty_log(kvm->arch.gmap, memslot->base_gfn, last_gfn); +} + +int kvm_arch_prepare_memory_region(struct kvm *kvm, + const struct kvm_memory_slot *old, + struct kvm_memory_slot *new, + enum kvm_mr_change change) +{ + return s390_kvm_mmu_prepare_memory_region(kvm, old, new, change); +} + +void kvm_arch_commit_memory_region(struct kvm *kvm, struct kvm_memory_slot= *old, + const struct kvm_memory_slot *new, + enum kvm_mr_change change) +{ + s390_kvm_mmu_commit_memory_region(kvm, old, new, change); +} + +bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) +{ + return gmap_unmap_gfn_range(kvm->arch.gmap, range->slot, range->start, ra= nge->end); +} + +bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) +{ + scoped_guard(read_lock, &kvm->mmu_lock) + return dat_test_age_gfn(kvm->arch.gmap->asce, range->start, range->end); +} + +#ifdef CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY +long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, + struct kvm_pre_fault_memory *range) +{ + return -EOPNOTSUPP; +} +#endif /* ifdef CONFIG_ */ + +int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long= arg) +{ + void __user *argp =3D (void __user *)arg; + + switch (ioctl) { + case KVM_ARM_PREFERRED_TARGET: { + struct kvm_vcpu_init init =3D { + .target =3D KVM_ARM_TARGET_GENERIC_V8, + }; + + if (copy_to_user(argp, &init, sizeof(init))) + return -EFAULT; + + return 0; + } + + default: + return -EINVAL; + } +} + bool kvm_arch_irqchip_in_kernel(struct kvm *kvm) { return false; diff --git a/arch/s390/kvm/arm64/arm.h b/arch/s390/kvm/arm64/arm.h index a3db254462c0..2e33800525e9 100644 --- a/arch/s390/kvm/arm64/arm.h +++ b/arch/s390/kvm/arm64/arm.h @@ -2,6 +2,57 @@ #ifndef ARCH_S390_KVM_ARM64_H #define ARCH_S390_KVM_ARM64_H =20 +#include + #define KVM_DEV_NAME "kvm-arm64" =20 +#define VM_EVENT(d_kvm, d_loglevel, d_string, d_args...)\ +do { \ + debug_sprintf_event((d_kvm)->arch.dbf, d_loglevel, KVM_DEV_NAME ": " d_st= ring "\n", d_args); \ +} while (0) + +#define VCPU_EVENT(d_vcpu, d_loglevel, d_string, d_args...) \ + do { \ + debug_sprintf_event( \ + (d_vcpu)->kvm->arch.dbf, d_loglevel, \ + KVM_DEV_NAME " %02d[%016llx-%016llx]: " d_string "\n", \ + (d_vcpu)->vcpu_id, (d_vcpu)->arch.sae_block.pstate, \ + (d_vcpu)->arch.sae_block.pc, d_args); \ + } while (0) + +static __always_inline int kvm_is_ucontrol(struct kvm *kvm) +{ + return 0; +} + +static __always_inline int __kvm_s390_pv_destroy_page(struct page *page) +{ + return 0; +} + +static __always_inline void kvm_s390_vsie_gmap_notifier(struct gmap *gmap,= gpa_t start, gpa_t end) +{ +} + +static __always_inline int kvm_s390_pv_get_handle(struct kvm *kvm) +{ + return 0; +} + +static __always_inline int kvm_s390_is_migration_mode(struct kvm *kvm) +{ + return false; +} + +static __always_inline bool kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu) +{ + return false; +} + +/* should never be called */ +static __always_inline int kvm_s390_vm_stop_migration(struct kvm *kvm) +{ + return -EINVAL; +} + #endif /* ARCH_S390_KVM_ARM64_H */ diff --git a/arch/s390/kvm/gmap/faultin.c b/arch/s390/kvm/gmap/faultin.c index 740415d494de..800e129ca40c 100644 --- a/arch/s390/kvm/gmap/faultin.c +++ b/arch/s390/kvm/gmap/faultin.c @@ -10,6 +10,11 @@ =20 #include "gmap.h" #include "faultin.h" +#ifdef KVM_S390_ARM64 +#include "arm.h" +#else +#include "s390.h" +#endif =20 bool kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu); #define CREATE_TRACE_POINTS diff --git a/arch/s390/kvm/gmap/gmap.c b/arch/s390/kvm/gmap/gmap.c index 07915278ee98..492a12a3a449 100644 --- a/arch/s390/kvm/gmap/gmap.c +++ b/arch/s390/kvm/gmap/gmap.c @@ -21,7 +21,11 @@ =20 #include "dat.h" #include "gmap.h" +#ifdef KVM_S390_ARM64 +#include "arm.h" +#else #include "s390.h" +#endif #include "faultin.h" =20 static int gmap_limit_to_type(gfn_t limit) diff --git a/arch/s390/kvm/gmap/kvm_mmu.c b/arch/s390/kvm/gmap/kvm_mmu.c index 40fee79eb71f..88d2187375da 100644 --- a/arch/s390/kvm/gmap/kvm_mmu.c +++ b/arch/s390/kvm/gmap/kvm_mmu.c @@ -3,7 +3,11 @@ #include #include =20 +#ifdef KVM_S390_ARM64 +#include "arm.h" +#else #include "s390.h" +#endif #include "gmap.h" #include "dat.h" #include "kvm_mmu.h" diff --git a/arch/s390/kvm/gmap/trace-gmap.h b/arch/s390/kvm/gmap/trace-gma= p.h index 78559298932c..25f8a527fdde 100644 --- a/arch/s390/kvm/gmap/trace-gmap.h +++ b/arch/s390/kvm/gmap/trace-gmap.h @@ -10,6 +10,18 @@ #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace-gmap =20 +#ifdef KVM_S390_ARM64 +#define __KVM_FIELDS \ + __field(unsigned long, pstate) \ + __field(unsigned long, pc) +#define __KVM_ASSIGN ({\ + __entry->pstate =3D vcpu->arch.sae_block.pstate; \ + __entry->pc =3D vcpu->arch.sae_block.pc; \ + }) +#define __KVM_PRINT \ + __entry->pstate, \ + __entry->pc +#else #define __KVM_FIELDS \ __field(unsigned long, pswmask) \ __field(unsigned long, pswaddr) @@ -20,6 +32,7 @@ #define __KVM_PRINT \ __entry->pswmask,\ __entry->pswaddr +#endif =20 TRACE_EVENT(kvm_s390_major_guest_pfault, TP_PROTO(struct kvm_vcpu *vcpu), --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 ED81D431E6E; Fri, 31 Jul 2026 13:14:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503686; cv=none; b=HRq0Fqyt+iDR+psuahuxXLbFm/rdYvzINLo0jW+stKYXSw9qedAr5Q6MCJes39mxO6cpWwSo8Vus74UN/7kZQNS48EGiorqUX5SD1OdLU93AzJ3XQmN7AT6Dfiptilw01ffpDNmnLGwPmvY5F/Va3nBSEbayMiB8KonYtY7S9mc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503686; c=relaxed/simple; bh=3zqr52vI/s7rXUyzXgPvTQAfkksfH6cto6FPtTfAgpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tZPgdq0jwlmw4cpOoTDqviMI2D1JmverFSaBrgUG9/hrU2fTQon8ijLS0bEk01VberwRpKA1zgeJ5/Bh/VtJVJnfKlfTvQTnqgp9IUOjLI4Pzh8JIUepWhBY0EMN+a/8+F9qXHob92QnPYpSTHvhiic4MRY6UZiCVVFr29WTh58= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=UCAU4mh1; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="UCAU4mh1" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlr7a4072858; Fri, 31 Jul 2026 13:09:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=Bs87uf6IKXOYmSFqp jQghfgFMbsEqQRoMCpmZpnEGeo=; b=UCAU4mh1zQe1xRA2FSMg+3OT1Gv6xev3v FnF8DSCt6iAy5dnJIFIoqVNhp31BL8FaYATMC9erz7YaZfRawUiLysFZ8u5fUeAu SOhw5S0BUiQCVbxV7+p6c7Q9RzRuI4L7BdXI6O2NG0pbcS24h2bxBs9Fssp5dnuM XNq+47yKyIG4xRumaprbd1hrWm3r4eXJV+2fq95U2+k6IXvYXY6gVoI4D5ZTjnfN 7RNB6QqQnkiPws0K7yOMTKE0alfJ3fxs9zyFXCYfhVBwZd37GXIGEk6x4R/+ewmz wRRXWNlLARRouk0NK97rOKdjzMWwE5Zjd1ra5SNcvgWte2O1p8jog== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2pe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:24 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuFKl021008; Fri, 31 Jul 2026 13:09:23 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn7fqr563-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:22 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9GnO38600976 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:16 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2F9AC20040; Fri, 31 Jul 2026 13:09:16 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B151720043; Fri, 31 Jul 2026 13:09:15 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:15 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 29/31] KVM: s390: arm64: Implement vCPU IOCTLs Date: Fri, 31 Jul 2026 15:08:57 +0200 Message-ID: <20260731130902.654679-30-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: jye6gH641YKWLVYJo4-ckptdhm6Qz2gG X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX+i2JKJbkOdeV yGa9NgTohTP+mJ6FGIhjbLZqOg3yhEnCKxtz1hJwkXvdlgF7R/R0/6vh0Nu52UIyljZ+ABFWZzX aaYEut9vAbsm/KwIMlz3i/HVz8Tet8Lw2rnZRZAn4XoLzILIBEcuVptG1oTTjqUtHrovH6JrrYr KA19QFSRJ8tsEMzd0I84LDEcIJNpDIdrHSHnTfM0B2Xmi/nItNVj8rLwP4J2LCZKuDVDERUSR3J BT1uI+Dd2rNv+AbihFS7JLBBnNEQcSLez2Z1Xwgn5Qsk9yQTpsRxR9LP+b30C+BTqS+LLb5mhhc 0Oqaw0YaabMvClsWNtxz1NZdKoApFCqRHQ5pezNJGYTb/3o510YejNqNrgLwcqzQZfmPaDhwRYl MYEet3jSvvisTcQEWyyQfIOMs8uvyceV8LDcTiNt5C3KYTOJMbJKP71AAiC4RRPkHgw5fC5dMIv +j4DgJHgstJXwarz5Rw== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX++AkcIzALml/ lQJFyaTRghqWMLbSviHgoXSrLfB7c6Kz2jWWAIHprWk3kf998Re1914VwQTE5OWFCdKmSGlVPc6 wcimswPUIFsIzI+Zo24tP+Mj9N+55b8= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e84 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=IkgDzAjWwly9UXgl8I0A:9 X-Proofpoint-GUID: vHLhvukoiemhwhFX1j3bkrQmJ0hi6JBX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Implement all required vCPU IOCTLs. Co-developed-by: Andreas Grapentin Signed-off-by: Andreas Grapentin Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Signed-off-by: Steffen Eiden --- arch/s390/kvm/arm64/arm.c | 392 ++++++++++++++++++++++++++++++ arch/s390/kvm/arm64/guest.c | 47 +++- arch/s390/kvm/arm64/handle_exit.c | 31 +++ arch/s390/kvm/arm64/handle_exit.h | 9 + arch/s390/kvm/arm64/reset.c | 77 ++++++ arch/s390/kvm/arm64/reset.h | 11 + arch/s390/kvm/arm64/trace.h | 25 ++ 7 files changed, 590 insertions(+), 2 deletions(-) create mode 100644 arch/s390/kvm/arm64/handle_exit.h create mode 100644 arch/s390/kvm/arm64/reset.c create mode 100644 arch/s390/kvm/arm64/reset.h diff --git a/arch/s390/kvm/arm64/arm.c b/arch/s390/kvm/arm64/arm.c index 3f1bbbf38abe..7b65e2f4ab3e 100644 --- a/arch/s390/kvm/arm64/arm.c +++ b/arch/s390/kvm/arm64/arm.c @@ -7,11 +7,20 @@ #include #include #include +#include "linux/cleanup.h" +#include + +#include + +#include +#include =20 #include #include =20 #include "arm.h" +#include "handle_exit.h" +#include "reset.h" =20 #define CREATE_TRACE_POINTS #include "trace.h" @@ -198,6 +207,22 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) VCPU_EVENT(vcpu, 3, "%s", "free cpu"); } =20 +void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) +{ + save_access_regs(&vcpu->arch.host_acrs[0]); + vcpu->cpu =3D cpu; + + lasrm(&vcpu->arch.save_area); +} + +void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) +{ + stiasrm(&vcpu->arch.save_area); + + vcpu->cpu =3D -1; + restore_access_regs(&vcpu->arch.host_acrs[0]); +} + int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, struct kvm_mp_state *mp_state) { @@ -223,6 +248,373 @@ static unsigned long system_supported_vcpu_features(v= oid) return features; } =20 +bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu) +{ + return vcpu_mode_priv(vcpu); +} + +int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) +{ + struct kvm *kvm =3D vcpu->kvm; + + if (!kvm_vcpu_initialized(vcpu)) + return -ENOEXEC; + + if (!kvm_arm_vcpu_is_finalized(vcpu)) + return -EPERM; + + if (likely(READ_ONCE(vcpu->pid))) + return 0; + + scoped_guard(mutex, &kvm->arch.config_lock) + set_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags); + + return 0; +} + +/** + * check_vcpu_requests - check and handle pending vCPU requests + * @vcpu: the VCPU pointer + * + * Return: 1 if we should enter the guest + * 0 if we should exit to userspace + * < 0 if we should exit to userspace, where the return value indicates + * an error + */ +static int check_vcpu_requests(struct kvm_vcpu *vcpu) +{ + if (kvm_request_pending(vcpu)) { + if (kvm_check_request(KVM_REQ_VCPU_RESET, vcpu)) + kvm_reset_vcpu(vcpu); + /* + * Clear IRQ_PENDING requests that were made to guarantee + * that a VCPU sees new virtual interrupts. + */ + kvm_check_request(KVM_REQ_IRQ_PENDING, vcpu); + } + + return 1; +} + +static int kvm_vcpu_initialize(struct kvm_vcpu *vcpu, + const struct kvm_vcpu_init *init) +{ + unsigned long features =3D init->features[0]; + struct kvm *kvm =3D vcpu->kvm; + + scoped_guard(mutex, &kvm->arch.config_lock) { + if (test_bit(KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED, + &kvm->arch.flags) && + kvm_vcpu_init_changed(vcpu, init)) + return -EINVAL; + + bitmap_copy(kvm->arch.vcpu_features, &features, + KVM_VCPU_MAX_FEATURES); + + kvm_reset_vcpu(vcpu); + + set_bit(KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED, + &kvm->arch.flags); + vcpu_set_flag(vcpu, VCPU_INITIALIZED); + } + + return 0; +} + +static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu, + const struct kvm_vcpu_init *init) +{ + int ret; + + if (init->target !=3D KVM_ARM_TARGET_GENERIC_V8) + return -EINVAL; + + ret =3D kvm_vcpu_init_check_features(vcpu, init); + if (ret) + return ret; + + if (!kvm_vcpu_initialized(vcpu)) + return kvm_vcpu_initialize(vcpu, init); + + if (kvm_vcpu_init_changed(vcpu, init)) + return -EINVAL; + + kvm_reset_vcpu(vcpu); + + return 0; +} + +static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu, + struct kvm_vcpu_init *init) +{ + struct kvm_sae_save_area *save_area =3D &vcpu->arch.save_area; + struct kvm_sae_block *sae_block =3D &vcpu->arch.sae_block; + int ret; + + sae_block->save_area =3D virt_to_phys(save_area); + save_area->sdo =3D virt_to_phys(sae_block); + + ret =3D kvm_vcpu_set_target(vcpu, init); + if (ret) + return ret; + + scoped_guard(spinlock, &vcpu->arch.mp_state_lock) { + WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_RUNNABLE); + } + + return 0; +} + +int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level, + bool line_status) +{ + /* stub for now*/ + return -EINVAL; +} + +static void adjust_pc(struct kvm_vcpu *vcpu) +{ + if (vcpu_get_flag(vcpu, INCREMENT_PC)) { + kvm_skip_instr(vcpu); + vcpu_clear_flag(vcpu, INCREMENT_PC); + } +} + +static void arm_vcpu_run(struct kvm_vcpu *vcpu) +{ + struct kvm_sae_block *sae_block =3D &vcpu->arch.sae_block; + + adjust_pc(vcpu); + + local_irq_disable(); + guest_enter_irqoff(); + local_irq_enable(); + + sae_block->icptr =3D 0; + + sae64a(sae_block); + + local_irq_disable(); + guest_exit_irqoff(); + local_irq_enable(); +} + +/** kvm_arch_vcpu_ioctl_run() - run arm64 vCPU + * + * Execute arm64 guest instructions using SAE. + * + * Returns: + * 1 enter the guest (should not be observed by userspace) + * 0 exit to userspace + * < 0 exit to userspace, where the return value indicates n error + * + * + */ +int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) +{ + DECLARE_KERNEL_FPU_ONSTACK32(fpu_save); + struct kvm_run *kvm_run =3D vcpu->run; + int ret; + + if (kvm_run->exit_reason =3D=3D KVM_EXIT_MMIO) { + ret =3D kvm_handle_mmio_return(vcpu); + if (ret <=3D 0) + return ret; + } + + vcpu_load(vcpu); + + kernel_fpu_begin(&fpu_save, KERNEL_FPC | KERNEL_VXR); + load_vx_regs((vcpu->arch.ctxt.vregs)); + + if (!vcpu->wants_to_run) { + ret =3D -EINTR; + goto out; + } + + kvm_sigset_activate(vcpu); + + might_fault(); + + ret =3D 1; + do { + if (signal_pending(current)) { + kvm_run->exit_reason =3D KVM_EXIT_INTR; + ret =3D -EINTR; + continue; + } + + if (need_resched()) + schedule(); + + if (ret > 0) + ret =3D check_vcpu_requests(vcpu); + + vcpu->arch.sae_block.icptr =3D 0; + + arm_vcpu_run(vcpu); + + ret =3D handle_exit(vcpu); + + } while (ret > 0); + + kvm_sigset_deactivate(vcpu); +out: + if (unlikely(vcpu_get_flag(vcpu, INCREMENT_PC))) + adjust_pc(vcpu); + + save_vx_regs(vcpu->arch.ctxt.vregs); + kernel_fpu_end(&fpu_save, KERNEL_FPC | KERNEL_VXR); + vcpu_put(vcpu); + + return ret; +} + +static int kvm_arm_vcpu_set_attr(struct kvm_vcpu *vcpu, + struct kvm_device_attr *attr) +{ + int ret; + + switch (attr->group) { + default: + ret =3D -ENXIO; + break; + } + + return ret; +} + +static int kvm_arm_vcpu_get_attr(struct kvm_vcpu *vcpu, + struct kvm_device_attr *attr) +{ + int ret; + + switch (attr->group) { + default: + ret =3D -ENXIO; + break; + } + + return ret; +} + +static int kvm_arm_vcpu_has_attr(struct kvm_vcpu *vcpu, + struct kvm_device_attr *attr) +{ + int ret; + + switch (attr->group) { + default: + ret =3D -ENXIO; + break; + } + + return ret; +} + +long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, unsigned l= ong arg) +{ + struct kvm_vcpu *vcpu =3D filp->private_data; + void __user *argp =3D (void __user *)arg; + struct kvm_device_attr attr; + int ret; + + switch (ioctl) { + case KVM_ARM_VCPU_INIT: { + struct kvm_vcpu_init init; + + ret =3D -EFAULT; + if (copy_from_user(&init, argp, sizeof(init))) + break; + + ret =3D kvm_arch_vcpu_ioctl_vcpu_init(vcpu, &init); + break; + } + case KVM_SET_ONE_REG: + case KVM_GET_ONE_REG: { + struct kvm_one_reg reg; + + ret =3D -ENOEXEC; + if (unlikely(!kvm_vcpu_initialized(vcpu))) + break; + + ret =3D -EFAULT; + if (copy_from_user(®, argp, sizeof(reg))) + break; + + if (kvm_check_request(KVM_REQ_VCPU_RESET, vcpu)) + kvm_reset_vcpu(vcpu); + + if (ioctl =3D=3D KVM_SET_ONE_REG) + ret =3D kvm_arm_set_reg(vcpu, ®); + else + ret =3D kvm_arm_get_reg(vcpu, ®); + break; + } + case KVM_GET_REG_LIST: { + struct kvm_reg_list __user *user_list =3D argp; + struct kvm_reg_list reg_list; + unsigned int n; + + ret =3D -ENOEXEC; + if (unlikely(!kvm_vcpu_initialized(vcpu))) + break; + ret =3D -EPERM; + if (!kvm_arm_vcpu_is_finalized(vcpu)) + break; + ret =3D -EFAULT; + if (copy_from_user(®_list, user_list, sizeof(reg_list))) + break; + n =3D reg_list.n; + reg_list.n =3D kvm_arm_num_regs(vcpu); + if (copy_to_user(user_list, ®_list, sizeof(reg_list))) + break; + ret =3D -E2BIG; + if (n < reg_list.n) + break; + ret =3D kvm_arm_copy_reg_indices(vcpu, user_list->reg); + break; + } + case KVM_ARM_VCPU_FINALIZE: { + int what; + + if (!kvm_vcpu_initialized(vcpu)) + return -ENOEXEC; + + if (get_user(what, (const int __user *)argp)) + return -EFAULT; + + ret =3D kvm_arm_vcpu_finalize(vcpu, what); + break; + } + case KVM_SET_DEVICE_ATTR: { + ret =3D -EFAULT; + if (copy_from_user(&attr, argp, sizeof(attr))) + break; + ret =3D kvm_arm_vcpu_set_attr(vcpu, &attr); + break; + } + case KVM_GET_DEVICE_ATTR: { + ret =3D -EFAULT; + if (copy_from_user(&attr, argp, sizeof(attr))) + break; + ret =3D kvm_arm_vcpu_get_attr(vcpu, &attr); + break; + } + case KVM_HAS_DEVICE_ATTR: { + ret =3D -EFAULT; + if (copy_from_user(&attr, argp, sizeof(attr))) + break; + ret =3D kvm_arm_vcpu_has_attr(vcpu, &attr); + break; + } + default: + ret =3D -EINVAL; + } + + return ret; +} + int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) { diff --git a/arch/s390/kvm/arm64/guest.c b/arch/s390/kvm/arm64/guest.c index fd6442d9e4f4..4ea6fe2c270d 100644 --- a/arch/s390/kvm/arm64/guest.c +++ b/arch/s390/kvm/arm64/guest.c @@ -5,8 +5,6 @@ #include #include =20 -#include "guest.h" - #define __INCL_GEN_ARM_FILE #include "generated/guest.inc" #undef __INCL_GEN_ARM_FILE @@ -47,6 +45,51 @@ const struct kvm_stats_header kvm_vcpu_stats_header =3D { sizeof(kvm_vcpu_stats_desc), }; =20 +int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) +{ + int ret; + + ret =3D copy_core_reg_indices(vcpu, uindices); + if (ret < 0) + return ret; + uindices +=3D ret; + + return 0; +} + +unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu) +{ + return num_core_regs(vcpu); +} + +int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) +{ + /* We currently use nothing arch-specific in upper 32 bits */ + if ((reg->id & ~KVM_REG_SIZE_MASK) >> 32 !=3D KVM_REG_ARM64 >> 32) + return -EINVAL; + + switch (reg->id & KVM_REG_ARM_COPROC_MASK) { + case KVM_REG_ARM_CORE: + return get_core_reg(vcpu, reg); + default: + return -EINVAL; + } +} + +int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) +{ + /* We currently use nothing arch-specific in upper 32 bits */ + if ((reg->id & ~KVM_REG_SIZE_MASK) >> 32 !=3D KVM_REG_ARM64 >> 32) + return -EINVAL; + + switch (reg->id & KVM_REG_ARM_COPROC_MASK) { + case KVM_REG_ARM_CORE: + return set_core_reg(vcpu, reg); + default: + return -EINVAL; + } +} + int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *r= egs) { return -EINVAL; diff --git a/arch/s390/kvm/arm64/handle_exit.c b/arch/s390/kvm/arm64/handle= _exit.c index b00653bf97da..bbe0ea1ccd0e 100644 --- a/arch/s390/kvm/arm64/handle_exit.c +++ b/arch/s390/kvm/arm64/handle_exit.c @@ -5,6 +5,8 @@ #include #include =20 +#include "handle_exit.h" + typedef int (*exit_handle_fn)(struct kvm_vcpu *); exit_handle_fn arm_exit_handlers[ESR_ELx_EC_MAX + 1]; =20 @@ -55,6 +57,35 @@ exit_handle_fn arm_exit_handlers[] =3D { [ESR_ELx_EC_HVC64] =3D handle_hvc, }; =20 +/* + * Return > 0 to return to guest, < 0 on error, 0 (and set exit_reason) on + * proper exit to userspace. + */ +int handle_exit(struct kvm_vcpu *vcpu) +{ + u8 icptr =3D vcpu->arch.sae_block.icptr; + int ret =3D 1; + + switch (icptr) { + case SAE_ICPTR_SPURIOUS: + break; + case SAE_ICPTR_VALIDITY: + WARN_ONCE(true, "SAE: validity intercept. vir: 0x%04x", + vcpu->arch.sae_block.vir); + ret =3D -EINVAL; + break; + case SAE_ICPTR_HOST_ACCESS_EXCEPTION: + case SAE_ICPTR_SYNCHRONOUS_EXCEPTION: + ret =3D handle_trap_exceptions(vcpu); + break; + default: + WARN_ONCE(true, "SAE: unknown interception reason 0x%02x", + icptr); + ret =3D -EINVAL; + } + return ret; +} + /* manually copied from arch/arm64/kernel/traps.c */ static const char * const esr_class_str[] =3D { [0 ... ESR_ELx_EC_MAX] =3D "UNRECOGNIZED EC", diff --git a/arch/s390/kvm/arm64/handle_exit.h b/arch/s390/kvm/arm64/handle= _exit.h new file mode 100644 index 000000000000..65ae58721537 --- /dev/null +++ b/arch/s390/kvm/arm64/handle_exit.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef KVM_ARM64_HANDLE_EXIT_H +#define KVM_ARM64_HANDLE_EXIT_H + +#include + +int handle_exit(struct kvm_vcpu *vcpu); + +#endif /* KVM_ARM64_HANDLE_EXIT_H */ diff --git a/arch/s390/kvm/arm64/reset.c b/arch/s390/kvm/arm64/reset.c new file mode 100644 index 000000000000..adf237254212 --- /dev/null +++ b/arch/s390/kvm/arm64/reset.c @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +#include +#include + +#include "reset.h" + +#define __INCL_GEN_ARM_FILE +#include "generated/reset.inc" +#undef __INCL_GEN_ARM_FILE + +bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu) +{ + return true; +} + +static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu) +{ + vcpu->arch.hcr_elz =3D HCR_EL2_E2H | HCR_EL2_RW | HCR_EL2_AMO | + HCR_EL2_IMO | HCR_EL2_FMO | HCR_EL2_PTW; + /* traps */ + vcpu->arch.hcr_elz |=3D HCR_EL2_TSC | HCR_EL2_TID1 | HCR_EL2_TID2 | + HCR_EL2_TID3 | HCR_EL2_TID4 | HCR_EL2_TID5 | + HCR_EL2_TIDCP; +} + +void kvm_reset_vcpu(struct kvm_vcpu *vcpu) +{ + struct vcpu_reset_state reset_state; + bool loaded; + + scoped_guard(spinlock, &vcpu->arch.mp_state_lock) { + reset_state =3D vcpu->arch.reset_state; + vcpu->arch.reset_state.reset =3D false; + } + + /* + * Disable preemption around the vcpu reset as we might otherwise race wi= th + * preempt notifiers which call stiasrm/lasrm from put/load + */ + preempt_disable(); + + /* The reset must run with an unloaded save area */ + loaded =3D vcpu_is_loaded(vcpu); + if (loaded) + vcpu_put(vcpu); + + kvm_reset_vcpu_core_regs(vcpu); + + /* Reset special registers */ + vcpu_reset_hcr(vcpu); + + if (reset_state.reset) { + *vcpu_pc(vcpu) =3D reset_state.pc; + vcpu_clear_flag(vcpu, PENDING_EXCEPTION); + vcpu_clear_flag(vcpu, EXCEPT_MASK); + vcpu_clear_flag(vcpu, INCREMENT_PC); + vcpu_set_reg(vcpu, 0, reset_state.r0); + } + + /* Load new vx-regs into HW if they are currently loaded */ + if (current->thread.kfpu_flags) + load_vx_regs(vcpu->arch.ctxt.vregs); + + if (loaded) + vcpu_load(vcpu); + + preempt_enable(); +} + +int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature) +{ + return 0; +} diff --git a/arch/s390/kvm/arm64/reset.h b/arch/s390/kvm/arm64/reset.h new file mode 100644 index 000000000000..a5c5304e47bc --- /dev/null +++ b/arch/s390/kvm/arm64/reset.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef KVM_ARM_RESET_H +#define KVM_ARM_RESET_H + +#include + +bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu); +void kvm_reset_vcpu(struct kvm_vcpu *vcpu); +int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature); + +#endif /* KVM_ARM_RESET_H */ diff --git a/arch/s390/kvm/arm64/trace.h b/arch/s390/kvm/arm64/trace.h index 3a5dcd039c13..224670b80bb6 100644 --- a/arch/s390/kvm/arm64/trace.h +++ b/arch/s390/kvm/arm64/trace.h @@ -7,6 +7,31 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM kvm =20 +TRACE_EVENT(kvm_irq_line, + TP_PROTO(unsigned int type, int vcpu_idx, int irq_num, int level), + TP_ARGS(type, vcpu_idx, irq_num, level), + + TP_STRUCT__entry( + __field( unsigned int, type ) + __field( int, vcpu_idx ) + __field( int, irq_num ) + __field( int, level ) + ), + + TP_fast_assign( + __entry->type =3D type; + __entry->vcpu_idx =3D vcpu_idx; + __entry->irq_num =3D irq_num; + __entry->level =3D level; + ), + + TP_printk("Inject %s interrupt (%d), vcpu->idx: %d, num: %d, level: %d", + (__entry->type =3D=3D KVM_ARM_IRQ_TYPE_CPU) ? "CPU" : + (__entry->type =3D=3D KVM_ARM_IRQ_TYPE_PPI) ? "VGIC PPI" : + (__entry->type =3D=3D KVM_ARM_IRQ_TYPE_SPI) ? "VGIC SPI" : "UNKNOWN", + __entry->type, __entry->vcpu_idx, __entry->irq_num, __entry->level) +); + #endif /* KVM_ARM64_TRACE_KVM_H */ =20 #undef TRACE_INCLUDE_PATH --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 525C14399F7; Fri, 31 Jul 2026 13:09:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503392; cv=none; b=dlvTWB7pPB2IB3gbXfcn/hPiKLoHhQMk9R4pf6xRDQdW3gpL8/rW6g78fjlaPlt68de9csyBHLVZXFFeuJs7u+ssD1tgZHBqwOxmQZdnpcrFNj7/SvNiFlNM8z7BX0y7oHbWUTC5AK5Kf7lEfOwNgFvWy1LaH2X0c2fNmDG/BRc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503392; c=relaxed/simple; bh=xuar8b5F+yPAqjPzqeMpgD+QsrKjykO039X3XloK3hQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m/hWJay6/1LfnnUJ5o/Tk4+M9GAZjR8p3F2Hu3viNASmTnF6tlOt0cAkgKjeABNi9qeuTwKWUluIynEh6Ea1cKBlz0LMBtmnLTIG+9SqjnK8w7PRg/f7ztHcRDcRWtKsD4gkx3eZ9tbihAZDQibYalQ8LYKhUx/gN6OBvLGKbE4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=JAEnBZ7v; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="JAEnBZ7v" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBlpqK4072834; Fri, 31 Jul 2026 13:09:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=OkQi6lJzRSxxgmKxz ZVpGy+2ug0rjm50rJIvLb7+IaU=; b=JAEnBZ7vcUXz8JHUoCIoTibVbTSee/r5q MLS8XdxJ0Whfq/gEn2w7ul4gtp7FOCMPwdmlVH/UsPBr419LjaAHovOHiFX4SD7c XcCRC/V3Ti5UPb50Xf/1wgE+Up3gCdufiEXPB9PuhoKY+fP0iHX4UxAQs1QaOS1/ 8cIRn4eOG7MK7BkvFR0iPBG2WcrLvH09QsaTxuSlSJ6VFwguDoREgyDskOWlOqa9 P9CS1dHweOqDClqQKXDm++5ZZoppgIaFgxCRn+BidAuhBP1lJ5PEmPIMNhlnVGyW /6XewKsIEiIRAflgbq8sQ46H7PUlY/xrRKw0TFB0rN+viiX7e4IgA== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuycw2pc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:24 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuP3j021771; Fri, 31 Jul 2026 13:09:22 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn7uwg43t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:22 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9Gst38600980 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:16 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9E76220040; Fri, 31 Jul 2026 13:09:16 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 361CC2004B; Fri, 31 Jul 2026 13:09:16 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:16 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 30/31] KVM: s390: arm64: Implement basic page fault handler Date: Fri, 31 Jul 2026 15:08:58 +0200 Message-ID: <20260731130902.654679-31-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: CX6u7hOgM2lahaeGUIyNgM2spVhXnfPT X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX2m7sBHGlQ4Zx rKq8pTy+bMlC76IQs+6sBPj9xcxaElELkdOHNC1YzAmiSZ6rVf8fMDq0o3TDX7ZeO/7J69Ort40 QrZfLgM3YGrK9pBkj81yyilnFAgKZEAJJywGJSVe5OXEKfRuXY5boilAyMk6gvOqphSyLYuxIzd hCAcBAdBPoQW6s7mvkYcJIimj4xsh5c02+QcnpMp+uBpewnWXXyaB7crfwMxP9Ov/RrPCiholjC jbI8aVMHCL88BNyULDmcqEh4Bk5kQakTKlgE4tChTNgUoH4OxbeUc9r8XCFkN4ubPxYlRLETUgH WP+bgOX+IuSF4hrm7+UFwEUEc3p9TsQbeshzeLJVtUoC+nDUOV/CsMtMyT3AoVDE6GmrKbR/dNc qMbe5WavFkl+NDBsSJDBNtxQrDCzwnHDNeVDFeMTjQ1bk9juuDT2Qmam5i2gfbS0477qnMxvwUG Bj+JK3ObrTjrhmtg1cg== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfXxlcopMCDNssT v4mHwZtuiOTkNRzLOrhqi5mVj0ZrVViRKdFVj635Akla2JT8Xlb0U2xBMVd0pp1OBMKxCuXElys an51/Use5CVeoy2626oim5SniSFNg5o= X-Authority-Analysis: v=2.4 cv=AZeB2XXG c=1 sm=1 tr=0 ts=6a6c9e84 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=SwCwYoEPLhOQ47qcL8QA:9 X-Proofpoint-GUID: k8sd1qs-heYE6bAA979kOx7hE4ahHcsm X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Add host functionality to page in guest memory. If the guest does something unexpected or illegal exit to userspace abort guest execution. This behaviour will be changed to guest error injects once all sysregs are accessible for the host. Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Signed-off-by: Steffen Eiden --- arch/s390/kvm/arm64/handle_exit.c | 2 + arch/s390/kvm/arm64/mmio.c | 15 +++ arch/s390/kvm/arm64/mmu.c | 177 ++++++++++++++++++++++++++++++ arch/s390/kvm/arm64/trace.h | 24 ++++ 4 files changed, 218 insertions(+) create mode 100644 arch/s390/kvm/arm64/mmio.c create mode 100644 arch/s390/kvm/arm64/mmu.c diff --git a/arch/s390/kvm/arm64/handle_exit.c b/arch/s390/kvm/arm64/handle= _exit.c index bbe0ea1ccd0e..9ba01ec66e34 100644 --- a/arch/s390/kvm/arm64/handle_exit.c +++ b/arch/s390/kvm/arm64/handle_exit.c @@ -55,6 +55,8 @@ static int handle_hvc(struct kvm_vcpu *vcpu) exit_handle_fn arm_exit_handlers[] =3D { [0 ... ESR_ELx_EC_MAX] =3D kvm_handle_unknown_ec, [ESR_ELx_EC_HVC64] =3D handle_hvc, + [ESR_ELx_EC_IABT_LOW] =3D kvm_handle_guest_abort, + [ESR_ELx_EC_DABT_LOW] =3D kvm_handle_guest_abort, }; =20 /* diff --git a/arch/s390/kvm/arm64/mmio.c b/arch/s390/kvm/arm64/mmio.c new file mode 100644 index 000000000000..908a6b43ddf7 --- /dev/null +++ b/arch/s390/kvm/arm64/mmio.c @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +#include + +#include +#include + +#include "trace.h" + +#define __INCL_GEN_ARM_FILE +#include "generated/mmio.inc" +#undef __INCL_GEN_ARM_FILE diff --git a/arch/s390/kvm/arm64/mmu.c b/arch/s390/kvm/arm64/mmu.c new file mode 100644 index 000000000000..71cd582f24ff --- /dev/null +++ b/arch/s390/kvm/arm64/mmu.c @@ -0,0 +1,177 @@ +// SPDX-License-Identifier: GPL-2.0 +#include + +#include + +#include + +static inline bool kvm_s390_cur_gmap_fault_is_write(struct kvm_vcpu *vcpu) +{ + return vcpu->arch.sae_block.hai.pic =3D=3D PGM_PROTECTION || + vcpu->arch.sae_block.hai.teid.fsi =3D=3D TEID_FSI_STORE; +} + +/* + * user_mem_abort() - handle a dat fault for the gmap of a vcpu + * + * Return: 0 on success, < 0 in case of error. + * Context: The mm lock must not be held before calling. May sleep. + */ +static int user_mem_abort(struct kvm_vcpu *vcpu, gpa_t fault_ipa, + struct kvm_memory_slot *slot, hva_t hva) +{ + struct guest_fault f =3D { }; + int ret; + + if (kvm_s390_cur_gmap_fault_is_write(vcpu)) + f.write_attempt =3D FOLL_WRITE; + f.gfn =3D gpa_to_gfn(fault_ipa); + + ret =3D kvm_s390_faultin_gfn(vcpu, NULL, &f); + if (ret <=3D 0) + return ret; + if (ret =3D=3D PGM_ADDRESSING) + /* + * Without the relevant sysregs we cannot do anything for now. + * Go back to userspace with an error. TODO sysreg handling + */ + return -ENOEXEC; + KVM_BUG_ON(ret, vcpu->kvm); + return -EINVAL; +} + +static int kvm_handle_pic(struct kvm_vcpu *vcpu, bool *translation) +{ + switch (kvm_vcpu_fault_pic(vcpu)) { + /* expected cases: */ + case PGM_ASCE_TYPE: + case PGM_REGION_FIRST_TRANS: + case PGM_REGION_SECOND_TRANS: + case PGM_REGION_THIRD_TRANS: + case PGM_SEGMENT_TRANSLATION: + case PGM_PAGE_TRANSLATION: + *translation =3D true; + break; + case PGM_PROTECTION: + break; + /* unexpected cases: */ + case 0: + KVM_BUG(1, vcpu->kvm, "On MMU fault path but no fault occurred"); + return -EFAULT; + default: + KVM_BUG(1, vcpu->kvm, "Unexpected program interrupt 0x%x, TEID 0x%016lx", + vcpu->arch.sae_block.hai.pic, vcpu->arch.sae_block.hai.teid.val); + send_sig(SIGSEGV, current, 0); + return -EFAULT; + } + + return 0; +} + +int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) +{ + struct kvm_memory_slot *memslot; + bool translation =3D false; + phys_addr_t fault_ipa; + unsigned long esr; + unsigned long hva; + bool write_fault; + bool guest_size_err; + bool writable; + bool is_iabt; + int ret; + gfn_t gfn; + int idx; + + esr =3D kvm_vcpu_get_esr(vcpu); + fault_ipa =3D kvm_vcpu_get_fault_ipa(vcpu); + is_iabt =3D kvm_vcpu_trap_is_iabt(vcpu); + guest_size_err =3D vcpu->arch.sae_block.icptr =3D=3D SAE_ICPTR_GUEST_ADDR= ESS_SIZE; + + if (guest_size_err) { + translation =3D true; + } else { + ret =3D kvm_handle_pic(vcpu, &translation); + if (ret) + return ret; + } + + if (translation) { + /* + * For both cases: + * Without the relevant sysregs we cannot do anything for now. + * Go back to userspace with an error. TODO sysreg handling + */ + if (fault_ipa >=3D BIT_ULL(get_kvm_ipa_limit())) + return -ENOEXEC; + + if (fault_ipa >=3D kvm_phys_size(vcpu->kvm)) + return -ENOEXEC; + } + + idx =3D srcu_read_lock(&vcpu->kvm->srcu); + + gfn =3D fault_ipa >> PAGE_SHIFT; + + memslot =3D gfn_to_memslot(vcpu->kvm, gfn); + hva =3D gfn_to_hva_memslot_prot(memslot, gfn, &writable); + write_fault =3D kvm_is_write_fault(vcpu); + if (kvm_is_error_hva(hva) || (write_fault && !writable)) { + ret =3D -ENOEXEC; + /* + * The guest has put either its instructions or its page-tables + * somewhere it shouldn't have. Userspace won't be able to do + * anything about this (there's no syndrome for a start). + * + * Without the relevant sysregs we cannot do anything for now. + * Go back to userspace with an error. TODO sysreg handling + */ + if (is_iabt) + goto out_unlock; + + if (kvm_vcpu_abt_iss1tw(vcpu)) { + /* + * Without the relevant sysregs we cannot do anything for now. + * Go back to userspace with an error. TODO sysreg handling + */ + goto out_unlock; + } + + /* + * Check for a cache maintenance operation. Assume the guest is + * cautious and skip instruction + */ + if (kvm_is_error_hva(hva) && kvm_vcpu_dabt_is_cm(vcpu)) { + kvm_incr_pc(vcpu); + ret =3D 1; + goto out_unlock; + } + + /* + * The IPA is reported as [MAX:12], so we need to + * complement it with the bottom 12 bits from the + * faulting VA. This is always 12 bits, irrespective + * of the page size. + */ + fault_ipa |=3D kvm_vcpu_get_hfar(vcpu) & ((1 << 12) - 1); + ret =3D io_mem_abort(vcpu, fault_ipa); + goto out_unlock; + } + + /* Userspace should not be able to register out-of-bounds IPAs */ + VM_BUG_ON(fault_ipa >=3D kvm_phys_size(vcpu->kvm)); + /* + * Proper guest size faults have been injected. + * In theory it's fine to have device memory higher than MSL, + * even if not currently possible, but that would have been handled above. + * So if we get here with a guest size intercept, we have a bug somewhere. + */ + VM_BUG_ON(guest_size_err); + + ret =3D user_mem_abort(vcpu, fault_ipa, memslot, hva); + if (!ret) + ret =3D 1; +out_unlock: + srcu_read_unlock(&vcpu->kvm->srcu, idx); + return ret; +} diff --git a/arch/s390/kvm/arm64/trace.h b/arch/s390/kvm/arm64/trace.h index 224670b80bb6..973054c5d11e 100644 --- a/arch/s390/kvm/arm64/trace.h +++ b/arch/s390/kvm/arm64/trace.h @@ -32,6 +32,30 @@ TRACE_EVENT(kvm_irq_line, __entry->type, __entry->vcpu_idx, __entry->irq_num, __entry->level) ); =20 +TRACE_EVENT(kvm_mmio_nisv, + TP_PROTO(unsigned long vcpu_pc, unsigned long esr, + unsigned long far, unsigned long ipa), + TP_ARGS(vcpu_pc, esr, far, ipa), + + TP_STRUCT__entry( + __field( unsigned long, vcpu_pc ) + __field( unsigned long, esr ) + __field( unsigned long, far ) + __field( unsigned long, ipa ) + ), + + TP_fast_assign( + __entry->vcpu_pc =3D vcpu_pc; + __entry->esr =3D esr; + __entry->far =3D far; + __entry->ipa =3D ipa; + ), + + TP_printk("ipa %#016lx, esr %#016lx, far %#016lx, pc %#016lx", + __entry->ipa, __entry->esr, + __entry->far, __entry->vcpu_pc) +); + #endif /* KVM_ARM64_TRACE_KVM_H */ =20 #undef TRACE_INCLUDE_PATH --=20 2.53.0 From nobody Fri Oct 2 12:19:53 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 92C2443847E; Fri, 31 Jul 2026 13:09:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503391; cv=none; b=TpBPZomH/rWKrUw+mZoDxcH77UrDywaP+Nw8zNXm06VSg7Cm306Wnl3dA3hugs7OlSm2cfbYd/+cCRx0ve5JB/iW/CbzaKZUZPohA1sq0ybP77Ptgrki8ICCYD1keAYm0XIsS7o0IrMoczNiavLqW5FUtPOPs9GpG788lXGfAik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785503391; c=relaxed/simple; bh=YG1NvJoyhv87X+UOUAt45z0IQnLMXQiRb3P/TcDdrTw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RD7XECcr/GFCFedgXhKQk21Jrb28LgdMNfiIA/uGzHW3Mflwax74HMvwmM9b7KWozXo1NuWAdLHRaaVSrCeNAMzJOiMbRKPHgPYXa3kLcxCZH+7qB0z1cqMdmQiSTe9lm67hPm2QjLmpPhgswCD6e6t/NJY3mBbYd4r4ar6geQ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=kjlRiwT8; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="kjlRiwT8" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66VBm7nw1732055; Fri, 31 Jul 2026 13:09:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=9O9bxcs/CQGb5OBe7 pnl0LW2foATwy5DPiHGFcANeLc=; b=kjlRiwT8bavw3mKEf8rwW0ZgpOrwFSdLV Faty8sqiEfRGnKX+o50P+sxqX+UPAnjLt+9+ZQTfF47UAyh+bHyR1AGkuw2CplYC QwGFbwY5RMK6dKq84gWV7yqGryFyLAUoJ6hsJnmbuhucGKftU9J/gFW5Lo/cHojC xZP8nEP+6RDSo9hC6T9/vz8AGtVf00pEelsVZj2KEGQMlPIABQ2Ef7I8hZ+bSTy1 HayOdMTE0ePeBhjmqHB6Wt1+TEFSLg2rvLIakzireM+ke/d1uNsMHB/fC2bOxgAV pBJQ5sLyGXbaP6l6zL3pIigb4g8a5PTnZWEt/fH0G6p/cXgU+Zo+w== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmuw7w4mh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:25 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66VCuN5R012675; Fri, 31 Jul 2026 13:09:23 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8fkg08c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2026 13:09:23 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66VD9Htk32637366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jul 2026 13:09:17 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 18A5120040; Fri, 31 Jul 2026 13:09:17 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A49E820043; Fri, 31 Jul 2026 13:09:16 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jul 2026 13:09:16 +0000 (GMT) From: Steffen Eiden To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Friedrich Welter , Fuad Tabba , Gautam Gala , Hariharan Mari , Heiko Carstens , Hendrik Brueckner , Ilya Leoshkevich , Janosch Frank , Joey Gouly , Marc Zyngier , Nico Boehr , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Sven Schnelle , Ulrich Weigand , Vasily Gorbik , Will Deacon , Zenghui Yu Subject: [PATCH v5 31/31] KVM: s390: arm64: Enable KVM_ARM64 config and Kbuild Date: Fri, 31 Jul 2026 15:08:59 +0200 Message-ID: <20260731130902.654679-32-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731130902.654679-1-seiden@linux.ibm.com> References: <20260731130902.654679-1-seiden@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: pfdhqXbQC7jqJMONarHISRs4XYt2XbXg X-Proofpoint-ORIG-GUID: qgJ8BdUnfumoSAFTZjSYs_6dq4KqKIZU X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX8S31ufeTk2JT cTq8XLGekONKaIkR+7wtbzF3FPNfxHoP8em+tTz41RN34jnNxpHr4fFz6dodBBID9Wg+RehSXLU VjMfPJ1FrV6Rt03wDL4iu+MpNJKr0UTSdpgUKi/N263o5I/KUxGh2bccZe2pol+fcnWfvfXuFaY 9BpdcpI/FVZ/JImKIdV5SZHzl/6ZlhuZNeQd64GzBzWokmfgRA5UGpvF84ySnL0SSCaSSF0XWCt J9xq7WASmNbsCt1cK/MnDgBLS/ZAvHkXQf4YSMsO799ishHcl55wSASS3b5v//oF+WQnIf8HksG V5dpf8UDGqJflsfZkEGpq8qcpVhxYM+AfB341bLsPdXDBKCV1EAfFxD2L1Fz6HrWbrKNV0Nu+Zh ugshwnD7WcYWn8CoAwOhLYoSil601kkkA7Y6m32XaOBGUm4g9oYA3omHA9TIyNmZKQMhvr2finr ixUnvR6hv+Wplwyk53A== X-Authority-Analysis: v=2.4 cv=SKFykuvH c=1 sm=1 tr=0 ts=6a6c9e85 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=Zz3svKs3IDGlfYr5LI8A:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMxMDA5NiBTYWx0ZWRfX3Gop5Qm/Sl5u 1R0oQN0H5xH0GLfACWWcCe6MVBMhys50CkbTXehE5EQpANZ7uKG+A3+7OavjyCS/69GXkMHNrN5 I6qx4xSZqVUOPXw69e3UMqcf+/LtcQI= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-31_04,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607310096 Content-Type: text/plain; charset="utf-8" Add all Kbuild/Makefile configurations to build a second KVM module on s390 implementing the arm64-KVM API. To prevent symbol conflicts with kvm-s390 all internal symbols in kvm-arm64 are mangled if compiled as built-in. The new module ins named kvm-arm64. As in this case the build does not go through the normal build process the module parameter handling would be messed up. By forcing KBUILD_MODNAME to kvm-arm64 all parameters are at the same location and not at object/basename of the object file the parameter is introduced. Co-developed-by: Andreas Grapentin Signed-off-by: Andreas Grapentin Co-developed-by: Nina Schoetterl-Glausch Signed-off-by: Nina Schoetterl-Glausch Co-developed-by: Gautam Gala Signed-off-by: Gautam Gala Signed-off-by: Steffen Eiden --- arch/s390/configs/defconfig | 1 + arch/s390/include/asm/Kbuild | 3 ++ arch/s390/kvm/Kconfig | 1 + arch/s390/kvm/Makefile | 1 + arch/s390/kvm/arm64/Kconfig | 22 +++++++++ arch/s390/kvm/arm64/Makefile | 91 ++++++++++++++++++++++++++++++++++++ 6 files changed, 119 insertions(+) create mode 100644 arch/s390/kvm/arm64/Kconfig create mode 100644 arch/s390/kvm/arm64/Makefile diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index 327ab4a3933c..20de85c96e9e 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -62,6 +62,7 @@ CONFIG_CMM=3Dm CONFIG_APPLDATA_BASE=3Dy CONFIG_S390_HYPFS_FS=3Dy CONFIG_KVM_S390=3Dm +CONFIG_KVM_ARM64=3Dm CONFIG_S390_UNWIND_SELFTEST=3Dm CONFIG_S390_KPROBES_SANITY_TEST=3Dm CONFIG_S390_MODULES_SANITY_TEST=3Dm diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index 0c1fc47c3ba0..f6fd67d1c651 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild @@ -8,3 +8,6 @@ generic-y +=3D asm-offsets.h generic-y +=3D mcs_spinlock.h generic-y +=3D mmzone.h generic-y +=3D ring_buffer.h + +generated-y +=3D sysreg-gen-defs.h +generated-y +=3D kvm_arm64_modname.h diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index f8d4a9a38dae..bbae58aa8bc4 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -20,5 +20,6 @@ config KVM tristate =20 source "arch/s390/kvm/s390/Kconfig" +source "arch/s390/kvm/arm64/Kconfig" =20 endif # VIRTUALIZATION diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index c43d7dffca13..38bdd7c9b42d 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -4,3 +4,4 @@ # Copyright IBM Corp. 2008 =20 obj-$(CONFIG_KVM_S390) +=3D s390/ +obj-$(CONFIG_KVM_ARM64) +=3D arm64/ diff --git a/arch/s390/kvm/arm64/Kconfig b/arch/s390/kvm/arm64/Kconfig new file mode 100644 index 000000000000..15de7c52c861 --- /dev/null +++ b/arch/s390/kvm/arm64/Kconfig @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0 + +config KVM_ARM64 + def_tristate y + prompt "Kernel-based Virtual Machine (KVM) support for arm64 guests" + depends on HAS_IOMEM + select KVM + select GUEST_PERF_EVENTS if PERF_EVENTS + select HAVE_KVM_CPU_RELAX_INTERCEPT + select HAVE_KVM_IRQCHIP + select HAVE_KVM_MSI + select HAVE_KVM_VCPU_RUN_PID_CHANGE + select IRQ_BYPASS_MANAGER + select KVM_COMMON + select KVM_MMIO + select KVM_VFIO + select SCHED_INFO + select XARRAY_MULTI + help + Support hosting virtualized arm64 guest machines on s390 host machines. + + If unsure, say N. diff --git a/arch/s390/kvm/arm64/Makefile b/arch/s390/kvm/arm64/Makefile new file mode 100644 index 000000000000..a102c35664ca --- /dev/null +++ b/arch/s390/kvm/arm64/Makefile @@ -0,0 +1,91 @@ +# SPDX-License-Identifier: GPL-2.0 + +KVM :=3D ../../../../virt/kvm +include $(srctree)/virt/kvm/Makefile.kvm +KVM_MANAGES_S390_GUEST =3D n +include $(srctree)/arch/s390/kvm/gmap/Makefile +include $(src)/Makefile.gen + +ccflags-y +=3D -I $(src) -I $(objtree)/$(obj) -I$(srctree)/arch/s390/kvm/g= map -DKVM_S390_ARM64 + +kvm-arm64-obj :=3D \ + arm.o \ + guest.o \ + handle_exit.o \ + inject_fault.o \ + mmu.o \ + mmio.o \ + reset.o \ + +kvm-arm64-obj +=3D $(patsubst %.o,%-arm64.o,$(kvm-y)) + +targets +=3D $(kvm-arm64-obj) + +$(obj)/%-arm64.o: $(src)/%.c FORCE + @mkdir -p $(dir $@) + $(call if_changed_rule,cc_o_c) + +ifeq ($(CONFIG_KVM_ARM64),m) + +kvm-arm64-y =3D $(kvm-arm64-obj) + +else ifeq ($(CONFIG_KVM_ARM64),y) + +KVM_ARM64_GEN_DIR :=3D $(objtree)/arch/${SRCARCH}/include/generated/asm +KVM_ARM64_MODNAME_H :=3D $(KVM_ARM64_GEN_DIR)/kvm_arm64_modname.h +ccflags-y +=3D -include $(KVM_ARM64_MODNAME_H) + +targets +=3D $(KVM_ARM64_MODNAME_H) + +quiet_cmd_kvm_arm64_modname_h =3D GEN $@ + cmd_kvm_arm64_modname_h =3D { \ + echo '/* Automatically generated; do not edit. */'; \ + echo '\#ifndef _KVM_ARM64_MODNAME_H'; \ + echo '\#define _KVM_ARM64_MODNAME_H'; \ + echo '\#undef KBUILD_MODNAME'; \ + echo '\#define KBUILD_MODNAME "kvm_arm64"'; \ + echo '\#endif /* _KVM_ARM64_MODNAME_H */'; \ + } > $@ + +$(addprefix $(obj)/,$(kvm-arm64-obj)): $(KVM_ARM64_MODNAME_H) + +$(KVM_ARM64_MODNAME_H): + @mkdir -p $(KVM_ARM64_GEN_DIR) + $(call cmd,kvm_arm64_modname_h) + +prereq-o-cmd =3D $(foreach o, $(filter %.o, $^), $(dir $(o)).$(notdir $(o)= ).cmd) +cmd_gen_symversions_o =3D \ + grep --no-filename "^\#SYMVER" $(prereq-o-cmd) >> $(dot-target).cmd || tr= ue + +define rule_ld_o_o + $(call cmd_and_savecmd,ld) + $(call cmd,gen_symversions_o) +endef + +LDFLAGS_kvm-unnamespaced.o :=3D -r --whole-archive +$(obj)/kvm-unnamespaced.o: $(addprefix $(obj)/,$(kvm-arm64-obj)) FORCE + $(call if_changed_rule,ld_o_o) + +quiet_cmd_nm_filter =3D NMFLTR $@ + cmd_nm_filter =3D $(NM) -jU $< | sort -u > $@ + +$(obj)/kvm_symbol_list: $(obj)/kvm-unnamespaced.o FORCE + $(call if_changed,nm_filter) + +define rule_oc_o_o + $(call cmd_and_savecmd,objcopy) + $(call cmd,gen_objtooldep) + $(call cmd,gen_symversions_o) +endef + +OBJCOPYFLAGS_kvm-namespaced.o :=3D -O default --localize-symbols=3D$(obj)/= kvm_symbol_list +$(obj)/kvm-namespaced.o: $(obj)/kvm-unnamespaced.o $(obj)/kvm_symbol_list = FORCE + $(call if_changed_rule,oc_o_o) + +kvm-arm64-y =3D kvm-namespaced.o + +targets +=3D kvm-unnamespaced.o kvm_symbol_list kvm-namespaced.o + +endif + +obj-$(CONFIG_KVM_ARM64) +=3D kvm-arm64.o --=20 2.53.0