From nobody Wed Dec 31 11:07:28 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D972C4332F for ; Fri, 3 Nov 2023 17:30:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377493AbjKCRaY (ORCPT ); Fri, 3 Nov 2023 13:30:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230161AbjKCRaU (ORCPT ); Fri, 3 Nov 2023 13:30:20 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A700B184; Fri, 3 Nov 2023 10:30:17 -0700 (PDT) Received: from pps.filterd (m0353723.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3H9W3n005481; Fri, 3 Nov 2023 17:30:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=NxvAOzhg827pv6avDli2bC+1p13rvYlgHvqhDgIz0KU=; b=XHF3Ao6SPCyr4CsYGzSuBOVE6yrGqh9o8STa7VDgwOhFAkDuFes00RnjlUyrhPrtuJpV gsp2gbMn1aAkgxnC05IuDAB3OBd2zbpQPWkPuRg30RvURwQPzxgLRunMFx10KIJh/xf1 2ZhJWJuml6xlp0sNLCGJBt7TO2Clb1ooRuQI2HMdrWeSRN7drt+N7tjHVy4KpwGRLdsL jGRMl5iaUxML6MLkQpwzi5aqFhW6ZS3lZnLSmhRr7T1yQC2jWpcb8sE0zblfajSCWW3t vmF4Mfm0xmVDj2AnRJBV4N30pceYaU0/59mus3ug3FvIRwkUrsn9XWlQkajIs5SdTf5n Kg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3u55100kyu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:30:16 +0000 Received: from m0353723.ppops.net (m0353723.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3A3HMJph022109; Fri, 3 Nov 2023 17:30:16 GMT 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 3u55100kyb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:30:16 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3FPOVm011389; Fri, 3 Nov 2023 17:30:15 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3u1eukq4ju-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:30:15 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3A3HUAQa36503890 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Nov 2023 17:30:10 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0BFE92004E; Fri, 3 Nov 2023 17:30:10 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B92EB2004B; Fri, 3 Nov 2023 17:30:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 3 Nov 2023 17:30:09 +0000 (GMT) From: Nina Schoetterl-Glausch To: Alexander Gordeev , Christian Borntraeger , Heiko Carstens , David Hildenbrand , Claudio Imbrenda , Janosch Frank , Vasily Gorbik Cc: Nina Schoetterl-Glausch , kvm@vger.kernel.org, Michael Mueller , linux-s390@vger.kernel.org, Cornelia Huck , Sven Schnelle , David Hildenbrand , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] KVM: s390: vsie: Fix STFLE interpretive execution identification Date: Fri, 3 Nov 2023 18:30:05 +0100 Message-Id: <20231103173008.630217-2-nsg@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231103173008.630217-1-nsg@linux.ibm.com> References: <20231103173008.630217-1-nsg@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: FIu8Gbxl_-q1aLPaEfkkKn_pD6qvy3Ys X-Proofpoint-GUID: cOAEU8HiC1LlMHHaNfDydcMjYdNJVRRB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-03_16,2023-11-02_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 suspectscore=0 mlxlogscore=999 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2311030146 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" STFLE can be interpretively executed. This occurs when the facility list designation is unequal to zero. Perform the check before applying the address mask instead of after. Fixes: 66b630d5b7f2 ("KVM: s390: vsie: support STFLE interpretation") Signed-off-by: Nina Schoetterl-Glausch Acked-by: David Hildenbrand Reviewed-by: Claudio Imbrenda --- arch/s390/kvm/vsie.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 61499293c2ac..d989772fe211 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -988,9 +988,10 @@ static void retry_vsie_icpt(struct vsie_page *vsie_pag= e) static int handle_stfle(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) { struct kvm_s390_sie_block *scb_s =3D &vsie_page->scb_s; - __u32 fac =3D READ_ONCE(vsie_page->scb_o->fac) & 0x7ffffff8U; + __u32 fac =3D READ_ONCE(vsie_page->scb_o->fac); =20 if (fac && test_kvm_facility(vcpu->kvm, 7)) { + fac =3D fac & 0x7ffffff8U; retry_vsie_icpt(vsie_page); if (read_guest_real(vcpu, fac, &vsie_page->fac, sizeof(vsie_page->fac))) --=20 2.39.2 From nobody Wed Dec 31 11:07:28 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7C7AC4332F for ; Fri, 3 Nov 2023 17:30:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377719AbjKCRa3 (ORCPT ); Fri, 3 Nov 2023 13:30:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376525AbjKCRaW (ORCPT ); Fri, 3 Nov 2023 13:30:22 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FD3313E; Fri, 3 Nov 2023 10:30:17 -0700 (PDT) Received: from pps.filterd (m0353726.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3H7GSB002202; Fri, 3 Nov 2023 17:30:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=rW1R49MZgm4F0aHWaNHbGSUo7bf0vAKQc//SxLmUw9Y=; b=g1C2WPVLZcVRnijp6gRdSMaWr5FPsbti5qUV2aGF11x4NNsUQq7Ysn88Axg0rFVGH/qW hcUk8lW06i8a4sdq0U+KU+xzpfmcxZ+a4YyPUc2v7W0ojcvAYrSxR/ADHx0p9kJD2f1n 1kQe0Q//o5PX3a1QaZk3WXu/IkuxTcFZGTEqGTwF4/eEIpHOegz40fIlcba0t+hmIVPR Q9deYgig4P7lRzOKfk9WB3NoMwx8gV45+j3R0MayL2cxROfd+JgvQcUmWN6UEreDm8IZ KQv1ey4Qs4VdgS/PGswz1iHTqqViIb17OqO4mXLh88BeuH1m4agDDgyaBEDsiowcr+Cv og== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3u54yws4sg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:30:16 +0000 Received: from m0353726.ppops.net (m0353726.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3A3H7iok003895; Fri, 3 Nov 2023 17:30:16 GMT 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 3u54yws4s4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:30:16 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3GUneB000588; Fri, 3 Nov 2023 17:30:15 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3u1cmtqt1c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:30:15 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3A3HUAfv18612758 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Nov 2023 17:30:10 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5D1BA2004E; Fri, 3 Nov 2023 17:30:10 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 206822004B; Fri, 3 Nov 2023 17:30:10 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 3 Nov 2023 17:30:10 +0000 (GMT) From: Nina Schoetterl-Glausch To: Alexander Gordeev , Claudio Imbrenda , Christian Borntraeger , Vasily Gorbik , Heiko Carstens , Nina Schoetterl-Glausch , Janosch Frank , David Hildenbrand Cc: Cornelia Huck , linux-s390@vger.kernel.org, Sven Schnelle , kvm@vger.kernel.org, David Hildenbrand , linux-kernel@vger.kernel.org, Michael Mueller Subject: [PATCH 2/4] KVM: s390: vsie: Fix length of facility list shadowed Date: Fri, 3 Nov 2023 18:30:06 +0100 Message-Id: <20231103173008.630217-3-nsg@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231103173008.630217-1-nsg@linux.ibm.com> References: <20231103173008.630217-1-nsg@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 48ytNKaUiGovYjAqXkgiQLFaTULcgg8q X-Proofpoint-ORIG-GUID: -z2QJDfpKsCF1d-9C8oeRphP6EqHBFSR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-03_16,2023-11-02_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 mlxlogscore=999 suspectscore=0 spamscore=0 clxscore=1015 impostorscore=0 mlxscore=0 bulkscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2311030146 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The length of the facility list accessed when interpretively executing STFLE is the same as the hosts facility list (in case of format-0) When shadowing, copy only those bytes. The memory following the facility list need not be accessible, in which case we'd wrongly inject a validity intercept. Fixes: 66b630d5b7f2 ("KVM: s390: vsie: support STFLE interpretation") Signed-off-by: Nina Schoetterl-Glausch Acked-by: David Hildenbrand --- arch/s390/include/asm/facility.h | 6 ++++++ arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/facility.c | 18 ++++++++++++++++++ arch/s390/kvm/vsie.c | 12 +++++++++++- 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 arch/s390/kernel/facility.c diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facil= ity.h index 94b6919026df..796007125dff 100644 --- a/arch/s390/include/asm/facility.h +++ b/arch/s390/include/asm/facility.h @@ -111,4 +111,10 @@ static inline void stfle(u64 *stfle_fac_list, int size) preempt_enable(); } =20 +/** + * stfle_size - Actual size of the facility list as specified by stfle + * (number of double words) + */ +unsigned int stfle_size(void); + #endif /* __ASM_FACILITY_H */ diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 0df2b88cc0da..0daa81439478 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -41,7 +41,7 @@ obj-y +=3D sysinfo.o lgr.o os_info.o obj-y +=3D runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sth= yi.o obj-y +=3D entry.o reipl.o kdebugfs.o alternative.o obj-y +=3D nospec-branch.o ipl_vmparm.o machine_kexec_reloc.o unwind_bc.o -obj-y +=3D smp.o text_amode31.o stacktrace.o abs_lowcore.o +obj-y +=3D smp.o text_amode31.o stacktrace.o abs_lowcore.o facility.o =20 extra-y +=3D vmlinux.lds =20 diff --git a/arch/s390/kernel/facility.c b/arch/s390/kernel/facility.c new file mode 100644 index 000000000000..c33a95a562da --- /dev/null +++ b/arch/s390/kernel/facility.c @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright IBM Corp. 2023 + */ + +#include + +unsigned int stfle_size(void) +{ + static unsigned int size =3D 0; + u64 dummy; + + if (!size) { + size =3D __stfle_asm(&dummy, 1) + 1; + } + return size; +} +EXPORT_SYMBOL(stfle_size); diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index d989772fe211..c168e88c64da 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "kvm-s390.h" #include "gaccess.h" =20 @@ -990,11 +991,20 @@ static int handle_stfle(struct kvm_vcpu *vcpu, struct= vsie_page *vsie_page) struct kvm_s390_sie_block *scb_s =3D &vsie_page->scb_s; __u32 fac =3D READ_ONCE(vsie_page->scb_o->fac); =20 + /* + * Alternate-STFLE-Interpretive-Execution facilities are not supported + * -> format-0 flcb + */ if (fac && test_kvm_facility(vcpu->kvm, 7)) { fac =3D fac & 0x7ffffff8U; retry_vsie_icpt(vsie_page); + /* + * format-0 -> size of nested guest's facility list =3D=3D guest's size + * guest's size =3D=3D host's size, since STFLE is interpretatively exec= uted + * using a format-0 for the guest, too. + */ if (read_guest_real(vcpu, fac, &vsie_page->fac, - sizeof(vsie_page->fac))) + stfle_size() * sizeof(u64))) return set_validity_icpt(scb_s, 0x1090U); scb_s->fac =3D (__u32)(__u64) &vsie_page->fac; } --=20 2.39.2 From nobody Wed Dec 31 11:07:28 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB3AAC4167D for ; Fri, 3 Nov 2023 17:34:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229861AbjKCRen (ORCPT ); Fri, 3 Nov 2023 13:34:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbjKCRek (ORCPT ); Fri, 3 Nov 2023 13:34:40 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7442F136; Fri, 3 Nov 2023 10:34:37 -0700 (PDT) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3HYT3l013380; Fri, 3 Nov 2023 17:34:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=sGgNOwlVhZlYtE5+QhkGDW3azCEhR3HlhRVRiIoH4jY=; b=UEwdZAzpWHtEZsSsE0f3s4C0RpAL6QR5liFhmBEk0nGF4h7cqZpKQ/zEuzQ1T1kgYV+P DtFtRUK96orxNRHnmSay+3Gk/6kibQqHOrGSq5opoCqJ287a1atBxZWk3F+08w/XLF/0 0sapJS8HLv9Fa8cjmUAxma4cEVfeiJj/MXJ8z6AjI4qTuLFjggaJ9R220j+4R4kzpaQC h2YPMGTxm4Xu+xh48qcCzOzoV/1jahOeNvHtEbTK1KmGUf8M2S26zm2zys4aD8JD7MR8 OQzp8XDrdfmqcn7ksc7PJ2Q1GDLJaI0FKKw1C2gajTrMRv7okLFRA1HLgL8I9u0hi/7c LQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3u553r0d5p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:34:35 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3A3HYVRE013423; Fri, 3 Nov 2023 17:34:34 GMT 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 3u553r0cs5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:34:34 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3F2lW5011548; Fri, 3 Nov 2023 17:30:17 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3u1e4mfc3d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:30:17 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3A3HUAtC18612762 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Nov 2023 17:30:10 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BAF882004F; Fri, 3 Nov 2023 17:30:10 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 749E72004B; Fri, 3 Nov 2023 17:30:10 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 3 Nov 2023 17:30:10 +0000 (GMT) From: Nina Schoetterl-Glausch To: Alexander Gordeev , Cornelia Huck , Michael Mueller , Christian Borntraeger , Vasily Gorbik , Claudio Imbrenda , Heiko Carstens , David Hildenbrand , Janosch Frank Cc: Nina Schoetterl-Glausch , linux-kernel@vger.kernel.org, Sven Schnelle , kvm@vger.kernel.org, David Hildenbrand , linux-s390@vger.kernel.org Subject: [PATCH 3/4] KVM: s390: cpu model: Use previously unused constant Date: Fri, 3 Nov 2023 18:30:07 +0100 Message-Id: <20231103173008.630217-4-nsg@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231103173008.630217-1-nsg@linux.ibm.com> References: <20231103173008.630217-1-nsg@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: fvxm4DdpCvAk0EVaJXMYdbAvxknqzbTC X-Proofpoint-ORIG-GUID: u45ttFxhuK44a0HVVBEoyCo7tzKAqyI0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-03_16,2023-11-02_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 clxscore=1015 impostorscore=0 malwarescore=0 spamscore=0 phishscore=0 priorityscore=1501 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2311030147 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No point in defining a size for the mask if we're not going to use it. Fixes: 9d8d578605b4 ("KVM: s390: use facilities and cpu_id per KVM") Signed-off-by: Nina Schoetterl-Glausch --- arch/s390/include/asm/kvm_host.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost.h index 427f9528a7b6..46fcd2f9dff8 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -811,7 +811,7 @@ struct s390_io_adapter { =20 struct kvm_s390_cpu_model { /* facility mask supported by kvm & hosting machine */ - __u64 fac_mask[S390_ARCH_FAC_LIST_SIZE_U64]; + __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; --=20 2.39.2 From nobody Wed Dec 31 11:07:28 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB4F5C4167D for ; Fri, 3 Nov 2023 17:31:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376991AbjKCRbi (ORCPT ); Fri, 3 Nov 2023 13:31:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230161AbjKCRbf (ORCPT ); Fri, 3 Nov 2023 13:31:35 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C899013E; Fri, 3 Nov 2023 10:31:32 -0700 (PDT) Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3H9OC2002669; Fri, 3 Nov 2023 17:31:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=UsNIhSuDbtYP3OaMXs+2agd2J5yFl9Vo8sEz+w3vziQ=; b=SrVzf+ok+1PamAioLd/0etN4xnUuW1ewG7aPQF5paIDUwv2EMc+eMfBvwMeXuC8Q5y/c KGVoz2edANb4Gf4+6VA3lzR208P35ssHZsuSZZFsi7mNgiZiPu+GbVSUJXtJflXDPEuQ Y4Zu2OcShLugkD80eXG0fi2Q3uzK21eXgyzQnt1oYyIF8dTHcRRMgkmsvsPceZCPorJb 5w0keDFdDVYmHWjUBJ8nsWkCvtJjfCffWxfSPQ7fqv0uOJqyhPnWdw+QZSdN6oKTX/QT gNGll7kfzD034KpknHXSrVjgPjHtaHc73gsi53OdLmjcA4uvSYFgnVHqj397tq8DbmEX +w== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3u550x0mby-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:31:31 +0000 Received: from m0353722.ppops.net (m0353722.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3A3H9lHV004743; Fri, 3 Nov 2023 17:31:31 GMT 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 3u550x0mbn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:31:31 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3HLu1K007685; Fri, 3 Nov 2023 17:31:30 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3u1dmp7gs1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 03 Nov 2023 17:31:30 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3A3HUBe138338974 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Nov 2023 17:30:11 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 172C920040; Fri, 3 Nov 2023 17:30:11 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D00962005A; Fri, 3 Nov 2023 17:30:10 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 3 Nov 2023 17:30:10 +0000 (GMT) From: Nina Schoetterl-Glausch To: Christian Borntraeger , Janosch Frank , Heiko Carstens , Claudio Imbrenda , Alexander Gordeev , Vasily Gorbik Cc: Nina Schoetterl-Glausch , David Hildenbrand , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, Cornelia Huck , Sven Schnelle , Michael Mueller , David Hildenbrand Subject: [PATCH 4/4] KVM: s390: Minor refactor of base/ext facility lists Date: Fri, 3 Nov 2023 18:30:08 +0100 Message-Id: <20231103173008.630217-5-nsg@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231103173008.630217-1-nsg@linux.ibm.com> References: <20231103173008.630217-1-nsg@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: YfRqRlpFGu1Yz6e7jED8TE4eMlxY3ZgT X-Proofpoint-GUID: T7TI_AAbL0-9oREfMC48cUjLy_6NNNn8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-03_16,2023-11-02_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 bulkscore=0 clxscore=1015 phishscore=0 spamscore=0 priorityscore=1501 malwarescore=0 adultscore=0 suspectscore=0 impostorscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310240000 definitions=main-2311030146 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Directly use the size of the arrays instead of going through the indirection of kvm_s390_fac_size(). Don't use magic number for the number of entries in the non hypervisor managed facility bit mask list. Make the constraint of that number on kvm_s390_fac_base obvious. Get rid of implicit double anding of stfle_fac_list. Signed-off-by: Nina Schoetterl-Glausch --- I found it confusing before and think it's nicer this way but it might be needless churn. arch/s390/kvm/kvm-s390.c | 44 +++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index b3f17e014cab..e00ab2f38c89 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -217,33 +217,25 @@ static int async_destroy =3D 1; module_param(async_destroy, int, 0444); MODULE_PARM_DESC(async_destroy, "Asynchronous destroy for protected guests= "); =20 -/* - * For now we handle at most 16 double words as this is what the s390 base - * kernel handles and stores in the prefix page. If we ever need to go bey= ond - * this, this requires changes to code, but the external uapi can stay. - */ -#define SIZE_INTERNAL 16 - +#define HMFAI_DWORDS 16 /* * Base feature mask that defines default mask for facilities. Consists of= the * defines in FACILITIES_KVM and the non-hypervisor managed bits. */ -static unsigned long kvm_s390_fac_base[SIZE_INTERNAL] =3D { FACILITIES_KVM= }; +static unsigned long kvm_s390_fac_base[HMFAI_DWORDS] =3D { FACILITIES_KVM = }; +static_assert(ARRAY_SIZE(((long[]){ FACILITIES_KVM })) <=3D HMFAI_DWORDS); +static_assert(ARRAY_SIZE(kvm_s390_fac_base) <=3D S390_ARCH_FAC_MASK_SIZE_U= 64); +static_assert(ARRAY_SIZE(kvm_s390_fac_base) <=3D S390_ARCH_FAC_LIST_SIZE_U= 64); +static_assert(ARRAY_SIZE(kvm_s390_fac_base) <=3D ARRAY_SIZE(stfle_fac_list= )); + /* * Extended feature mask. Consists of the defines in FACILITIES_KVM_CPUMOD= EL * and defines the facilities that can be enabled via a cpu model. */ -static unsigned long kvm_s390_fac_ext[SIZE_INTERNAL] =3D { FACILITIES_KVM_= CPUMODEL }; - -static unsigned long kvm_s390_fac_size(void) -{ - BUILD_BUG_ON(SIZE_INTERNAL > S390_ARCH_FAC_MASK_SIZE_U64); - BUILD_BUG_ON(SIZE_INTERNAL > S390_ARCH_FAC_LIST_SIZE_U64); - BUILD_BUG_ON(SIZE_INTERNAL * sizeof(unsigned long) > - sizeof(stfle_fac_list)); - - return SIZE_INTERNAL; -} +static const unsigned long kvm_s390_fac_ext[] =3D { FACILITIES_KVM_CPUMODE= L }; +static_assert(ARRAY_SIZE(kvm_s390_fac_ext) <=3D S390_ARCH_FAC_MASK_SIZE_U6= 4); +static_assert(ARRAY_SIZE(kvm_s390_fac_ext) <=3D S390_ARCH_FAC_LIST_SIZE_U6= 4); +static_assert(ARRAY_SIZE(kvm_s390_fac_ext) <=3D ARRAY_SIZE(stfle_fac_list)= ); =20 /* available cpu features supported by kvm */ static DECLARE_BITMAP(kvm_s390_available_cpu_feat, KVM_S390_VM_CPU_FEAT_NR= _BITS); @@ -3341,13 +3333,16 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long= type) kvm->arch.sie_page2->kvm =3D kvm; kvm->arch.model.fac_list =3D kvm->arch.sie_page2->fac_list; =20 - for (i =3D 0; i < kvm_s390_fac_size(); i++) { + for (i =3D 0; i < ARRAY_SIZE(kvm_s390_fac_base); i++) { kvm->arch.model.fac_mask[i] =3D stfle_fac_list[i] & - (kvm_s390_fac_base[i] | - kvm_s390_fac_ext[i]); + kvm_s390_fac_base[i]; kvm->arch.model.fac_list[i] =3D stfle_fac_list[i] & kvm_s390_fac_base[i]; } + for (i =3D 0; i < ARRAY_SIZE(kvm_s390_fac_ext); i++) { + kvm->arch.model.fac_mask[i] |=3D stfle_fac_list[i] & + kvm_s390_fac_ext[i]; + } kvm->arch.model.subfuncs =3D kvm_s390_available_subfunc; =20 /* we are always in czam mode - even on pre z14 machines */ @@ -5859,9 +5854,8 @@ static int __init kvm_s390_init(void) return -EINVAL; } =20 - for (i =3D 0; i < 16; i++) - kvm_s390_fac_base[i] |=3D - stfle_fac_list[i] & nonhyp_mask(i); + for (i =3D 0; i < HMFAI_DWORDS; i++) + kvm_s390_fac_base[i] |=3D nonhyp_mask(i); =20 r =3D __kvm_s390_init(); if (r) --=20 2.39.2