From nobody Thu Apr 2 09:18:46 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1774784314; cv=none; d=zohomail.com; s=zohoarc; b=hv/IdUNq5fov8IFltzDEoTRZkENffKFhTiS4ec9Xq7UepvH7XtMDUlIkLRB2EedpDjLHnzu3gmI149U/nI2KBe6I2G+XHfMZlhybi+t6jTJ/PqxJ47bwh2FHGd8EyJbEqq0RkQJw1RDIMEK0Q3thkHQY5Z4USbXSRWpO7LlqW1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774784314; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=f6tBx4kE4tawEvFskmw/LuVxmCKqiEYHJXY2wQ9tAY4=; b=XHvrrdTvDLOAkT6uNthQXeNRo/VCdw2nbI5xPhAu9qkZDfHypGHMvbEIbuNmdpTzo3e0juI89ouzo+qEEH0BlFZ4ZmXnzIFUlcomcjgKY4OQJikOjfNbjs6DfzLp+npBDHac1nffd6Kjw1V0srNwWooODF/0q23hoFCIhCugRdU= 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 1774784314359160.53750273444155; Sun, 29 Mar 2026 04:38:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w6oSi-0002Mv-74; Sun, 29 Mar 2026 07:37:50 -0400 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 1w6oSe-0002Li-GE for qemu-devel@nongnu.org; Sun, 29 Mar 2026 07:37:44 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w6oSb-00042A-Ot for qemu-devel@nongnu.org; Sun, 29 Mar 2026 07:37:43 -0400 Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-c7412b07f22so1849638a12.0 for ; Sun, 29 Mar 2026 04:37:41 -0700 (PDT) Received: from trieu2-huynh-trieuhpn-ubuntu24.bee-live.svc.cluster.local ([27.122.242.65]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82ca8467824sm4353108b3a.17.2026.03.29.04.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2026 04:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774784259; x=1775389059; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=f6tBx4kE4tawEvFskmw/LuVxmCKqiEYHJXY2wQ9tAY4=; b=d3j+SEuf1g7Zd/mTmFZ3+N2QGnMm34su4AkYnVziVKA1vuFVP3qEwfr24ddgKNwikU SINCn+wOLZbyPSIkwqvugf08ZWRYkfvGtb+vDx6kQ5upprkqZDvI3zDftI9fcKJRiPrl 2Z4QFhAIa5rJnL9/Wv4K07SYrleppyCV19ZiPXYjWfwHFFBIuCEAkpcsqw+7rmRtqpsZ 1CCU5xKppfRzbPhQx3efc/riGFQoiB20hEckrcv/Hs9ckUPeBaoyDVDqi2o1Ow9r2cib WUv3Aq5TsDRRkiAu6IGM2NcllnsEMf/Npl9Vc1R/5lNg2fwwCEQRGa4QB0cFN5nEccjB Deag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774784259; x=1775389059; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=f6tBx4kE4tawEvFskmw/LuVxmCKqiEYHJXY2wQ9tAY4=; b=B1CH5ztCK6w5HZvMbQwJsP90wtD1HxTwOiYhtmAZWQYb8QmzxLLRNadvnliSweZupT nn7pbALM1v/hRM3j2P/phF9AVdDVwOywnodD8ZCqqDPSBgG2NpZxhQCxz2Uv3VVnw+z4 xTXsOiEfCU8VWSudLLE2MAFOrO6xQEkbej5O6RH+/bJOf+n8jdpAL5pT0Asup22kLB71 G1sj9Su+Pm57J3Fdca/RFUFMDQ4v8Zb6XX0mrWZqFn/q239PRmsswBOSi7Xd3y353AUo UuJyRfn8ufMm7r4mMIyhH28M4QAZwkHojMMDmhYZG7XZ7dq7h4jnRXe9VXk0i9cG6YpA pldQ== X-Gm-Message-State: AOJu0YxSivVZ7ywNWHZxC16YeQI4lqx4WH6h8tEqKACSrsL4U+4qUGpV 7TvqVrAG2oe5WtR/ZYRgE94q8wSLpKJmfA8Zc4W6XGLSlhDaObTbWXPZbR6gALkw2M4= X-Gm-Gg: ATEYQzx1Q0KL/byKI0s0ijH3XcVKmSWshVMekFNu9K+Ehp+/FEcbsdLsmPViLl1djWI lSVR6px98bwlDwVV8M6Cphu1ggMXMSOnuDM1Y1ZHlvfowB086XjY4LoC7IX/2xUZ7xxpSO6oINB Z5JweiAsGFiGdtmCO3NPz7mgLYaEqZUELYNJlxo321U9G5YoLTHHbQfM7cKPLjD0fGpJy83ep0V ZQMAF7JuyF9WECxss3LEBubJkTfgnOK0biKe0BheWjB0zH3QmpRfOe7yYjxwt0Smp5H4ETYMRC0 wQ0fZgQ1oRImY/FTTA656pt49vmH4+tu4YDnApLlZo3okqW/Oar1bPtalROcwq40SwXAjsbslpH ZKkqXPFr63d7BdjYCubw6qE/aLqOG3NZBXGaFL70/S2iY94OA/Wmol83akorU3XbD0xso+xrOKM oEDF9LeYnj3/8jUBVCgZ7LhTYS1UAvuv5YAoJ99PKhjWHpdQtTtAKkNyZTYy3Jwzjc9kSAxOX8a ij2VzDEDg== X-Received: by 2002:a05:6a20:3d87:b0:39c:373b:3b48 with SMTP id adf61e73a8af0-39c8ab9ef24mr8169182637.25.1774784259463; Sun, 29 Mar 2026 04:37:39 -0700 (PDT) From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [PATCH] target/mips: save CP0 timer in vmstate Date: Sun, 29 Mar 2026 20:37:32 +0900 Message-ID: <20260329113732.482619-1-vikingtc4@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::52d; envelope-from=vikingtc4@gmail.com; helo=mail-pg1-x52d.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development 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 @gmail.com) X-ZM-MESSAGEID: 1774784317027154100 Content-Type: text/plain; charset="utf-8" The MIPS R4K CP0 timer (env->timer) is not included in vmstate_mips_cpu, so after loadvm the QEMUTimer has no scheduled expiry. This causes qemu_poll_ns() to block indefinitely and the guest to freeze until an external I/O event (e.g. a keypress) wakes the main loop. Fix by adding an optional vmstate subsection for the timer, following the same pattern used by ARM (gt_timer), RISC-V (env.stimer), SPARC (qtimer), and OpenRISC (timer). The .needed callback returns false when env->timer is NULL (KVM mode), keeping the subsection optional for backwards compatibility with existing snapshots. nit: when trying to reproduce of this bug requires savevm to work on MIPS Malta. That is currently broken by a separate crash in vmsd_can_compress() introduced by commit 7aa563630b ("pc: Start with modern CPU hotplug interface by default"), which is being tracked and fixed independently [1], [2]. This fix is independent of that crash and touches no shared code. [1] https://lore.kernel.org/qemu-devel/20260316194759.22672-1-farosas@suse.= de/ [2] https://lore.kernel.org/qemu-devel/87341zsvmc.fsf@suse.de/ Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1987 Signed-off-by: Trieu Huynh Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/system/machine.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/target/mips/system/machine.c b/target/mips/system/machine.c index 8af11fd896..473d3ab036 100644 --- a/target/mips/system/machine.c +++ b/target/mips/system/machine.c @@ -3,6 +3,7 @@ #include "internal.h" #include "migration/cpu.h" #include "fpu_helper.h" +#include "qemu/timer.h" =20 static int cpu_post_load(void *opaque, int version_id) { @@ -219,6 +220,23 @@ static const VMStateDescription vmstate_tlb =3D { =20 /* MIPS CPU state */ =20 +static bool mips_timer_needed(void *opaque) +{ + MIPSCPU *cpu =3D opaque; + return cpu->env.timer !=3D NULL; +} + +static const VMStateDescription mips_vmstate_timer =3D { + .name =3D "cpu/timer", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D mips_timer_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_TIMER_PTR(env.timer, MIPSCPU), + VMSTATE_END_OF_LIST() + } +}; + const VMStateDescription vmstate_mips_cpu =3D { .name =3D "cpu", .version_id =3D 21, @@ -333,4 +351,8 @@ const VMStateDescription vmstate_mips_cpu =3D { =20 VMSTATE_END_OF_LIST() }, + .subsections =3D (const VMStateDescription * const []) { + &mips_vmstate_timer, + NULL + } }; --=20 2.43.0