From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
David Hildenbrand <david@redhat.com>,
peterx@redhat.com, Richard Henderson <rth@twiddle.net>
Subject: [PATCH v2 9/9] memory: Delay the transaction pop() until commit completed
Date: Fri, 23 Jul 2021 15:34:44 -0400 [thread overview]
Message-ID: <20210723193444.133412-10-peterx@redhat.com> (raw)
In-Reply-To: <20210723193444.133412-1-peterx@redhat.com>
This should be functionally the same as before, but this allows the
memory_region_transaction_depth to be non-zero during commit, which can help us
to do sanity check on misuses.
Since at it, fix an indentation issue on the bracket.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
softmmu/memory.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/softmmu/memory.c b/softmmu/memory.c
index 08327c22e2..cf7943c02c 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -1114,8 +1114,7 @@ void memory_region_transaction_commit(void)
assert(memory_region_transaction_depth);
assert(qemu_mutex_iothread_locked());
- memory_region_transaction_pop();
- if (!memory_region_transaction_depth) {
+ if (memory_region_transaction_depth == 1) {
if (memory_region_update_pending) {
flatviews_reset();
@@ -1134,7 +1133,14 @@ void memory_region_transaction_commit(void)
}
ioeventfd_update_pending = false;
}
- }
+ }
+
+ /*
+ * Pop the depth at last, so that memory_region_transaction_depth will
+ * still be non-zero during committing. This can help us to do some sanity
+ * check within the process of committing.
+ */
+ memory_region_transaction_pop();
}
static void memory_region_destructor_none(MemoryRegion *mr)
--
2.31.1
next prev parent reply other threads:[~2021-07-23 19:41 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 19:34 [PATCH v2 0/9] memory: Sanity checks memory transaction when releasing BQL Peter Xu
2021-07-23 19:34 ` [PATCH v2 1/9] cpus: Export queue work related fields to cpu.h Peter Xu
2021-07-27 13:02 ` David Hildenbrand
2021-07-23 19:34 ` [PATCH v2 2/9] cpus: Move do_run_on_cpu into softmmu/cpus.c Peter Xu
2021-07-27 13:04 ` David Hildenbrand
2021-07-23 19:34 ` [PATCH v2 3/9] memory: Introduce memory_region_transaction_{push|pop}() Peter Xu
2021-07-27 13:06 ` David Hildenbrand
2021-07-23 19:34 ` [PATCH v2 4/9] memory: Don't do topology update in memory finalize() Peter Xu
2021-07-27 13:21 ` David Hildenbrand
2021-07-27 16:02 ` Peter Xu
2021-07-28 12:13 ` David Hildenbrand
2021-07-28 13:56 ` Peter Xu
2021-07-28 14:01 ` David Hildenbrand
2021-07-23 19:34 ` [PATCH v2 5/9] cpus: Use qemu_cond_wait_iothread() where proper Peter Xu
2021-07-27 12:49 ` David Hildenbrand
2021-07-23 19:34 ` [PATCH v2 6/9] cpus: Remove the mutex parameter from do_run_on_cpu() Peter Xu
2021-07-27 12:50 ` David Hildenbrand
2021-07-23 19:34 ` [PATCH v2 7/9] cpus: Introduce qemu_mutex_unlock_iothread_prepare() Peter Xu
2021-07-27 12:59 ` David Hildenbrand
2021-07-27 16:08 ` Peter Xu
2021-07-28 12:11 ` David Hildenbrand
2021-07-23 19:34 ` [PATCH v2 8/9] memory: Assert on no ongoing memory transaction before release BQL Peter Xu
2021-07-27 13:00 ` David Hildenbrand
2021-07-23 19:34 ` Peter Xu [this message]
2021-07-27 13:02 ` [PATCH v2 9/9] memory: Delay the transaction pop() until commit completed David Hildenbrand
2021-07-23 22:36 ` [PATCH v2 0/9] memory: Sanity checks memory transaction when releasing BQL Peter Xu
2021-07-27 12:41 ` David Hildenbrand
2021-07-27 16:35 ` Peter Xu
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=20210723193444.133412-10-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=david@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).