From patchwork Wed Dec 13 12:49:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Schoetterl-Glausch X-Patchwork-Id: 13490881 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="MulCm4ME" Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 871B7F7; Wed, 13 Dec 2023 04:49:54 -0800 (PST) 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 3BDCfKTv027272; Wed, 13 Dec 2023 12:49:49 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=PoeWTyV0kZNdQX7BfxGA5W7kDFdwH1b/DaBzb7aRoRA=; b=MulCm4MEzvz9iN0T1fWOKt/pXB6aq6Pq7td3OUtUgfSaK9e7CC61Dj0NKV8m76Imh89i t606rAmWZhNHL7xZZ8+QwfFZUuARuwl/PqN5XuCXO1h16Jor8hqERGrAefmM6Hu66R9S YBTTN+pdzAlkCxdvPMoY7J4gNU1XWbXYGQbG59zTSsQ1XC79fCzKaRmAhX+3JdpwCzHV GP3aSMeJouF91EuDkxxH8qaaydelG8Bi69j5up+iiKO97fp6DouxS6S8jg3Q2vwwM6hQ YmKh0AMVqZbPSXew1qBxpj61YSyO34G60+KMH/RYcvQVdWEtQKPB8GkVPM6//b8x8Ypq Bw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uybhn2agf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:48 +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 3BDCnmQO023442; Wed, 13 Dec 2023 12:49:48 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uybhn2ag4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:48 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3BDBlD1t028244; Wed, 13 Dec 2023 12:49:47 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uw2xyrw6g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:47 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3BDCni2x42992342 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2023 12:49:44 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5DDE520040; Wed, 13 Dec 2023 12:49:44 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2C9E220043; Wed, 13 Dec 2023 12:49:44 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 13 Dec 2023 12:49:44 +0000 (GMT) From: Nina Schoetterl-Glausch To: Thomas Huth , Nico Boehr , Andrew Jones , Nina Schoetterl-Glausch Cc: Claudio Imbrenda , David Hildenbrand , Janosch Frank , kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH 1/5] lib: Add pseudo random functions Date: Wed, 13 Dec 2023 13:49:38 +0100 Message-Id: <20231213124942.604109-2-nsg@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231213124942.604109-1-nsg@linux.ibm.com> References: <20231213124942.604109-1-nsg@linux.ibm.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: kfu0LXyPqkB3k34U33es9PnIeR6VlhrL X-Proofpoint-GUID: O2TkKxU39Fy4vdBFiUE9jK84YD7BV17u X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_05,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 mlxlogscore=906 malwarescore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 phishscore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130093 Add functions for generating pseudo random 32 and 64 bit values. The implementation is very simple and the randomness likely not of high quality. Signed-off-by: Nina Schoetterl-Glausch --- Makefile | 1 + lib/libcflat.h | 7 +++++++ lib/rand.c | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 lib/rand.c diff --git a/Makefile b/Makefile index 602910dd..7997e035 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ cflatobjs := \ lib/printf.o \ lib/string.o \ lib/abort.o \ + lib/rand.o \ lib/report.o \ lib/stack.o diff --git a/lib/libcflat.h b/lib/libcflat.h index 700f4352..ed947f98 100644 --- a/lib/libcflat.h +++ b/lib/libcflat.h @@ -83,6 +83,13 @@ extern void abort(void) __attribute__((noreturn)); extern long atol(const char *ptr); extern char *getenv(const char *name); +typedef struct { + uint32_t val; +} rand_state; +#define RAND_STATE_INIT(x) ((rand_state){ .val = (x) }) +uint32_t rand32(rand_state *state); +uint64_t rand64(rand_state *state); + extern int printf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); extern int snprintf(char *buf, int size, const char *fmt, ...) diff --git a/lib/rand.c b/lib/rand.c new file mode 100644 index 00000000..658c4cbf --- /dev/null +++ b/lib/rand.c @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * pseudo random functions + * + * Copyright IBM Corp. 2023 + */ + +#include "libcflat.h" + +uint32_t rand32(rand_state *state) +{ + state->val = 0x915f77f5 * state->val + 1; + return state->val ^ (state->val >> 16); +} + +uint64_t rand64(rand_state *state) +{ + return (uint64_t)rand32(state) << 32 | rand32(state); +} From patchwork Wed Dec 13 12:49:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Schoetterl-Glausch X-Patchwork-Id: 13490880 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="HTB+cimB" Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 902FD106; Wed, 13 Dec 2023 04:49:54 -0800 (PST) Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BDCluQb011965; Wed, 13 Dec 2023 12:49:49 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=4YbvUWxAmQdfoGDiwSA3Zht0pnxEdFXb9M3y8UeUUZw=; b=HTB+cimBZocrWvBhp4QKwVOI7gDFCWPzfHbnjgGUYE8Z5uFGT1LG2rOS2QwwDco6Ee+3 RSZB4cDkN6tZkUWk6RQLKKmIX62/AqUPRLijU+9fg+EkIp0uAgen8dWbt3sgbbLxbvXX Onluzn9FJlL8f5ly8D5X/PPXhiBStzphKO/yytrvKY7hlHDXFCvxl9gkYK7PgbI8JWu+ fD4YsBW4ivlxtS0DM8GiiO91jjmTrPP4wcXPAvfERs8DYIK6gS/JSYnxXHvDidpXfmbz wj5Rob+Wa5z9OvNrI+X0cCYrYrMY8Q3jKfCAxUUMNdUJQJrK+P0J9hTMd2SUcNfWgTHu Gg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uycxag0w1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:49 +0000 Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3BDCnmqA016137; Wed, 13 Dec 2023 12:49:48 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 3uycxag0vt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:48 +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 3BD7MHav014819; Wed, 13 Dec 2023 12:49:47 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uw42keshv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:47 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3BDCni8A44696020 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2023 12:49:44 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ABC1220040; Wed, 13 Dec 2023 12:49:44 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 713E920043; Wed, 13 Dec 2023 12:49:44 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 13 Dec 2023 12:49:44 +0000 (GMT) From: Nina Schoetterl-Glausch To: Janosch Frank , =?utf-8?q?Nico_B=C3=B6hr?= , Claudio Imbrenda Cc: Nina Schoetterl-Glausch , kvm@vger.kernel.org, Andrew Jones , Thomas Huth , David Hildenbrand , linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH 2/5] s390x: lib: Remove double include Date: Wed, 13 Dec 2023 13:49:39 +0100 Message-Id: <20231213124942.604109-3-nsg@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231213124942.604109-1-nsg@linux.ibm.com> References: <20231213124942.604109-1-nsg@linux.ibm.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: M8Y1JNzewUn4Xx7PxjsVzZJ4AHNUAG1K X-Proofpoint-ORIG-GUID: W6gxDDc6ktizdoyl45OTnITNTPZdJxCC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_05,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 mlxscore=0 clxscore=1015 impostorscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 mlxlogscore=784 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130093 libcflat.h was included twice. Signed-off-by: Nina Schoetterl-Glausch Reviewed-by: Claudio Imbrenda --- lib/s390x/sie.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/s390x/sie.c b/lib/s390x/sie.c index 28fbf146..40936bd2 100644 --- a/lib/s390x/sie.c +++ b/lib/s390x/sie.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include From patchwork Wed Dec 13 12:49:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Schoetterl-Glausch X-Patchwork-Id: 13490883 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="bbQKhCdS" Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29C10114; Wed, 13 Dec 2023 04:49:55 -0800 (PST) Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BDARbdn008379; Wed, 13 Dec 2023 12:49:49 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=KPLxJ9ucc1tIvxepfZTG5Oz8YahSf1qKHc1DzFFo+fk=; b=bbQKhCdSqLIKfrqCU3m86a8fTs4/NADijXW2jgXUgNmxOVCcrh3auRCLnekGDg+V0fGY 5QUuCyA5z4EEg87DRqDMqHfADfW+29gijL6eCf7Bd4hQKxa5NsRYfP1JEsrZq7zoo+ph DH4+jU6MwaUk7hE0Tsq+BycsKPRK1DmP2Wdqq2GZeN0VSuaYy5UUVZJ8DG23yfWRB64X bvu4EXbNfUS+nr9DG6mFDq04G/2nLwCimEMQrSs7o7p4qNRUtGf0c+ag+M9x78y/YU4b 4G57KUyWQ9eM3ZZPMP9MuWmMMJ0keFMhHmUJdyVnUB3764kghov+NcvDXi/j+Yt1xTTG CQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uyavkv70u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:49 +0000 Received: from m0360072.ppops.net (m0360072.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3BDCUgN5002825; Wed, 13 Dec 2023 12:49:48 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 3uyavkv70m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:48 +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 3BDBBeGN008455; Wed, 13 Dec 2023 12:49:47 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3uw2jth14q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:47 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3BDCnjE117302214 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2023 12:49:45 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 044B820040; Wed, 13 Dec 2023 12:49:45 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BF94520043; Wed, 13 Dec 2023 12:49:44 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 13 Dec 2023 12:49:44 +0000 (GMT) From: Nina Schoetterl-Glausch To: =?utf-8?q?Nico_B=C3=B6hr?= , Thomas Huth , Janosch Frank , Claudio Imbrenda , Nina Schoetterl-Glausch Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, Andrew Jones , David Hildenbrand Subject: [kvm-unit-tests PATCH 3/5] s390x: Add library functions for exiting from snippet Date: Wed, 13 Dec 2023 13:49:40 +0100 Message-Id: <20231213124942.604109-4-nsg@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231213124942.604109-1-nsg@linux.ibm.com> References: <20231213124942.604109-1-nsg@linux.ibm.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: T2qwzIsKkQTS6kId-hHHHWyMojZi0egF X-Proofpoint-GUID: 2PSrxpteVeNECsHrn7DYgTC8olEfQSic X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_05,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=898 spamscore=0 bulkscore=0 adultscore=0 mlxscore=0 priorityscore=1501 malwarescore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130093 It is useful to be able to force an exit to the host from the snippet, as well as do so while returning a value. Add this functionality, also add helper functions for the host to check for an exit and get or check the value. Use diag 0x44 and 0x9c for this. Add a guest specific snippet header file and rename the host's. Signed-off-by: Nina Schoetterl-Glausch --- s390x/Makefile | 1 + lib/s390x/asm/arch_def.h | 13 ++++++++ lib/s390x/sie.h | 1 + lib/s390x/snippet-guest.h | 26 ++++++++++++++++ lib/s390x/{snippet.h => snippet-host.h} | 9 ++++-- lib/s390x/sie.c | 28 +++++++++++++++++ lib/s390x/snippet-host.c | 40 +++++++++++++++++++++++++ lib/s390x/uv.c | 2 +- s390x/mvpg-sie.c | 2 +- s390x/pv-diags.c | 2 +- s390x/pv-icptcode.c | 2 +- s390x/pv-ipl.c | 2 +- s390x/sie-dat.c | 2 +- s390x/spec_ex-sie.c | 2 +- s390x/uv-host.c | 2 +- 15 files changed, 123 insertions(+), 11 deletions(-) create mode 100644 lib/s390x/snippet-guest.h rename lib/s390x/{snippet.h => snippet-host.h} (93%) create mode 100644 lib/s390x/snippet-host.c diff --git a/s390x/Makefile b/s390x/Makefile index f79fd009..a10695a2 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -109,6 +109,7 @@ cflatobjs += lib/s390x/css_lib.o cflatobjs += lib/s390x/malloc_io.o cflatobjs += lib/s390x/uv.o cflatobjs += lib/s390x/sie.o +cflatobjs += lib/s390x/snippet-host.o cflatobjs += lib/s390x/fault.o OBJDIRS += lib/s390x diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h index 745a3387..db04deca 100644 --- a/lib/s390x/asm/arch_def.h +++ b/lib/s390x/asm/arch_def.h @@ -504,4 +504,17 @@ static inline uint32_t get_prefix(void) return current_prefix; } +static inline void diag44(void) +{ + asm volatile("diag 0,0,0x44\n"); +} + +static inline void diag9c(uint64_t val) +{ + asm volatile("diag %[val],0,0x9c\n" + : + : [val] "d"(val) + ); +} + #endif diff --git a/lib/s390x/sie.h b/lib/s390x/sie.h index c1724cf2..18fdd72e 100644 --- a/lib/s390x/sie.h +++ b/lib/s390x/sie.h @@ -281,6 +281,7 @@ void sie_expect_validity(struct vm *vm); uint16_t sie_get_validity(struct vm *vm); void sie_check_validity(struct vm *vm, uint16_t vir_exp); void sie_handle_validity(struct vm *vm); +bool sie_is_diag_icpt(struct vm *vm, unsigned int diag); void sie_guest_sca_create(struct vm *vm); void sie_guest_create(struct vm *vm, uint64_t guest_mem, uint64_t guest_mem_len); void sie_guest_destroy(struct vm *vm); diff --git a/lib/s390x/snippet-guest.h b/lib/s390x/snippet-guest.h new file mode 100644 index 00000000..e82e8e29 --- /dev/null +++ b/lib/s390x/snippet-guest.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Snippet functionality for the guest. + * + * Copyright IBM Corp. 2023 + */ + +#ifndef _S390X_SNIPPET_GUEST_H_ +#define _S390X_SNIPPET_GUEST_H_ + +#include +#include + +static inline void force_exit(void) +{ + diag44(); + mb(); /* allow host to modify guest memory */ +} + +static inline void force_exit_value(uint64_t val) +{ + diag9c(val); + mb(); /* allow host to modify guest memory */ +} + +#endif diff --git a/lib/s390x/snippet.h b/lib/s390x/snippet-host.h similarity index 93% rename from lib/s390x/snippet.h rename to lib/s390x/snippet-host.h index 910849aa..d21dd958 100644 --- a/lib/s390x/snippet.h +++ b/lib/s390x/snippet-host.h @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Snippet definitions + * Snippet functionality for the host. * * Copyright IBM Corp. 2021 * Author: Janosch Frank */ -#ifndef _S390X_SNIPPET_H_ -#define _S390X_SNIPPET_H_ +#ifndef _S390X_SNIPPET_HOST_H_ +#define _S390X_SNIPPET_HOST_H_ #include #include @@ -144,4 +144,7 @@ static inline void snippet_setup_guest(struct vm *vm, bool is_pv) } } +bool snippet_check_force_exit(struct vm *vm); +bool snippet_get_force_exit_value(struct vm *vm, uint64_t *value); +void snippet_check_force_exit_value(struct vm *vm, uint64_t exit_exp); #endif diff --git a/lib/s390x/sie.c b/lib/s390x/sie.c index 40936bd2..908b0130 100644 --- a/lib/s390x/sie.c +++ b/lib/s390x/sie.c @@ -42,6 +42,34 @@ void sie_check_validity(struct vm *vm, uint16_t vir_exp) report(vir_exp == vir, "VALIDITY: %x", vir); } +bool sie_is_diag_icpt(struct vm *vm, unsigned int diag) +{ + uint32_t ipb = vm->sblk->ipb; + uint64_t code; + uint16_t displace; + uint8_t base; + bool ret = true; + + ret = ret && vm->sblk->icptcode == ICPT_INST; + ret = ret && (vm->sblk->ipa & 0xff00) == 0x8300; + switch (diag) { + case 0x44: + case 0x9c: + ret = ret && !(ipb & 0xffff); + ipb >>= 16; + displace = ipb & 0xfff; + ipb >>= 12; + base = ipb & 0xf; + code = base ? vm->save_area.guest.grs[base] + displace : displace; + code &= 0xffff; + ret = ret && (code == diag); + break; + default: + abort(); /* not implemented */ + } + return ret; +} + void sie_handle_validity(struct vm *vm) { if (vm->sblk->icptcode != ICPT_VALIDITY) diff --git a/lib/s390x/snippet-host.c b/lib/s390x/snippet-host.c new file mode 100644 index 00000000..a829c1d5 --- /dev/null +++ b/lib/s390x/snippet-host.c @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Snippet functionality for the host. + * + * Copyright IBM Corp. 2023 + */ + +#include +#include +#include + +bool snippet_check_force_exit(struct vm *vm) +{ + bool r; + + r = sie_is_diag_icpt(vm, 0x44); + report(r, "guest forced exit"); + return r; +} + +bool snippet_get_force_exit_value(struct vm *vm, uint64_t *value) +{ + struct kvm_s390_sie_block *sblk = vm->sblk; + + if (sie_is_diag_icpt(vm, 0x9c)) { + *value = vm->save_area.guest.grs[(sblk->ipa & 0xf0) >> 4]; + report_pass("guest forced exit with value: 0x%lx", *value); + return true; + } + report_fail("guest forced exit with value"); + return false; +} + +void snippet_check_force_exit_value(struct vm *vm, uint64_t value_exp) +{ + uint64_t value; + + if (snippet_get_force_exit_value(vm, &value)) + report(value == value_exp, "guest exit value matches 0x%lx", value_exp); +} diff --git a/lib/s390x/uv.c b/lib/s390x/uv.c index 23a86179..81e9a71e 100644 --- a/lib/s390x/uv.c +++ b/lib/s390x/uv.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include static struct uv_cb_qui uvcb_qui = { .header.cmd = UVC_CMD_QUI, diff --git a/s390x/mvpg-sie.c b/s390x/mvpg-sie.c index d182b49a..3aec9d71 100644 --- a/s390x/mvpg-sie.c +++ b/s390x/mvpg-sie.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include static struct vm vm; diff --git a/s390x/pv-diags.c b/s390x/pv-diags.c index 3193ad99..7fb7f091 100644 --- a/s390x/pv-diags.c +++ b/s390x/pv-diags.c @@ -8,7 +8,7 @@ * Janosch Frank */ #include -#include +#include #include #include #include diff --git a/s390x/pv-icptcode.c b/s390x/pv-icptcode.c index d7c47d6f..9a9c7357 100644 --- a/s390x/pv-icptcode.c +++ b/s390x/pv-icptcode.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/s390x/pv-ipl.c b/s390x/pv-ipl.c index cc46e7f7..7d654b84 100644 --- a/s390x/pv-ipl.c +++ b/s390x/pv-ipl.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/s390x/sie-dat.c b/s390x/sie-dat.c index f0257770..9e60f26e 100644 --- a/s390x/sie-dat.c +++ b/s390x/sie-dat.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "snippets/c/sie-dat.h" static struct vm vm; diff --git a/s390x/spec_ex-sie.c b/s390x/spec_ex-sie.c index fe2f23ee..0ad7ec08 100644 --- a/s390x/spec_ex-sie.c +++ b/s390x/spec_ex-sie.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include static struct vm vm; diff --git a/s390x/uv-host.c b/s390x/uv-host.c index 55b46446..87d108b6 100644 --- a/s390x/uv-host.c +++ b/s390x/uv-host.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include From patchwork Wed Dec 13 12:49:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Schoetterl-Glausch X-Patchwork-Id: 13490879 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="egWi7QZj" Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04C83CF; Wed, 13 Dec 2023 04:49:54 -0800 (PST) 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 3BDBg7w1012627; Wed, 13 Dec 2023 12:49:51 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=ohNkST7v9P/jw2vaqTn4Kx8aR9QUP7uMxD/EhkxjZ/I=; b=egWi7QZj/S9UqrYSJpVfAHAav0vsXuN94ukm6UYGjCl6p8QnIe3lXr8O5JnazDqMzSdw gctP9ZuaxBMQRcJ7Qx6CoBQ38Nl71gfB8Al2+2f8WdsVlvyWO1EzupklEEwTeC5W8PN+ 7jfbgOi2wIPFLvtrHGQIPZDCM7MouKg/NOYpcjPTqWIQoTqLk5z19QFTZ88q3pfQWp52 AtypcA9s0v621MRiK7lA5cF4c2qrGAB9xCgskqlCdziQqI0t5dBzi/C/TNAWWVVcXSLw ZlIMJdnkmwI4GMRAznzdv0x9qC06yxGt3deKfxtN2XRy8DU8LeP0Er+PKx3nCz4BQ5Aq 4Q== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uybyj9wa7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:51 +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 3BDCSmX5029544; Wed, 13 Dec 2023 12:49:50 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 3uybyj9w9t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:50 +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 3BDArZX0004139; Wed, 13 Dec 2023 12:49:49 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3uw4skgdxn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:49 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3BDCnjPO17302216 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2023 12:49:45 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 482C720040; Wed, 13 Dec 2023 12:49:45 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 16F4D2004D; Wed, 13 Dec 2023 12:49:45 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 13 Dec 2023 12:49:45 +0000 (GMT) From: Nina Schoetterl-Glausch To: =?utf-8?q?Nico_B=C3=B6hr?= , Claudio Imbrenda , Nina Schoetterl-Glausch , Thomas Huth , Janosch Frank Cc: linux-s390@vger.kernel.org, Andrew Jones , David Hildenbrand , kvm@vger.kernel.org Subject: [kvm-unit-tests PATCH 4/5] s390x: Use library functions for snippet exit Date: Wed, 13 Dec 2023 13:49:41 +0100 Message-Id: <20231213124942.604109-5-nsg@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231213124942.604109-1-nsg@linux.ibm.com> References: <20231213124942.604109-1-nsg@linux.ibm.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 9VbWiMtbsb5W4N--mjhcbFI-EkzxryuP X-Proofpoint-ORIG-GUID: iMHelifZZqLFyKF2zrZKJs5MTtfUFmzr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_05,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 spamscore=0 mlxlogscore=999 clxscore=1015 suspectscore=0 bulkscore=0 lowpriorityscore=0 mlxscore=0 malwarescore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130093 Replace the existing code for exiting from snippets with the newly introduced library functionality. This causes additional report()s, otherwise no change in functionality intended. Signed-off-by: Nina Schoetterl-Glausch --- s390x/sie-dat.c | 10 ++-------- s390x/snippets/c/sie-dat.c | 19 +------------------ 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/s390x/sie-dat.c b/s390x/sie-dat.c index 9e60f26e..6b6e6868 100644 --- a/s390x/sie-dat.c +++ b/s390x/sie-dat.c @@ -27,23 +27,17 @@ static void test_sie_dat(void) uint64_t test_page_gpa, test_page_hpa; uint8_t *test_page_hva, expected_val; bool contents_match; - uint8_t r1; /* guest will tell us the guest physical address of the test buffer */ sie(&vm); - assert(vm.sblk->icptcode == ICPT_INST && - (vm.sblk->ipa & 0xff00) == 0x8300 && vm.sblk->ipb == 0x9c0000); - - r1 = (vm.sblk->ipa & 0xf0) >> 4; - test_page_gpa = vm.save_area.guest.grs[r1]; + assert(snippet_get_force_exit_value(&vm, &test_page_gpa)); test_page_hpa = virt_to_pte_phys(guest_root, (void*)test_page_gpa); test_page_hva = __va(test_page_hpa); report_info("test buffer gpa=0x%lx hva=%p", test_page_gpa, test_page_hva); /* guest will now write to the test buffer and we verify the contents */ sie(&vm); - assert(vm.sblk->icptcode == ICPT_INST && - vm.sblk->ipa == 0x8300 && vm.sblk->ipb == 0x440000); + assert(snippet_check_force_exit(&vm)); contents_match = true; for (unsigned int i = 0; i < GUEST_TEST_PAGE_COUNT; i++) { diff --git a/s390x/snippets/c/sie-dat.c b/s390x/snippets/c/sie-dat.c index ecfcb60e..414afd42 100644 --- a/s390x/snippets/c/sie-dat.c +++ b/s390x/snippets/c/sie-dat.c @@ -9,28 +9,11 @@ */ #include #include +#include #include "sie-dat.h" static uint8_t test_pages[GUEST_TEST_PAGE_COUNT * PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); -static inline void force_exit(void) -{ - asm volatile("diag 0,0,0x44\n" - : - : - : "memory" - ); -} - -static inline void force_exit_value(uint64_t val) -{ - asm volatile("diag %[val],0,0x9c\n" - : - : [val] "d"(val) - : "memory" - ); -} - int main(void) { uint8_t *invalid_ptr; From patchwork Wed Dec 13 12:49:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nina Schoetterl-Glausch X-Patchwork-Id: 13490882 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Tx2H/gWK" Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29DCF115; Wed, 13 Dec 2023 04:49:55 -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 3BDBlnMe028165; Wed, 13 Dec 2023 12:49:52 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=81nH/wKMgJCeQ0T288t6HejOyQaPoSux1S5n1WNd59A=; b=Tx2H/gWKB/G5d1M3FFsiXGH2LLQ0gFLsFJjdGRpNHa4B2J7Mvvb5z3ADcYO7LaMay2/Y q7nnPyeO5TkT24rO1b73YUwXF08KcQ7xrmX0q4G3vB5rC3RtlWUMgI2SaSX9ZJZD8/xk V0Jq9gtrruhD1zvOE9r3BzZSbLbC8sZwfWjcU9Ci96CStH10cDC1v7/wHxZ4o5AlvgQY UrK6jukK2r0PQjHJJrKEoFdfzeFqY/pYcmvfOTSF2O+B3YfCeU6YrrGFaJK3CIty8OsS /YL8zHWRwKT1SgjjugijDXKKtKGJVgA5x4zfVVij+c0GGvaCyZ6gOIJISAt2Uih1fOrj mQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uybamaw22-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:52 +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 3BDCPPod007825; Wed, 13 Dec 2023 12:49:51 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uybamaw1w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:51 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3BDCDo4u028217; Wed, 13 Dec 2023 12:49:51 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uw2xyrw6u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 12:49:51 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3BDCnjRo17302220 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2023 12:49:45 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8D1B520040; Wed, 13 Dec 2023 12:49:45 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5B7442004D; Wed, 13 Dec 2023 12:49:45 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 13 Dec 2023 12:49:45 +0000 (GMT) From: Nina Schoetterl-Glausch To: =?utf-8?q?Nico_B=C3=B6hr?= , Claudio Imbrenda , Janosch Frank , Nina Schoetterl-Glausch Cc: David Hildenbrand , linux-s390@vger.kernel.org, Andrew Jones , kvm@vger.kernel.org, Thomas Huth Subject: [kvm-unit-tests PATCH 5/5] s390x: Add test for STFLE interpretive execution (format-0) Date: Wed, 13 Dec 2023 13:49:42 +0100 Message-Id: <20231213124942.604109-6-nsg@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231213124942.604109-1-nsg@linux.ibm.com> References: <20231213124942.604109-1-nsg@linux.ibm.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: okUhs5d13wrFaUgpCYyjyumrfrxP4jJD X-Proofpoint-ORIG-GUID: Ce9shyUvWiGtOLMvTf2li6IStnb7c7lT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_05,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 clxscore=1015 lowpriorityscore=0 bulkscore=0 priorityscore=1501 phishscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130093 The STFLE instruction indicates installed facilities. SIE can interpretively execute STFLE. Use a snippet guest executing STFLE to get the result of interpretive execution and check the result. Signed-off-by: Nina Schoetterl-Glausch --- s390x/Makefile | 2 + lib/s390x/asm/facility.h | 10 ++- s390x/snippets/c/stfle.c | 26 ++++++++ s390x/stfle-sie.c | 132 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 s390x/snippets/c/stfle.c create mode 100644 s390x/stfle-sie.c diff --git a/s390x/Makefile b/s390x/Makefile index a10695a2..12eb3053 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -42,6 +42,7 @@ tests += $(TEST_DIR)/exittime.elf tests += $(TEST_DIR)/ex.elf tests += $(TEST_DIR)/topology.elf tests += $(TEST_DIR)/sie-dat.elf +tests += $(TEST_DIR)/stfle-sie.elf pv-tests += $(TEST_DIR)/pv-diags.elf pv-tests += $(TEST_DIR)/pv-icptcode.elf @@ -127,6 +128,7 @@ snippet_lib = $(snippet_asmlib) lib/auxinfo.o $(TEST_DIR)/mvpg-sie.elf: snippets = $(SNIPPET_DIR)/c/mvpg-snippet.gbin $(TEST_DIR)/sie-dat.elf: snippets = $(SNIPPET_DIR)/c/sie-dat.gbin $(TEST_DIR)/spec_ex-sie.elf: snippets = $(SNIPPET_DIR)/c/spec_ex.gbin +$(TEST_DIR)/stfle-sie.elf: snippets = $(SNIPPET_DIR)/c/stfle.gbin $(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/pv-diag-yield.gbin $(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/pv-diag-288.gbin diff --git a/lib/s390x/asm/facility.h b/lib/s390x/asm/facility.h index a66fe56a..2bad05c5 100644 --- a/lib/s390x/asm/facility.h +++ b/lib/s390x/asm/facility.h @@ -27,12 +27,20 @@ static inline void stfl(void) asm volatile(" stfl 0(0)\n" : : : "memory"); } -static inline void stfle(uint64_t *fac, unsigned int nb_doublewords) +static inline unsigned int stfle(uint64_t *fac, unsigned int nb_doublewords) { register unsigned long r0 asm("0") = nb_doublewords - 1; asm volatile(" .insn s,0xb2b00000,0(%1)\n" : "+d" (r0) : "a" (fac) : "memory", "cc"); + return r0 + 1; +} + +static inline unsigned long stfle_size(void) +{ + uint64_t dummy; + + return stfle(&dummy, 1); } static inline void setup_facilities(void) diff --git a/s390x/snippets/c/stfle.c b/s390x/snippets/c/stfle.c new file mode 100644 index 00000000..eb024a6a --- /dev/null +++ b/s390x/snippets/c/stfle.c @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright IBM Corp. 2023 + * + * Snippet used by the STLFE interpretive execution facilities test. + */ +#include +#include + +int main(void) +{ + const unsigned int max_fac_len = 8; + uint64_t res[max_fac_len + 1]; + + res[0] = max_fac_len - 1; + asm volatile ( "lg 0,%[len]\n" + " stfle %[fac]\n" + " stg 0,%[len]\n" + : [fac] "=QS"(*(uint64_t(*)[max_fac_len])&res[1]), + [len] "+RT"(res[0]) + : + : "%r0", "cc" + ); + force_exit_value((uint64_t)&res); + return 0; +} diff --git a/s390x/stfle-sie.c b/s390x/stfle-sie.c new file mode 100644 index 00000000..574319ed --- /dev/null +++ b/s390x/stfle-sie.c @@ -0,0 +1,132 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright IBM Corp. 2023 + * + * SIE with STLFE interpretive execution facilities test. + */ +#include +#include +#include +#include +#include +#include +#include + +static struct vm vm; +static uint64_t (*fac)[PAGE_SIZE / sizeof(uint64_t)]; +static rand_state rand_s; + +static void setup_guest(void) +{ + extern const char SNIPPET_NAME_START(c, stfle)[]; + extern const char SNIPPET_NAME_END(c, stfle)[]; + + setup_vm(); + fac = alloc_pages_flags(0, AREA_DMA31); + + snippet_setup_guest(&vm, false); + snippet_init(&vm, SNIPPET_NAME_START(c, stfle), + SNIPPET_LEN(c, stfle), SNIPPET_UNPACK_OFF); +} + +struct guest_stfle_res { + uint16_t len; + uint64_t reg; + unsigned char *mem; +}; + +static struct guest_stfle_res run_guest(void) +{ + struct guest_stfle_res res; + uint64_t guest_stfle_addr; + + sie(&vm); + assert(snippet_get_force_exit_value(&vm, &guest_stfle_addr)); + res.mem = &vm.guest_mem[guest_stfle_addr]; + memcpy(&res.reg, res.mem, sizeof(res.reg)); + res.len = (res.reg & 0xff) + 1; + res.mem += sizeof(res.reg); + return res; +} + +static void test_stfle_format_0(void) +{ + struct guest_stfle_res res; + + report_prefix_push("format-0"); + for (int j = 0; j < stfle_size(); j++) + WRITE_ONCE((*fac)[j], rand64(&rand_s)); + vm.sblk->fac = (uint32_t)(uint64_t)fac; + res = run_guest(); + report(res.len == stfle_size(), "stfle len correct"); + report(!memcmp(*fac, res.mem, res.len * sizeof(uint64_t)), + "Guest facility list as specified"); + report_prefix_pop(); +} + +struct args { + uint64_t seed; +}; + +static bool parse_uint64_t(const char *arg, uint64_t *out) +{ + char *end; + uint64_t num; + + if (arg[0] == '\0') + return false; + num = strtoul(arg, &end, 0); + if (end[0] != '\0') + return false; + *out = num; + return true; +} + +static struct args parse_args(int argc, char **argv) +{ + struct args args; + const char *flag; + unsigned int i; + uint64_t arg; + bool has_arg; + + stck(&args.seed); + + for (i = 1; i < argc; i++) { + if (i + 1 < argc) + has_arg = parse_uint64_t(argv[i + 1], &arg); + else + has_arg = false; + + flag = "--seed"; + if (!strcmp(flag, argv[i])) { + if (!has_arg) + report_abort("%s needs an uint64_t parameter", flag); + args.seed = arg; + ++i; + continue; + } + report_abort("Unsupported parameter '%s'", + argv[i]); + } + + return args; +} + +int main(int argc, char **argv) +{ + struct args args = parse_args(argc, argv); + + if (!sclp_facilities.has_sief2) { + report_skip("SIEF2 facility unavailable"); + goto out; + } + + report_info("pseudo rand seed: 0x%lx", args.seed); + rand_s = RAND_STATE_INIT(args.seed); + setup_guest(); + if (test_facility(7)) + test_stfle_format_0(); +out: + return report_summary(); +}