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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF243C41513 for ; Thu, 17 Aug 2023 11:01:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350107AbjHQLBB (ORCPT ); Thu, 17 Aug 2023 07:01:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350173AbjHQLA7 (ORCPT ); Thu, 17 Aug 2023 07:00:59 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13CE32D4A; Thu, 17 Aug 2023 04:00:58 -0700 (PDT) Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37HAlaCK015999; Thu, 17 Aug 2023 11:00:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=87DQzJH3rUcB74qf6X10NHHO1nTtQlAD8crmjKfqJFc=; b=R2bBe40F1dKqlEmlcNv6N76UTp5mk/FaiGDb0NG/Igu/aVaRMvwODAulXiRSVSN8/6OG vNnR8ygkogDnbhqzvhNom8lql9ikfVuQggKaVHJUy3ApCgxfkItNybakaU6EI2VBlI7R usVu2TiuTFWsopgMgFdEezJGS8WxhyJswdz7hh3osXf+Dte6t2gOZLlPDZY/XGqhscae brwFMRrrFHLT1kct/kvOp7v+2HEn4KABpLM61NIoVGq66YfyWGuOCOZsqVq7OJQrYE0B nGEGKXEM0H6Z99vpOhgGBvEWqupDx9pEa5dFjvptEvBYFDpR58R3HD//u+lJmdrzItmT Uw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3shj3y08n7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Aug 2023 11:00:57 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 37HAluqt018117; Thu, 17 Aug 2023 11:00:57 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 3shj3y08mm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Aug 2023 11:00:57 +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 37HAIOlx013234; Thu, 17 Aug 2023 11:00:55 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3sepmk51sw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Aug 2023 11:00:55 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37HB0pJD23921366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Aug 2023 11:00:52 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E1A772004B; Thu, 17 Aug 2023 11:00:51 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4473C20040; Thu, 17 Aug 2023 11:00:51 +0000 (GMT) Received: from [9.152.224.236] (unknown [9.152.224.236]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 17 Aug 2023 11:00:51 +0000 (GMT) Message-ID: Date: Thu, 17 Aug 2023 13:00:50 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [PATCH v4 2/4] s390: uv: UV feature check utility To: Steffen Eiden , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org Cc: Janosch Frank , Claudio Imbrenda , David Hildenbrand , Michael Mueller , Marc Hartmayer , Christian Borntraeger , Viktor Mihajlovski References: <20230815151415.379760-1-seiden@linux.ibm.com> <20230815151415.379760-3-seiden@linux.ibm.com> From: Michael Mueller In-Reply-To: <20230815151415.379760-3-seiden@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: kFGmflBMVI1KfdIw_ZP_pWAJTnOnDFlj X-Proofpoint-ORIG-GUID: oO9OciI3NiJ632-2GENKijanKaKd4sXq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-08-17_03,2023-08-17_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1011 malwarescore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308170095 Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On 15.08.23 17:14, Steffen Eiden wrote: > Introduces a function to check the existence of an UV feature. > Refactor feature bit checks to use the new function. > > Signed-off-by: Steffen Eiden > Reviewed-by: Claudio Imbrenda > Reviewed-by: Janosch Frank Reviewed-by: Michael Mueller > --- > arch/s390/include/asm/uv.h | 7 +++++++ > arch/s390/kernel/uv.c | 2 +- > arch/s390/kvm/kvm-s390.c | 2 +- > arch/s390/mm/fault.c | 2 +- > 4 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/arch/s390/include/asm/uv.h b/arch/s390/include/asm/uv.h > index d2cd42bb2c26..823adfff7315 100644 > --- a/arch/s390/include/asm/uv.h > +++ b/arch/s390/include/asm/uv.h > @@ -397,6 +397,13 @@ struct uv_info { > > extern struct uv_info uv_info; > > +static inline bool uv_has_feature(u8 feature_bit) > +{ > + if (feature_bit >= sizeof(uv_info.uv_feature_indications) * 8) > + return false; > + return test_bit_inv(feature_bit, &uv_info.uv_feature_indications); > +} > + > #ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST > extern int prot_virt_guest; > > diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c > index b771f1b4cdd1..fc07bc39e698 100644 > --- a/arch/s390/kernel/uv.c > +++ b/arch/s390/kernel/uv.c > @@ -258,7 +258,7 @@ static bool should_export_before_import(struct uv_cb_header *uvcb, struct mm_str > * shared page from a different protected VM will automatically also > * transfer its ownership. > */ > - if (test_bit_inv(BIT_UV_FEAT_MISC, &uv_info.uv_feature_indications)) > + if (uv_has_feature(BIT_UV_FEAT_MISC)) > return false; > if (uvcb->cmd == UVC_CMD_UNPIN_PAGE_SHARED) > return false; > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c > index e6511608280c..813cc3d59c90 100644 > --- a/arch/s390/kvm/kvm-s390.c > +++ b/arch/s390/kvm/kvm-s390.c > @@ -2406,7 +2406,7 @@ static int kvm_s390_cpus_to_pv(struct kvm *kvm, u16 *rc, u16 *rrc) > struct kvm_vcpu *vcpu; > > /* Disable the GISA if the ultravisor does not support AIV. */ > - if (!test_bit_inv(BIT_UV_FEAT_AIV, &uv_info.uv_feature_indications)) > + if (!uv_has_feature(BIT_UV_FEAT_AIV)) > kvm_s390_gisa_disable(kvm); > > kvm_for_each_vcpu(i, vcpu, kvm) { > diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c > index b5e1bea9194c..8a86dd725870 100644 > --- a/arch/s390/mm/fault.c > +++ b/arch/s390/mm/fault.c > @@ -599,7 +599,7 @@ void do_secure_storage_access(struct pt_regs *regs) > * reliable without the misc UV feature so we need to check > * for that as well. > */ > - if (test_bit_inv(BIT_UV_FEAT_MISC, &uv_info.uv_feature_indications) && > + if (uv_has_feature(BIT_UV_FEAT_MISC) && > !test_bit_inv(61, ®s->int_parm_long)) { > /* > * When this happens, userspace did something that it