From patchwork Mon Dec 12 11:17:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Boehr X-Patchwork-Id: 13070964 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 4CFEAC04FDE for ; Mon, 12 Dec 2022 11:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232118AbiLLLTG (ORCPT ); Mon, 12 Dec 2022 06:19:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232054AbiLLLSU (ORCPT ); Mon, 12 Dec 2022 06:18:20 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 513FEE1D for ; Mon, 12 Dec 2022 03:17:44 -0800 (PST) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BCA6XEZ007325; Mon, 12 Dec 2022 11:17:39 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=BFULCdgkvC3kJ5cmsY4c1h9e8ReOx/XFgUXhwrS8aj8=; b=AEjdTFwWoxFJ8uUVbAeAADYSr5I7vbKFvoTTIp+uTCQUwooW/1SwqRBO5t95lmEdrBeX NseAOwueiira88iYRQmvlkLfK1BxJfZgQsCgzPCZYDx0WWB2BP2PnMA1zVVgYPwxK1SX lqcPNIE/a7BVA02V/y1OQiWBtZvHW95a6uVyFrabrAas3xcH1AB5349YqFIRSjE8HoTq 1wy2HXFVjY2p2XMVlXkvkLCYoMDzBB/tnG1gOV9XRGPDObQu5R8W+oQRkwF6YrTTwA3P qkt03HjfQRASGcOHmb8lOUG5H9fgvzs3xHzNFs1bv+6F7PGirXACcIfB+TLpNul3QsMv Hg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3md421ekry-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:38 +0000 Received: from m0098420.ppops.net (m0098420.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2BCBHcAl010158; Mon, 12 Dec 2022 11:17:38 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3md421ekrk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:38 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 2BC3GmYE001463; Mon, 12 Dec 2022 11:17:36 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma03fra.de.ibm.com (PPS) with ESMTPS id 3mchr5sth8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:36 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2BCBHWVr42336692 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Dec 2022 11:17:32 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6C41B20040; Mon, 12 Dec 2022 11:17:32 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3AE672004E; Mon, 12 Dec 2022 11:17:32 +0000 (GMT) Received: from a46lp57.lnxne.boe (unknown [9.152.108.100]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 12 Dec 2022 11:17:32 +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 v3 1/4] lib: add function to request migration Date: Mon, 12 Dec 2022 12:17:28 +0100 Message-Id: <20221212111731.292942-2-nrb@linux.ibm.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221212111731.292942-1-nrb@linux.ibm.com> References: <20221212111731.292942-1-nrb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: LuxdEK9ThLejrWwn0YLJXcH1_AcbErPn X-Proofpoint-GUID: Yv19jdhC-WVYEM3J8iMi0HKiD29ZqS4_ 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-12_02,2022-12-12_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 spamscore=0 clxscore=1015 bulkscore=0 mlxlogscore=978 impostorscore=0 phishscore=0 priorityscore=1501 adultscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212120102 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Migration tests can ask migrate_cmd to migrate them to a new QEMU process. Requesting migration and waiting for completion is hence a common pattern which is repeated all over the code base. Add a function which does all of that to avoid repeating the same pattern. Since migrate_cmd currently can only migrate exactly once, this function is called migrate_once() and is a no-op when it has been called before. This can simplify the control flow, especially when tests are skipped. Suggested-by: Claudio Imbrenda Signed-off-by: Nico Boehr Reviewed-by: Claudio Imbrenda --- lib/migrate.h | 9 +++++++++ lib/migrate.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 lib/migrate.h create mode 100644 lib/migrate.c diff --git a/lib/migrate.h b/lib/migrate.h new file mode 100644 index 000000000000..3c94e6af761c --- /dev/null +++ b/lib/migrate.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Migration-related functions + * + * Copyright IBM Corp. 2022 + * Author: Nico Boehr + */ + +void migrate_once(void); diff --git a/lib/migrate.c b/lib/migrate.c new file mode 100644 index 000000000000..527e63ae189b --- /dev/null +++ b/lib/migrate.c @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Migration-related functions + * + * Copyright IBM Corp. 2022 + * Author: Nico Boehr + */ +#include +#include "migrate.h" + +/* static for now since we only support migrating exactly once per test. */ +static void migrate(void) +{ + puts("Now migrate the VM, then press a key to continue...\n"); + (void)getchar(); + report_info("Migration complete"); +} + +/* + * Initiate migration and wait for it to complete. + * If this function is called more than once, it is a no-op. + * Since migrate_cmd can only migrate exactly once this function can + * simplify the control flow, especially when skipping tests. + */ +void migrate_once(void) +{ + static bool migrated; + + if (migrated) + return; + + migrated = true; + migrate(); +} From patchwork Mon Dec 12 11:17:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Boehr X-Patchwork-Id: 13070963 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 1E94DC4332F for ; Mon, 12 Dec 2022 11:19:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232065AbiLLLTD (ORCPT ); Mon, 12 Dec 2022 06:19:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231801AbiLLLSE (ORCPT ); Mon, 12 Dec 2022 06:18:04 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AAA4D70 for ; Mon, 12 Dec 2022 03:17:42 -0800 (PST) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BC9wFq9026544; Mon, 12 Dec 2022 11:17:40 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=3ME6uKr+u4ee5nC5VbglimhUWecWIQHKwL1CMGIVBtY=; b=VeggvFNyDIlOkb5DesLoTPR8WhE6nG+VZDo76RiSyc/0uxABj2Ti+P/paT5eV8veKDZL LwjyJwrgcSj1/UxxUJRvVn7vAmRnnBSmtznxSdjqp5RsHWbdDGwnKGJWvu4vvkHpjmRt VFIno9aaxcozPvPaftnVltr5BGaw8gjXP4Dd00UOCLSwgNTQBZsryLaPiWmIGxoPG4bq 5nla8EBns+4nDz7WBltArpX8ffLmpDGenvRQEjbdCE9qmbsswu9P3VhjfcRZrzN57EL2 +7OEd9dclWIwjURjyDQYc9H/BA34yUubQI1qhSB7BEwIgdV2w97zS8j7qyHO2ee/kaUY cQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3md40kp887-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:40 +0000 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2BCA3nDj024978; Mon, 12 Dec 2022 11:17:39 GMT Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3md40kp877-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:39 +0000 Received: from pps.filterd (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.17.1.19/8.16.1.2) with ESMTP id 2BCAfLEr015510; Mon, 12 Dec 2022 11:17:37 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma01fra.de.ibm.com (PPS) with ESMTPS id 3mchr61tuw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:37 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2BCBHXci52167120 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Dec 2022 11:17:33 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AEC5920049; Mon, 12 Dec 2022 11:17:32 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 740072004B; Mon, 12 Dec 2022 11:17:32 +0000 (GMT) Received: from a46lp57.lnxne.boe (unknown [9.152.108.100]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 12 Dec 2022 11:17:32 +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 v3 2/4] powerpc: use migrate_once() in migration tests Date: Mon, 12 Dec 2022 12:17:29 +0100 Message-Id: <20221212111731.292942-3-nrb@linux.ibm.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221212111731.292942-1-nrb@linux.ibm.com> References: <20221212111731.292942-1-nrb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Tn7ToAIbCGkNAif7qY8VzQw1JZUH03DL X-Proofpoint-ORIG-GUID: q7SBE3Qj11LNatB31DJ_G57YP11QYtr2 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-12_02,2022-12-12_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 phishscore=0 mlxlogscore=845 impostorscore=0 suspectscore=0 spamscore=0 mlxscore=0 clxscore=1015 adultscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212120102 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Nico Boehr Reviewed-by: Thomas Huth --- powerpc/Makefile.common | 1 + powerpc/sprs.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index 12c280c15fff..8ce00340b6be 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -36,6 +36,7 @@ cflatobjs += lib/getchar.o cflatobjs += lib/alloc_phys.o cflatobjs += lib/alloc.o cflatobjs += lib/devicetree.o +cflatobjs += lib/migrate.o cflatobjs += lib/powerpc/io.o cflatobjs += lib/powerpc/hcall.o cflatobjs += lib/powerpc/setup.o diff --git a/powerpc/sprs.c b/powerpc/sprs.c index d3c8780e8376..5cc1cd16cfda 100644 --- a/powerpc/sprs.c +++ b/powerpc/sprs.c @@ -21,6 +21,7 @@ */ #include #include +#include #include #include #include @@ -285,8 +286,7 @@ int main(int argc, char **argv) get_sprs(before); if (pause) { - puts("Now migrate the VM, then press a key to continue...\n"); - (void) getchar(); + migrate_once(); } else { puts("Sleeping...\n"); handle_exception(0x900, &dec_except_handler, &decr); From patchwork Mon Dec 12 11:17:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Boehr X-Patchwork-Id: 13070962 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 F1B7BC4332F for ; Mon, 12 Dec 2022 11:19:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231324AbiLLLS7 (ORCPT ); Mon, 12 Dec 2022 06:18:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231802AbiLLLR4 (ORCPT ); Mon, 12 Dec 2022 06:17:56 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E261C7E for ; Mon, 12 Dec 2022 03:17:41 -0800 (PST) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BCBCvNI029803; Mon, 12 Dec 2022 11:17:39 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=0llOsZEZl9+m/Kol1xvtDBjGCGTso1v8oAv9ZQv4OCE=; b=r3dktJob/I2/JWLNnEhvFXoYIs3sTS95ii3xFdSYFyqHEZrZ6wIe/Qe9LWLTLWmoLjdT L2qt4oOTzfO50Mz7LtWvm6Y9IQygI9vtroXiB0bUJ0d07k2Z4BiEfz13LMAZVk8LDQ34 475mcYP/JLnnsOAvs8w+tO+hvVcHesNySKYtk108112vEFVXWJnH6V9tpzyX4iwLHgom D4RAu9BqxJ8EjufjnXS05pJJUkIOO5wwKS9K9ln0STTL991xRv+ZbOyrOmsIycvX6nCW gIHbUHAFrDHFr5EbZ1fvqrdKNUV6oqihr5xJqF2Ffos3iOmRV7Y+0b3oMR4NPwfcEq0G MQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3md3sjpf1m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:38 +0000 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2BCBG6oP010908; Mon, 12 Dec 2022 11:17:38 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3md3sjpf13-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:38 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 2BBNRNDO007817; Mon, 12 Dec 2022 11:17:36 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3mchcf2hsp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:36 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2BCBHXtY46465340 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Dec 2022 11:17:33 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E7A442004F; Mon, 12 Dec 2022 11:17:32 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B6BA32004E; Mon, 12 Dec 2022 11:17:32 +0000 (GMT) Received: from a46lp57.lnxne.boe (unknown [9.152.108.100]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 12 Dec 2022 11:17:32 +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 v3 3/4] s390x: use migrate_once() in migration tests Date: Mon, 12 Dec 2022 12:17:30 +0100 Message-Id: <20221212111731.292942-4-nrb@linux.ibm.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221212111731.292942-1-nrb@linux.ibm.com> References: <20221212111731.292942-1-nrb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: nNRAS1tPu7iQM9-gjCXBW-dGEDHEfNBz X-Proofpoint-ORIG-GUID: dDbviQl7XxjmMURXevgMvhNMv_XBMyqS 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-12_02,2022-12-12_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 suspectscore=0 clxscore=1015 phishscore=0 malwarescore=0 mlxscore=0 impostorscore=0 priorityscore=1501 mlxlogscore=999 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212120102 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 Reviewed-by: Claudio Imbrenda --- s390x/Makefile | 1 + s390x/migration-cmm.c | 24 +++++++----------------- s390x/migration-sck.c | 4 ++-- s390x/migration-skey.c | 20 +++++++------------- s390x/migration.c | 7 ++----- 5 files changed, 19 insertions(+), 37 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..43673f18e45a 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,15 @@ 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(); + if (!check_essa_available()) + report_skip("ESSA is not available"); + else + test_migration(); - goto done; - } + migrate_once(); - test_migration(); -done: 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..a91eb6b5a63e 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,19 +64,13 @@ 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 { + if (test_facility(169)) + report_skip("storage key removal facility is active"); + 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; From patchwork Mon Dec 12 11:17:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Boehr X-Patchwork-Id: 13070960 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 D3AF0C04FDE for ; Mon, 12 Dec 2022 11:18:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231962AbiLLLSs (ORCPT ); Mon, 12 Dec 2022 06:18:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232033AbiLLLRr (ORCPT ); Mon, 12 Dec 2022 06:17:47 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A8DE256 for ; Mon, 12 Dec 2022 03:17:42 -0800 (PST) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BCBD3YB017097; Mon, 12 Dec 2022 11:17:40 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=zpXxV8LyELDBq08sgH7VA9srihlW4RPOY+uAr4pNY48=; b=BN5kDyfpuBojrC5IJc8Glu61bjv9OdG0Ps9gSkc+Ag+m6WJsuNjPgfrI5QSyeXotIbyF +aQOoHF0wG3o3PgzdArLpeGyhh44Sw/Wk46kp40m04VXmqt9k6r+93OLzsCVu6fIQT7z C85oN8EJDE4Rb4+WF/PJD8O3xF/K+tcK/EEVey2C8010x3S3DreaU8r6znBtaHsQkzgD CPstBeatztmnfwSgksXFzehxnNHnUTyUQQpcMBjA73JZY8a7HH+8AR2IYp3VQu956Olz u8U8/ldlPqfJ8DYBVphqZW9H3ttfS4APgAQZjzKUaEdrGJX413Gpa6G0wMY8a62gEIdI iw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3md3jhqq1w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:39 +0000 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2BCBHdgh008683; Mon, 12 Dec 2022 11:17:39 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3md3jhqq0y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:39 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 2BCAi6Gw024547; Mon, 12 Dec 2022 11:17:36 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma03fra.de.ibm.com (PPS) with ESMTPS id 3mchr5sth9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Dec 2022 11:17:36 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2BCBHXeC43974930 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Dec 2022 11:17:33 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2CD472004E; Mon, 12 Dec 2022 11:17:33 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EFC512005A; Mon, 12 Dec 2022 11:17:32 +0000 (GMT) Received: from a46lp57.lnxne.boe (unknown [9.152.108.100]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 12 Dec 2022 11:17:32 +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 v3 4/4] arm: use migrate_once() in migration tests Date: Mon, 12 Dec 2022 12:17:31 +0100 Message-Id: <20221212111731.292942-5-nrb@linux.ibm.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221212111731.292942-1-nrb@linux.ibm.com> References: <20221212111731.292942-1-nrb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: c8T6N8EHWH-NqFj6-Ar16roJnCj1_LAx X-Proofpoint-GUID: U8kglyfOOtEHX6YalALV2zQRZvyncYXG 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-12_02,2022-12-12_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 impostorscore=0 bulkscore=0 spamscore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212120102 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Some tests already shipped with their own do_migrate() function, remove it and instead use the new migrate_once() function. The control flow in the gic tests can be simplified due to migrate_once(). Signed-off-by: Nico Boehr Reviewed-by: Andrew Jones --- arm/Makefile.common | 1 + arm/debug.c | 17 +++++----------- arm/gic.c | 49 +++++++++++++-------------------------------- 3 files changed, 20 insertions(+), 47 deletions(-) diff --git a/arm/Makefile.common b/arm/Makefile.common index 38385e0c558e..1bbec64f2342 100644 --- a/arm/Makefile.common +++ b/arm/Makefile.common @@ -38,6 +38,7 @@ cflatobjs += lib/alloc_page.o cflatobjs += lib/vmalloc.o cflatobjs += lib/alloc.o cflatobjs += lib/devicetree.o +cflatobjs += lib/migrate.o cflatobjs += lib/pci.o cflatobjs += lib/pci-host-generic.o cflatobjs += lib/pci-testdev.o diff --git a/arm/debug.c b/arm/debug.c index e9f805632db7..b3e9749c598f 100644 --- a/arm/debug.c +++ b/arm/debug.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -257,13 +258,6 @@ static void reset_debug_state(void) isb(); } -static void do_migrate(void) -{ - puts("Now migrate the VM, then press a key to continue...\n"); - (void)getchar(); - report_info("Migration complete"); -} - static noinline void test_hw_bp(bool migrate) { extern unsigned char hw_bp0; @@ -291,7 +285,7 @@ static noinline void test_hw_bp(bool migrate) isb(); if (migrate) { - do_migrate(); + migrate_once(); report(num_bp == get_num_hw_bp(), "brps match after migrate"); } @@ -335,7 +329,7 @@ static noinline void test_wp(bool migrate) isb(); if (migrate) { - do_migrate(); + migrate_once(); report(num_wp == get_num_wp(), "wrps match after migrate"); } @@ -368,9 +362,8 @@ static noinline void test_ss(bool migrate) write_sysreg(mdscr, mdscr_el1); isb(); - if (migrate) { - do_migrate(); - } + if (migrate) + migrate_once(); asm volatile("msr daifclr, #8"); diff --git a/arm/gic.c b/arm/gic.c index 60457e29e73a..c950b0d1597c 100644 --- a/arm/gic.c +++ b/arm/gic.c @@ -12,6 +12,7 @@ * This work is licensed under the terms of the GNU LGPL, version 2. */ #include +#include #include #include #include @@ -779,23 +780,15 @@ static void test_its_trigger(void) static void test_its_migration(void) { struct its_device *dev2, *dev7; - bool test_skipped = false; cpumask_t mask; - if (its_setup1()) { - test_skipped = true; - goto do_migrate; - } + if (its_setup1()) + return; dev2 = its_get_device(2); dev7 = its_get_device(7); -do_migrate: - puts("Now migrate the VM, then press a key to continue...\n"); - (void)getchar(); - report_info("Migration complete"); - if (test_skipped) - return; + migrate_once(); stats_reset(); cpumask_clear(&mask); @@ -822,21 +815,17 @@ static void test_migrate_unmapped_collection(void) { struct its_collection *col = NULL; struct its_device *dev2 = NULL, *dev7 = NULL; - bool test_skipped = false; cpumask_t mask; int pe0 = 0; u8 config; - if (its_setup1()) { - test_skipped = true; - goto do_migrate; - } + if (its_setup1()) + return; if (!errata(ERRATA_UNMAPPED_COLLECTIONS)) { report_skip("Skipping test, as this test hangs without the fix. " "Set %s=y to enable.", ERRATA_UNMAPPED_COLLECTIONS); - test_skipped = true; - goto do_migrate; + return; } col = its_create_collection(pe0, pe0); @@ -847,12 +836,7 @@ static void test_migrate_unmapped_collection(void) its_send_mapti(dev2, 8192, 0, col); gicv3_lpi_set_config(8192, LPI_PROP_DEFAULT); -do_migrate: - puts("Now migrate the VM, then press a key to continue...\n"); - (void)getchar(); - report_info("Migration complete"); - if (test_skipped) - return; + migrate_once(); /* on the destination, map the collection */ its_send_mapc(col, true); @@ -887,15 +871,12 @@ static void test_its_pending_migration(void) struct its_collection *collection[2]; int *expected = calloc(nr_cpus, sizeof(int)); int pe0 = nr_cpus - 1, pe1 = nr_cpus - 2; - bool test_skipped = false; u64 pendbaser; void *ptr; int i; - if (its_prerequisites(4)) { - test_skipped = true; - goto do_migrate; - } + if (its_prerequisites(4)) + return; dev = its_create_device(2 /* dev id */, 8 /* nb_ites */); its_send_mapd(dev, true); @@ -942,12 +923,7 @@ static void test_its_pending_migration(void) gicv3_lpi_rdist_enable(pe0); gicv3_lpi_rdist_enable(pe1); -do_migrate: - puts("Now migrate the VM, then press a key to continue...\n"); - (void)getchar(); - report_info("Migration complete"); - if (test_skipped) - return; + migrate_once(); /* let's wait for the 256 LPIs to be handled */ mdelay(1000); @@ -994,14 +970,17 @@ int main(int argc, char **argv) } else if (!strcmp(argv[1], "its-migration")) { report_prefix_push(argv[1]); test_its_migration(); + migrate_once(); report_prefix_pop(); } else if (!strcmp(argv[1], "its-pending-migration")) { report_prefix_push(argv[1]); test_its_pending_migration(); + migrate_once(); report_prefix_pop(); } else if (!strcmp(argv[1], "its-migrate-unmapped-collection")) { report_prefix_push(argv[1]); test_migrate_unmapped_collection(); + migrate_once(); report_prefix_pop(); } else if (strcmp(argv[1], "its-introspection") == 0) { report_prefix_push(argv[1]);