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 68B8CC43219 for ; Tue, 7 Dec 2021 16:02:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239406AbhLGQFu (ORCPT ); Tue, 7 Dec 2021 11:05:50 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:50002 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239396AbhLGQFt (ORCPT ); Tue, 7 Dec 2021 11:05:49 -0500 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1B7DrpUT016278; Tue, 7 Dec 2021 16:02:19 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=8p3rz2v9DS0O1Raxtiqx8T2opT3X5KH1KV6Fjh+bwjk=; b=FnridkVGoWUMpU07NehG0rpbTpuuKCdO6O/4tDpbeNtBdOfTTshnhD7ovGPzMGct3oV5 cg7ooOpwbX2DbZi9HltkbpYynoBUTha3GyFwy+LDKIWfroBreDQNHvIJICHaYO81lYpr NlKcwYmNAkdQq9RDN803uTpE5i3PJgvhyGbbRUMzoe96lbXKwWpQZEv5ZQonsFuayPjm IZqCpzJqKsNQonEfc8AfIxXqL7ElU3uIm5/ZE5am6gk0M9EuAV6ijUtCeZWTfqJyzCG7 BNY/wJyy8xlEdFxT94GqtTVOUSbb3VBycRUs4xHgIpmiKCBuBbBGwiiNSSyOiORcyQ2y GA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3ct8w6u0pj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Dec 2021 16:02:18 +0000 Received: from m0098409.ppops.net (m0098409.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 1B7Dw50Y029793; Tue, 7 Dec 2021 16:02:18 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 3ct8w6u0n4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Dec 2021 16:02:18 +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 1B7FqhMu010876; Tue, 7 Dec 2021 16:02:15 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma06ams.nl.ibm.com with ESMTP id 3cqykj872c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Dec 2021 16:02:15 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 1B7G2CNM31916500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 Dec 2021 16:02:12 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 36B284C044; Tue, 7 Dec 2021 16:02:12 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 066474C052; Tue, 7 Dec 2021 16:02:11 +0000 (GMT) Received: from linux6.. (unknown [9.114.12.104]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 7 Dec 2021 16:02:10 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, imbrenda@linux.ibm.com, david@redhat.com, thuth@redhat.com, seiden@linux.ibm.com Subject: [kvm-unit-tests PATCH v2 10/10] s390x: sie: Add PV diag test Date: Tue, 7 Dec 2021 16:00:05 +0000 Message-Id: <20211207160005.1586-11-frankja@linux.ibm.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211207160005.1586-1-frankja@linux.ibm.com> References: <20211207160005.1586-1-frankja@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: -WqdD2PBFv8LhIMMcrzyCuCHhwfhFluU X-Proofpoint-ORIG-GUID: RiMB6CdGkLXzpUHX0ZEBHWcFirWpSNia X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-07_06,2021-12-06_02,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 impostorscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 clxscore=1015 spamscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112070098 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Let's start testing the format 4 (PV) SIE via the diagnose instructions since most of them are pretty simple to handle. The tests check for the intercept values like ipa/ipb and icptcode as well as the values in the registers and handling of the exception injection. Signed-off-by: Janosch Frank --- s390x/Makefile | 6 + s390x/pv-diags.c | 187 +++++++++++++++++++++ s390x/snippets/asm/snippet-pv-diag-288.S | 25 +++ s390x/snippets/asm/snippet-pv-diag-500.S | 39 +++++ s390x/snippets/asm/snippet-pv-diag-yield.S | 7 + 5 files changed, 264 insertions(+) create mode 100644 s390x/pv-diags.c create mode 100644 s390x/snippets/asm/snippet-pv-diag-288.S create mode 100644 s390x/snippets/asm/snippet-pv-diag-500.S create mode 100644 s390x/snippets/asm/snippet-pv-diag-yield.S diff --git a/s390x/Makefile b/s390x/Makefile index 55e6d962..0cb90466 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -26,6 +26,8 @@ tests += $(TEST_DIR)/edat.elf tests += $(TEST_DIR)/mvpg-sie.elf tests += $(TEST_DIR)/spec_ex-sie.elf +pv-tests += $(TEST_DIR)/pv-diags.elf + ifneq ($(HOST_KEY_DOCUMENT),) ifneq ($(GEN_SE_HEADER),) tests += $(pv-tests) @@ -98,6 +100,10 @@ snippet_lib = $(snippet_asmlib) lib/auxinfo.o $(TEST_DIR)/mvpg-sie.elf: snippets = $(SNIPPET_DIR)/c/mvpg-snippet.gbin $(TEST_DIR)/spec_ex-sie.elf: snippets = $(SNIPPET_DIR)/c/spec_ex.gbin +$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-yield.gbin +$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-288.gbin +$(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-500.gbin + ifneq ($(GEN_SE_HEADER),) snippets += $(pv-snippets) tests += $(pv-tests) diff --git a/s390x/pv-diags.c b/s390x/pv-diags.c new file mode 100644 index 00000000..110547ad --- /dev/null +++ b/s390x/pv-diags.c @@ -0,0 +1,187 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * PV virtualization interception tests for diagnose instructions. + * + * Copyright (c) 2021 IBM Corp + * + * Authors: + * Janosch Frank + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static struct vm vm; + +static void test_diag_500(void) +{ + extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_500)[]; + extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_500)[]; + extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_500)[]; + extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_500)[]; + int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_500); + int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_500); + + report_prefix_push("diag 0x500"); + + snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_500), + SNIPPET_HDR_START(asm, snippet_pv_diag_500), + size_gbin, size_hdr, SNIPPET_OFF_ASM); + + 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"); + report(vm.save_area.guest.grs[1] == 1 && + vm.save_area.guest.grs[2] == 2 && + vm.save_area.guest.grs[3] == 3 && + vm.save_area.guest.grs[4] == 4, + "register values"); + /* + * Check if we can inject a PGM operand which we are always + * allowed to do after a diag500 exit. + */ + vm.sblk->iictl = IICTL_CODE_OPERAND; + 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] == PGM_INT_CODE_OPERAND, + "operand exception"); + + /* + * Check if we can inject a PGM specification which we are always + * allowed to do after a diag500 exit. + */ + sie(&vm); + vm.sblk->iictl = IICTL_CODE_SPECIFICATION; + /* Inject PGM, next exit should be 9c */ + 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] == PGM_INT_CODE_SPECIFICATION, + "specification exception"); + + /* No need for cleanup, just tear down the VM */ + uv_destroy_guest(&vm); + + report_prefix_pop(); +} + + +static void test_diag_288(void) +{ + extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_288)[]; + extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_288)[]; + extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_288)[]; + extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_288)[]; + int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_288); + int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_288); + + report_prefix_push("diag 0x288"); + + snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_288), + SNIPPET_HDR_START(asm, snippet_pv_diag_288), + size_gbin, size_hdr, SNIPPET_OFF_ASM); + + sie(&vm); + report(vm.sblk->icptcode == ICPT_PV_INSTR && vm.sblk->ipa == 0x8302 && + vm.sblk->ipb == 0x50000000 && vm.save_area.guest.grs[5] == 0x288, + "intercept values"); + report(vm.save_area.guest.grs[0] == 1 && + vm.save_area.guest.grs[1] == 2 && + vm.save_area.guest.grs[2] == 3, + "register values"); + + /* + * Check if we can inject a PGM spec which we are always + * allowed to do after a diag288 exit. + */ + vm.sblk->iictl = IICTL_CODE_SPECIFICATION; + 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] == PGM_INT_CODE_SPECIFICATION, + "specification exception"); + + /* No need for cleanup, just tear down the VM */ + uv_destroy_guest(&vm); + + report_prefix_pop(); +} + +static void test_diag_yield(void) +{ + extern const char SNIPPET_NAME_START(asm, snippet_pv_diag_yield)[]; + extern const char SNIPPET_NAME_END(asm, snippet_pv_diag_yield)[]; + extern const char SNIPPET_HDR_START(asm, snippet_pv_diag_yield)[]; + extern const char SNIPPET_HDR_END(asm, snippet_pv_diag_yield)[]; + int size_hdr = SNIPPET_HDR_LEN(asm, snippet_pv_diag_yield); + int size_gbin = SNIPPET_LEN(asm, snippet_pv_diag_yield); + + report_prefix_push("diag yield"); + + snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_yield), + SNIPPET_HDR_START(asm, snippet_pv_diag_yield), + size_gbin, size_hdr, SNIPPET_OFF_ASM); + + /* 0x44 */ + report_prefix_push("0x44"); + sie(&vm); + report(vm.sblk->icptcode == ICPT_PV_NOTIFY && vm.sblk->ipa == 0x8302 && + vm.sblk->ipb == 0x50000000 && vm.save_area.guest.grs[5] == 0x44, + "intercept values"); + report_prefix_pop(); + + /* 0x9c */ + report_prefix_push("0x9c"); + sie(&vm); + report(vm.sblk->icptcode == ICPT_PV_NOTIFY && vm.sblk->ipa == 0x8302 && + vm.sblk->ipb == 0x50000000 && vm.save_area.guest.grs[5] == 0x9c, + "intercept values"); + report(vm.save_area.guest.grs[0] == 42, "r1 correct"); + report_prefix_pop(); + + uv_destroy_guest(&vm); + report_prefix_pop(); +} + + +int main(void) +{ + report_prefix_push("pv-diags"); + if (!test_facility(158)) { + report_skip("UV Call facility unavailable"); + goto done; + } + if (!sclp_facilities.has_sief2) { + report_skip("SIEF2 facility unavailable"); + goto done; + } + + uv_setup_asces(); + snippet_setup_guest(&vm, true); + test_diag_yield(); + test_diag_288(); + test_diag_500(); + sie_guest_destroy(&vm); + +done: + report_prefix_pop(); + return report_summary(); +} diff --git a/s390x/snippets/asm/snippet-pv-diag-288.S b/s390x/snippets/asm/snippet-pv-diag-288.S new file mode 100644 index 00000000..e3e63121 --- /dev/null +++ b/s390x/snippets/asm/snippet-pv-diag-288.S @@ -0,0 +1,25 @@ +#include +.section .text + +/* Clean and pre-load registers that are used for diag 288 */ +xgr %r0, %r0 +xgr %r1, %r1 +xgr %r3, %r3 +lghi %r0, 1 +lghi %r1, 2 +lghi %r2, 3 + +/* Let's jump to the pgm exit label on a PGM */ +larl %r4, exit_pgm +stg %r4, GEN_LC_PGM_NEW_PSW + 8 + +/* Execute the diag288 */ +diag %r0, %r2, 0x288 + +/* Force exit if we don't get a PGM */ +diag 0, 0, 0x44 + +/* Communicate the PGM code via diag9c(easiest) */ +exit_pgm: +lh %r1, GEN_LC_PGM_INT_CODE +diag %r1, 0, 0x9c diff --git a/s390x/snippets/asm/snippet-pv-diag-500.S b/s390x/snippets/asm/snippet-pv-diag-500.S new file mode 100644 index 00000000..50c06779 --- /dev/null +++ b/s390x/snippets/asm/snippet-pv-diag-500.S @@ -0,0 +1,39 @@ +#include +.section .text + +/* Clean and pre-load registers that are used for diag 500 */ +xgr %r1, %r1 +xgr %r2, %r2 +xgr %r3, %r3 +xgr %r4, %r4 +lghi %r1, 1 +lghi %r2, 2 +lghi %r3, 3 +lghi %r4, 4 + +/* Let's jump to the next label on a PGM */ +xgr %r5, %r5 +stg %r5, GEN_LC_PGM_NEW_PSW +larl %r5, next +stg %r5, GEN_LC_PGM_NEW_PSW + 8 + +/* Execute the diag500 */ +diag 0, 0, 0x500 + +/* Should never be executed because of the PGM */ +diag 0, 0, 0x44 + +/* Execute again to test spec PGM injection*/ +next: +lh %r1, GEN_LC_PGM_INT_CODE +diag %r1, 0, 0x9c +larl %r5, done +stg %r5, GEN_LC_PGM_NEW_PSW + 8 +diag 0, 0, 0x500 + +/* Should never be executed because of the PGM */ +diag 0, 0, 0x44 + +done: +lh %r1, GEN_LC_PGM_INT_CODE +diag %r1, 0, 0x9c diff --git a/s390x/snippets/asm/snippet-pv-diag-yield.S b/s390x/snippets/asm/snippet-pv-diag-yield.S new file mode 100644 index 00000000..5795cf0f --- /dev/null +++ b/s390x/snippets/asm/snippet-pv-diag-yield.S @@ -0,0 +1,7 @@ +.section .text + +xgr %r0, %r0 +xgr %r1, %r1 +diag 0,0,0x44 +lghi %r1, 42 +diag 1,0,0x9c -- 2.32.0