From patchwork Fri Dec 9 13:48:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Boehr X-Patchwork-Id: 13069570 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 E0A57C4167B for ; Fri, 9 Dec 2022 13:48:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229760AbiLINs0 (ORCPT ); Fri, 9 Dec 2022 08:48:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229723AbiLINsX (ORCPT ); Fri, 9 Dec 2022 08:48:23 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91B4A67212 for ; Fri, 9 Dec 2022 05:48:22 -0800 (PST) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B9DjIj6023242; Fri, 9 Dec 2022 13:48:17 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=SKMkjU2G3/rcidO63G+Hv9g8OcWNtuv7QqE3ZgpuyyI=; b=nVzxlHhv9sTa5vyStO1IVDubaSjvG9kDGSJoXlDHrVG5ROWKENb4cfCrBRLK7JNeYy+J 7zbVRqVwZDGWH+sBqQ6hxs/OtHASESudpIUQ4Y227l9FXAdQmfm2j0l9Uev93HnsHjXY Zg2GQUQbrxtb+ZwZR1M1vfhCzxC2cQKril0pQvhTtWDuYs3MR0hHbjkPfzGj0ZtlELxF 4aUJ9XA2XsY8oG3b8UmmKwGa92MMkhg9SyC/w+94OlGvt+07TEGuZKeF234t0T6l+p9+ wrj65fuwLFYueqwzt8Unnl8X2+1j71XleYNjveokWoDaxcA8m0EznmbLhFRb1QpFDIll 6A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3mbxfdk119-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 09 Dec 2022 13:48:17 +0000 Received: from m0127361.ppops.net (m0127361.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2B9DE8ZD003992; Fri, 9 Dec 2022 13:48:16 GMT Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3mbxfdk10e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 09 Dec 2022 13:48:16 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 2B99Ii7V022504; Fri, 9 Dec 2022 13:48:14 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma04fra.de.ibm.com (PPS) with ESMTPS id 3m9kur4dv6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 09 Dec 2022 13:48:14 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2B9DmBd723462540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 9 Dec 2022 13:48:11 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E798D20040; Fri, 9 Dec 2022 13:48:10 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A309120049; Fri, 9 Dec 2022 13:48:10 +0000 (GMT) Received: from a46lp57.lnxne.boe (unknown [9.152.108.100]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 9 Dec 2022 13:48:10 +0000 (GMT) From: Nico Boehr To: kvm@vger.kernel.org Cc: frankja@linux.ibm.com, imbrenda@linux.ibm.com, thuth@redhat.com, pbonzini@redhat.com, andrew.jones@linux.dev, lvivier@redhat.com Subject: [kvm-unit-tests PATCH v2 3/4] s390x: use migrate_once() in migration tests Date: Fri, 9 Dec 2022 14:48:08 +0100 Message-Id: <20221209134809.34532-4-nrb@linux.ibm.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221209134809.34532-1-nrb@linux.ibm.com> References: <20221209134809.34532-1-nrb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ctqlczqAFdctfZA4fRV2rAnqecNs_DcZ X-Proofpoint-ORIG-GUID: 0MUgO_tdgK6tU6yxmWjyey0rpd4zgU2j X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-09_07,2022-12-08_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 impostorscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212090108 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org migrate_once() can simplify the control flow in migration-skey and migration-cmm. Signed-off-by: Nico Boehr --- s390x/Makefile | 1 + s390x/migration-cmm.c | 25 ++++++++----------------- s390x/migration-sck.c | 4 ++-- s390x/migration-skey.c | 15 +++++---------- s390x/migration.c | 7 ++----- 5 files changed, 18 insertions(+), 34 deletions(-) diff --git a/s390x/Makefile b/s390x/Makefile index bf1504f9d58c..52a9d821974e 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -85,6 +85,7 @@ cflatobjs += lib/alloc_page.o cflatobjs += lib/vmalloc.o cflatobjs += lib/alloc_phys.o cflatobjs += lib/getchar.o +cflatobjs += lib/migrate.o cflatobjs += lib/s390x/io.o cflatobjs += lib/s390x/stack.o cflatobjs += lib/s390x/sclp.o diff --git a/s390x/migration-cmm.c b/s390x/migration-cmm.c index aa7910ca76bf..eef45f5f8fb7 100644 --- a/s390x/migration-cmm.c +++ b/s390x/migration-cmm.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -39,8 +40,7 @@ static void test_migration(void) essa(ESSA_SET_POT_VOLATILE, (unsigned long)pagebuf[i + 3]); } - puts("Please migrate me, then press return\n"); - (void)getchar(); + migrate_once(); for (i = 0; i < NUM_PAGES; i++) { actual_state = essa(ESSA_GET_STATE, (unsigned long)pagebuf[i]); @@ -53,25 +53,16 @@ static void test_migration(void) int main(void) { - bool has_essa = check_essa_available(); - report_prefix_push("migration-cmm"); - if (!has_essa) { - report_skip("ESSA is not available"); - - /* - * If we just exit and don't ask migrate_cmd to migrate us, it - * will just hang forever. Hence, also ask for migration when we - * skip this test alltogether. - */ - puts("Please migrate me, then press return\n"); - (void)getchar(); - goto done; + if (!check_essa_available()) { + report_skip("ESSA is not available"); + } else { + test_migration(); } - test_migration(); -done: + migrate_once(); + report_prefix_pop(); return report_summary(); } diff --git a/s390x/migration-sck.c b/s390x/migration-sck.c index 2d9a195ab4c4..2a9c87071643 100644 --- a/s390x/migration-sck.c +++ b/s390x/migration-sck.c @@ -9,6 +9,7 @@ */ #include +#include #include static void test_sck_migration(void) @@ -30,8 +31,7 @@ static void test_sck_migration(void) report(!cc, "clock running after set"); report(now_after_set >= time_to_set, "TOD clock value is larger than what has been set"); - puts("Please migrate me, then press return\n"); - (void)getchar(); + migrate_once(); cc = stckf(&now_after_migration); report(!cc, "clock still set"); diff --git a/s390x/migration-skey.c b/s390x/migration-skey.c index b7bd82581abe..438a4be95702 100644 --- a/s390x/migration-skey.c +++ b/s390x/migration-skey.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -35,8 +36,7 @@ static void test_migration(void) set_storage_key(pagebuf[i], key_to_set, 1); } - puts("Please migrate me, then press return\n"); - (void)getchar(); + migrate_once(); for (i = 0; i < NUM_PAGES; i++) { actual_key.val = get_storage_key(pagebuf[i]); @@ -64,20 +64,15 @@ static void test_migration(void) int main(void) { report_prefix_push("migration-skey"); + if (test_facility(169)) { report_skip("storage key removal facility is active"); - - /* - * If we just exit and don't ask migrate_cmd to migrate us, it - * will just hang forever. Hence, also ask for migration when we - * skip this test altogether. - */ - puts("Please migrate me, then press return\n"); - (void)getchar(); } else { test_migration(); } + migrate_once(); + report_prefix_pop(); return report_summary(); } diff --git a/s390x/migration.c b/s390x/migration.c index a45296374cd8..fe6ea8369edb 100644 --- a/s390x/migration.c +++ b/s390x/migration.c @@ -8,6 +8,7 @@ * Nico Boehr */ #include +#include #include #include #include @@ -178,11 +179,7 @@ int main(void) mb(); flag_thread_complete = 0; - /* ask migrate_cmd to migrate (it listens for 'migrate') */ - puts("Please migrate me, then press return\n"); - - /* wait for migration to finish, we will read a newline */ - (void)getchar(); + migrate_once(); flag_migration_complete = 1;