From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04E486082BE3 for ; Fri, 6 Nov 2026 16:08:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=DvIVwagp; dkim=pass (2048-bit key, unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=dy6XQ8yQ 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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=1S09I8a7yWrqvahJtv4gmjvFPe1GtmBLLAtRtlKmIjM=; b=DvIVwagpKVgeib /xFZHjF5Plkcgvhxe82z4DDiPaPCKJeEG5s4wM6drfHllJtxQyDy2MfDmPsUXOE6kYJc6z6Eif37O u8QOFcfVntIJ7PkSPzViuwQRPc0YGk7k6v2Jk7lgZEmZHaix6Nq3c0UEY7Gln5VYGuXLlFSXGyEEY etgCDuwpevy5aCFScIp5yPeKPOb1ih//EgcfSf15CfE3S757XfWcPoy8q68QiUE2wGFbXfloT2fpG QDcmQEDICBvj56UzM5jH7i5kHh2As4spJjsNvye+CQN6OwMxRbMoBcu17J8Z2MijzYCCKHU5hL4c8 XidH8dVWTBJ9fGoHy5AA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPMUd-0000000CxUN-1MGc; Fri, 06 Nov 2026 16:08:43 +0000 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPMUY-0000000CxQN-3gim for linux-arm-kernel@lists.infradead.org; Fri, 06 Nov 2026 16:08:40 +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 6A6FE4fW1094477; Fri, 6 Nov 2026 16:08:25 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=1S09I8 a7yWrqvahJtv4gmjvFPe1GtmBLLAtRtlKmIjM=; b=dy6XQ8yQaSzcRS6WOAC0Kc Bl6duE+Tcm100gIvdH9WAwqb1/dtJujm3Pf10KQZIkp38g0b3BTBSww/GOoSVt9L W6ir6ISWnevLPYLvgpcbR++PphSbPJAdtt4NdB2xFC1tUIQHrENPZWuqhDkEXV50 WCgr4PyEKAigwxx7RvgJJHQ9U7Rh8+BBXVC6L5Q3aL2mjG4hou5NzQ3L/rNFYfM3 gTpI/z5rw4bGO9M09Rt87Jodv9Co8pxGUAftVuCuFd+z4rrSdRg5zzQlp8Wf21Jn YyZWfF3RjYGJ7Ud4yt4sDa4KsAoJ9qxDtKnS2SEnKu5+cvcFDm9x1jfOPT5Rp3Jg == 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 4hs3rawj04-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 06 Nov 2026 16:08:25 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 6A6F4vxg3617218; Fri, 6 Nov 2026 16:08:24 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4hrdd7ukcp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Nov 2026 16:08:24 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 6A6G8KHo56033582 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 6 Nov 2026 16:08:20 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1B4F12004B; Fri, 6 Nov 2026 16:08:20 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A9B4420067; Fri, 6 Nov 2026 16:08:19 +0000 (GMT) Received: from a46lp73.lnxne.boe (unknown [9.87.84.240]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 6 Nov 2026 16:08:19 +0000 (GMT) From: Steffen Eiden Date: Fri, 06 Nov 2026 17:07:48 +0100 Subject: [PATCH v3 15/23] KVM: s390: arm64: Implement feature sanitisation X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261106-sysreg-v3-15-75e95980fb10@linux.ibm.com> References: <20261106-sysreg-v3-0-75e95980fb10@linux.ibm.com> In-Reply-To: <20261106-sysreg-v3-0-75e95980fb10@linux.ibm.com> To: Marc Zyngier , Oliver Upton , Fuad Tabba , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Mark Rutland , Andreas Grapentin , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , David Hildenbrand , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Sven Schnelle , Friedrich Welter , Gautam Gala , Hariharan Mari , Hendrik Brueckner , Nico Boehr , Ulrich Weigand , Arnd Bergmann , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, Steffen Eiden X-Mailer: b4 0.14.3 X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=QYDzLcbv c=1 sm=1 tr=0 ts=6aedfb79 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=IkcTkHD0fZMA:10 a=zJRp6_cAMcgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=Oy4CJlU8JfxsjEMJYM8A:9 a=QEXdDO2ut3YA:10 X-Proofpoint-GUID: xQav5-pQc2VEFR4eZ4Y1e5nbgbjxKHwv X-Proofpoint-ORIG-GUID: xQav5-pQc2VEFR4eZ4Y1e5nbgbjxKHwv X-Proofpoint-Spam-Info: AW1haW4tMjYxMTA2MDA2MiBTYWx0ZWRfX9QLP60xuCNSF SAj5QG9WFZ81UvW97tUjQhcpZExR09JEbN5/Cs2Lw4KzxPnOb+UcFzZSprijk72F0PVwtwGW+gN rKmgg4NzremG2YIl1I1w9l46UlG17dU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMTA2MDA2MiBTYWx0ZWRfX3KH9ahbLGN36 9AhaHcKzRg3rrLI/2MogTrryQqEzA0F4dPst+mzVcBUSolDuWTaFgw1fUDaKa1QxhCw+3e+gYmJ c6hB79oIyDiBF4YDoP8O2P1T6veP/R+QIQwevQAROGKQphTZqN6IKQmMnkAZveewYxTfiqjlcgL 0iy/GCd55ieWCX+o1VironOU8Czj68v/894k4jBp2dDkUt0cOa4fJ7oIWsHNVojkHsMin1Rz8j+ AWuNcRFVuaFftOUhXUJ26/+NtWPxRKBdTCiridH37TBc6vWC1u9JSuRxIYY9yN6emPtv4VE3lJO 1lvtQgc54X+sh06lcMJcJRAb7xdMCy0e78UYJSRXN2j/huNNTHsyG/AQXENmdQxB9c3e86M3BPt +TOzYiDPDV975AZdGnnQD8jjWLiExcVI5NUqToLTgPI5oPs1OwtsfXSO01KGwfsQQCKOLZDPUVh S5pWNCL514TPk7LAtHQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.138,FMLib:17.12.100.49 definitions=2026-11-06_05,2026-11-06_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 impostorscore=0 suspectscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2611040001 definitions=main-2611060062 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261106_080839_093116_FEEC8828 X-CRM114-Status: GOOD ( 23.64 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Implement feature detection and sanitization for arm64 KVM guests on s390. Query hardware capabilities using QAAF instruction and sanitize arm64 ID registers. Provide accessor functions for queried capabilities and integrate feature detection into module initialization sequence. Co-developed-by: Andreas Grapentin Signed-off-by: Andreas Grapentin Signed-off-by: Steffen Eiden --- arch/s390/include/asm/kvm_host_arm64.h | 13 +++ arch/s390/kvm/arm64/Makefile | 1 + arch/s390/kvm/arm64/arm.c | 2 +- arch/s390/kvm/arm64/feature.c | 163 +++++++++++++++++++++++++++++++++ arch/s390/kvm/arm64/feature.h | 86 +++++++++++++++++ arch/s390/kvm/arm64/qaaf.c | 2 + 6 files changed, 266 insertions(+), 1 deletion(-) diff --git a/arch/s390/include/asm/kvm_host_arm64.h b/arch/s390/include/asm/kvm_host_arm64.h index 3e69724f17c9..9afe37f6696c 100644 --- a/arch/s390/include/asm/kvm_host_arm64.h +++ b/arch/s390/include/asm/kvm_host_arm64.h @@ -15,6 +15,19 @@ enum vcpu_sysreg; #include +enum { + ARM64_HAS_WFXT, + ARM64_HAS_RASV1P1_EXTN, + ARM64_HAS_STAGE2_FWB, + ARM64_HAS_RAS_EXTN, + ARM64_HAS_EVT, + ARM64_HAS_HCR_NV1, + ARM64_MISMATCHED_CACHE_TYPE, + ARM64_HAS_ECV_CNTPOFF, +}; + +bool cpus_have_final_cap(unsigned int num); + #define KVM_HAVE_MMU_RWLOCK #define KVM_MAX_VCPUS 1 #define __KVM_HAVE_VCPU_RUN_PID_CHANGE diff --git a/arch/s390/kvm/arm64/Makefile b/arch/s390/kvm/arm64/Makefile index e9587c6d6de9..e75b38071f8a 100644 --- a/arch/s390/kvm/arm64/Makefile +++ b/arch/s390/kvm/arm64/Makefile @@ -11,6 +11,7 @@ ccflags-y += -I $(src) -I $(objtree)/$(obj) -I$(srctree)/arch/$(SRCARCH)/kvm/gma kvm-arm64-local := \ arm.o \ + feature.o \ guest.o \ handle_exit.o \ inject_fault.o \ diff --git a/arch/s390/kvm/arm64/arm.c b/arch/s390/kvm/arm64/arm.c index 3af0b47b8377..ba6235629c7d 100644 --- a/arch/s390/kvm/arm64/arm.c +++ b/arch/s390/kvm/arm64/arm.c @@ -20,6 +20,7 @@ #include #include "arm.h" +#include "feature.h" #include "handle_exit.h" #include "qaaf.h" @@ -27,7 +28,6 @@ #include "trace.h" static unsigned long system_supported_vcpu_features(struct kvm_vcpu *vcpu); -#define read_sanitised_ftr_reg(_id) 0 #define __INCL_GEN_ARM_FILE #include "generated/arm.inc" diff --git a/arch/s390/kvm/arm64/feature.c b/arch/s390/kvm/arm64/feature.c new file mode 100644 index 000000000000..f8b23ba85f9e --- /dev/null +++ b/arch/s390/kvm/arm64/feature.c @@ -0,0 +1,163 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include +#include +#include +#include + +#include + +#include "feature.h" + +#define MASK_RESERVED(_qaafp, _id) \ + ({ \ + u64 *_reg = &((_qaafp)->regs[QAAF_REG_##_id]); \ + *_reg = (*_reg & ~_id##_RES0) | _id##_RES1; \ + }) + +#define QAAF_FIELD_MODIFY(_idp, _id_field, _val) \ + FIELD_MODIFY(_id_field##_MASK, _idp, _id_field##_##_val) + +#define MODIFY(_qaafp, _id, _field, _val) \ + QAAF_FIELD_MODIFY(&((_qaafp)->regs[QAAF_REG_##_id]), _id##_##_field, _val) + +void __init kvm_arm_host_sanitize_features(struct qaaf_qmc_block *qaaf_qmc) +{ + MASK_RESERVED(qaaf_qmc, ID_AA64ISAR0_EL1); + + MODIFY(qaaf_qmc, ID_AA64ISAR1_EL1, LS64, NI); + MASK_RESERVED(qaaf_qmc, ID_AA64ISAR1_EL1); + + MODIFY(qaaf_qmc, ID_AA64ISAR2_EL1, SYSINSTR_128, NI); + MODIFY(qaaf_qmc, ID_AA64ISAR2_EL1, SYSREG_128, NI); + MODIFY(qaaf_qmc, ID_AA64ISAR2_EL1, PAC_frac, NI); + MASK_RESERVED(qaaf_qmc, ID_AA64ISAR2_EL1); + + MASK_RESERVED(qaaf_qmc, ID_AA64ISAR3_EL1); + + MASK_RESERVED(qaaf_qmc, ID_AA64MMFR0_EL1); + MASK_RESERVED(qaaf_qmc, ID_AA64MMFR1_EL1); + MASK_RESERVED(qaaf_qmc, ID_AA64MMFR2_EL1); + + MODIFY(qaaf_qmc, ID_AA64MMFR3_EL1, Spec_FPACC, NI); + MODIFY(qaaf_qmc, ID_AA64MMFR3_EL1, ADERR, NI); + MODIFY(qaaf_qmc, ID_AA64MMFR3_EL1, SDERR, NI); + MODIFY(qaaf_qmc, ID_AA64MMFR3_EL1, ANERR, NI); + MODIFY(qaaf_qmc, ID_AA64MMFR3_EL1, SNERR, NI); + MODIFY(qaaf_qmc, ID_AA64MMFR3_EL1, MEC, NI); + MASK_RESERVED(qaaf_qmc, ID_AA64MMFR3_EL1); + + MODIFY(qaaf_qmc, ID_AA64MMFR4_EL1, SRMASK, NI); + MODIFY(qaaf_qmc, ID_AA64MMFR4_EL1, E3DSE, NI); + MODIFY(qaaf_qmc, ID_AA64MMFR4_EL1, RMEGDI, NI); + MODIFY(qaaf_qmc, ID_AA64MMFR4_EL1, FGWTE3, NI); + MODIFY(qaaf_qmc, ID_AA64MMFR4_EL1, ASID2, NI); + MASK_RESERVED(qaaf_qmc, ID_AA64MMFR4_EL1); + + MODIFY(qaaf_qmc, ID_AA64PFR0_EL1, SEL2, NI); + MODIFY(qaaf_qmc, ID_AA64PFR0_EL1, SVE, NI); + MASK_RESERVED(qaaf_qmc, ID_AA64PFR0_EL1); + MASK_RESERVED(qaaf_qmc, ID_AA64PFR1_EL1); + MASK_RESERVED(qaaf_qmc, ID_AA64PFR2_EL1); + + MODIFY(qaaf_qmc, ID_AA64DFR0_EL1, PMUVer, NI); + MASK_RESERVED(qaaf_qmc, ID_AA64DFR0_EL1); + MASK_RESERVED(qaaf_qmc, ID_AA64DFR1_EL1); + MASK_RESERVED(qaaf_qmc, ID_AA64DFR2_EL1); + + MASK_RESERVED(qaaf_qmc, ID_AA64AFR0_EL1); + MASK_RESERVED(qaaf_qmc, ID_AA64AFR1_EL1); + + MASK_RESERVED(qaaf_qmc, ID_AA64ZFR0_EL1); + + MASK_RESERVED(qaaf_qmc, ID_AA64SMFR0_EL1); + + MASK_RESERVED(qaaf_qmc, ID_AA64FPFR0_EL1); + + MASK_RESERVED(qaaf_qmc, ID_PFR0_EL1); + MASK_RESERVED(qaaf_qmc, ID_PFR1_EL1); + MASK_RESERVED(qaaf_qmc, ID_PFR2_EL1); + + MASK_RESERVED(qaaf_qmc, ID_DFR0_EL1); + MASK_RESERVED(qaaf_qmc, ID_DFR1_EL1); + + MASK_RESERVED(qaaf_qmc, ID_MMFR0_EL1); + MASK_RESERVED(qaaf_qmc, ID_MMFR1_EL1); + MASK_RESERVED(qaaf_qmc, ID_MMFR2_EL1); + MASK_RESERVED(qaaf_qmc, ID_MMFR3_EL1); + MASK_RESERVED(qaaf_qmc, ID_MMFR4_EL1); + MASK_RESERVED(qaaf_qmc, ID_MMFR5_EL1); + + MASK_RESERVED(qaaf_qmc, ID_ISAR0_EL1); + MASK_RESERVED(qaaf_qmc, ID_ISAR1_EL1); + MASK_RESERVED(qaaf_qmc, ID_ISAR2_EL1); + MASK_RESERVED(qaaf_qmc, ID_ISAR3_EL1); + MASK_RESERVED(qaaf_qmc, ID_ISAR4_EL1); + MASK_RESERVED(qaaf_qmc, ID_ISAR5_EL1); + MASK_RESERVED(qaaf_qmc, ID_ISAR6_EL1); + + MASK_RESERVED(qaaf_qmc, MVFR0_EL1); + MASK_RESERVED(qaaf_qmc, MVFR1_EL1); + MASK_RESERVED(qaaf_qmc, MVFR2_EL1); + + MASK_RESERVED(qaaf_qmc, CTR_EL0); + + MASK_RESERVED(qaaf_qmc, ICH_VTR_EL2); +} + +/** + * cpus_have_final_cap - Check if an ARM64 CPU capability is supported + * @num: Capability number to check + * + * Maps ARM64 CPU capabilities to their corresponding ID register fields + * and checks if the feature is supported by the s390 hardware via QAAF. + * + * Return: true if capability is supported, false otherwise + */ +bool cpus_have_final_cap(unsigned int num) +{ + u64 reg_val; + + switch (num) { + case ARM64_HAS_STAGE2_FWB: + reg_val = read_sanitised_ftr_reg(SYS_ID_AA64MMFR2_EL1); + return SYS_FIELD_GET(ID_AA64MMFR2_EL1, FWB, reg_val) >= + ID_AA64MMFR2_EL1_FWB_IMP; + + case ARM64_HAS_WFXT: + reg_val = read_sanitised_ftr_reg(SYS_ID_AA64ISAR2_EL1); + return SYS_FIELD_GET(ID_AA64ISAR2_EL1, WFxT, reg_val) >= + ID_AA64ISAR2_EL1_WFxT_IMP; + + case ARM64_HAS_RASV1P1_EXTN: + reg_val = read_sanitised_ftr_reg(SYS_ID_AA64PFR1_EL1); + return SYS_FIELD_GET(ID_AA64PFR1_EL1, RAS_frac, reg_val) == + ID_AA64PFR1_EL1_RAS_frac_RASv1p1; + + case ARM64_HAS_HCR_NV1: + reg_val = read_sanitised_ftr_reg(SYS_ID_AA64MMFR4_EL1); + return SYS_FIELD_GET(ID_AA64MMFR4_EL1, E2H0, reg_val) == + ID_AA64MMFR4_EL1_E2H0_IMP; + + case ARM64_HAS_RAS_EXTN: + reg_val = read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1); + return SYS_FIELD_GET(ID_AA64PFR0_EL1, RAS, reg_val) >= + ID_AA64PFR0_EL1_RAS_IMP; + + case ARM64_HAS_EVT: + reg_val = read_sanitised_ftr_reg(SYS_ID_AA64MMFR2_EL1); + return SYS_FIELD_GET(ID_AA64MMFR2_EL1, EVT, reg_val) >= + ID_AA64MMFR2_EL1_EVT_IMP; + + case ARM64_HAS_ECV_CNTPOFF: + reg_val = read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1); + return SYS_FIELD_GET(ID_AA64MMFR0_EL1, ECV, reg_val) >= + ID_AA64MMFR0_EL1_ECV_CNTPOFF; + + case ARM64_MISMATCHED_CACHE_TYPE: + return false; + default: + return false; + } +} diff --git a/arch/s390/kvm/arm64/feature.h b/arch/s390/kvm/arm64/feature.h new file mode 100644 index 000000000000..0a59047fda6e --- /dev/null +++ b/arch/s390/kvm/arm64/feature.h @@ -0,0 +1,86 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef ARCH_S390_KVM_FEATURE_H +#define ARCH_S390_KVM_FEATURE_H + +#include +#include + +#include + +#include "qaaf.h" + +void __init kvm_arm_host_sanitize_features(struct qaaf_qmc_block *qaaf_qmc); + +/** + * read_sanitised_ftr_reg() - Get the value of a sys register + * + * @id - ARM sysreg id + * + * Get the value of a sys register describing the host configuration. + * The returned value indicates support by the machine (HW/FW) + * after some sanitisation. + * + * Example: + * read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1) + * + * Return: Sanitised HW value of the specified register + */ +static inline u64 read_sanitised_ftr_reg(u32 id) +{ + return kvm_qaaf_read_ftr_reg(id); +} + +/** + * kvm_sae_supported_sd_formats() - Retrieve supported SAE SD formats + * + * Return: Bitmap of supported SAE state description formats. + */ +static inline u32 kvm_sae_supported_sd_formats(void) +{ + struct qaaf_qmc_block *qmc = kvm_qaaf_qmc(); + + return qmc->ssdf; +} + +/** + * kvm_sae_supported_sa_formats() - Retrieve supported SAE SA formats + * + * Return: Bitmap of supported SAE save area formats. + */ +static inline u32 kvm_sae_supported_sa_formats(void) +{ + struct qaaf_qmc_block *qmc = kvm_qaaf_qmc(); + + return qmc->ssaf; +} + +/** + * kvm_sae_max_vcpus() - Retrieve maximum supported vcpus + * + * Return: Max number of vCPUs supported by the SAE instruction/the machine + * as indicated by QAAF, not necessarily that supported by the host software. + */ +static inline u32 kvm_sae_max_vcpus(void) +{ + struct qaaf_qmc_block *qmc = kvm_qaaf_qmc(); + + /* QAAF QMC reports the max id not the max num */ + return qmc->maxncpu + 1; +} + +/** + * kvm_sae_irptc() - Retrieve supported SAE IRPTCs + * + * Return: Bitmap of supported SAE IRPTCs. + */ +static inline u64 kvm_sae_irptc(void) +{ + struct qaaf_qmc_block *qmc = kvm_qaaf_qmc(); + + return qmc->regs[QAAF_IRPTC]; +} + +#define kvm_vcpu_has_pmu(_v) false + +#endif /* ARCH_S390_KVM_FEATURE_H */ diff --git a/arch/s390/kvm/arm64/qaaf.c b/arch/s390/kvm/arm64/qaaf.c index f6b1750aed68..36487025013c 100644 --- a/arch/s390/kvm/arm64/qaaf.c +++ b/arch/s390/kvm/arm64/qaaf.c @@ -3,6 +3,7 @@ #include #include #include "qaaf.h" +#include "feature.h" static struct qaaf_qmc_block qmc_sanitized; @@ -17,6 +18,7 @@ struct qaaf_qmc_block *kvm_qaaf_qmc(void) void __init kvm_init_qaaf(void) { qmc_sanitized = *aef_qmc(); + kvm_arm_host_sanitize_features(&qmc_sanitized); } #define _qaaf_reg_case(id) case SYS_##id: return qmc_sanitized.regs[QAAF_REG_##id] -- 2.56.0