[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC 04/13] migration: Cleanup xbzrle zero page cache update logic
From: |
Peter Xu |
Subject: |
[PATCH RFC 04/13] migration: Cleanup xbzrle zero page cache update logic |
Date: |
Mon, 29 Aug 2022 12:56:50 -0400 |
The major change is to replace "!save_page_use_compression()" with
"xbzrle_enabled" to make it clear.
Reasonings:
(1) When compression enabled, "!save_page_use_compression()" is exactly the
same as checking "xbzrle_enabled".
(2) When compression disabled, "!save_page_use_compression()" always return
true. We used to try calling the xbzrle code, but after this change we
won't, and we shouldn't need to.
Since at it, drop the xbzrle_enabled check in xbzrle_cache_zero_page()
because with this change it's not needed anymore.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/ram.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 9e96a46323..612c7dd708 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -741,10 +741,6 @@ void mig_throttle_counter_reset(void)
*/
static void xbzrle_cache_zero_page(RAMState *rs, ram_addr_t current_addr)
{
- if (!rs->xbzrle_enabled) {
- return;
- }
-
/* We don't care if this fails to allocate a new cache page
* as long as it updated an old one */
cache_insert(XBZRLE.cache, current_addr, XBZRLE.zero_target_page,
@@ -2301,7 +2297,7 @@ static int ram_save_target_page(RAMState *rs,
PageSearchStatus *pss)
/* Must let xbzrle know, otherwise a previous (now 0'd) cached
* page would be stale
*/
- if (!save_page_use_compression(rs)) {
+ if (rs->xbzrle_enabled) {
XBZRLE_cache_lock();
xbzrle_cache_zero_page(rs, block->offset + offset);
XBZRLE_cache_unlock();
--
2.32.0
- [PATCH RFC 00/13] migration: Postcopy Preempt-Full, Peter Xu, 2022/08/29
- [PATCH RFC 02/13] migration: Add postcopy_preempt_active(), Peter Xu, 2022/08/29
- [PATCH RFC 01/13] migration: Use non-atomic ops for clear log bitmap, Peter Xu, 2022/08/29
- [PATCH RFC 06/13] migration: Trivial cleanup save_page_header() on same block check, Peter Xu, 2022/08/29
- [PATCH RFC 07/13] migration: Remove RAMState.f references in compression code, Peter Xu, 2022/08/29
- [PATCH RFC 04/13] migration: Cleanup xbzrle zero page cache update logic,
Peter Xu <=
- [PATCH RFC 11/13] migration: Make PageSearchStatus part of RAMState, Peter Xu, 2022/08/29
- [PATCH RFC 03/13] migration: Yield bitmap_mutex properly when sending/sleeping, Peter Xu, 2022/08/29
- [PATCH RFC 08/13] migration: Teach PSS about host page, Peter Xu, 2022/08/29
- [PATCH RFC 10/13] migration: Add pss_init(), Peter Xu, 2022/08/29
- [PATCH RFC 13/13] migration: Send requested page directly in rp-return thread, Peter Xu, 2022/08/29
- [PATCH RFC 05/13] migration: Disallow postcopy preempt to be used with compress, Peter Xu, 2022/08/29
- [PATCH RFC 12/13] migration: Move last_sent_block into PageSearchStatus, Peter Xu, 2022/08/29
- [PATCH RFC 09/13] migration: Introduce pss_channel, Peter Xu, 2022/08/29
- Re: [PATCH RFC 00/13] migration: Postcopy Preempt-Full, Peter Xu, 2022/08/29