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 BB871C4332F for ; Mon, 28 Nov 2022 17:31:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232516AbiK1RbZ (ORCPT ); Mon, 28 Nov 2022 12:31:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbiK1RbW (ORCPT ); Mon, 28 Nov 2022 12:31:22 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B433E1126 for ; Mon, 28 Nov 2022 09:31:21 -0800 (PST) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2ASFgXU8013218 for ; Mon, 28 Nov 2022 17:31:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=pp1; bh=hWnnviy6gR+iYUWP57Oo1ft+A5QmaVU0Vuzlv1wiPeo=; b=QFtsv68BrGAvgiW1/FhekumxgKAFcntuv7Po6VipJHhkjMSfNwuy42/ax4ukyC52ky/8 1O3yf9hnqIVhDIkybz9dGaNM3n2bLuZrhskzJDT7XguLAqh1PDmN1WkUFnWmPgiCnsAS pdupEQsmP8TNjAjUd72eUf1tSzhxBJO/33ybYrSmUN4WkLb/Y0rAqs/7pch/fELwhSQc /VNauXeep/Sy8KCC/SAdrjQohaGffC3kRpvehI8DB37+gAFmNzGssMSdxqrNaiMIcZRJ VQc7U6bfj6xIAC/PTNUsknbrx/JA9enKDhdx2pDvFWOwyx4kP75ypLYhpZmH5SVOQQLH jQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3m4x6gnxfm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 28 Nov 2022 17:31:19 +0000 Received: from m0098419.ppops.net (m0098419.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2ASGRmMi001557 for ; Mon, 28 Nov 2022 17:31:18 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3m4x6gnxey-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 28 Nov 2022 17:31: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 2ASHJxBH015672; Mon, 28 Nov 2022 17:31:16 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma06ams.nl.ibm.com with ESMTP id 3m3a2htx0x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 28 Nov 2022 17:31:16 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2ASHVDB3656060 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 28 Nov 2022 17:31:13 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 91A434203F; Mon, 28 Nov 2022 17:31:13 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 650CD42047; Mon, 28 Nov 2022 17:31:13 +0000 (GMT) Received: from p-imbrenda (unknown [9.152.224.56]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 28 Nov 2022 17:31:13 +0000 (GMT) Date: Mon, 28 Nov 2022 18:31:03 +0100 From: Claudio Imbrenda To: Nico Boehr Cc: kvm@vger.kernel.org, frankja@linux.ibm.com, thuth@redhat.com Subject: Re: [kvm-unit-tests PATCH v3 2/2] s390x: add CMM test during migration Message-ID: <20221128183103.659d32b4@p-imbrenda> In-Reply-To: <20221128132323.1964532-3-nrb@linux.ibm.com> References: <20221128132323.1964532-1-nrb@linux.ibm.com> <20221128132323.1964532-3-nrb@linux.ibm.com> Organization: IBM X-Mailer: Claws Mail 4.1.1 (GTK 3.24.35; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: eKGfAX0_P82ERgxCtyio2NiYgBmX-USs X-Proofpoint-ORIG-GUID: UNVMToZIQWIkex5k3wo9xzzyNkDdy4Ip X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-28_14,2022-11-28_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211280126 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, 28 Nov 2022 14:23:23 +0100 Nico Boehr wrote: > Add a test which modifies CMM page states while migration is in > progress. > > Signed-off-by: Nico Boehr > Reviewed-by: Thomas Huth Reviewed-by: Claudio Imbrenda > --- > s390x/Makefile | 1 + > s390x/migration-during-cmm.c | 127 +++++++++++++++++++++++++++++++++++ > s390x/unittests.cfg | 5 ++ > 3 files changed, 133 insertions(+) > create mode 100644 s390x/migration-during-cmm.c > > diff --git a/s390x/Makefile b/s390x/Makefile > index 401cb6371cee..64c7c04409ae 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -39,6 +39,7 @@ tests += $(TEST_DIR)/panic-loop-extint.elf > tests += $(TEST_DIR)/panic-loop-pgm.elf > tests += $(TEST_DIR)/migration-sck.elf > tests += $(TEST_DIR)/exittime.elf > +tests += $(TEST_DIR)/migration-during-cmm.elf > > pv-tests += $(TEST_DIR)/pv-diags.elf > > diff --git a/s390x/migration-during-cmm.c b/s390x/migration-during-cmm.c > new file mode 100644 > index 000000000000..1a8dc89f7b32 > --- /dev/null > +++ b/s390x/migration-during-cmm.c > @@ -0,0 +1,127 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Perform CMMA actions while migrating. > + * > + * Copyright IBM Corp. 2022 > + * > + * Authors: > + * Nico Boehr > + */ > + > +#include > +#include > +#include > + > +#include "cmm.h" > + > +#define NUM_PAGES 128 > + > +/* > + * Allocate 3 pages more than we need so we can start at different offsets. > + * This ensures page states change on every loop iteration. > + */ > +static uint8_t pagebuf[(NUM_PAGES + 3) * PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); > + > +static unsigned int thread_iters; > +static int thread_should_exit; > +static int thread_exited; > +struct cmm_verify_result result; > + > +static void test_cmm_during_migration(void) > +{ > + uint8_t *pagebuf_start; > + /* > + * The second CPU must not print to the console, otherwise it will race with > + * the primary CPU on the SCLP buffer. > + */ > + while (!READ_ONCE(thread_should_exit)) { > + /* > + * Start on a offset different from the last iteration so page states change with > + * every iteration. This is why pagebuf has 3 extra pages. > + */ > + pagebuf_start = pagebuf + (thread_iters % 4) * PAGE_SIZE; > + cmm_set_page_states(pagebuf_start, NUM_PAGES); > + > + /* > + * Always increment even if the verify fails. This ensures primary CPU knows where > + * we left off and can do an additional verify round after migration finished. > + */ > + thread_iters++; > + > + result = cmm_verify_page_states(pagebuf_start, NUM_PAGES); > + if (result.verify_failed) > + break; > + } > + > + WRITE_ONCE(thread_exited, 1); > +} > + > +static void migrate_once(void) > +{ > + static bool migrated; > + > + if (migrated) > + return; > + > + migrated = true; > + puts("Please migrate me, then press return\n"); > + (void)getchar(); > +} > + > +int main(void) > +{ > + bool has_essa = check_essa_available(); > + struct psw psw; > + > + report_prefix_push("migration-during-cmm"); > + if (!has_essa) { > + report_skip("ESSA is not available"); > + goto error; > + } > + > + if (smp_query_num_cpus() == 1) { > + report_skip("need at least 2 cpus for this test"); > + goto error; > + } > + > + psw.mask = extract_psw_mask(); > + psw.addr = (unsigned long)test_cmm_during_migration; > + smp_cpu_setup(1, psw); > + > + migrate_once(); > + > + WRITE_ONCE(thread_should_exit, 1); > + > + while (!thread_exited) > + mb(); > + > + report_info("thread completed %u iterations", thread_iters); > + > + report_prefix_push("during migration"); > + cmm_report_verify(&result); > + report_prefix_pop(); > + > + /* > + * Verification of page states occurs on the thread. We don't know if we > + * were still migrating during the verification. > + * To be sure, make another verification round after the migration > + * finished to catch page states which might not have been migrated > + * correctly. > + */ > + report_prefix_push("after migration"); > + assert(thread_iters > 0); > + result = cmm_verify_page_states(pagebuf + ((thread_iters - 1) % 4) * PAGE_SIZE, NUM_PAGES); > + cmm_report_verify(&result); > + report_prefix_pop(); > + > +error: > + /* > + * 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. > + */ > + migrate_once(); > + > + report_prefix_pop(); > + return report_summary(); > +} > diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg > index 3caf81eda396..f6889bd4da01 100644 > --- a/s390x/unittests.cfg > +++ b/s390x/unittests.cfg > @@ -208,3 +208,8 @@ groups = migration > [exittime] > file = exittime.elf > smp = 2 > + > +[migration-during-cmm] > +file = migration-during-cmm.elf > +groups = migration > +smp = 2