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 42D16C624A5 for ; Mon, 31 Aug 2026 15:01:28 +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=MmNBAaSP10njDEMdVZMQ4XCdAiOoaIKg1V9E56+33X0=; b=kL4wY9d9t9yg5sHNqfzHY9cvWZ 3Crx5xOF6hiiGTYsex22pYxasqsZlBXTjoALbqFgxoktrLgNu1l48t+I5/9iktzNkGdR70zH+sAZZ qUN6oQN8i7FnVK62Kg95KcPyKjQO4jWo+n0/QlRS0z/qyhwi3KYKtQ6yvwb+V9JaYIb1GYcmatsY1 tnUYAVRJSE08yf+3Y5W4eI3zjFuAFyktzYHjzlevHhYu0vD5add8gKU1fmETjpGfGL7cJr5YQoAbS IWm0YslFyJp/fR6erQqEusOrhorYCuVjr7KPurvhfww3TejnrNqsLKHFBC/0BI/Ux5aoMe3liJFWM HUBmQTaw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x13Vf-00000009mAy-1P2O; Mon, 31 Aug 2026 15:01:19 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x13VX-00000009m1l-4BPO for linux-arm-kernel@bombadil.infradead.org; Mon, 31 Aug 2026 15:01:12 +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=MmNBAaSP10njDEMdVZMQ4XCdAiOoaIKg1V9E56+33X0=; b=LEZ82yJPNaudEiHgmsZfwzCSkK Z2ec2R+H0K1uxmjBLq+bC010U6px4M6KxDs6+TAE8SvW2fU1rUcTim+ncrvdrICazj18EgHARflse QKgjjNmRm4VoG7MvEtOeoFscb5tslj1uXK3vjsKHUKOEYl2nDL12wjzr0XZbOJ8C3wrxht9xTo3kA 9/FjCJUNdfDfQUUjQPqG+csjFtqsG1Vw1f8Zv/kOJDgfPpkTwB4RerbIlXUXnEljjJtRoW8byntYk JwzOixXGKTLWvbhjUc/4umf7EOqiUC/be7y/hUXhOcrt0Vg/BlclUou9U3tnC1IbQgSv1uACS4hFF xLJzquXg==; Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1x13VU-00000009xvu-33gP for linux-arm-kernel@lists.infradead.org; Mon, 31 Aug 2026 15:01:10 +0000 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 67VEZMYp1398414; Mon, 31 Aug 2026 14:55:55 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=MmNBAaSP10njDEMdV ZMQ4XCdAiOoaIKg1V9E56+33X0=; b=MswAUQPUygQGaQ8vGlocoWdRdNj1XajXw 7gkvwOiHuIxKp7z0KygxWEMcbXS8TgoUoTuoHAofM30hL+zgfd1j85LJc8gA3yeD q115LHLyncqaBAgBe2CXoz0gfwWUWxSbUs0i0oRdmpOkq1JqyE53QaLBWrvM1dH1 LjgyOExgv7FaDhFFHzyTAOiajO3lgxBgCRNZWm5e4NdATHtcQy5Rb51hMCMaLBRM uasQI2SPD2++Ikg0NRTz7gtZvIz2DhXSUdXG7q+5QqBrf5f+0ZwczASyKIoyi8KU OawaXrn32mZRegm+mln0nl/RdrQn5rVvCUTIN3DYYrwHrYPPR2tOw== 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 4gbnudj18k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 31 Aug 2026 14:55:54 +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 67VEfcEX029530; Mon, 31 Aug 2026 14:55:53 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gccexx8v5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 31 Aug 2026 14:55:53 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67VEtkgH49086974 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 31 Aug 2026 14:55:46 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 193BF20040; Mon, 31 Aug 2026 14:55:46 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9C4112004D; Mon, 31 Aug 2026 14:55:45 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 31 Aug 2026 14:55:45 +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 v2 17/20] KVM: s390: arm64: Finalize page fault handling Date: Mon, 31 Aug 2026 16:55:32 +0200 Message-ID: <20260831145536.913567-18-seiden@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260831145536.913567-1-seiden@linux.ibm.com> References: <20260831145536.913567-1-seiden@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: hZjDaTtAfeAICy-xgzvXSwbI66Vtr1TP X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMxMDEyNSBTYWx0ZWRfX6cDYM6nRgIso gMUtvnOyN6rAokb0HxDWp8kBI9v9ocaaWKuBGXpu1JnHlEAXatxbMj/Zi8dGKFe1buY3nVz+rGP jZdhmf8UUpXZW/jzvs/wQ/f4vWlna7dYfWG0Byg2E/xkAdYf+lTx5p8ZPt6kIxoiIZnDPeT3fh0 gqK/klvnZOa6ontAjBI/xXKywVGeesgKsQDxjLwc0F1ni5moTUAgb88RpBXcOs3KiZWgwtE/LJ9 n9FAKW6QSWfL7gHMhHwI6gS5LNaRT3v6LhxME4imPCaSrk/3zxXGEyHT0zdnySfFbr7PDRCE66k cxQtnaXbErFzjHl1NcCyjOT85+XG2PnkOdJTbf7GbOOYZlpGKiw1/Abf7MVjGChPBcwAkmhwrMg P5vbW6GxinAb5uLnQNQAWgO2g6rNIpyU1eAdO6jy1vJJQPBJutsFtygK5ITOlZdGUhlvxqIn0tv JtgsEACYRdPb3Nert0g== X-Proofpoint-ORIG-GUID: upSeR6PoHmbjotaSlhTZxboIidNTVjRE X-Proofpoint-Spam-Info: AW1haW4tMjYwODMxMDEyNSBTYWx0ZWRfX3BhtkiMLLJ1Z uIjDmch94OgUgODmGmC6liW3qzyysCYvlLi+dO2R9trDR7ZpgVgbYszcOjnyPg82fGxe/WLPua0 jWJBxwXj2ZiY0jN/NxOmzd4/GoELdCI= X-Authority-Analysis: v=2.4 cv=B92JFutM c=1 sm=1 tr=0 ts=6a9595fa cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=LtHRyupC2uTP9dkk8LUA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-31_05,2026-08-27_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 clxscore=1015 suspectscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608310125 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260831_160109_085604_9E9E23AD X-CRM114-Status: GOOD ( 22.25 ) 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 Complete the page fault handling implementation by replacing temporary error returns with proper ARM64 exception injection. Signed-off-by: Steffen Eiden --- arch/s390/include/asm/kvm_host_arm64.h | 1 + arch/s390/kvm/arm64/arm.c | 6 +++ arch/s390/kvm/arm64/mmu.c | 68 ++++++++++++++++++-------- 3 files changed, 54 insertions(+), 21 deletions(-) diff --git a/arch/s390/include/asm/kvm_host_arm64.h b/arch/s390/include/asm/kvm_host_arm64.h index 16a378b68c8a..c0e8fbddc9dc 100644 --- a/arch/s390/include/asm/kvm_host_arm64.h +++ b/arch/s390/include/asm/kvm_host_arm64.h @@ -427,5 +427,6 @@ static inline bool has_broken_cntvoff(void) } void kvm_adjust_pc(struct kvm_vcpu *vcpu); +size_t kvm_parange_to_address_sanitized(u32 id_parange); #endif /* ASM_KVM_HOST_ARM64_H */ diff --git a/arch/s390/kvm/arm64/arm.c b/arch/s390/kvm/arm64/arm.c index 89984c6a5b64..d2ff69422217 100644 --- a/arch/s390/kvm/arm64/arm.c +++ b/arch/s390/kvm/arm64/arm.c @@ -62,9 +62,15 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) static u64 kvm_max_guest_address(void) { + u64 mmfr0 = read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1); + u64 id_pa_addr; u64 max_addr; + id_pa_addr = kvm_parange_to_address_sanitized( + SYS_FIELD_GET(ID_AA64MMFR0_EL1, PARANGE, mmfr0)); + max_addr = min_t(u64, TASK_SIZE_MAX, sclp.hamax); + max_addr = min_t(u64, max_addr, id_pa_addr); max_addr = max_t(u64, max_addr, SZ_1G - 1); return ALIGN_DOWN(max_addr + 1, SZ_1G) - 1; } diff --git a/arch/s390/kvm/arm64/mmu.c b/arch/s390/kvm/arm64/mmu.c index bf3442d3609b..b5f1dc3ca0d2 100644 --- a/arch/s390/kvm/arm64/mmu.c +++ b/arch/s390/kvm/arm64/mmu.c @@ -30,12 +30,14 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, gpa_t fault_ipa, ret = kvm_s390_faultin_gfn(vcpu, NULL, &f); if (ret <= 0) return ret; - if (ret == PGM_ADDRESSING) + if (ret == PGM_ADDRESSING) { /* - * Without the relevant sysregs we cannot do anything for now. - * Go back to userspace with an error. TODO sysreg handling + * There is no page with the requested address. Inject size fault + * which is the closest arm match to PGM-addressing */ - return -ENOEXEC; + kvm_inject_size_fault(vcpu); + return 1; + } KVM_BUG_ON(ret, vcpu->kvm); return -EINVAL; } @@ -68,6 +70,33 @@ static int kvm_handle_pic(struct kvm_vcpu *vcpu, bool *translation) return 0; } +size_t kvm_parange_to_address_sanitized(u32 id_parange) +{ + static u32 ranges_map[6] = { + [ID_AA64MMFR0_EL1_PARANGE_32] = 32, + [ID_AA64MMFR0_EL1_PARANGE_36] = 36, + [ID_AA64MMFR0_EL1_PARANGE_40] = 40, + [ID_AA64MMFR0_EL1_PARANGE_42] = 42, + [ID_AA64MMFR0_EL1_PARANGE_44] = 44, + [ID_AA64MMFR0_EL1_PARANGE_48] = 48, + }; + u32 parange; + + /* + * Future values must be higher than we know already. + * See ARM DDI 0487C.a. Return a safe limit. + */ + parange = ranges_map[min(id_parange, ID_AA64MMFR0_EL1_PARANGE_48)]; + return BIT_ULL(parange); +} + +static size_t kvm_get_pa_address(struct kvm *kvm) +{ + u32 id_parange = get_idreg_field_enum(kvm, ID_AA64MMFR0_EL1, PARANGE); + + return kvm_parange_to_address_sanitized(id_parange); +} + int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) { struct kvm_memory_slot *memslot; @@ -97,16 +126,17 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) } 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 >= BIT_ULL(get_kvm_ipa_limit())) - return -ENOEXEC; + /* Beyond sanitised PA range (which is the IPA limit) */ + if (fault_ipa >= kvm_get_pa_address(vcpu->kvm)) { + kvm_inject_size_fault(vcpu); + return 1; + } - if (fault_ipa >= vcpu->kvm->arch.guest_phys_size) - return -ENOEXEC; + /* Falls between the IPA range and the PA range? */ + if (fault_ipa >= vcpu->kvm->arch.guest_phys_size) { + fault_ipa |= kvm_vcpu_get_hfar(vcpu) & GENMASK(11, 0); + return kvm_inject_sea(vcpu, is_iabt, fault_ipa); + } } idx = srcu_read_lock(&vcpu->kvm->srcu); @@ -122,18 +152,14 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) * 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) + if (is_iabt) { + ret = kvm_inject_sea_iabt(vcpu, kvm_vcpu_get_hfar(vcpu)); 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 - */ + ret = kvm_inject_sea_dabt(vcpu, kvm_vcpu_get_hfar(vcpu)); goto out_unlock; } -- 2.53.0