From nobody Sun Feb 8 22:59:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1765990030; cv=none; d=zohomail.com; s=zohoarc; b=Wf/dKHuXfVK0HR6No63bRuwzt84e1eRab7cm9rrAcUu2CMgYIcZwY2sP/rpHZMehk1xuKccpTabj2nuujbRLoMnGue4mrIrH4qWrljXOhwEFCcUKovL4SwxZ9keQ9lcOCjOX8ObdXpI8ZWlsR1gekEilyCuCD8SGWxQDSmZ/AJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765990030; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TbvuXOg1Y4LlrzptIx8Hb9bXB4IRb9OH83ReYs2vues=; b=iDQqQq2/3I3qBALTItdMDrFj3dzTdKdit7pKZ7wXtzgsToibPAe8WP0SUcldD4Oy1mhB2J1K5AhMqz3LAbHpnOw7ckx4Jr2CGADuT9W71OvhqwTU0vNTw+8pbFd0/8JtCtO3LOkKUckDLsZUsQyPFDf6Qyg/FtGJ0Msrl4sHauo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1765990030081380.5281867871644; Wed, 17 Dec 2025 08:47:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVufh-0004Ne-03; Wed, 17 Dec 2025 11:46:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVufA-0004GE-Dr for qemu-devel@nongnu.org; Wed, 17 Dec 2025 11:46:12 -0500 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vVuf2-00078h-9p for qemu-devel@nongnu.org; Wed, 17 Dec 2025 11:46:03 -0500 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 439D4336A5; Wed, 17 Dec 2025 16:45:56 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E82773EA65; Wed, 17 Dec 2025 16:45:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id kM+ZKUHeQmlyDQAAD6G6ig (envelope-from ); Wed, 17 Dec 2025 16:45:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1765989956; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbvuXOg1Y4LlrzptIx8Hb9bXB4IRb9OH83ReYs2vues=; b=KT8UW5z5BBszDmV7/ydrLO2X6xPRt4Pr84cdHiPWot6/rC5co4YD6rz0mi7amNLvfa7kIh GabTFRmKBide2Wdkt0zL2cgqFMXFgnL9nboEbH1EDYAq35Lz3zu9iYdezUWVgBWDZ4k82i aEmJi8BIDYsNWsYVnAudGvgtOP+MkNo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1765989956; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbvuXOg1Y4LlrzptIx8Hb9bXB4IRb9OH83ReYs2vues=; b=pSD3vPHRoaRkj2yIwxR4PM0RmNWG4ZrDt3R7talD9kd3dYpvlMCd7cpLx7x8YVQ2m8qXJH 4uVmDbxqFrTjC3Dg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1765989956; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbvuXOg1Y4LlrzptIx8Hb9bXB4IRb9OH83ReYs2vues=; b=KT8UW5z5BBszDmV7/ydrLO2X6xPRt4Pr84cdHiPWot6/rC5co4YD6rz0mi7amNLvfa7kIh GabTFRmKBide2Wdkt0zL2cgqFMXFgnL9nboEbH1EDYAq35Lz3zu9iYdezUWVgBWDZ4k82i aEmJi8BIDYsNWsYVnAudGvgtOP+MkNo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1765989956; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbvuXOg1Y4LlrzptIx8Hb9bXB4IRb9OH83ReYs2vues=; b=pSD3vPHRoaRkj2yIwxR4PM0RmNWG4ZrDt3R7talD9kd3dYpvlMCd7cpLx7x8YVQ2m8qXJH 4uVmDbxqFrTjC3Dg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: thuth@redhat.com, peterx@redhat.com, Fabian Vogt , Nicholas Piggin , Harsh Prateek Bora , Chinmay Rath Subject: [PATCH v2 1/2] target/ppc: Fix env->quiesced migration Date: Wed, 17 Dec 2025 13:45:47 -0300 Message-ID: <20251217164549.4311-2-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251217164549.4311-1-farosas@suse.de> References: <20251217164549.4311-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[redhat.com,suse.de,gmail.com,linux.ibm.com]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,gitlab.com:url,suse.de:mid,suse.de:email]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-Spam-Score: -2.80 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1765990032710158500 Content-Type: text/plain; charset="utf-8" The commit referenced (from QEMU 10.0) has changed the way the pseries machine marks a cpu as quiesced. Previously, the cpu->halted value from QEMU common cpu code was (incorrectly) used. With the fix, the env->quiesced variable starts being used, which improves on the original situation, but also causes a side effect after migration: The env->quiesced is set at reset and never migrated, which causes the destination QEMU to stop delivering interrupts and hang the machine. To fix the issue from this point on, start migrating the env->quiesced value. For QEMU versions < 10.0, sending the new element on the stream would cause migration to be aborted, so add the appropriate compatibility property to omit the new subsection. Independently of this patch, all migrations from QEMU versions < 10.0 would result in a hang since the older QEMU never migrates env->quiesced. This is bad because it leaves machines already running on the old QEMU without a migration path into newer versions. As a workaround, use a few heuristics to infer the new value of env->quiesced based on cpu->halted, LPCR and PSSCR bits that are usually set/cleared along with quiesced. Note that this was tested with -cpu power9 and -machine ic-mode=3Dxive due to another bug affecting migration of XICS guests. Tested both forward and backward migration and savevm/loadvm from 9.2 and 10.0. Also tested loadvm of a savevm image that contains a mix of cpus both halted and not halted. Reported-by: Fabian Vogt Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3079 Fixes: fb802acdc8b ("ppc/spapr: Fix RTAS stopped state") Signed-off-by: Fabiano Rosas --- hw/ppc/spapr.c | 6 +++++ target/ppc/cpu.h | 1 + target/ppc/cpu_init.c | 7 +++++ target/ppc/machine.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 99b843ba2f..9dde61a667 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4776,8 +4776,14 @@ DEFINE_SPAPR_MACHINE(10, 1); */ static void spapr_machine_10_0_class_options(MachineClass *mc) { + static GlobalProperty spapr_compat_10_0[] =3D { + { TYPE_POWERPC_CPU, "rtas-stopped-state", "false" }, + }; + spapr_machine_10_1_class_options(mc); compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); + compat_props_add(mc->compat_props, spapr_compat_10_0, + G_N_ELEMENTS(spapr_compat_10_0)); } =20 DEFINE_SPAPR_MACHINE(10, 0); diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 787020f6f9..bbd661e96c 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1529,6 +1529,7 @@ struct ArchCPU { void *machine_data; int32_t node_id; /* NUMA node this CPU belongs to */ PPCHash64Options *hash64_opts; + bool rtas_stopped_state; =20 /* Those resources are used only during code translation */ /* opcode handlers */ diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 86ead740ee..8dac1cd812 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -55,6 +55,11 @@ /* #define PPC_DEBUG_SPR */ /* #define USE_APPLE_GDB */ =20 +static const Property powerpc_cpu_properties[] =3D { + DEFINE_PROP_BOOL("rtas-stopped-state", PowerPCCPU, + rtas_stopped_state, true), +}; + static inline void vscr_init(CPUPPCState *env, uint32_t val) { /* Altivec always uses round-to-nearest */ @@ -7529,6 +7534,8 @@ static void ppc_cpu_class_init(ObjectClass *oc, const= void *data) &pcc->parent_unrealize); pcc->pvr_match =3D ppc_pvr_match_default; =20 + device_class_set_props(dc, powerpc_cpu_properties); + resettable_class_set_parent_phases(rc, NULL, ppc_cpu_reset_hold, NULL, &pcc->parent_phases); =20 diff --git a/target/ppc/machine.c b/target/ppc/machine.c index d72e5ecb94..ba63a7debb 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -6,6 +6,7 @@ #include "mmu-hash64.h" #include "migration/cpu.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "kvm_ppc.h" #include "power8-pmu.h" #include "system/replay.h" @@ -257,6 +258,45 @@ static int cpu_post_load(void *opaque, int version_id) ppc_store_sdr1(env, env->spr[SPR_SDR1]); } =20 + if (!cpu->rtas_stopped_state) { + /* + * The source QEMU doesn't have fb802acdc8 and still uses halt + + * PM bits in LPCR to implement RTAS stopped state. The new (this) + * QEMU will have put the secondary vcpus in stopped state, + * waiting for the start-cpu RTAS call. That call will never come + * if the source cpus were already running. Try to infer the cpus + * state and set env->quiesced accordingly. + * + * env->quiesced =3D true =3D=3D> the cpu is waiting to start + * env->quiesced =3D false =3D=3D> the cpu is running (unless halt= ed) + */ + + /* + * Halted _could_ mean quiesced, but it could also be cede, + * confer_self, power management, etc. + */ + if (CPU(cpu)->halted) { + PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); + /* + * Both the PSSCR_EC bit and LPCR PM bits set at cpu reset + * and rtas_stop and cleared at rtas_start, it's a good + * heuristic. + */ + if ((env->spr[SPR_PSSCR] & PSSCR_EC) && + (env->spr[SPR_LPCR] & pcc->lpcr_pm)) { + env->quiesced =3D true; + } else { + env->quiesced =3D false; + } + } else { + /* + * Old QEMU sets halted during rtas_stop_self. Not halted, + * therefore definitely not quiesced. + */ + env->quiesced =3D false; + } + } + post_load_update_msr(env); =20 if (tcg_enabled()) { @@ -649,6 +689,28 @@ static const VMStateDescription vmstate_reservation = =3D { } }; =20 +static bool rtas_stopped_needed(void *opaque) +{ + PowerPCCPU *cpu =3D opaque; + + return cpu->rtas_stopped_state; +} + +static const VMStateDescription vmstate_rtas_stopped =3D { + .name =3D "cpu/rtas_stopped", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D rtas_stopped_needed, + .fields =3D (const VMStateField[]) { + /* + * "RTAS stopped" state, independent of halted state. For QEMU + * < 10.0, this is taken from cpu->halted at cpu_post_load() + */ + VMSTATE_BOOL(env.quiesced, PowerPCCPU), + VMSTATE_END_OF_LIST() + } +}; + #ifdef TARGET_PPC64 static bool bhrb_needed(void *opaque) { @@ -715,6 +777,7 @@ const VMStateDescription vmstate_ppc_cpu =3D { &vmstate_tlbmas, &vmstate_compat, &vmstate_reservation, + &vmstate_rtas_stopped, NULL } }; --=20 2.51.0 From nobody Sun Feb 8 22:59:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1765990063; cv=none; d=zohomail.com; s=zohoarc; b=N5NtaQMGFC1f+6uFMb28qTQd72FKD4LPal2WsP+aaYrAUwwkr8R6Nn3IRokLNJpbfC+U1SsohclJ8/pa4g337Nbokce0zsPaYyXzRoLCELIFhyFxG3cPufk2z2UgvFxkjlofNVuFjAfLUBa8zlvrzWbAkkQfzJ22akNdHYURHi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765990063; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BOdX227QL3oWFhXpMwmHJU3UZWXXFN5ORNQ7qNLZu5c=; b=Dl//NLQj3OOOslCEUnea+3qZdiE0KwyG5s6LGYvJ5iRgSKgtB/oM5cadfJ7L4PKJcjpZX3H/ocm88Jh+/ivlWWqrPXIh5qZT+FKoLZHuHynXVfXjstaMiMePYbj7rf92mtQ2ABu39yL6SoU3kvbXooK5KJZwvOfMaq1z4+qkE00= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1765990063530386.91247021550737; Wed, 17 Dec 2025 08:47:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVufp-0004RI-2L; Wed, 17 Dec 2025 11:46:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVufG-0004GT-Qx for qemu-devel@nongnu.org; Wed, 17 Dec 2025 11:46:17 -0500 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vVufE-0007Ao-Qj for qemu-devel@nongnu.org; Wed, 17 Dec 2025 11:46:14 -0500 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 97BEE33694; Wed, 17 Dec 2025 16:45:58 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CB60A3EA63; Wed, 17 Dec 2025 16:45:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id mNPQIkTeQmlyDQAAD6G6ig (envelope-from ); Wed, 17 Dec 2025 16:45:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1765989958; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BOdX227QL3oWFhXpMwmHJU3UZWXXFN5ORNQ7qNLZu5c=; b=iKZdoyM+yLZAEGz/y+SpK74B7C9EJe1uupxk5j6+zkgIE9FFr+KGYxGMUdpsxskgm6kYYP fmZw2e3gxO0P3ZJWWOq06pp+BYMUc3LTs96BTlOqUIt4SRdzV1f0w5LQb9Xm7UCzU1OLfx x/YfgiF18/TUYPzMiSCRi2dtOgoBB6M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1765989958; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BOdX227QL3oWFhXpMwmHJU3UZWXXFN5ORNQ7qNLZu5c=; b=LPjVNoGLn+0qSvgdgtMGOy5XKa0z+v1IwJGiItg9IEUOj6wWjGhx67E4I1h2FpRyiv9oIw W33g0KBjL8tQxhDQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=iKZdoyM+; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=LPjVNoGL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1765989958; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BOdX227QL3oWFhXpMwmHJU3UZWXXFN5ORNQ7qNLZu5c=; b=iKZdoyM+yLZAEGz/y+SpK74B7C9EJe1uupxk5j6+zkgIE9FFr+KGYxGMUdpsxskgm6kYYP fmZw2e3gxO0P3ZJWWOq06pp+BYMUc3LTs96BTlOqUIt4SRdzV1f0w5LQb9Xm7UCzU1OLfx x/YfgiF18/TUYPzMiSCRi2dtOgoBB6M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1765989958; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BOdX227QL3oWFhXpMwmHJU3UZWXXFN5ORNQ7qNLZu5c=; b=LPjVNoGLn+0qSvgdgtMGOy5XKa0z+v1IwJGiItg9IEUOj6wWjGhx67E4I1h2FpRyiv9oIw W33g0KBjL8tQxhDQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: thuth@redhat.com, peterx@redhat.com, Nicholas Piggin , Harsh Prateek Bora Subject: [PATCH v2 2/2] tests/functional: Add a OS level migration test for pseries Date: Wed, 17 Dec 2025 13:45:48 -0300 Message-ID: <20251217164549.4311-3-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251217164549.4311-1-farosas@suse.de> References: <20251217164549.4311-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.01 X-Rspamd-Queue-Id: 97BEE33694 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; URIBL_BLOCKED(0.00)[suse.de:mid,suse.de:dkim,suse.de:email,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:dkim,suse.de:email]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; FREEMAIL_CC(0.00)[redhat.com,gmail.com,linux.ibm.com]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Action: no action Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1765990064721154100 Content-Type: text/plain; charset="utf-8" There's currently no OS level test for ppc64le. Add one such test by reusing the boot level tests that are already present. The test boots the source machine, waits for it to reach a mid-boot message, migrates and checks that the destination has reached the final boot message (VFS error due to no disk). Signed-off-by: Fabiano Rosas Reviewed-by: Thomas Huth --- tests/functional/ppc64/test_migration.py | 12 ++++++++ tests/functional/ppc64/test_pseries.py | 35 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/tests/functional/ppc64/test_migration.py b/tests/functional/pp= c64/test_migration.py index 5dfdaaf709..a3b819680b 100755 --- a/tests/functional/ppc64/test_migration.py +++ b/tests/functional/ppc64/test_migration.py @@ -4,6 +4,7 @@ # # ppc migration test =20 +from qemu_test.ports import Ports from migration import MigrationTest =20 =20 @@ -21,6 +22,17 @@ def test_migration_with_exec(self): self.set_machine('mac99') self.migration_with_exec() =20 + def do_migrate_ppc64_linux(self, source_vm, dest_vm): + with Ports() as ports: + port =3D ports.find_free_port() + if port is None: + self.skipTest('Failed to find a free port') + uri =3D 'tcp:localhost:%u' % port + + dest_vm.qmp('migrate-incoming', uri=3Duri) + source_vm.qmp('migrate', uri=3Duri) + self.assert_migration(source_vm, dest_vm) + =20 if __name__ =3D=3D '__main__': MigrationTest.main() diff --git a/tests/functional/ppc64/test_pseries.py b/tests/functional/ppc6= 4/test_pseries.py index 7840c4e3ff..e15a8956a5 100755 --- a/tests/functional/ppc64/test_pseries.py +++ b/tests/functional/ppc64/test_pseries.py @@ -9,6 +9,7 @@ =20 from qemu_test import QemuSystemTest, Asset from qemu_test import wait_for_console_pattern +from test_migration import PpcMigrationTest =20 class PseriesMachine(QemuSystemTest): =20 @@ -87,5 +88,39 @@ def test_ppc64_linux_big_boot(self): wait_for_console_pattern(self, console_pattern, self.panic_message) wait_for_console_pattern(self, self.good_message, self.panic_messa= ge) =20 + def test_ppc64_linux_migration(self): + kernel_path =3D self.ASSET_KERNEL.fetch() + kernel_command_line =3D self.KERNEL_COMMON_COMMAND_LINE + + self.set_machine('pseries') + + dest_vm =3D self.get_vm(name=3D"dest-qemu") + dest_vm.add_args('-incoming', 'defer') + dest_vm.add_args('-smp', '4') + dest_vm.add_args('-nodefaults') + dest_vm.add_args('-kernel', kernel_path, + '-append', kernel_command_line) + dest_vm.set_console() + dest_vm.launch() + + source_vm =3D self.get_vm(name=3D"source-qemu") + source_vm.add_args('-smp', '4') + source_vm.add_args('-nodefaults') + source_vm.add_args('-kernel', kernel_path, + '-append', kernel_command_line) + source_vm.set_console() + source_vm.launch() + + # ensure the boot has reached Linux + console_pattern =3D 'smp: Brought up 1 node, 4 CPUs' + wait_for_console_pattern(self, console_pattern, self.panic_message, + vm=3Dsource_vm) + + PpcMigrationTest().do_migrate_ppc64_linux(source_vm, dest_vm); + + # ensure the boot proceeds after migration + wait_for_console_pattern(self, self.good_message, self.panic_messa= ge, + vm=3Ddest_vm) + if __name__ =3D=3D '__main__': QemuSystemTest.main() --=20 2.51.0