From patchwork Thu Jul 29 13:48:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janosch Frank X-Patchwork-Id: 12408793 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 7CEDEC4338F for ; Thu, 29 Jul 2021 13:48:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63E9360EB5 for ; Thu, 29 Jul 2021 13:48:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237686AbhG2Nsd (ORCPT ); Thu, 29 Jul 2021 09:48:33 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:24068 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237816AbhG2Ns1 (ORCPT ); Thu, 29 Jul 2021 09:48:27 -0400 Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16TDkTj7150426; Thu, 29 Jul 2021 09:48:16 -0400 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=USVgL8ddNGk6Y9ZyApptJZKXs5YWa+xUZsE8cNHY09o=; b=J9I6PWd1RJG14HAktljyN/6vdy/u8MUBjeesuRokkQP3fAcSOl+mwdTOZuHEbuBNgFSV dg3GHM9l5vZy1dNQyoAc1WdhwmDrVB1FiiuVW3Uo30G/VLSMfhwY1STQpL3GRLuMkWKd WEoOmeAQfRU4m6vIMMe+/2qn8PqTNRrci2e+XBmE1iZi6Dg3o2U9f5tQLTnWFR3BsAX2 hM5A1omuMFt5CTMoFV7CzykhZNNcLRj/c/OFhQzjgX+zO+3MuhvS0gsfkGh8CwznPUbq zTmR3artCiR4GzBnKwWAepCbLoVgXUIDCjr30eANqezoNzihdCv2qGby5KcPraIzaQgN mg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3a3wgw01gc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 09:48:15 -0400 Received: from m0127361.ppops.net (m0127361.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 16TDkkeU151191; Thu, 29 Jul 2021 09:48:15 -0400 Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com with ESMTP id 3a3wgw01fj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 09:48:15 -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 16TDaYlr008219; Thu, 29 Jul 2021 13:48:13 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 3a235kh544-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 13:48:13 +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 16TDmBNB28836184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Jul 2021 13:48:11 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BB4E34C0B0; Thu, 29 Jul 2021 13:48:10 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 74C744C070; Thu, 29 Jul 2021 13:48:10 +0000 (GMT) Received: from t46lp67.lnxne.boe (unknown [9.152.108.100]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 29 Jul 2021 13:48: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, cohuck@redhat.com Subject: [kvm-unit-tests PATCH 1/4] s390x: sie: Add sie lib validity handling Date: Thu, 29 Jul 2021 13:48:00 +0000 Message-Id: <20210729134803.183358-2-frankja@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210729134803.183358-1-frankja@linux.ibm.com> References: <20210729134803.183358-1-frankja@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 9d_HXLttQ_T_fFkJb9nzhgQ2Ek-CI1P3 X-Proofpoint-GUID: P7gIFfRnQsNCSoTq7NnjwBOeZ7qY4z92 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-07-29_10:2021-07-29,2021-07-29 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 priorityscore=1501 phishscore=0 mlxlogscore=999 clxscore=1015 spamscore=0 malwarescore=0 suspectscore=0 impostorscore=0 bulkscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2107290087 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Let's start off the SIE lib with validity handling code since that has the least amount of dependencies to other files. Signed-off-by: Janosch Frank Reviewed-by: Claudio Imbrenda --- lib/s390x/sie.c | 41 +++++++++++++++++++++++++++++++++++++++++ lib/s390x/sie.h | 3 +++ s390x/Makefile | 1 + s390x/mvpg-sie.c | 2 +- s390x/sie.c | 7 +------ 5 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 lib/s390x/sie.c diff --git a/lib/s390x/sie.c b/lib/s390x/sie.c new file mode 100644 index 00000000..9107519f --- /dev/null +++ b/lib/s390x/sie.c @@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Virtualization library that speeds up managing guests. + * + * Copyright (c) 2021 IBM Corp + * + * Authors: + * Janosch Frank + */ + +#include +#include +#include + +static bool validity_expected; +static uint16_t vir; + +void sie_expect_validity(void) +{ + validity_expected = true; + vir = 0; +} + +void sie_check_validity(uint16_t vir_exp) +{ + report(vir_exp == vir, "VALIDITY: %x", vir); + mb(); + vir = 0; +} + +void sie_handle_validity(struct vm *vm) +{ + if (vm->sblk->icptcode != ICPT_VALIDITY) + return; + + vir = vm->sblk->ipb >> 16; + + if (!validity_expected) + report_abort("VALIDITY: %x", vir); + validity_expected = false; +} diff --git a/lib/s390x/sie.h b/lib/s390x/sie.h index 6ba858a2..7ff98d2d 100644 --- a/lib/s390x/sie.h +++ b/lib/s390x/sie.h @@ -197,5 +197,8 @@ struct vm { extern void sie_entry(void); extern void sie_exit(void); extern void sie64a(struct kvm_s390_sie_block *sblk, struct vm_save_area *save_area); +void sie_expect_validity(void); +void sie_check_validity(uint16_t vir_exp); +void sie_handle_validity(struct vm *vm); #endif /* _S390X_SIE_H_ */ diff --git a/s390x/Makefile b/s390x/Makefile index 6565561b..ef8041a6 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -71,6 +71,7 @@ cflatobjs += lib/s390x/css_dump.o cflatobjs += lib/s390x/css_lib.o cflatobjs += lib/s390x/malloc_io.o cflatobjs += lib/s390x/uv.o +cflatobjs += lib/s390x/sie.o OBJDIRS += lib/s390x diff --git a/s390x/mvpg-sie.c b/s390x/mvpg-sie.c index 5e70f591..2ac91eec 100644 --- a/s390x/mvpg-sie.c +++ b/s390x/mvpg-sie.c @@ -39,7 +39,7 @@ static void sie(struct vm *vm) while (vm->sblk->icptcode == 0) { sie64a(vm->sblk, &vm->save_area); - assert(vm->sblk->icptcode != ICPT_VALIDITY); + sie_handle_validity(vm); } vm->save_area.guest.grs[14] = vm->sblk->gg14; vm->save_area.guest.grs[15] = vm->sblk->gg15; diff --git a/s390x/sie.c b/s390x/sie.c index 134d3c4f..5c798a9e 100644 --- a/s390x/sie.c +++ b/s390x/sie.c @@ -24,17 +24,12 @@ static u8 *guest; static u8 *guest_instr; static struct vm vm; -static void handle_validity(struct vm *vm) -{ - report(0, "VALIDITY: %x", vm->sblk->ipb >> 16); -} static void sie(struct vm *vm) { while (vm->sblk->icptcode == 0) { sie64a(vm->sblk, &vm->save_area); - if (vm->sblk->icptcode == ICPT_VALIDITY) - handle_validity(vm); + sie_handle_validity(vm); } vm->save_area.guest.grs[14] = vm->sblk->gg14; vm->save_area.guest.grs[15] = vm->sblk->gg15; From patchwork Thu Jul 29 13:48:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janosch Frank X-Patchwork-Id: 12408791 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 DC633C43214 for ; Thu, 29 Jul 2021 13:48:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C96DC6023F for ; Thu, 29 Jul 2021 13:48:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237814AbhG2Nsb (ORCPT ); Thu, 29 Jul 2021 09:48:31 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:12378 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237813AbhG2Ns1 (ORCPT ); Thu, 29 Jul 2021 09:48:27 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16TDgALf109798; Thu, 29 Jul 2021 09:48:15 -0400 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=CDs+LVthPv03BLTFGwvqb05OcTnp8NgWKZ4mKsCatN8=; b=ZBiU/6WL2lrNFCVkJH2JTR0HHqhBy/jW9U2Rova1f75Hsx/8Natq47QNC2TDNS6Y4ImK eSOZhRaM8W8BeZrHgEW9WNso8EexhEprpRgd6JQ64SlNDJRNbYUiw3UncKq0AoK/xFL0 1fjY83s3XCp+BlfqLaLXR/tmejzLKnbr+oVVkdZjFBAaFzcfCWPQfyZCJHW0CZPRg31u 082gDa84YpEjqkTWZ8RVE88dTJhb23o50EkGh0Gwq36Cp+Unzlf3u05y9/6b8Bz/sNLX TJ32SL76A6VWyM0Gxj/bLwR4C0PU+FdiOFk78HGrgtPfSuG0zgnEcui0VtJMMpqFsuxF WQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3a3qb6n4gh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 09:48:15 -0400 Received: from m0098421.ppops.net (m0098421.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 16TDhQo3115640; Thu, 29 Jul 2021 09:48:15 -0400 Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 3a3qb6n4fn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 09:48:15 -0400 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 16TDZwwg031045; Thu, 29 Jul 2021 13:48:13 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma04ams.nl.ibm.com with ESMTP id 3a235m1r8d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 13:48:13 +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 16TDjQIW33751512 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Jul 2021 13:45:26 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 269964C095; Thu, 29 Jul 2021 13:48:11 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C9E984C070; Thu, 29 Jul 2021 13:48:10 +0000 (GMT) Received: from t46lp67.lnxne.boe (unknown [9.152.108.100]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 29 Jul 2021 13:48: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, cohuck@redhat.com Subject: [kvm-unit-tests PATCH 2/4] s390x: lib: Introduce HPAGE_* constants Date: Thu, 29 Jul 2021 13:48:01 +0000 Message-Id: <20210729134803.183358-3-frankja@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210729134803.183358-1-frankja@linux.ibm.com> References: <20210729134803.183358-1-frankja@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: BnY1H4xdZdOit44nCLvpF6_A4Q1ywRM4 X-Proofpoint-ORIG-GUID: AiEDgN-oA7AFVZQr0aSFwcOXEa59IxbF X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-07-29_10:2021-07-29,2021-07-29 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 lowpriorityscore=0 phishscore=0 bulkscore=0 impostorscore=0 clxscore=1015 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2107290087 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org They come in handy when working with 1MB blocks/addresses. Signed-off-by: Janosch Frank Reviewed-by: Claudio Imbrenda Reviewed-by: Thomas Huth --- lib/s390x/asm/page.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/s390x/asm/page.h b/lib/s390x/asm/page.h index f130f936..2f4afd06 100644 --- a/lib/s390x/asm/page.h +++ b/lib/s390x/asm/page.h @@ -35,4 +35,8 @@ typedef struct { pteval_t pte; } pte_t; #define __pmd(x) ((pmd_t) { (x) } ) #define __pte(x) ((pte_t) { (x) } ) +#define HPAGE_SHIFT 20 +#define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT) +#define HPAGE_MASK (~(HPAGE_SIZE-1)) + #endif From patchwork Thu Jul 29 13:48:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janosch Frank X-Patchwork-Id: 12408795 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 874CDC432BE for ; Thu, 29 Jul 2021 13:48:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 746E160EB5 for ; Thu, 29 Jul 2021 13:48:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237804AbhG2Nse (ORCPT ); Thu, 29 Jul 2021 09:48:34 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:30380 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237818AbhG2Ns1 (ORCPT ); Thu, 29 Jul 2021 09:48:27 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16TDXWr7110586; Thu, 29 Jul 2021 09:48:16 -0400 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=EsHZ+QhPTBgzuJAraXcHOD2mzedOEH+3TReHC3vWe8g=; b=fVZ02OcTSfGGsUkb7Cc4A88K5waU5GxJvoNa8l3OefZGGXy0371wVymLhFEHJTyksoUC 3CKzI35/jILnnh/93BlfLuhlNUWl0wlPwEk6Xhcd2nThn6Gv8yxD8QEckNxY+49U3eIf xXUC7zUq2Xw2pGmLE/BUy3yhkwP4cdQJIzWyhCroR2e0T4W9SqaFA/CafF992u0QyU1Y VI+2+P/iuUYa9guVc+e1VHtI3Le/JRZyKLnXf+tqoYso7k+blDuK5GQOltQMPRnfWxih uPP4Q+HngOgQu57Se2ciRzaekja8EFsy2HDC11PloBv/Lg1/0CoDwL1K4AKEYBNEzFOo 7g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3a3tw7nmeg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 09:48:16 -0400 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 16TDXbJm111183; Thu, 29 Jul 2021 09:48:15 -0400 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 3a3tw7nmdm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 09:48:15 -0400 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 16TDZOwk028272; Thu, 29 Jul 2021 13:48:14 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 3a235khra8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 13:48:14 +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 16TDjRlh33816962 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Jul 2021 13:45:27 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 729EA4C0B1; Thu, 29 Jul 2021 13:48:11 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3553B4C073; Thu, 29 Jul 2021 13:48:11 +0000 (GMT) Received: from t46lp67.lnxne.boe (unknown [9.152.108.100]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 29 Jul 2021 13:48:11 +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, cohuck@redhat.com Subject: [kvm-unit-tests PATCH 3/4] s390x: lib: sie: Add struct vm (de)initialization functions Date: Thu, 29 Jul 2021 13:48:02 +0000 Message-Id: <20210729134803.183358-4-frankja@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210729134803.183358-1-frankja@linux.ibm.com> References: <20210729134803.183358-1-frankja@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: JUQzhY8FXsnxSy-1tVSKuVOv3OKwdZiQ X-Proofpoint-GUID: dIE9ASDvUbklDQBC4B5OnvzE-CmM7Cev X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-07-29_10:2021-07-29,2021-07-29 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxscore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 spamscore=0 impostorscore=0 malwarescore=0 phishscore=0 priorityscore=1501 clxscore=1015 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2107290087 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Before I start copying the same code over and over lets move this into the library. Signed-off-by: Janosch Frank Reviewed-by: Claudio Imbrenda Reviewed-by: Thomas Huth --- lib/s390x/sie.c | 30 ++++++++++++++++++++++++++++++ lib/s390x/sie.h | 3 +++ s390x/mvpg-sie.c | 18 ++---------------- s390x/sie.c | 19 +++---------------- 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/lib/s390x/sie.c b/lib/s390x/sie.c index 9107519f..ec0c4867 100644 --- a/lib/s390x/sie.c +++ b/lib/s390x/sie.c @@ -11,6 +11,9 @@ #include #include #include +#include +#include +#include static bool validity_expected; static uint16_t vir; @@ -39,3 +42,30 @@ void sie_handle_validity(struct vm *vm) report_abort("VALIDITY: %x", vir); validity_expected = false; } + +/* Initializes the struct vm members like the SIE control block. */ +void sie_guest_create(struct vm *vm, uint64_t guest_mem, uint64_t guest_mem_len) +{ + vm->sblk = alloc_page(); + memset(vm->sblk, 0, PAGE_SIZE); + vm->sblk->cpuflags = CPUSTAT_ZARCH | CPUSTAT_RUNNING; + vm->sblk->ihcpu = 0xffff; + vm->sblk->prefix = 0; + + /* Guest memory chunks are always 1MB */ + assert(!(guest_mem_len & ~HPAGE_MASK)); + /* Currently MSO/MSL is the easiest option */ + vm->sblk->mso = (uint64_t)guest_mem; + vm->sblk->msl = (uint64_t)guest_mem + ((guest_mem_len - 1) & HPAGE_MASK); + + /* CRYCB needs to be in the first 2GB */ + vm->crycb = alloc_pages_flags(0, AREA_DMA31); + vm->sblk->crycbd = (uint32_t)(uintptr_t)vm->crycb; +} + +/* Frees the memory that was gathered on initialization */ +void sie_guest_destroy(struct vm *vm) +{ + free_page(vm->crycb); + free_page(vm->sblk); +} diff --git a/lib/s390x/sie.h b/lib/s390x/sie.h index 7ff98d2d..946bd164 100644 --- a/lib/s390x/sie.h +++ b/lib/s390x/sie.h @@ -190,6 +190,7 @@ struct vm_save_area { struct vm { struct kvm_s390_sie_block *sblk; struct vm_save_area save_area; + uint8_t *crycb; /* Crypto Control Block */ /* Ptr to first guest page */ uint8_t *guest_mem; }; @@ -200,5 +201,7 @@ extern void sie64a(struct kvm_s390_sie_block *sblk, struct vm_save_area *save_ar void sie_expect_validity(void); void sie_check_validity(uint16_t vir_exp); void sie_handle_validity(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); #endif /* _S390X_SIE_H_ */ diff --git a/s390x/mvpg-sie.c b/s390x/mvpg-sie.c index 2ac91eec..71ae4f88 100644 --- a/s390x/mvpg-sie.c +++ b/s390x/mvpg-sie.c @@ -110,22 +110,7 @@ static void setup_guest(void) /* 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(); + sie_guest_create(&vm, (uint64_t)guest, HPAGE_SIZE); vm.sblk->gpsw.addr = PAGE_SIZE * 4; vm.sblk->gpsw.mask = 0x0000000180000000ULL; @@ -150,6 +135,7 @@ int main(void) setup_guest(); test_mvpg(); test_mvpg_pei(); + sie_guest_destroy(&vm); done: report_prefix_pop(); diff --git a/s390x/sie.c b/s390x/sie.c index 5c798a9e..9cb9b055 100644 --- a/s390x/sie.c +++ b/s390x/sie.c @@ -84,22 +84,7 @@ static void setup_guest(void) /* 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(); + sie_guest_create(&vm, (uint64_t)guest, HPAGE_SIZE); } int main(void) @@ -112,6 +97,8 @@ int main(void) setup_guest(); test_diags(); + sie_guest_destroy(&vm); + done: report_prefix_pop(); return report_summary(); From patchwork Thu Jul 29 13:48:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janosch Frank X-Patchwork-Id: 12408789 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 C1373C4320E for ; Thu, 29 Jul 2021 13:48:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE9D96023F for ; Thu, 29 Jul 2021 13:48:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237585AbhG2Ns3 (ORCPT ); Thu, 29 Jul 2021 09:48:29 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:5792 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237825AbhG2Ns1 (ORCPT ); Thu, 29 Jul 2021 09:48:27 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16TDiI27078928; Thu, 29 Jul 2021 09:48:17 -0400 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=vyJKt0bZhoq6ffyST58lUouDpSCAs2tHH4tmV7Qw7TU=; b=Ti4mKsbAMkW1//RkGfqT4znKMsJvbonU199wHuFqLo+PjGoOsSdkHlayl2MW1S2um3ux xymxIgrHxXk4PX4Of5r/OEIYnew4iNT3pdBjGtS8lZqqRLQoVSF1+QhNvuVeUI7qBMue knvriImhvLM09G/kzH68S39yYtp9biaeySbUwrtxZcD8LrlKUIjxx0SYC2ja5zaSMwlC dpJq7R/hu5UFKoVsukmcfeh9OzPj56gO6+heqF6m1Y95bcY3tNrR3xAXob8n7XFzMPTx PbmCuJLJQfUVqPax+fGKufDRV7THZqhBDUAclXxrarMe7zjwdRfih91EHOKmQxBcHx1q 3w== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3a3wftr3p9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 09:48:17 -0400 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 16TDjOhS082679; Thu, 29 Jul 2021 09:48:17 -0400 Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com with ESMTP id 3a3wftr3mv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 09:48:17 -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 16TDZaEN007575; Thu, 29 Jul 2021 13:48:14 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma06fra.de.ibm.com with ESMTP id 3a235kh545-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jul 2021 13:48:14 +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 16TDjRhp21955056 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Jul 2021 13:45:27 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D55904C0BB; Thu, 29 Jul 2021 13:48:11 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8B90C4C0B6; Thu, 29 Jul 2021 13:48:11 +0000 (GMT) Received: from t46lp67.lnxne.boe (unknown [9.152.108.100]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 29 Jul 2021 13:48:11 +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, cohuck@redhat.com Subject: [kvm-unit-tests PATCH 4/4] lib: s390x: sie: Move sie function into library Date: Thu, 29 Jul 2021 13:48:03 +0000 Message-Id: <20210729134803.183358-5-frankja@linux.ibm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210729134803.183358-1-frankja@linux.ibm.com> References: <20210729134803.183358-1-frankja@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: AnrGKglxMdlTEmwuZV8tqQ9SN-oQ8UdF X-Proofpoint-GUID: lV_-kcy4UMNGefFORXUOmB__JaEGZ3Iy X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-07-29_10:2021-07-29,2021-07-29 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 bulkscore=0 spamscore=0 impostorscore=0 clxscore=1015 suspectscore=0 malwarescore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2107290087 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Time to deduplicate more code. Signed-off-by: Janosch Frank Reviewed-by: Claudio Imbrenda Reviewed-by: Thomas Huth --- lib/s390x/sie.c | 13 +++++++++++++ lib/s390x/sie.h | 1 + s390x/mvpg-sie.c | 13 ------------- s390x/sie.c | 17 ----------------- 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/lib/s390x/sie.c b/lib/s390x/sie.c index ec0c4867..d971e825 100644 --- a/lib/s390x/sie.c +++ b/lib/s390x/sie.c @@ -43,6 +43,19 @@ void sie_handle_validity(struct vm *vm) validity_expected = false; } +void sie(struct vm *vm) +{ + /* Reset icptcode so we don't trip over it below */ + vm->sblk->icptcode = 0; + + while (vm->sblk->icptcode == 0) { + sie64a(vm->sblk, &vm->save_area); + sie_handle_validity(vm); + } + vm->save_area.guest.grs[14] = vm->sblk->gg14; + vm->save_area.guest.grs[15] = vm->sblk->gg15; +} + /* Initializes the struct vm members like the SIE control block. */ void sie_guest_create(struct vm *vm, uint64_t guest_mem, uint64_t guest_mem_len) { diff --git a/lib/s390x/sie.h b/lib/s390x/sie.h index 946bd164..ca514ef3 100644 --- a/lib/s390x/sie.h +++ b/lib/s390x/sie.h @@ -198,6 +198,7 @@ struct vm { extern void sie_entry(void); extern void sie_exit(void); extern void sie64a(struct kvm_s390_sie_block *sblk, struct vm_save_area *save_area); +void sie(struct vm *vm); void sie_expect_validity(void); void sie_check_validity(uint16_t vir_exp); void sie_handle_validity(struct vm *vm); diff --git a/s390x/mvpg-sie.c b/s390x/mvpg-sie.c index 71ae4f88..70d2fcfa 100644 --- a/s390x/mvpg-sie.c +++ b/s390x/mvpg-sie.c @@ -32,19 +32,6 @@ 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 sie(struct vm *vm) -{ - /* Reset icptcode so we don't trip over it below */ - vm->sblk->icptcode = 0; - - while (vm->sblk->icptcode == 0) { - sie64a(vm->sblk, &vm->save_area); - sie_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); diff --git a/s390x/sie.c b/s390x/sie.c index 9cb9b055..ed2c3263 100644 --- a/s390x/sie.c +++ b/s390x/sie.c @@ -24,22 +24,6 @@ static u8 *guest; static u8 *guest_instr; static struct vm vm; - -static void sie(struct vm *vm) -{ - while (vm->sblk->icptcode == 0) { - sie64a(vm->sblk, &vm->save_area); - sie_handle_validity(vm); - } - vm->save_area.guest.grs[14] = vm->sblk->gg14; - vm->save_area.guest.grs[15] = vm->sblk->gg15; -} - -static void sblk_cleanup(struct vm *vm) -{ - vm->sblk->icptcode = 0; -} - static void test_diag(u32 instr) { vm.sblk->gpsw.addr = PAGE_SIZE * 2; @@ -51,7 +35,6 @@ static void test_diag(u32 instr) report(vm.sblk->icptcode == ICPT_INST && vm.sblk->ipa == instr >> 16 && vm.sblk->ipb == instr << 16, "Intercept data"); - sblk_cleanup(&vm); } static struct {