From patchwork Wed Feb 1 08:48:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janosch Frank X-Patchwork-Id: 13123936 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 1C77EC636D6 for ; Wed, 1 Feb 2023 08:49:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230404AbjBAItV (ORCPT ); Wed, 1 Feb 2023 03:49:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbjBAItO (ORCPT ); Wed, 1 Feb 2023 03:49:14 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0B9460CB5; Wed, 1 Feb 2023 00:49:03 -0800 (PST) Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3118PlIG000558; Wed, 1 Feb 2023 08:49:03 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=xkkBEHnLJQXnCg7egV6rZsd0GcNLSl5AALu3pnRAo+M=; b=h8aRwUWzZoSfUEYe+C6bdxB7yziwirDLP+gs0WzVjCh83LFcJ7RNlJrnADt8QR5XHhIO Wk3E1QLYTCcsbdcNcBqL1IzLsi8nPmiK6sGuDtTogLTng1YEGf/41AZ2pf5JyATRWGD3 EhmIa8r27neOx4jWeEuW24pOBQU81B9rGtMgT0WPe3VruNOMG1WIrjgUgNqIPbapq+kP /A+lIupWrf9AXxAFYv88n6zhjOIYDuUpPhjHtMZFgdBcpl5emlCs3nE0rByDFlZ3WMXI ymPDhEmsXFwfAk/xfSWAdNRSkDnJTYKcJHGUMnkb7SbNCiKLPeg+7SRnqmHtcIeykqFr sw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3nfmjggh8c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 01 Feb 2023 08:49:03 +0000 Received: from m0098396.ppops.net (m0098396.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3118hGQB012470; Wed, 1 Feb 2023 08:49:02 GMT Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3nfmjggh7p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 01 Feb 2023 08:49:02 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3116lHr0026871; Wed, 1 Feb 2023 08:49:00 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma04ams.nl.ibm.com (PPS) with ESMTPS id 3ncvs7mkgp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 01 Feb 2023 08:49:00 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3118mu0u50266394 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 1 Feb 2023 08:48:56 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AD98C20067; Wed, 1 Feb 2023 08:48:56 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D48E320040; Wed, 1 Feb 2023 08:48:55 +0000 (GMT) Received: from linux6.. (unknown [9.114.12.104]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 1 Feb 2023 08:48:55 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, imbrenda@linux.ibm.com, thuth@redhat.com, seiden@linux.ibm.com, nrb@linux.ibm.com, nsg@linux.ibm.com Subject: [kvm-unit-tests PATCH 3/3] s390x: pv: Add IPL reset tests Date: Wed, 1 Feb 2023 08:48:33 +0000 Message-Id: <20230201084833.39846-4-frankja@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230201084833.39846-1-frankja@linux.ibm.com> References: <20230201084833.39846-1-frankja@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: GLYeXluFFpHd9AN4t6AIFWCuGdwiynLJ X-Proofpoint-ORIG-GUID: Vew4T4j1jgMt5XUFDu3I7uO8mq_IhrJC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-01_03,2023-01-31_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 spamscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 adultscore=0 lowpriorityscore=0 phishscore=0 mlxscore=0 bulkscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302010073 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The diag308 requires extensive cooperation between the hypervisor and the Ultravisor so the Ultravisor can make sure all necessary reset steps have been done. Let's check if we get the correct validity errors. Signed-off-by: Janosch Frank --- s390x/Makefile | 2 + s390x/pv-ipl.c | 237 +++++++++++++++++++++++ s390x/snippets/asm/snippet-pv-diag-308.S | 67 +++++++ 3 files changed, 306 insertions(+) create mode 100644 s390x/pv-ipl.c create mode 100644 s390x/snippets/asm/snippet-pv-diag-308.S diff --git a/s390x/Makefile b/s390x/Makefile index 858f5af4..e8559a4e 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -42,6 +42,7 @@ tests += $(TEST_DIR)/exittime.elf pv-tests += $(TEST_DIR)/pv-diags.elf pv-tests += $(TEST_DIR)/pv-icptcode.elf +pv-tests += $(TEST_DIR)/pv-ipl.elf ifneq ($(HOST_KEY_DOCUMENT),) ifneq ($(GEN_SE_HEADER),) @@ -124,6 +125,7 @@ $(TEST_DIR)/pv-icptcode.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-icpt-1 $(TEST_DIR)/pv-icptcode.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-icpt-loop.gbin $(TEST_DIR)/pv-icptcode.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-loop.gbin $(TEST_DIR)/pv-icptcode.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-icpt-vir-timing.gbin +$(TEST_DIR)/pv-ipl.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-308.gbin ifneq ($(GEN_SE_HEADER),) snippets += $(pv-snippets) diff --git a/s390x/pv-ipl.c b/s390x/pv-ipl.c new file mode 100644 index 00000000..61afde5c --- /dev/null +++ b/s390x/pv-ipl.c @@ -0,0 +1,237 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * PV diagnose 308 (IPL) tests + * + * Copyright (c) 2023 IBM Corp + * + * Authors: + * Janosch Frank + */ +#include +#include +#include +#include +#include +#include + +static struct vm vm; + +static void setup_gbin(void) +{ + extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_308)[]; + extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_308)[]; + extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_308)[]; + extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_308)[]; + int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_308); + int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_308); + + snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_308), + SNIPPET_HDR_START(asm, snippet_pv_diag_308), + size_gbin, size_hdr, SNIPPET_UNPACK_OFF); +} + +static void test_diag_308_1(void) +{ + uint16_t rc, rrc; + int cc; + + report_prefix_push("subcode 1"); + setup_gbin(); + + sie(&vm); + report(vm.sblk->icptcode == ICPT_PV_INSTR && vm.sblk->ipa == 0x8302 && + vm.sblk->ipb == 0x50000000 && vm.save_area.guest.grs[5] == 0x500, + "intercept values diag 500"); + /* The snippet asked us for the subcode and we answer with 1 in gr2 */ + vm.save_area.guest.grs[2] = 1; + + /* Continue after diag 0x500, next icpt should be the 0x308 */ + sie(&vm); + report(vm.sblk->icptcode == ICPT_PV_NOTIFY && vm.sblk->ipa == 0x8302 && + vm.sblk->ipb == 0x50000000 && vm.save_area.guest.grs[5] == 0x308, + "intercept values diag 0x308"); + report(vm.save_area.guest.grs[2] == 1, + "subcode 1"); + + /* + * We need to perform several UV calls to emulate the subcode + * 1. Failing to do that should result in a validity + * + * - Mark all cpus as stopped + * - Reset the cpus, calling one gets an initial reset + * - Load the reset PSW + * - Unshare all + * - Load the reset PSW + */ + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, "validity no UVCs"); + + /* Mark the CPU as stopped so we can unshare and reset */ + cc = uv_set_cpu_state(vm.sblk->pv_handle_cpu, PV_CPU_STATE_STP); + report(!cc, "Set cpu stopped"); + + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, "validity stopped"); + + /* Unshare all memory */ + cc = uv_cmd_nodata(vm.sblk->pv_handle_config, + UVC_CMD_SET_UNSHARED_ALL, &rc, &rrc); + report(cc == 0 && rc == 1, "Unshare all"); + + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, + "validity stopped, unshared"); + + /* Prepare the CPU reset */ + cc = uv_cmd_nodata(vm.sblk->pv_handle_config, + UVC_CMD_PREPARE_RESET, &rc, &rrc); + report(cc == 0 && rc == 1, "Prepare reset call"); + + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, + "validity stopped, unshared, prepare"); + + /* Do the reset */ + cc = uv_cmd_nodata(vm.sblk->pv_handle_cpu, + UVC_CMD_CPU_RESET_INITIAL, &rc, &rrc); + report(cc == 0 && rc == 1, "Clear reset cpu"); + + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, + "validity stopped, unshared, prepare, reset"); + + /* Load the PSW from 0x0 */ + cc = uv_set_cpu_state(vm.sblk->pv_handle_cpu, PV_CPU_STATE_OPR_LOAD); + report(!cc, "Set cpu load"); + + /* + * Check if we executed the iaddr of the reset PSW, we should + * see a diagnose 0x9c PV instruction notification. + */ + sie(&vm); + report(vm.sblk->icptcode == ICPT_PV_NOTIFY && vm.sblk->ipa == 0x8302 && + vm.sblk->ipb == 0x50000000 && vm.save_area.guest.grs[5] == 0x9c && + vm.save_area.guest.grs[0] == 42, + "intercept values after diag 0x308"); + + + uv_destroy_guest(&vm); + report_prefix_pop(); +} + +static void test_diag_308_0(void) +{ + uint16_t rc, rrc; + int cc; + + report_prefix_push("subcode 0"); + setup_gbin(); + + sie(&vm); + report(vm.sblk->icptcode == ICPT_PV_INSTR && vm.sblk->ipa == 0x8302 && + vm.sblk->ipb == 0x50000000 && vm.save_area.guest.grs[5] == 0x500, + "intercept values diag 500"); + /* The snippet asked us for the subcode and we answer with 0 in gr2 */ + vm.save_area.guest.grs[2] = 0; + + /* Continue after diag 0x500, next icpt should be the 0x308 */ + sie(&vm); + report(vm.sblk->icptcode == ICPT_PV_NOTIFY && vm.sblk->ipa == 0x8302 && + vm.sblk->ipb == 0x50000000 && vm.save_area.guest.grs[5] == 0x308, + "intercept values"); + report(vm.save_area.guest.grs[2] == 0, + "subcode 0"); + + /* + * We need to perform several UV calls to emulate the subcode + * 0. Failing to do that should result in a validity + * + * - Mark all cpus as stopped + * - Unshare all memory + * - Prepare the reset + * - Reset the cpus + * - Load the reset PSW + */ + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, "validity, no action"); + + /* Mark the CPU as stopped so we can unshare and reset */ + cc = uv_set_cpu_state(vm.sblk->pv_handle_cpu, PV_CPU_STATE_STP); + report(!cc, "Set cpu stopped"); + + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, "validity, stopped"); + + /* Unshare all memory */ + cc = uv_cmd_nodata(vm.sblk->pv_handle_config, + UVC_CMD_SET_UNSHARED_ALL, &rc, &rrc); + report(cc == 0 && rc == 1, "Unshare all"); + + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, "validity stopped, unshared"); + + /* Prepare the CPU reset */ + cc = uv_cmd_nodata(vm.sblk->pv_handle_config, + UVC_CMD_PREPARE_RESET, &rc, &rrc); + report(cc == 0 && rc == 1, "Prepare reset call"); + + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, "validity stopped, unshared, prep reset"); + + /* Do the reset */ + cc = uv_cmd_nodata(vm.sblk->pv_handle_cpu, + UVC_CMD_CPU_RESET_CLEAR, &rc, &rrc); + report(cc == 0 && rc == 1, "Clear reset cpu"); + + sie_expect_validity(&vm); + sie(&vm); + report((sie_get_validity(&vm) & 0xff00) == 0x2000, "validity stopped, unshared, prep reset, cpu reset"); + + /* Load the PSW from 0x0 */ + cc = uv_set_cpu_state(vm.sblk->pv_handle_cpu, PV_CPU_STATE_OPR_LOAD); + report(!cc, "Set cpu load"); + + /* + * Check if we executed the iaddr of the reset PSW, we should + * see a diagnose 0x9c PV instruction notification. + */ + sie(&vm); + report(vm.sblk->icptcode == ICPT_PV_NOTIFY && vm.sblk->ipa == 0x8302 && + vm.sblk->ipb == 0x50000000 && vm.save_area.guest.grs[5] == 0x9c && + vm.save_area.guest.grs[0] == 42, + "intercept values"); + + uv_destroy_guest(&vm); + report_prefix_pop(); +} + +int main(void) +{ + report_prefix_push("uv-sie"); + if (!test_facility(158)) { + report_skip("UV Call facility unavailable"); + goto done; + } + if (!sclp_facilities.has_sief2) { + report_skip("SIEF2 facility unavailable"); + goto done; + } + + snippet_setup_guest(&vm, true); + test_diag_308_0(); + test_diag_308_1(); + sie_guest_destroy(&vm); + +done: + report_prefix_pop(); + return report_summary(); +} diff --git a/s390x/snippets/asm/snippet-pv-diag-308.S b/s390x/snippets/asm/snippet-pv-diag-308.S new file mode 100644 index 00000000..58c96173 --- /dev/null +++ b/s390x/snippets/asm/snippet-pv-diag-308.S @@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Diagnose 0x308 snippet used for PV IPL and reset testing + * + * Copyright (c) 2023 IBM Corp + * + * Authors: + * Janosch Frank + */ +#include +.section .text + +/* Sets a reset PSW with the given PSW address */ +.macro SET_RESET_PSW_ADDR label +lgrl %r5, reset_psw +larl %r6, \label +ogr %r5, %r6 +stg %r5, 0 +.endm + +/* Does a diagnose 308 with the given subcode */ +.macro DIAG308 subcode +xgr %r3, %r3 +lghi %r3, \subcode +diag 1, 3, 0x308 +.endm + +sam64 + +/* Execute the diag500 which will set the subcode we execute in gr2 */ +diag 0, 0, 0x500 + +/* + * A valid PGM new PSW can be a real problem since we never fall out + * of SIE and therefore effectively loop forever. 0 is a valid PSW + * therefore we re-use the reset_psw as this has the short PSW + * bit set which is invalid for a long PSW like the exception new + * PSWs. + * + * For subcode 0/1 there are no PGMs to consider. + */ +lgrl %r5, reset_psw +stg %r5, GEN_LC_PGM_NEW_PSW + +/* Clean registers that are used */ +xgr %r0, %r0 +xgr %r1, %r1 +xgr %r3, %r3 +xgr %r4, %r4 +xgr %r5, %r5 +xgr %r6, %r6 + +/* Subcode 0 - Modified Clear */ +SET_RESET_PSW_ADDR done +diag %r0, %r2, 0x308 + +/* Should never be executed because of the reset PSW */ +diag 0, 0, 0x44 + +done: +lghi %r1, 42 +diag %r1, 0, 0x9c + + + .align 8 +reset_psw: + .quad 0x0008000180000000