From nobody Tue Feb 10 03:44:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642507387; cv=none; d=zohomail.com; s=zohoarc; b=MdA68jTcZ7QH9u07oSPwtEymrcL9/erjxu1KlnRFCAlLGKHKDuAh/cPcDTQI/U39ITHz2t73se3HNlk1JxElQaedMveKJfqxq3iocUfFnRtbbBJpRL4dDhSLH2w8Ab1FkHjegNATZBNnfm0LK/OuUVrPfl0Wu23Uu4L0N2PMBLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642507387; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hxLa1Ic+oybIIaxhFPog8XM4Pmte85GJPK9MXeVj63o=; b=Ou87A2zhb36xJaE5RX4OMJh7alDV3bEckbc8iNM+j3IfHNvqdfCe/yo30ZJlprtUeRy5tzEO8t6Xo5XjLZ2gUneJj3mhGj7+l6ONgpvFa8W8qcw/69TqiWB3fLwR36JQilW+OfAsZm14XyI4SXtdOrq5PW2WsJb/cFwo7bj7lpw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1642507387048196.80536762605118; Tue, 18 Jan 2022 04:03:07 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id az27-20020a05600c601b00b0034d2956eb04so4336223wmb.5 for ; Tue, 18 Jan 2022 04:03:06 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id y13sm10157596wry.111.2022.01.18.04.03.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 04:03:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hxLa1Ic+oybIIaxhFPog8XM4Pmte85GJPK9MXeVj63o=; b=O7bd4EtLj01BUr/Jqa34IHAsVt/KzxBcUJPmhU15WC1wLvTX178Bx2nhzYsIvSX+9X sEl9ljNKBiRe/xy8TS0W3O5gmpFvjfS45cQpClUqJxY/2G8RI63EIlzSAT3DHnzalRFi ioCU9gk6A5r4fqlnr3V054N8A+wWcGAmv28uJyegrgqhLjjFq3wBSqifU5MNFpq/8zJW avH7HdlQExwhsJ6iGQPqWzwZyeKOwoGkBct0aHPBSoPWUxzeOKXD6CsS4AIxLHn341qe 5KLBKP5Zqw2I1ec/dT6/YqoQjiZ8xYZALQqTjLAqq/Tw6NcGBYRhhJLsjSKXT/YRwOcY LGWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hxLa1Ic+oybIIaxhFPog8XM4Pmte85GJPK9MXeVj63o=; b=CJ+Wlg5zTWY/NMuvBVCpIleKu4cdmEj9seIq1cIf+EHO/bHiMGPJSkPJ3LOgIVrs9B ycdFLlx+VyWIfKhudUPw4SBykqs0Wxee2T1HAp4zowjwkBfK+ANGcN11tpBs8pZRO9h2 M6LfJp6T485Hmo91bDCKxYlAeCttUC1Peulj2pG1xA0i74DxQzoH+TbwEkE6RBz9mpv7 qrzmF59XrkdAwfjZz6+G+IdLgFqJ5PSNZqoWqKprKU7TR91pjPRx57ms0l2jzdHdiLgh qcHPt7HV43l6OCkCXX8BqzvktBuu3SMhnAd1D0cyiu/cHjQA0Xio+Q1YWogfMikLoXi5 QnDg== X-Gm-Message-State: AOAM531EX5v/vVJ1RLLV40l5cShgQZrc9yY8tNeUQB/8O0RKQt1Xo0lH 6h3HWzP3+5pS9KhR/twRGck= X-Google-Smtp-Source: ABdhPJwEvKgmumh8Nh1oK47qDO3VUsxvWAXlDjZ8f1E11pgk6ACQR+tBRNhlCLT0tOcXFXPFQq3Zyg== X-Received: by 2002:a05:6000:1ac7:: with SMTP id i7mr6381681wry.491.1642507385380; Tue, 18 Jan 2022 04:03:05 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , David Hildenbrand , Paolo Bonzini , qemu-block@nongnu.org, qemu-stable@nongnu.org, Hyman Huang , "Dr . David Alan Gilbert" , Juan Quintela , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 07/19] memory: Fix incorrect calls of log_global_start/stop Date: Tue, 18 Jan 2022 13:02:17 +0100 Message-Id: <20220118120229.196337-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118120229.196337-1-f4bug@amsat.org> References: <20220118120229.196337-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642507388270100001 From: Peter Xu We should only call the log_global_start/stop when the global dirty track bitmask changes from zero<->non-zero. No real issue reported for this yet probably because no immediate user to enable both dirty rate measurement and migration at the same time. However it'll be good to be prepared for it. Fixes: 63b41db4bc ("memory: make global_dirty_tracking a bitmask") Cc: qemu-stable@nongnu.org Cc: Hyman Huang Cc: Paolo Bonzini Cc: Dr. David Alan Gilbert Cc: Juan Quintela Cc: David Hildenbrand Signed-off-by: Peter Xu Reviewed-by: David Hildenbrand Message-Id: <20211130080028.6474-1-peterx@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/memory.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/softmmu/memory.c b/softmmu/memory.c index e37a4b8ae39..678dc62f069 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -2794,6 +2794,8 @@ static VMChangeStateEntry *vmstate_change; =20 void memory_global_dirty_log_start(unsigned int flags) { + unsigned int old_flags =3D global_dirty_tracking; + if (vmstate_change) { qemu_del_vm_change_state_handler(vmstate_change); vmstate_change =3D NULL; @@ -2802,15 +2804,14 @@ void memory_global_dirty_log_start(unsigned int fla= gs) assert(flags && !(flags & (~GLOBAL_DIRTY_MASK))); assert(!(global_dirty_tracking & flags)); global_dirty_tracking |=3D flags; - trace_global_dirty_changed(global_dirty_tracking); =20 - MEMORY_LISTENER_CALL_GLOBAL(log_global_start, Forward); - - /* Refresh DIRTY_MEMORY_MIGRATION bit. */ - memory_region_transaction_begin(); - memory_region_update_pending =3D true; - memory_region_transaction_commit(); + if (!old_flags) { + MEMORY_LISTENER_CALL_GLOBAL(log_global_start, Forward); + memory_region_transaction_begin(); + memory_region_update_pending =3D true; + memory_region_transaction_commit(); + } } =20 static void memory_global_dirty_log_do_stop(unsigned int flags) @@ -2821,12 +2822,12 @@ static void memory_global_dirty_log_do_stop(unsigne= d int flags) =20 trace_global_dirty_changed(global_dirty_tracking); =20 - /* Refresh DIRTY_MEMORY_MIGRATION bit. */ - memory_region_transaction_begin(); - memory_region_update_pending =3D true; - memory_region_transaction_commit(); - - MEMORY_LISTENER_CALL_GLOBAL(log_global_stop, Reverse); + if (!global_dirty_tracking) { + memory_region_transaction_begin(); + memory_region_update_pending =3D true; + memory_region_transaction_commit(); + MEMORY_LISTENER_CALL_GLOBAL(log_global_stop, Reverse); + } } =20 static void memory_vm_change_state_handler(void *opaque, bool running, --=20 2.34.1