[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 12/13] KVM: Disable manual dirty log when dirty ring enabled
From: |
Peter Xu |
Subject: |
[PATCH v4 12/13] KVM: Disable manual dirty log when dirty ring enabled |
Date: |
Fri, 8 Jan 2021 11:50:49 -0500 |
KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 is for KVM_CLEAR_DIRTY_LOG, which is only
useful for KVM_GET_DIRTY_LOG. Skip enabling it for kvm dirty ring.
More importantly, KVM_DIRTY_LOG_INITIALLY_SET will not wr-protect all the pages
initially, which is against how kvm dirty ring is used - there's no way for kvm
dirty ring to re-protect a page before it's notified as being written first
with a GFN entry in the ring! So when KVM_DIRTY_LOG_INITIALLY_SET is enabled
with dirty ring, we'll see silent data loss after migration.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
accel/kvm/kvm-all.c | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 77b2c4eb0c..9a9ce0316a 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2174,20 +2174,29 @@ static int kvm_init(MachineState *ms)
}
}
- dirty_log_manual_caps =
- kvm_check_extension(s, KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2);
- dirty_log_manual_caps &= (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE |
- KVM_DIRTY_LOG_INITIALLY_SET);
- s->manual_dirty_log_protect = dirty_log_manual_caps;
- if (dirty_log_manual_caps) {
- ret = kvm_vm_enable_cap(s, KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2, 0,
- dirty_log_manual_caps);
- if (ret) {
- warn_report("Trying to enable capability %"PRIu64" of "
- "KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 but failed. "
- "Falling back to the legacy mode. ",
- dirty_log_manual_caps);
- s->manual_dirty_log_protect = 0;
+ /*
+ * KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 is not needed when dirty ring is
+ * enabled. More importantly, KVM_DIRTY_LOG_INITIALLY_SET will assume no
+ * page is wr-protected initially, which is against how kvm dirty ring is
+ * usage - kvm dirty ring requires all pages are wr-protected at the very
+ * beginning. Enabling this feature for dirty ring causes data corruption.
+ */
+ if (!s->kvm_dirty_ring_enabled) {
+ dirty_log_manual_caps =
+ kvm_check_extension(s, KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2);
+ dirty_log_manual_caps &= (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE |
+ KVM_DIRTY_LOG_INITIALLY_SET);
+ s->manual_dirty_log_protect = dirty_log_manual_caps;
+ if (dirty_log_manual_caps) {
+ ret = kvm_vm_enable_cap(s, KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2, 0,
+ dirty_log_manual_caps);
+ if (ret) {
+ warn_report("Trying to enable capability %"PRIu64" of "
+ "KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 but failed. "
+ "Falling back to the legacy mode. ",
+ dirty_log_manual_caps);
+ s->manual_dirty_log_protect = 0;
+ }
}
}
--
2.26.2
- [PATCH v4 03/13] memory: Introduce log_sync_global() to memory listener, (continued)
- [PATCH v4 03/13] memory: Introduce log_sync_global() to memory listener, Peter Xu, 2021/01/08
- [PATCH v4 01/13] update-linux-headers: Include const.h, Peter Xu, 2021/01/08
- [PATCH v4 04/13] KVM: Fixup kvm_log_clear_one_slot() ioctl return check, Peter Xu, 2021/01/08
- [PATCH v4 05/13] KVM: Use a big lock to replace per-kml slots_lock, Peter Xu, 2021/01/08
- [PATCH v4 06/13] KVM: Create the KVMSlot dirty bitmap on flag changes, Peter Xu, 2021/01/08
- [PATCH v4 07/13] KVM: Provide helper to get kvm dirty log, Peter Xu, 2021/01/08
- [PATCH v4 08/13] KVM: Provide helper to sync dirty bitmap from slot to ramblock, Peter Xu, 2021/01/08
- [PATCH v4 09/13] KVM: Simplify dirty log sync in kvm_set_phys_mem, Peter Xu, 2021/01/08
- [PATCH v4 10/13] KVM: Cache kvm slot dirty bitmap size, Peter Xu, 2021/01/08
- [PATCH v4 11/13] KVM: Add dirty-gfn-count property, Peter Xu, 2021/01/08
- [PATCH v4 12/13] KVM: Disable manual dirty log when dirty ring enabled,
Peter Xu <=
- [PATCH v4 13/13] KVM: Dirty ring support, Peter Xu, 2021/01/08