Skip to contentSkip to conversation

RISC-V: KVM: Enhance the logging check for mmu mapping

PATCH In review Inochi Amaoto 2 participants 4 messages May 28 – Jun 5

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RISC-V: KVM: Enhance the logging check for mmu mapping

When enabling dirty ring, the dirty bitmap is disable, and the logging check is always false as the RISC-V architecture does not select "NEED_KVM_DIRTY_RING_WITH_BITMAP". Although the dirty log is recorded since the write path already trying to add the dirty log, the logic for logging check is broken and some side effect will occurs.

Enhance the logging check for mmu mapping so it can check both the dirty ring and the dirty bitmap.

---
 arch/riscv/kvm/mmu.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
arch/riscv/kvm/mmu.c +4 -5
index 2d3def024270..b5873bca9dce 100644
@@ -142,9 +142,8 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
 				enum kvm_mr_change change)
 {
 	/*
-	 * At this point memslot has been committed and there is an
-	 * allocated dirty_bitmap[], dirty pages will be tracked while
-	 * the memory slot is write protected.
+	 * At this point memslot has been committed and dirty pages will be
+	 * tracked while the memory slot is write protected.
 	 */
 	if (change != KVM_MR_DELETE && new->flags & KVM_MEM_LOG_DIRTY_PAGES) {
 		if (kvm_dirty_log_manual_protect_and_init_set(kvm))
@@ -433,8 +432,8 @@ int kvm_riscv_mmu_map(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot,
 	struct vm_area_struct *vma;
 	struct kvm *kvm = vcpu->kvm;
 	struct kvm_mmu_memory_cache *pcache = &vcpu->arch.mmu_page_cache;
-	bool logging = (memslot->dirty_bitmap &&
-			!(memslot->flags & KVM_MEM_READONLY)) ? true : false;
+	bool logging = kvm_slot_dirty_track_enabled(memslot) &&
+		       !(memslot->flags & KVM_MEM_READONLY);
 	unsigned long vma_pagesize, mmu_seq;
 	struct kvm_gstage gstage;
 	struct page *page;
Signature · 1 line
2.54.0
maintainer
#1 lore raw
Quoted 32 lines · Inochi Amaoto

When enabling dirty ring, the dirty bitmap is disable, and the logging check is always false as the RISC-V architecture does not select "NEED_KVM_DIRTY_RING_WITH_BITMAP". Although the dirty log is recorded since the write path already trying to add the dirty log, the logic for logging check is broken and some side effect will occurs.

Enhance the logging check for mmu mapping so it can check both the dirty ring and the dirty bitmap.

---
 arch/riscv/kvm/mmu.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
arch/riscv/kvm/mmu.c +2 -3
index 2d3def024270..b5873bca9dce 100644
@@ -142,9 +142,8 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
                                enum kvm_mr_change change)
 {
        /*
-        * At this point memslot has been committed and there is an
-        * allocated dirty_bitmap[], dirty pages will be tracked while
-        * the memory slot is write protected.
+        * At this point memslot has been committed and dirty pages will be
+        * tracked while the memory slot is write protected.
         */
        if (change != KVM_MR_DELETE && new->flags & KVM_MEM_LOG_DIRTY_PAGES) {
                if (kvm_dirty_log_manual_protect_and_init_set(kvm))

arch/riscv/kvm/mmu.c int kvm_riscv_mmu_map(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot, · line 437

Quoted 5 lines
arch/riscv/kvm/mmu.c +0 -2
@@ -433,8 +432,8 @@ int kvm_riscv_mmu_map(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot,
        struct vm_area_struct *vma;
        struct kvm *kvm = vcpu->kvm;
        struct kvm_mmu_memory_cache *pcache = &vcpu->arch.mmu_page_cache;
-       bool logging = (memslot->dirty_bitmap &&
-                       !(memslot->flags & KVM_MEM_READONLY)) ? true : false;

Why is this not correct approach to determine whether logging is enabled ?

KVM ARM64 does a very similar thing (Refer, memslot_is_logging() in arch/arm64/kvm/mmu.c).

Quoted 8 lines
arch/riscv/kvm/mmu.c +2 -1
+       bool logging = kvm_slot_dirty_track_enabled(memslot) &&
+                      !(memslot->flags & KVM_MEM_READONLY);
        unsigned long vma_pagesize, mmu_seq;
        struct kvm_gstage gstage;
        struct page *page;
--

2.54.0

Regards,
Anup

#2 lore raw
Quoted 41 lines · Anup Patel
Quoted 32 lines · Inochi Amaoto

When enabling dirty ring, the dirty bitmap is disable, and the logging check is always false as the RISC-V architecture does not select "NEED_KVM_DIRTY_RING_WITH_BITMAP". Although the dirty log is recorded since the write path already trying to add the dirty log, the logic for logging check is broken and some side effect will occurs.

Enhance the logging check for mmu mapping so it can check both the dirty ring and the dirty bitmap.

---
 arch/riscv/kvm/mmu.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
arch/riscv/kvm/mmu.c +2 -3
index 2d3def024270..b5873bca9dce 100644
@@ -142,9 +142,8 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
                                enum kvm_mr_change change)
 {
        /*
-        * At this point memslot has been committed and there is an
-        * allocated dirty_bitmap[], dirty pages will be tracked while
-        * the memory slot is write protected.
+        * At this point memslot has been committed and dirty pages will be
+        * tracked while the memory slot is write protected.
         */
        if (change != KVM_MR_DELETE && new->flags & KVM_MEM_LOG_DIRTY_PAGES) {
                if (kvm_dirty_log_manual_protect_and_init_set(kvm))

arch/riscv/kvm/mmu.c int kvm_riscv_mmu_map(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot, · line 437

Quoted 5 lines
arch/riscv/kvm/mmu.c +0 -2
@@ -433,8 +432,8 @@ int kvm_riscv_mmu_map(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot,
        struct vm_area_struct *vma;
        struct kvm *kvm = vcpu->kvm;
        struct kvm_mmu_memory_cache *pcache = &vcpu->arch.mmu_page_cache;
-       bool logging = (memslot->dirty_bitmap &&
-                       !(memslot->flags & KVM_MEM_READONLY)) ? true : false;

Why is this not correct approach to determine whether logging is enabled ?

Quoted 3 lines

KVM ARM64 does a very similar thing (Refer, memslot_is_logging() in arch/arm64/kvm/mmu.c).

ARM64 is correct as it select NEED_KVM_DIRTY_RING_WITH_BITMAP, which will add a backup bitmap when enabling dirty ring. However, the RISCV does not select this, which means the bitmap is not present when the dirty ring is used.

Although we still have dirty log with dirty ring now, it comes from the check in the mark_page_dirty_in_slot(). And the check for variable "logging" is always false when enabling dirty ring.

Regards,
Inochi

Quoted 16 lines
Quoted 8 lines
arch/riscv/kvm/mmu.c +2 -1
+       bool logging = kvm_slot_dirty_track_enabled(memslot) &&
+                      !(memslot->flags & KVM_MEM_READONLY);
        unsigned long vma_pagesize, mmu_seq;
        struct kvm_gstage gstage;
        struct page *page;
--

2.54.0

Regards,
Anup

Signature · 3 lines
kvm-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kvm-riscv
maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to Inochi Amaoto
Quoted 11 lines · Inochi Amaoto

When enabling dirty ring, the dirty bitmap is disable, and the logging check is always false as the RISC-V architecture does not select "NEED_KVM_DIRTY_RING_WITH_BITMAP". Although the dirty log is recorded since the write path already trying to add the dirty log, the logic for logging check is broken and some side effect will occurs.

Enhance the logging check for mmu mapping so it can check both the dirty ring and the dirty bitmap.

LGTM.

Queued this patch for Linux-7.2

Thanks,
Anup

Quoted 34 lines
---
 arch/riscv/kvm/mmu.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
arch/riscv/kvm/mmu.c +4 -6
index 2d3def024270..b5873bca9dce 100644
@@ -142,9 +142,8 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
                                enum kvm_mr_change change)
 {
        /*
-        * At this point memslot has been committed and there is an
-        * allocated dirty_bitmap[], dirty pages will be tracked while
-        * the memory slot is write protected.
+        * At this point memslot has been committed and dirty pages will be
+        * tracked while the memory slot is write protected.
         */
        if (change != KVM_MR_DELETE && new->flags & KVM_MEM_LOG_DIRTY_PAGES) {
                if (kvm_dirty_log_manual_protect_and_init_set(kvm))
@@ -433,8 +432,8 @@ int kvm_riscv_mmu_map(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot,
        struct vm_area_struct *vma;
        struct kvm *kvm = vcpu->kvm;
        struct kvm_mmu_memory_cache *pcache = &vcpu->arch.mmu_page_cache;
-       bool logging = (memslot->dirty_bitmap &&
-                       !(memslot->flags & KVM_MEM_READONLY)) ? true : false;
+       bool logging = kvm_slot_dirty_track_enabled(memslot) &&
+                      !(memslot->flags & KVM_MEM_READONLY);
        unsigned long vma_pagesize, mmu_seq;
        struct kvm_gstage gstage;
        struct page *page;
--

2.54.0