From nobody Wed Dec 31 05:05:43 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 B941FC4332F for ; Wed, 8 Nov 2023 17:12:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232678AbjKHRMp (ORCPT ); Wed, 8 Nov 2023 12:12:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232495AbjKHRMj (ORCPT ); Wed, 8 Nov 2023 12:12:39 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DFFF1FF6; Wed, 8 Nov 2023 09:12:37 -0800 (PST) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A8GtRL0012939; Wed, 8 Nov 2023 17:12: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=2NGVr2b1yHvGxHjOrPSZFgQarUSjlXt1y6/20minRPs=; b=DwcQx0U4+LEdpZ2JVIX3Yj4aFnoviNfcNSscGoCpJ0/S7UKiNdgF/oDW7Y6IGkvPtSoJ XK+W7SdAwVVJsZXsPX6j4dMHrN8GW+oQ/s3JVCS48fWTJC2h2pChYKz9BPP7433LTchw 9+4U35ORnVG8duQ+IReiceTQsCLOMMjVmyJYIonxh5/DLl/o35ex6sZwcqHO7NvJ0vz2 eqdZSnIBaPX9P8X+HprUFTO3xJFpP6iHq8knxnl985ZpQ1+cXpyHor0TIuBeBrVj5G1u uWWuIEVHLFVaEICcefDTO4LV98BDYTeaBEZF2ImxJ/8gA1H2n3e7aozUzM8p8/Z/47Km iA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3u8dfk2vq5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Nov 2023 17:12:36 +0000 Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3A8G12mF011120; Wed, 8 Nov 2023 17:12:36 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 3u8dfk2vpn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Nov 2023 17:12:35 +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 3A8GWpcG019231; Wed, 8 Nov 2023 17:12:35 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3u7w23x91a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Nov 2023 17:12:35 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3A8HCW8x45220304 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 8 Nov 2023 17:12:32 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6610F20040; Wed, 8 Nov 2023 17:12:32 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 34DF72004B; Wed, 8 Nov 2023 17:12:32 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 8 Nov 2023 17:12:32 +0000 (GMT) From: Nina Schoetterl-Glausch To: Heiko Carstens , Alexander Gordeev , Claudio Imbrenda , Janosch Frank , Vasily Gorbik , Christian Borntraeger Cc: Nina Schoetterl-Glausch , kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, David Hildenbrand , Sven Schnelle Subject: [PATCH v3 4/4] KVM: s390: Minor refactor of base/ext facility lists Date: Wed, 8 Nov 2023 18:12:29 +0100 Message-Id: <20231108171229.3404476-5-nsg@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231108171229.3404476-1-nsg@linux.ibm.com> References: <20231108171229.3404476-1-nsg@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: PADLjdPIClBS5g3GrhcOmD4qIq2jc9zj X-Proofpoint-GUID: vHKWNxNPDOEgZCke-rGp2NJQVbLzgLfd 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-08_05,2023-11-08_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 impostorscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 phishscore=0 spamscore=0 mlxlogscore=999 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311080141 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. Reviewed-by: Claudio Imbrenda Signed-off-by: Nina Schoetterl-Glausch --- Notes: I 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