From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 43678CC6B01 for ; Thu, 2 Apr 2026 04:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9spkLSJNpWgki/FaBhYJAtNhpquMefNBpzVs8QMMlvk=; b=t+IIFspo4w6IRxomFYyu42rkqL YPcWc6hRdy/RJ1p5lMplX+Xou8vYxoPxv+Cyo1yhE06zMtKcjXEgnC4FQJtiffOrASU9ZFh/R1YRU 81VM6le9dcqcEznG2oqxa6NoCFfRD98dGJGgrBoYiiv0d0lyi0NdgEHDg1rhOOUiN7zIepJLziVXN cJIss6HVSctIVVHVc26c5NSu7LGNJlbAJdeDIqGgCti9mqeS+51fjHny/p4vtFOvOLaYgt6MpvZ/4 as89L1fSOPUVwUBRWXWwCM0EoqYQa/ogFKmOfCSIy/QvV0O+F7UxuIXlQ1P8d2o3Qu4tgu4xkAg2g q3yxcIEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w89a6-0000000GjzO-1gAx; Thu, 02 Apr 2026 04:22:58 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w89a1-0000000GjqN-3VkX for linux-arm-kernel@bombadil.infradead.org; Thu, 02 Apr 2026 04:22:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=9spkLSJNpWgki/FaBhYJAtNhpquMefNBpzVs8QMMlvk=; b=HyFPrFfwbMyX54fEobrGAOVLdT vxhdfjtwwP0gY4wWVFQKorDQlUdPb98t8PaZ4JoKDb1LIFCS9wp3MBvi1gQyatAqgFowBiwWgM0N+ fG8DwgGJg4IEDEsK+gsFWlbVlLTukED4NARD3e66p6EzqEJ8dN7I8iWBBG+Vf7PsJCyAAhMZq7H0S Vvdjoq/9LJobFjOOEwjuP6zMxo7e8S7nUMRPHgprN2TvqEbbK6TQP0FrFIYjTuARafYsXCq6tKfNR 3eRf9HyPtJmRiiZZHkeGGf2Wo/dhS0iXnvx88gQ1Hy0fWZGMreSKB9E4ejyuWWEQeE/Kx6Oz0UjH1 eJNnXPtA==; Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w89ZO-00000001kOg-2tZN for linux-arm-kernel@lists.infradead.org; Thu, 02 Apr 2026 04:22:36 +0000 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 632370g7367956; Thu, 2 Apr 2026 04:21:39 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=9spkLSJNpWgki/FaB hYJAtNhpquMefNBpzVs8QMMlvk=; b=fWNSwcrrNh1DS5ffVgLVUiCAFwLnFqpUF rr1t6qokPYdIqeNJLiVa1laQV2K9VmvRDNp6/ferSyVIxlkB7Jh+J53DBWjzcKEJ FNU9gTF0AqXs3ATvKBElDBsvZFxdByu1UEgqeAw8hIdfFiiH3K7/DZ7k8wEULPsS kerFN4UieCz0oW0U3TcradDHziOLWJ9LJY221ou8OqrjZrmOUIw7mTkKjPfWfKKq ++UhqgTbZvz4JrCDwxQJrLzs4REJXtWVNaHfCcWoJjTGRyWbmN4KszV5YmLhaWqC XzhQ3MiUzUhIDf0Ak7SIGcuzPopN5DYpwGnpgvKJgMURp+hFnQ8Eg== 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 4d66nnu7t3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 02 Apr 2026 04:21:39 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 631NEI0U021631; Thu, 2 Apr 2026 04:21:38 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4d6sasrsb8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 02 Apr 2026 04:21:38 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 6324LYCO39846298 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 2 Apr 2026 04:21:34 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA02920040; Thu, 2 Apr 2026 04:21:34 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 581132004D; Thu, 2 Apr 2026 04:21:34 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 2 Apr 2026 04:21:34 +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: Andreas Grapentin , Arnd Bergmann , Catalin Marinas , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Gautam Gala , Hendrik Brueckner , Janosch Frank , Joey Gouly , Marc Zyngier , Nina Schoetterl-Glausch , Oliver Upton , Paolo Bonzini , Suzuki K Poulose , Ulrich Weigand , Will Deacon , Zenghui Yu Subject: [PATCH v1 23/27] KVM: s390: arm64: Implement required functions Date: Thu, 2 Apr 2026 06:21:19 +0200 Message-ID: <20260402042125.3948963-24-seiden@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260402042125.3948963-1-seiden@linux.ibm.com> References: <20260402042125.3948963-1-seiden@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: jERbivUGXYk7moeyGsAAmEICPLP-zLQa X-Authority-Analysis: v=2.4 cv=KslAGGWN c=1 sm=1 tr=0 ts=69cdeed3 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=JEk9-RCT-MC-l0ff1-cA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDAyMDAzNCBTYWx0ZWRfX1Kz7fKinvF9/ 2eYF7UR/I8j9mpn1scyCgyvDuUIfuT5Zu2tshw7LN1jxYKh4imyolKzjx4GEXHV+7Do0CWrnViz oETYAgDJCSwOIEJYalIqw+m3H6yp55KFJOFIdUHJKoEwTP735B+oSvaoOSNP5TW3ZgZl4txqdkc KPTbHpY0q2C04ak1DzuQwSaM1VbCMGHnIsGiUr1VXHRqAm28Y9Tgn6nXnE6D5ZRgXS67olxHETj W24iJkPjUMYPOUXCoPJLIObihXEDtJIb/RblQkBDIMigWkxlj+fNOxqA4dqaGLS4tceY/QxZNR6 4oHivqG1z7l1vsHMtmeev7HrdGQ+5sV0BOjva3xN3IONk/tIrMkJmSKjb+50DwE0dFg9kCU4+qH foWAf4HC5cfNl0d69a/IXL9st2ncHTyyg9UAELCJ4jsizcN09u3cy9RLIYZe6KBWaMxEIEWKIR8 fhM+ZQ1znu9dFf065tQ== X-Proofpoint-ORIG-GUID: jERbivUGXYk7moeyGsAAmEICPLP-zLQa X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-02_01,2026-04-01_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 impostorscore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2604020034 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260402_052228_372175_7F65F2B0 X-CRM114-Status: GOOD ( 21.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Implement the mostly trivial functions that the shared arm64 (kvm) 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/asm/kvm_emulate.h | 135 ++++++++++++++++++++++++++++ arch/s390/include/asm/kvm_mmu.h | 12 +++ arch/s390/include/asm/kvm_nested.h | 13 +++ arch/s390/kvm/arm64/handle_exit.c | 50 +++++++++++ arch/s390/kvm/arm64/inject_fault.c | 15 ++++ 5 files changed, 225 insertions(+) create mode 100644 arch/s390/include/asm/kvm_emulate.h create mode 100644 arch/s390/include/asm/kvm_mmu.h create mode 100644 arch/s390/include/asm/kvm_nested.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/asm/kvm_emulate.h b/arch/s390/include/asm/kvm_emulate.h new file mode 100644 index 000000000000..bf019005e137 --- /dev/null +++ b/arch/s390/include/asm/kvm_emulate.h @@ -0,0 +1,135 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Emulation functionality for arm64 guests. + */ + +#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 *vcpu) +{ + return (unsigned long *)&vcpu->arch.sae_block.pstate; +} + +static __always_inline unsigned long *vcpu_sp_el0(const struct kvm_vcpu *vcpu) +{ + 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 __always_inline unsigned long kvm_vcpu_get_hfar(const struct kvm_vcpu *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; +} + +/* Should be unreachable, arm64 on s390 does not claim KVM_CAP_ARM_NISV_TO_USER*/ +static inline unsigned long kvm_vcpu_dabt_iss_nisv_sanitized(const struct kvm_vcpu *vcpu) +{ + return kvm_vcpu_get_esr(vcpu) & (ESR_ELx_CM | ESR_ELx_WNR); +} + +static __always_inline +bool kvm_vcpu_trap_is_permission_fault(const struct kvm_vcpu *vcpu) +{ + return kvm_vcpu_fault_pic(vcpu) == PGM_PROTECTION; +} + +static __always_inline bool kvm_condition_valid(const struct kvm_vcpu *vcpu) +{ + return true; +} + +static __always_inline bool vcpu_el1_is_32bit(struct kvm_vcpu *vcpu) +{ + return false; +} + +static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu) +{ + vcpu->arch.hcr_elz = HCR_E2H | HCR_RW | HCR_PTW; + /* traps */ + vcpu->arch.hcr_elz |= HCR_TSC | HCR_TID1 | HCR_TID2 | HCR_TID3 | + HCR_TID4 | HCR_TID5 | HCR_TIDCP; +} + +static inline unsigned long vcpu_get_vsesr(struct kvm_vcpu *vcpu) +{ + WARN(true, "not implemented, just feat RAS"); + + return 0L; +} + +static inline void vcpu_set_vsesr(struct kvm_vcpu *vcpu, u64 vsesr) +{ + WARN(true, "not implemented, just feat RAS"); +} + +static inline unsigned long *vcpu_hcr(struct kvm_vcpu *vcpu) +{ + return (unsigned long *)&vcpu->arch.hcr_elz; +} + +static inline bool vcpu_el2_tge_is_set(const 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 is_hyp_ctxt(const struct kvm_vcpu *vcpu) +{ + return false; +} + +static inline bool is_nested_ctxt(struct kvm_vcpu *vcpu) +{ + return false; +} + +static inline bool vcpu_mode_priv(const struct kvm_vcpu *vcpu) +{ + u32 mode = *vcpu_cpsr(vcpu) & PSR_MODE_MASK; + + return mode != PSR_MODE_EL0t; +} + +#endif /* __S390_ARM64_KVM_EMULATE_H__ */ diff --git a/arch/s390/include/asm/kvm_mmu.h b/arch/s390/include/asm/kvm_mmu.h new file mode 100644 index 000000000000..ac354fd5bac9 --- /dev/null +++ b/arch/s390/include/asm/kvm_mmu.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * KVM MMU for arm64 guests. + */ +#ifndef __S390_ARM64_KVM_MMU_H__ +#define __S390_ARM64_KVM_MMU_H__ + +#include + +#include + +#endif /* __S390_ARM64_KVM_MMU_H__ */ diff --git a/arch/s390/include/asm/kvm_nested.h b/arch/s390/include/asm/kvm_nested.h new file mode 100644 index 000000000000..7158932e718b --- /dev/null +++ b/arch/s390/include/asm/kvm_nested.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Nested KVM for arm64 guests. (Not supported by s390) + */ +#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/kvm/arm64/handle_exit.c b/arch/s390/kvm/arm64/handle_exit.c new file mode 100644 index 000000000000..89933a604876 --- /dev/null +++ b/arch/s390/kvm/arm64/handle_exit.c @@ -0,0 +1,50 @@ +// SPDX-License-Identifier: GPL-2.0 +#include + +#include +#include + +#include + +#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 missing). + * 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 = vcpu_get_reg(vcpu, 0); + u64 val = PSCI_RET_NOT_SUPPORTED; + int ret = 1; + + if (func_id == PSCI_0_2_FN_SYSTEM_OFF) { + spin_lock(&vcpu->arch.mp_state_lock); + WRITE_ONCE(vcpu->arch.mp_state.mp_state, KVM_MP_STATE_STOPPED); + spin_unlock(&vcpu->arch.mp_state_lock); + 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 = KVM_SYSTEM_EVENT_SHUTDOWN; + vcpu->run->system_event.ndata = 1; + vcpu->run->system_event.data[0] = 0; + vcpu->run->exit_reason = KVM_EXIT_SYSTEM_EVENT; + val = PSCI_RET_INTERNAL_FAILURE; + ret = 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[] = { + [0 ... ESR_ELx_EC_MAX] = kvm_handle_unknown_ec, + [ESR_ELx_EC_HVC64] = handle_hvc, +}; diff --git a/arch/s390/kvm/arm64/inject_fault.c b/arch/s390/kvm/arm64/inject_fault.c new file mode 100644 index 000000000000..d4058c3f226e --- /dev/null +++ b/arch/s390/kvm/arm64/inject_fault.c @@ -0,0 +1,15 @@ +// 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*/ +} -- 2.51.0