From patchwork Wed Jun 8 13:33:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Schoetterl-Glausch X-Patchwork-Id: 12873503 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 744DEC43334 for ; Wed, 8 Jun 2022 13:33:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240252AbiFHNdP (ORCPT ); Wed, 8 Jun 2022 09:33:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240175AbiFHNdM (ORCPT ); Wed, 8 Jun 2022 09:33:12 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCDFF110479; Wed, 8 Jun 2022 06:33:11 -0700 (PDT) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 258DDUAx014333; Wed, 8 Jun 2022 13:33:11 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=/kHztYtNU8ZIG8TZAmeQpGr/URgYi4SyOZDD8Aurd0g=; b=ZaEEj2JgJueiUTL+5xwk22Diu/SrFwNbSoSK2xBVUVmTqcmwEAuqlPjykpRwfVaUxLax R2A8KlK57HnGeCBDRBdliVTDpE9YkQafb55k+2gIrcJG7FuamB8zUUf2T1GvHKM6NSNh +xyeYAmJy4Vmn+16oaxSSmYPaza5dAk+8Ed6a+NtoQBpITbPSsvpD9zEqYl4KgmYc7Hp H2/9nik/+VHVZKKqOIXBCUOkX2iQLYMkV4vQapdUTJQ5HkF86kehgesKesCQeWJZqOw7 M+Zp8Qz2I/uVfsWTN/t4tNeEKyCLeGZckhoToPRwh8TYhJqKYRGd9jmwb3ztwSlUUHz9 Fg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3gjvf68ev9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Jun 2022 13:33:11 +0000 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 258DFBAO020891; Wed, 8 Jun 2022 13:33:11 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3gjvf68eu3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Jun 2022 13:33:10 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 258DJubS020303; Wed, 8 Jun 2022 13:33:08 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma06ams.nl.ibm.com with ESMTP id 3gfxnhwbmw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Jun 2022 13:33:08 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 258DX5hu21627144 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 8 Jun 2022 13:33:05 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 896B511C052; Wed, 8 Jun 2022 13:33:05 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4E3D411C050; Wed, 8 Jun 2022 13:33:05 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 8 Jun 2022 13:33:05 +0000 (GMT) From: Janis Schoetterl-Glausch To: Thomas Huth , Janosch Frank , Claudio Imbrenda Cc: Janis Schoetterl-Glausch , David Hildenbrand , kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH v2 2/3] s390x: lib: SOP facility query function Date: Wed, 8 Jun 2022 15:33:02 +0200 Message-Id: <20220608133303.1532166-3-scgl@linux.ibm.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220608133303.1532166-1-scgl@linux.ibm.com> References: <20220608133303.1532166-1-scgl@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: sbt95BNQNibW5yS9Mr3ZpeSOaf6ABeYK X-Proofpoint-ORIG-GUID: cdUq2sit7OA00Tz4EInE_jReZKsx4vkn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-08_04,2022-06-07_02,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 adultscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 phishscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206080058 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add function returning which suppression-on-protection facility is installed. Signed-off-by: Janis Schoetterl-Glausch Reviewed-by: Claudio Imbrenda --- lib/s390x/asm/facility.h | 21 +++++++++++++++++++++ lib/s390x/sclp.h | 4 ++++ lib/s390x/sclp.c | 2 ++ 3 files changed, 27 insertions(+) diff --git a/lib/s390x/asm/facility.h b/lib/s390x/asm/facility.h index 49380203..a66fe56a 100644 --- a/lib/s390x/asm/facility.h +++ b/lib/s390x/asm/facility.h @@ -12,6 +12,7 @@ #include #include #include +#include #define NB_STFL_DOUBLEWORDS 32 extern uint64_t stfl_doublewords[]; @@ -42,4 +43,24 @@ static inline void setup_facilities(void) stfle(stfl_doublewords, NB_STFL_DOUBLEWORDS); } +enum supp_on_prot_facility { + SOP_NONE, + SOP_BASIC, + SOP_ENHANCED_1, + SOP_ENHANCED_2, +}; + +static inline enum supp_on_prot_facility get_supp_on_prot_facility(void) +{ + if (sclp_facilities.has_esop) { + if (test_facility(131)) /* side-effect-access facility */ + return SOP_ENHANCED_2; + else + return SOP_ENHANCED_1; + } + if (sclp_facilities.has_sop) + return SOP_BASIC; + return SOP_NONE; +} + #endif diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h index 3488f4d2..853529bf 100644 --- a/lib/s390x/sclp.h +++ b/lib/s390x/sclp.h @@ -123,7 +123,9 @@ struct sclp_facilities { uint64_t has_cei : 1; uint64_t has_diag318 : 1; + uint64_t has_sop : 1; uint64_t has_gsls : 1; + uint64_t has_esop : 1; uint64_t has_cmma : 1; uint64_t has_64bscao : 1; uint64_t has_esca : 1; @@ -134,7 +136,9 @@ struct sclp_facilities { }; /* bit number within a certain byte */ +#define SCLP_FEAT_80_BIT_SOP 2 #define SCLP_FEAT_85_BIT_GSLS 0 +#define SCLP_FEAT_85_BIT_ESOP 6 #define SCLP_FEAT_98_BIT_KSS 7 #define SCLP_FEAT_116_BIT_64BSCAO 0 #define SCLP_FEAT_116_BIT_CMMA 1 diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c index b8204c5f..e6017f64 100644 --- a/lib/s390x/sclp.c +++ b/lib/s390x/sclp.c @@ -152,7 +152,9 @@ void sclp_facilities_setup(void) cpu = sclp_get_cpu_entries(); if (read_info->offset_cpu > 134) sclp_facilities.has_diag318 = read_info->byte_134_diag318; + sclp_facilities.has_sop = sclp_feat_check(80, SCLP_FEAT_80_BIT_SOP); sclp_facilities.has_gsls = sclp_feat_check(85, SCLP_FEAT_85_BIT_GSLS); + sclp_facilities.has_esop = sclp_feat_check(85, SCLP_FEAT_85_BIT_ESOP); sclp_facilities.has_kss = sclp_feat_check(98, SCLP_FEAT_98_BIT_KSS); sclp_facilities.has_cmma = sclp_feat_check(116, SCLP_FEAT_116_BIT_CMMA); sclp_facilities.has_64bscao = sclp_feat_check(116, SCLP_FEAT_116_BIT_64BSCAO);