From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fabiano Rosas <farosas@suse.de>,
Stefan Hajnoczi <stefanha@redhat.com>,
Peter Xu <peterx@redhat.com>, Bin Guo <guobin@linux.alibaba.com>
Subject: [PULL 2/3] migration: fix ineffective overflow assert in postcopy blocktime
Date: Mon, 20 Jul 2026 10:58:52 -0400 [thread overview]
Message-ID: <20260720145853.1483307-3-peterx@redhat.com> (raw)
In-Reply-To: <20260720145853.1483307-1-peterx@redhat.com>
From: Bin Guo <guobin@linux.alibaba.com>
vcpu_faults_current[] is uint8_t. The overflow assert was checked
after the post-increment, so 255 would wrap to 0 and the assert
would pass silently. Move the check before the increment and use
< 255.
Signed-off-by: Bin Guo <guobin@linux.alibaba.com>
Link: https://lore.kernel.org/r/20260716101952.65329-2-guobin@linux.alibaba.com
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/postcopy-ram.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 980b938a4c..b0828edb3e 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -1093,7 +1093,11 @@ void mark_postcopy_blocktime_begin(uintptr_t addr, uint32_t ptid,
/*
* Account how many concurrent faults on this vCPU we trapped. See
* comments above vcpu_faults_current[] on why it can be more than one.
+ *
+ * vcpu_faults_current[] is uint8_t, so assert before incrementing to
+ * catch overflow before it wraps.
*/
+ assert(dc->vcpu_faults_current[cpu] < 255);
if (dc->vcpu_faults_current[cpu]++ == 0) {
dc->smp_cpus_down++;
/*
@@ -1103,9 +1107,6 @@ void mark_postcopy_blocktime_begin(uintptr_t addr, uint32_t ptid,
*/
dc->last_begin = current;
}
-
- /* Making sure it won't overflow - it really should never! */
- assert(dc->vcpu_faults_current[cpu] <= 255);
} else {
/*
* For non-vCPU thread faults, we don't care about tid or cpu index
--
2.54.0
next prev parent reply other threads:[~2026-07-20 14:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-20 14:58 [PULL 0/3] Next patches Peter Xu
2026-07-20 14:58 ` [PULL 1/3] migration: Fix invalid %ud format and trace arg typo Peter Xu
2026-07-20 14:58 ` Peter Xu [this message]
2026-07-20 14:58 ` [PULL 3/3] migration: clean up postcopy blocktime presentation Peter Xu
2026-07-20 17:11 ` [PULL 0/3] Next patches Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260720145853.1483307-3-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=farosas@suse.de \
--cc=guobin@linux.alibaba.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.