[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 8/8] memory: Delay the transaction pop() until commit complete
From: |
Peter Xu |
Subject: |
[PATCH v3 8/8] memory: Delay the transaction pop() until commit completed |
Date: |
Wed, 28 Jul 2021 14:31:51 -0400 |
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 62ec00b52d..e830649011 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_depth_dec();
- 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;
}
- }
+ }
+
+ /*
+ * Decrease 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_depth_dec();
}
static void memory_region_destructor_none(MemoryRegion *mr)
--
2.31.1
- Re: [PATCH v3 1/8] cpus: Export queue work related fields to cpu.h, (continued)
- [PATCH v3 3/8] memory: Introduce memory_region_transaction_depth_{inc|dec}(), Peter Xu, 2021/07/28
- [PATCH v3 2/8] cpus: Move do_run_on_cpu into softmmu/cpus.c, Peter Xu, 2021/07/28
- [PATCH v3 4/8] memory: Don't do topology update in memory finalize(), Peter Xu, 2021/07/28
- [PATCH v3 5/8] cpus: Use qemu_cond_wait_iothread() where proper, Peter Xu, 2021/07/28
- [PATCH v3 6/8] cpus: Remove the mutex parameter from do_run_on_cpu(), Peter Xu, 2021/07/28
- [PATCH v3 8/8] memory: Delay the transaction pop() until commit completed,
Peter Xu <=
- [PATCH v3 7/8] memory: Assert on no ongoing memory transaction before release BQL, Peter Xu, 2021/07/28