On 05/31/2013 07:16 AM, Paolo Bonzini wrote: > So far, the size of all regions passed to listeners could fit in 64 bits, > because artificial regions (containers and aliases) are eliminated by > the memory core, leaving only device regions which have reasonable sizes > > An IOMMU however cannot be eliminated by the memory core, and may have > an artificial size, hence we may need 65 bits to represent its size. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
[...] > diff --git a/kvm-all.c b/kvm-all.c > index 8222729..86c9af3 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -316,7 +316,7 @@ static void kvm_log_start(MemoryListener *listener, > int r; > > r = kvm_dirty_pages_log_change(section->offset_within_address_space, > - section->size, true); > + int128_get64(section->size), true); > if (r < 0) { > abort(); > } > @@ -328,7 +328,7 @@ static void kvm_log_stop(MemoryListener *listener, > int r; > > r = kvm_dirty_pages_log_change(section->offset_within_address_space, > - section->size, false); > + int128_get64(section->size), false); > if (r < 0) { > abort(); > } > @@ -366,7 +366,8 @@ static int > kvm_get_dirty_pages_log_range(MemoryRegionSection *section, > unsigned int i, j; > unsigned long page_number, c; > hwaddr addr, addr1; > - unsigned int len = ((section->size / getpagesize()) + HOST_LONG_BITS - > 1) / HOST_LONG_BITS; > + unsigned int pages = int128_get64(section->size) / getpagesize(); > + unsigned int len = (pages + HOST_LONG_BITS - 1) / HOST_LONG_BITS; > unsigned long hpratio = getpagesize() / TARGET_PAGE_SIZE; > > /* > @@ -409,7 +410,7 @@ static int > kvm_physical_sync_dirty_bitmap(MemoryRegionSection *section) > KVMSlot *mem; > int ret = 0; > hwaddr start_addr = section->offset_within_address_space; > - hwaddr end_addr = start_addr + section->size; > + hwaddr end_addr = start_addr + int128_get64(section->size); > > d.dirty_bitmap = NULL; > while (start_addr < end_addr) { > @@ -619,7 +620,7 @@ static void kvm_set_phys_mem(MemoryRegionSection > *section, bool add) > MemoryRegion *mr = section->mr; > bool log_dirty = memory_region_is_logging(mr); > hwaddr start_addr = section->offset_within_address_space; > - ram_addr_t size = section->size; > + ram_addr_t size = int128_get64(section->size); > void *ram = NULL; > unsigned delta; > Tried to replay part2 and part3 on qemu.org/master (I assume part1 is already there), part2 played well, part3 failed. What did I do wrong? Thanks. alexey@ka1:~/pcipassthru/qemu-impreza$ git am ~/bonzini-iommu3.mbox Applying: memory: Introduce address_space_lookup_region Applying: memory: move private types to exec.c Applying: exec: Allow unaligned address_space_rw Applying: exec: Resolve subpages in one step except for IOTLB fills Applying: exec: Implement subpage_read/write via address_space_rw Applying: exec: return MemoryRegion from address_space_translate Applying: Revert "memory: limit sections in the radix tree to the actual address space size" Applying: Revert "s390x: reduce TARGET_PHYS_ADDR_SPACE_BITS to 62" Applying: exec: reorganize mem_add to match Int128 version Applying: memory: make section size a 128-bit integer error: patch failed: kvm-all.c:619 error: kvm-all.c: patch does not apply Patch failed at 0010 memory: make section size a 128-bit integer When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- Alexey