[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFCv1 8/8] kvm: Enable dirty ring for arm64
From: |
Gavin Shan |
Subject: |
[PATCH RFCv1 8/8] kvm: Enable dirty ring for arm64 |
Date: |
Mon, 6 Feb 2023 19:20:10 +0800 |
arm64 has different capability from x86 to enable the dirty ring, which
is KVM_CAP_DIRTY_LOG_RING_ACQ_REL. To enable it in kvm_dirty_ring_init()
when KVM_CAP_DIRTY_LOG_RING isn't supported.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
accel/kvm/kvm-all.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 399ef0f7e6..8ab31865eb 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1479,13 +1479,19 @@ static int kvm_dirty_ring_reaper_init(KVMState *s)
static int kvm_dirty_ring_init(KVMState *s)
{
uint64_t ring_bytes;
+ unsigned int capability = KVM_CAP_DIRTY_LOG_RING;
int ret;
/*
* Read the max supported pages. Fall back to dirty logging mode
* if the dirty ring isn't supported.
*/
- ret = kvm_vm_check_extension(s, KVM_CAP_DIRTY_LOG_RING);
+ ret = kvm_vm_check_extension(s, capability);
+ if (ret <= 0) {
+ capability = KVM_CAP_DIRTY_LOG_RING_ACQ_REL;
+ ret = kvm_vm_check_extension(s, capability);
+ }
+
if (ret <= 0) {
warn_report("KVM dirty ring not available, using bitmap method");
s->kvm_dirty_ring_size = 0;
@@ -1502,7 +1508,7 @@ static int kvm_dirty_ring_init(KVMState *s)
goto out;
}
- ret = kvm_vm_enable_cap(s, KVM_CAP_DIRTY_LOG_RING, 0, ring_bytes);
+ ret = kvm_vm_enable_cap(s, capability, 0, ring_bytes);
if (ret) {
error_report("Enabling of KVM dirty ring failed: %s. "
"Suggested minimum value is 1024.", strerror(-ret));
--
2.23.0
- [PATCH RFCv1 0/8] hw/arm/virt: Support dirty ring, Gavin Shan, 2023/02/06
- [PATCH RFCv1 1/8] linux-headers: Update for dirty ring, Gavin Shan, 2023/02/06
- [PATCH RFCv1 2/8] memory: Add last stage indicator to global dirty log synchronization, Gavin Shan, 2023/02/06
- [PATCH RFCv1 3/8] migration: Add last stage indicator to global dirty log synchronization, Gavin Shan, 2023/02/06
- [PATCH RFCv1 4/8] kvm: Introduce secondary dirty bitmap, Gavin Shan, 2023/02/06
- [PATCH RFCv1 8/8] kvm: Enable dirty ring for arm64,
Gavin Shan <=
- [PATCH RFCv1 6/8] kvm: Add helper kvm_dirty_ring_init(), Gavin Shan, 2023/02/06
- [PATCH RFCv1 5/8] kvm: Synchronize secondary bitmap in last stage, Gavin Shan, 2023/02/06
- [PATCH RFCv1 7/8] hw/arm/virt: Enable backup bitmap for dirty ring, Gavin Shan, 2023/02/06