| Message ID | 20240918152807.25135-5-lilitj@amazon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | *** RFC: ARM KVM dirty tracking device *** | expand |
Hi Lilit,
kernel test robot noticed the following build errors:
[auto build test ERROR on powerpc/topic/ppc-kvm]
[also build test ERROR on v6.11]
[cannot apply to kvmarm/next kvm/queue linus/master kvm/linux-next next-20240918]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Lilit-Janpoladyan/arm64-add-an-interface-for-stage-2-page-tracking/20240918-233004
base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/ppc-kvm
patch link: https://lore.kernel.org/r/20240918152807.25135-5-lilitj%40amazon.com
patch subject: [PATCH 4/8] KVM: return value from kvm_arch_sync_dirty_log
config: s390-allyesconfig (https://download.01.org/0day-ci/archive/20240919/202409190941.BQaCqQSk-lkp@intel.com/config)
compiler: s390-linux-gcc (GCC) 14.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240919/202409190941.BQaCqQSk-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409190941.BQaCqQSk-lkp@intel.com/
All errors (new ones prefixed by >>):
arch/s390/kvm/kvm-s390.c: In function 'kvm_arch_sync_dirty_log':
>> arch/s390/kvm/kvm-s390.c:705:25: error: 'return' with no value, in function returning non-void [-Wreturn-mismatch]
705 | return;
| ^~~~~~
arch/s390/kvm/kvm-s390.c:680:5: note: declared here
680 | int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot)
| ^~~~~~~~~~~~~~~~~~~~~~~
vim +/return +705 arch/s390/kvm/kvm-s390.c
5b5865e81387b9 Lilit Janpoladyan 2024-09-18 679
522a3b6f0285f5 Lilit Janpoladyan 2024-09-18 680 int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot)
15f36ebd34b5b2 Jason J. Herne 2012-08-02 681 {
0959e168678d2d Janosch Frank 2018-07-17 682 int i;
15f36ebd34b5b2 Jason J. Herne 2012-08-02 683 gfn_t cur_gfn, last_gfn;
0959e168678d2d Janosch Frank 2018-07-17 684 unsigned long gaddr, vmaddr;
15f36ebd34b5b2 Jason J. Herne 2012-08-02 685 struct gmap *gmap = kvm->arch.gmap;
0959e168678d2d Janosch Frank 2018-07-17 686 DECLARE_BITMAP(bitmap, _PAGE_ENTRIES);
15f36ebd34b5b2 Jason J. Herne 2012-08-02 687
0959e168678d2d Janosch Frank 2018-07-17 688 /* Loop over all guest segments */
0959e168678d2d Janosch Frank 2018-07-17 689 cur_gfn = memslot->base_gfn;
15f36ebd34b5b2 Jason J. Herne 2012-08-02 690 last_gfn = memslot->base_gfn + memslot->npages;
0959e168678d2d Janosch Frank 2018-07-17 691 for (; cur_gfn <= last_gfn; cur_gfn += _PAGE_ENTRIES) {
0959e168678d2d Janosch Frank 2018-07-17 692 gaddr = gfn_to_gpa(cur_gfn);
0959e168678d2d Janosch Frank 2018-07-17 693 vmaddr = gfn_to_hva_memslot(memslot, cur_gfn);
0959e168678d2d Janosch Frank 2018-07-17 694 if (kvm_is_error_hva(vmaddr))
0959e168678d2d Janosch Frank 2018-07-17 695 continue;
0959e168678d2d Janosch Frank 2018-07-17 696
0959e168678d2d Janosch Frank 2018-07-17 697 bitmap_zero(bitmap, _PAGE_ENTRIES);
0959e168678d2d Janosch Frank 2018-07-17 698 gmap_sync_dirty_log_pmd(gmap, bitmap, gaddr, vmaddr);
0959e168678d2d Janosch Frank 2018-07-17 699 for (i = 0; i < _PAGE_ENTRIES; i++) {
0959e168678d2d Janosch Frank 2018-07-17 700 if (test_bit(i, bitmap))
0959e168678d2d Janosch Frank 2018-07-17 701 mark_page_dirty(kvm, cur_gfn + i);
0959e168678d2d Janosch Frank 2018-07-17 702 }
15f36ebd34b5b2 Jason J. Herne 2012-08-02 703
1763f8d09d522b Christian Borntraeger 2016-02-03 704 if (fatal_signal_pending(current))
1763f8d09d522b Christian Borntraeger 2016-02-03 @705 return;
70c88a00fbf659 Christian Borntraeger 2016-02-02 706 cond_resched();
15f36ebd34b5b2 Jason J. Herne 2012-08-02 707 }
522a3b6f0285f5 Lilit Janpoladyan 2024-09-18 708 return 0;
15f36ebd34b5b2 Jason J. Herne 2012-08-02 709 }
15f36ebd34b5b2 Jason J. Herne 2012-08-02 710
Hi Lilit,
kernel test robot noticed the following build warnings:
[auto build test WARNING on powerpc/topic/ppc-kvm]
[also build test WARNING on v6.11]
[cannot apply to kvmarm/next kvm/queue linus/master kvm/linux-next next-20240918]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Lilit-Janpoladyan/arm64-add-an-interface-for-stage-2-page-tracking/20240918-233004
base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/ppc-kvm
patch link: https://lore.kernel.org/r/20240918152807.25135-5-lilitj%40amazon.com
patch subject: [PATCH 4/8] KVM: return value from kvm_arch_sync_dirty_log
config: s390-allmodconfig (https://download.01.org/0day-ci/archive/20240919/202409191039.OFrXIvns-lkp@intel.com/config)
compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project 8663a75fa2f31299ab8d1d90288d9df92aadee88)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240919/202409191039.OFrXIvns-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409191039.OFrXIvns-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from arch/s390/kvm/kvm-s390.c:22:
In file included from include/linux/kvm_host.h:16:
In file included from include/linux/mm.h:2228:
include/linux/vmstat.h:500:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
500 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
501 | item];
| ~~~~
include/linux/vmstat.h:507:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
507 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
508 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:514:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
514 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:519:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
519 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
520 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:528:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
528 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
529 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from arch/s390/kvm/kvm-s390.c:22:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:24:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:14:
In file included from arch/s390/include/asm/io.h:93:
include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
548 | val = __raw_readb(PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
561 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:37:59: note: expanded from macro '__le16_to_cpu'
37 | #define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x))
| ^
include/uapi/linux/swab.h:102:54: note: expanded from macro '__swab16'
102 | #define __swab16(x) (__u16)__builtin_bswap16((__u16)(x))
| ^
In file included from arch/s390/kvm/kvm-s390.c:22:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:24:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:14:
In file included from arch/s390/include/asm/io.h:93:
include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
574 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:35:59: note: expanded from macro '__le32_to_cpu'
35 | #define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
| ^
include/uapi/linux/swab.h:115:54: note: expanded from macro '__swab32'
115 | #define __swab32(x) (__u32)__builtin_bswap32((__u32)(x))
| ^
In file included from arch/s390/kvm/kvm-s390.c:22:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:24:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:14:
In file included from arch/s390/include/asm/io.h:93:
include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
585 | __raw_writeb(value, PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
595 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
605 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:693:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
693 | readsb(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:701:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
701 | readsw(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:709:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
709 | readsl(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:718:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
718 | writesb(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:727:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
727 | writesw(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:736:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
736 | writesl(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
>> arch/s390/kvm/kvm-s390.c:705:4: warning: non-void function 'kvm_arch_sync_dirty_log' should return a value [-Wreturn-mismatch]
705 | return;
| ^
18 warnings generated.
vim +/kvm_arch_sync_dirty_log +705 arch/s390/kvm/kvm-s390.c
5b5865e81387b9 Lilit Janpoladyan 2024-09-18 679
522a3b6f0285f5 Lilit Janpoladyan 2024-09-18 680 int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot)
15f36ebd34b5b2 Jason J. Herne 2012-08-02 681 {
0959e168678d2d Janosch Frank 2018-07-17 682 int i;
15f36ebd34b5b2 Jason J. Herne 2012-08-02 683 gfn_t cur_gfn, last_gfn;
0959e168678d2d Janosch Frank 2018-07-17 684 unsigned long gaddr, vmaddr;
15f36ebd34b5b2 Jason J. Herne 2012-08-02 685 struct gmap *gmap = kvm->arch.gmap;
0959e168678d2d Janosch Frank 2018-07-17 686 DECLARE_BITMAP(bitmap, _PAGE_ENTRIES);
15f36ebd34b5b2 Jason J. Herne 2012-08-02 687
0959e168678d2d Janosch Frank 2018-07-17 688 /* Loop over all guest segments */
0959e168678d2d Janosch Frank 2018-07-17 689 cur_gfn = memslot->base_gfn;
15f36ebd34b5b2 Jason J. Herne 2012-08-02 690 last_gfn = memslot->base_gfn + memslot->npages;
0959e168678d2d Janosch Frank 2018-07-17 691 for (; cur_gfn <= last_gfn; cur_gfn += _PAGE_ENTRIES) {
0959e168678d2d Janosch Frank 2018-07-17 692 gaddr = gfn_to_gpa(cur_gfn);
0959e168678d2d Janosch Frank 2018-07-17 693 vmaddr = gfn_to_hva_memslot(memslot, cur_gfn);
0959e168678d2d Janosch Frank 2018-07-17 694 if (kvm_is_error_hva(vmaddr))
0959e168678d2d Janosch Frank 2018-07-17 695 continue;
0959e168678d2d Janosch Frank 2018-07-17 696
0959e168678d2d Janosch Frank 2018-07-17 697 bitmap_zero(bitmap, _PAGE_ENTRIES);
0959e168678d2d Janosch Frank 2018-07-17 698 gmap_sync_dirty_log_pmd(gmap, bitmap, gaddr, vmaddr);
0959e168678d2d Janosch Frank 2018-07-17 699 for (i = 0; i < _PAGE_ENTRIES; i++) {
0959e168678d2d Janosch Frank 2018-07-17 700 if (test_bit(i, bitmap))
0959e168678d2d Janosch Frank 2018-07-17 701 mark_page_dirty(kvm, cur_gfn + i);
0959e168678d2d Janosch Frank 2018-07-17 702 }
15f36ebd34b5b2 Jason J. Herne 2012-08-02 703
1763f8d09d522b Christian Borntraeger 2016-02-03 704 if (fatal_signal_pending(current))
1763f8d09d522b Christian Borntraeger 2016-02-03 @705 return;
70c88a00fbf659 Christian Borntraeger 2016-02-02 706 cond_resched();
15f36ebd34b5b2 Jason J. Herne 2012-08-02 707 }
522a3b6f0285f5 Lilit Janpoladyan 2024-09-18 708 return 0;
15f36ebd34b5b2 Jason J. Herne 2012-08-02 709 }
15f36ebd34b5b2 Jason J. Herne 2012-08-02 710
diff --git a/arch/loongarch/kvm/mmu.c b/arch/loongarch/kvm/mmu.c index 28681dfb4b85..825c60d35529 100644 --- a/arch/loongarch/kvm/mmu.c +++ b/arch/loongarch/kvm/mmu.c @@ -943,8 +943,9 @@ int kvm_handle_mm_fault(struct kvm_vcpu *vcpu, unsigned long gpa, bool write) return 0; } -void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) +int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) { + return 0; } void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm, diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index edc6f473af4e..4326b8c721e9 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -984,9 +984,9 @@ int kvm_arch_disable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot return 0; } -void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) +int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) { - + return 0; } int kvm_arch_flush_remote_tlbs(struct kvm *kvm) diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index 4c4a3ecc301c..aab6f5c62aee 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -854,9 +854,9 @@ int kvm_arch_disable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot return 0; } -void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) +int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) { - + return 0; } int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index f263ebc8fa49..60629a320222 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -1824,9 +1824,9 @@ int kvm_arch_disable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot return -EOPNOTSUPP; } -void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) +int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) { - + return -EOPNOTSUPP; } int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c index b63650f9b966..53ad23432b31 100644 --- a/arch/riscv/kvm/mmu.c +++ b/arch/riscv/kvm/mmu.c @@ -402,8 +402,9 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, gstage_wp_range(kvm, start, end); } -void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) +int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) { + return 0; } void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index d6a8f7dbc644..5f1bb4bd4121 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -677,7 +677,7 @@ int kvm_arch_disable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot return 0; } -void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) +int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) { int i; gfn_t cur_gfn, last_gfn; @@ -705,6 +705,7 @@ void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) return; cond_resched(); } + return 0; } /* Section: vm related */ diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1be8bacfe2bd..e95e070c9bf3 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6498,7 +6498,7 @@ int kvm_arch_disable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot return 0; } -void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) +int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) { /* @@ -6510,11 +6510,12 @@ void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) struct kvm_vcpu *vcpu; unsigned long i; - if (!kvm_x86_ops.cpu_dirty_log_size) - return; + if (kvm_x86_ops.cpu_dirty_log_size) { + kvm_for_each_vcpu(i, vcpu, kvm) + kvm_vcpu_kick(vcpu); + } - kvm_for_each_vcpu(i, vcpu, kvm) - kvm_vcpu_kick(vcpu); + return 0; } int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_event, diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ae905f54ec47..245b4172a7fb 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1477,7 +1477,7 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, unsigned long mask); int kvm_arch_enable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot *memslot); int kvm_arch_disable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot *memslot); -void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot); +int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot); #ifndef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1fd5e234c188..d55d92f599b0 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2145,6 +2145,7 @@ int kvm_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log, int i, as_id, id; unsigned long n; unsigned long any = 0; + int r; /* Dirty ring tracking may be exclusive to dirty log tracking */ if (!kvm_use_dirty_bitmap(kvm)) @@ -2163,7 +2164,9 @@ int kvm_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log, if (!(*memslot) || !(*memslot)->dirty_bitmap) return -ENOENT; - kvm_arch_sync_dirty_log(kvm, *memslot); + r = kvm_arch_sync_dirty_log(kvm, *memslot); + if (r) + return r; n = kvm_dirty_bitmap_bytes(*memslot); @@ -2210,6 +2213,7 @@ static int kvm_get_dirty_log_protect(struct kvm *kvm, struct kvm_dirty_log *log) unsigned long *dirty_bitmap; unsigned long *dirty_bitmap_buffer; bool flush; + int r; /* Dirty ring tracking may be exclusive to dirty log tracking */ if (!kvm_use_dirty_bitmap(kvm)) @@ -2227,7 +2231,9 @@ static int kvm_get_dirty_log_protect(struct kvm *kvm, struct kvm_dirty_log *log) dirty_bitmap = memslot->dirty_bitmap; - kvm_arch_sync_dirty_log(kvm, memslot); + r = kvm_arch_sync_dirty_log(kvm, memslot); + if (r) + return r; n = kvm_dirty_bitmap_bytes(memslot); flush = false; @@ -2322,6 +2328,7 @@ static int kvm_clear_dirty_log_protect(struct kvm *kvm, unsigned long *dirty_bitmap; unsigned long *dirty_bitmap_buffer; bool flush; + int r; /* Dirty ring tracking may be exclusive to dirty log tracking */ if (!kvm_use_dirty_bitmap(kvm)) @@ -2349,7 +2356,9 @@ static int kvm_clear_dirty_log_protect(struct kvm *kvm, (log->num_pages < memslot->npages - log->first_page && (log->num_pages & 63))) return -EINVAL; - kvm_arch_sync_dirty_log(kvm, memslot); + r = kvm_arch_sync_dirty_log(kvm, memslot); + if (r) + return r; flush = false; dirty_bitmap_buffer = kvm_second_dirty_bitmap(memslot);
Make kvm_arch_sync_dirty_log return a value, which is needed to propagate errors that could happen when getting dirty pages via a page tracking device. Signed-off-by: Lilit Janpoladyan <lilitj@amazon.com> --- arch/loongarch/kvm/mmu.c | 3 ++- arch/mips/kvm/mips.c | 4 ++-- arch/powerpc/kvm/book3s.c | 4 ++-- arch/powerpc/kvm/booke.c | 4 ++-- arch/riscv/kvm/mmu.c | 3 ++- arch/s390/kvm/kvm-s390.c | 3 ++- arch/x86/kvm/x86.c | 11 ++++++----- include/linux/kvm_host.h | 2 +- virt/kvm/kvm_main.c | 15 ++++++++++++--- 9 files changed, 31 insertions(+), 18 deletions(-)