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 X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54C1EC2B9F7 for ; Wed, 26 May 2021 10:18:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2661261441 for ; Wed, 26 May 2021 10:18:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233742AbhEZKTg (ORCPT ); Wed, 26 May 2021 06:19:36 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:50896 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233730AbhEZKTf (ORCPT ); Wed, 26 May 2021 06:19:35 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 14QA3NEj019601; Wed, 26 May 2021 06:18:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=3DHEWgBdzZxhl/+OY+NUtTZbiE51mmU+o/YzqDXnZ54=; b=bmzqqrznVmB0PzIEVvjcu3zv969ciH0i8hc6DEnZ2oFVsqBZlR078g7lIx0VVwd8SHzD Mu7ix/Uwkjot1RKXuTsFzR0FTAqpbROeGc/WJavGSZ7YkIfUFh6ozon045iDItAazlK5 6AKmjmNlcXLbZ4Od+JZphINgRJqkTEy2Dyv2Uot4mABfChmL0N9V9k7P9r6Vf5pQ1q4D rUqIarXwkXqNX5LDobbulY6d7PnASZ+CHGpL3QQPpuJAQ1TxjQ0BwbaKkMN4c00U9cZ1 vTtgjkKPjJzXIHABVmGFBCF0+vqo8zx8Ed1aFuYGmVLv/Zc+qO3R2tiB7IkIhjP/U85f Wg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 38skmc9btc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 May 2021 06:18:04 -0400 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 14QA4juY025234; Wed, 26 May 2021 06:18:03 -0400 Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0b-001b2d01.pphosted.com with ESMTP id 38skmc9bsd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 May 2021 06:18:03 -0400 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 14QAC1iX008066; Wed, 26 May 2021 10:18:01 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma06fra.de.ibm.com with ESMTP id 38s1rp08cm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 May 2021 10:18:01 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 14QAHxAn28049666 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 26 May 2021 10:17:59 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 47B3D4C04A; Wed, 26 May 2021 10:17:59 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D03F64C046; Wed, 26 May 2021 10:17:58 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.174.11]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 26 May 2021 10:17:58 +0000 (GMT) Subject: Re: [kvm-unit-tests RFC 2/2] s390x: mvpg: Add SIE mvpg test To: Claudio Imbrenda Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, david@redhat.com, thuth@redhat.com, cohuck@redhat.com References: <20210520094730.55759-1-frankja@linux.ibm.com> <20210520094730.55759-3-frankja@linux.ibm.com> <20210525193751.5e6630c7@ibm-vm> From: Janosch Frank Message-ID: Date: Wed, 26 May 2021 12:17:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210525193751.5e6630c7@ibm-vm> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: JjITLE6cJsm19y-qfl4jmeEijcH3shkW X-Proofpoint-ORIG-GUID: dHGMHkPGMDYDTCn6MnKVXKC7z6_fcYtC X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-05-26_06:2021-05-26,2021-05-26 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 suspectscore=0 spamscore=0 priorityscore=1501 mlxlogscore=999 bulkscore=0 mlxscore=0 malwarescore=0 adultscore=0 clxscore=1015 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105260067 Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On 5/25/21 7:37 PM, Claudio Imbrenda wrote: > On Thu, 20 May 2021 09:47:30 +0000 > Janosch Frank wrote: > >> Let's also check the PEI values to make sure our VSIE implementation >> is correct. >> >> Signed-off-by: Janosch Frank >> --- >> s390x/Makefile | 3 +- >> s390x/mvpg-sie.c | 139 >> ++++++++++++++++++++++++++++++++ s390x/snippets/c/mvpg-snippet.c | >> 33 ++++++++ s390x/unittests.cfg | 3 + >> 4 files changed, 177 insertions(+), 1 deletion(-) >> create mode 100644 s390x/mvpg-sie.c >> create mode 100644 s390x/snippets/c/mvpg-snippet.c >> >> diff --git a/s390x/Makefile b/s390x/Makefile >> index fe267011..6692cf73 100644 >> --- a/s390x/Makefile >> +++ b/s390x/Makefile >> @@ -22,6 +22,7 @@ tests += $(TEST_DIR)/uv-guest.elf >> tests += $(TEST_DIR)/sie.elf >> tests += $(TEST_DIR)/mvpg.elf >> tests += $(TEST_DIR)/uv-host.elf >> +tests += $(TEST_DIR)/mvpg-sie.elf >> >> tests_binary = $(patsubst %.elf,%.bin,$(tests)) >> ifneq ($(HOST_KEY_DOCUMENT),) >> @@ -79,7 +80,7 @@ FLATLIBS = $(libcflat) >> SNIPPET_DIR = $(TEST_DIR)/snippets >> >> # C snippets that need to be linked >> -snippets-c = >> +snippets-c = $(SNIPPET_DIR)/c/mvpg-snippet.gbin >> >> # ASM snippets that are directly compiled and converted to a *.gbin >> snippets-a = >> diff --git a/s390x/mvpg-sie.c b/s390x/mvpg-sie.c >> new file mode 100644 >> index 00000000..a617704b >> --- /dev/null >> +++ b/s390x/mvpg-sie.c >> @@ -0,0 +1,139 @@ >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +static u8 *guest; >> +static u8 *guest_instr; >> +static struct vm vm; >> + >> +static uint8_t *src; >> +static uint8_t *dst; >> + >> +extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_start[]; >> +extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_end[]; >> +int binary_size; >> + >> +static void handle_validity(struct vm *vm) >> +{ >> + report(0, "VALIDITY: %x", vm->sblk->ipb >> 16); > > I think an assert would be better. This should not happen, and if it > happens something went very wrong and we have no guarantee that we will > be able to continue That depends on the test. If you use multiple gbins/snippets in a test, then a validity for one of those does not necessarily break the others. Especially when you think about PV tests where the destroy will clean out all the state anyway. > >> +} >> + >> +static void sie(struct vm *vm) >> +{ >> + /* Reset icptcode so we don't trip below */ >> + vm->sblk->icptcode = 0; >> + >> + while (vm->sblk->icptcode == 0) { >> + sie64a(vm->sblk, &vm->save_area); >> + if (vm->sblk->icptcode == ICPT_VALIDITY) >> + handle_validity(vm); >> + } >> + vm->save_area.guest.grs[14] = vm->sblk->gg14; >> + vm->save_area.guest.grs[15] = vm->sblk->gg15; >> +} >> + >> +static void test_mvpg_pei(void) >> +{ >> + uint64_t **pei_dst = (uint64_t **)((uintptr_t) vm.sblk + >> 0xc0); >> + uint64_t **pei_src = (uint64_t **)((uintptr_t) vm.sblk + >> 0xc8); + >> + report_prefix_push("pei"); > > maybe clear the destination buffer... > >> + protect_page(guest + 0x6000, PAGE_ENTRY_I); >> + sie(&vm); >> + report(vm.sblk->icptcode == ICPT_PARTEXEC, "Partial >> execution"); >> + report((uintptr_t)**pei_src == ((uintptr_t)vm.sblk->mso) + >> 0x6000 + PAGE_ENTRY_I, "PEI_SRC correct"); >> + report((uintptr_t)**pei_dst == vm.sblk->mso + 0x5000, >> "PEI_DST correct"); > > ... and check that the page was not copied Sure > >> + /* Jump over the diag44 */ >> + sie(&vm); > > I would check if you really got a diag44 Sure, reporting doesn't make sense to me but an assert should be fine > >> + /* Clear PEI data for next check */ >> + memset((uint64_t *)((uintptr_t) vm.sblk + 0xc0), 0, 16); >> + unprotect_page(guest + 0x6000, PAGE_ENTRY_I); >> + protect_page(guest + 0x5000, PAGE_ENTRY_I); >> + sie(&vm); >> + report(vm.sblk->icptcode == ICPT_PARTEXEC, "Partial >> execution"); >> + report((uintptr_t)**pei_src == vm.sblk->mso + 0x6000, >> "PEI_SRC correct"); >> + report((uintptr_t)**pei_dst == vm.sblk->mso + 0x5000 + >> PAGE_ENTRY_I, "PEI_DST correct"); + >> + report_prefix_pop(); >> +} >> + >> +static void test_mvpg(void) >> +{ >> + int binary_size = >> ((uintptr_t)_binary_s390x_snippets_c_mvpg_snippet_gbin_end - >> + >> (uintptr_t)_binary_s390x_snippets_c_mvpg_snippet_gbin_start); + >> + memcpy(guest, >> _binary_s390x_snippets_c_mvpg_snippet_gbin_start, binary_size); >> + memset(src, 0x42, PAGE_SIZE); >> + memset(dst, 0x43, PAGE_SIZE); >> + sie(&vm); >> + mb(); >> + report(!memcmp(src, dst, PAGE_SIZE) && *dst == 0x42, "Page > > or maybe you can clear the destination buffer here, if you prefer I'll have a look, thanks for the review! > >> moved"); +} >> + >> +static void setup_guest(void) >> +{ >> + setup_vm(); >> + >> + /* Allocate 1MB as guest memory */ >> + guest = alloc_pages(8); >> + /* The first two pages are the lowcore */ >> + guest_instr = guest + PAGE_SIZE * 2; >> + >> + vm.sblk = alloc_page(); >> + >> + vm.sblk->cpuflags = CPUSTAT_ZARCH | CPUSTAT_RUNNING; >> + vm.sblk->prefix = 0; >> + /* >> + * Pageable guest with the same ASCE as the test programm, >> but >> + * the guest memory 0x0 is offset to start at the allocated >> + * guest pages and end after 1MB. >> + * >> + * It's not pretty but faster and easier than managing guest >> ASCEs. >> + */ >> + vm.sblk->mso = (u64)guest; >> + vm.sblk->msl = (u64)guest; >> + vm.sblk->ihcpu = 0xffff; >> + >> + vm.sblk->crycbd = (uint64_t)alloc_page(); >> + >> + vm.sblk->gpsw.addr = PAGE_SIZE * 4; >> + vm.sblk->gpsw.mask = 0x0000000180000000ULL; >> + vm.sblk->ictl = ICTL_OPEREXC | ICTL_PINT; >> + /* Enable MVPG interpretation as we want to test KVM and not >> ourselves */ >> + vm.sblk->eca = ECA_MVPGI; >> + >> + src = guest + PAGE_SIZE * 6; >> + dst = guest + PAGE_SIZE * 5; >> +} >> + >> +int main(void) >> +{ >> + report_prefix_push("mvpg-sie"); >> + if (!sclp_facilities.has_sief2) { >> + report_skip("SIEF2 facility unavailable"); >> + goto done; >> + } >> + >> + setup_guest(); >> + test_mvpg(); >> + test_mvpg_pei(); >> + >> +done: >> + report_prefix_pop(); >> + return report_summary(); >> + >> +} >> diff --git a/s390x/snippets/c/mvpg-snippet.c >> b/s390x/snippets/c/mvpg-snippet.c new file mode 100644 >> index 00000000..96b70c9c >> --- /dev/null >> +++ b/s390x/snippets/c/mvpg-snippet.c >> @@ -0,0 +1,33 @@ >> +#include >> + >> +static inline void force_exit(void) >> +{ >> + asm volatile(" diag 0,0,0x44\n"); >> +} >> + >> +static inline int mvpg(unsigned long r0, void *dest, void *src) >> +{ >> + register unsigned long reg0 asm ("0") = r0; >> + int cc; >> + >> + asm volatile(" mvpg %1,%2\n" >> + " ipm %0\n" >> + " srl %0,28" >> + : "=&d" (cc) : "a" (dest), "a" (src), "d" (reg0) >> + : "memory", "cc"); >> + return cc; >> +} >> + >> +static void test_mvpg_real(void) >> +{ >> + mvpg(0, (void *)0x5000, (void *)0x6000); >> + force_exit(); >> +} >> + >> +__attribute__((section(".text"))) int main(void) >> +{ >> + test_mvpg_real(); >> + test_mvpg_real(); >> + test_mvpg_real(); >> + return 0; >> +} >> diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg >> index 9f81a608..8634b1b1 100644 >> --- a/s390x/unittests.cfg >> +++ b/s390x/unittests.cfg >> @@ -103,3 +103,6 @@ file = sie.elf >> [mvpg] >> file = mvpg.elf >> timeout = 10 >> + >> +[mvpg-sie] >> +file = mvpg-sie.elf >