Skip to contentSkip to conversation

system/physmem: Extract API out of 'system/ram_addr.h' header

PATCH In review Philippe Mathieu-Daudé 6 participants 31 messages Oct 1, 2025 – Oct 3, 2025 KVM

lore
Share & tools
lore
#0 lore raw

v2 cover system/physmem: Extract API out of 'system/ram_addr.h' header

Missing review: #12 (new)

Since v2:
- Dropped few patches
- Do not rename @start -> @addr (rth)

Following a previous comment from Richard in [*], reduce "system/ram_addr.h" size by un-inlining a lot of huge functions that aren't really justified, and extract the API to the hew "system/physmem.h" header, after renaming the functions (removing the confusing 'cpu_' prefix).

(I plan to eventually merge this myself due to the likelyness of conflicts).

[*] https://lore.kernel.org/qemu-devel/[email protected]/

Philippe Mathieu-Daudé (18):
system/ram_addr: Remove unnecessary 'exec/cpu-common.h' header accel/kvm: Include missing 'exec/target_page.h' header hw/s390x/s390-stattrib: Include missing 'exec/target_page.h' header hw/vfio/listener: Include missing 'exec/target_page.h' header target/arm/tcg/mte: Include missing 'exec/target_page.h' header
hw: Remove unnecessary 'system/ram_addr.h' header system/physmem: Un-inline cpu_physical_memory_get_dirty_flag() system/physmem: Un-inline cpu_physical_memory_is_clean() system/physmem: Un-inline cpu_physical_memory_range_includes_clean() system/physmem: Un-inline cpu_physical_memory_set_dirty_flag() system/physmem: Un-inline cpu_physical_memory_set_dirty_range() system/physmem: Remove _WIN32 #ifdef'ry
system/physmem: Un-inline cpu_physical_memory_set_dirty_lebitmap() system/physmem: Un-inline cpu_physical_memory_dirty_bits_cleared() system/physmem: Reduce cpu_physical_memory_clear_dirty_range() scope system/physmem: Reduce cpu_physical_memory_sync_dirty_bitmap() scope system/physmem: Drop 'cpu_' prefix in Physical Memory API system/physmem: Extract API out of 'system/ram_addr.h' header

 MAINTAINERS                       |   1 +
 include/system/physmem.h          |  54 ++++
 include/system/ram_addr.h         | 413 ------------------------------
 accel/kvm/kvm-all.c               |   5 +-
 accel/tcg/cputlb.c                |  13 +-
 hw/ppc/spapr.c                    |   1 -
 hw/ppc/spapr_caps.c               |   1 -
 hw/ppc/spapr_pci.c                |   1 -
 hw/remote/memory.c                |   1 -
 hw/remote/proxy-memory-listener.c |   1 -
 hw/s390x/s390-stattrib-kvm.c      |   2 +-
 hw/s390x/s390-stattrib.c          |   2 +-
 hw/s390x/s390-virtio-ccw.c        |   1 -
 hw/vfio/container-legacy.c        |  10 +-
 hw/vfio/container.c               |   5 +-
 hw/vfio/listener.c                |   2 +-
 hw/vfio/spapr.c                   |   1 -
 hw/virtio/virtio-mem.c            |   1 -
 migration/ram.c                   |  78 +++++-
 system/memory.c                   |   9 +-
 system/physmem.c                  | 322 ++++++++++++++++++++++-
 target/arm/tcg/mte_helper.c       |   5 +-
 system/memory_ldst.c.inc          |   2 +-
 tests/tsan/ignore.tsan            |   4 +-
 24 files changed, 475 insertions(+), 460 deletions(-)
 create mode 100644 include/system/physmem.h
Signature · 1 line
2.51.0
#1 lore raw

PATCH v2 1/18 system/ram_addr: Remove unnecessary 'exec/cpu-common.h' header

Nothing in "system/ram_addr.h" requires definitions from "exec/cpu-common.h", remove it.

---
 include/system/ram_addr.h | 1 -
 1 file changed, 1 deletion(-)
include/system/ram_addr.h +0 -1
index 6b528338efc..f74a0ecee56 100644
@@ -29,7 +29,6 @@
 #include "qemu/rcu.h"
 
 #include "exec/hwaddr.h"
-#include "exec/cpu-common.h"
 
 extern uint64_t total_dirty_pages;
 
Signature · 1 line
2.51.0
#2 lore raw

PATCH v2 2/18 accel/kvm: Include missing 'exec/target_page.h' header

In reply to Philippe Mathieu-Daudé

The "exec/target_page.h" header is indirectly pulled from "system/ram_addr.h". Include it explicitly, in order to avoid unrelated issues when refactoring "system/ram_addr.h":

accel/kvm/kvm-all.c: In function ‘kvm_init’:
accel/kvm/kvm-all.c:2636:12: error: ‘TARGET_PAGE_SIZE’ undeclared (first use in this function); did you mean ‘TARGET_PAGE_BITS’?

   2636 |     assert(TARGET_PAGE_SIZE <= qemu_real_host_page_size());
        |            ^~~~~~~~~~~~~~~~
---
 accel/kvm/kvm-all.c | 1 +
 1 file changed, 1 insertion(+)
accel/kvm/kvm-all.c +1 -0
index e3c84723406..08b2b5a371c 100644
@@ -36,6 +36,7 @@
 #include "accel/accel-ops.h"
 #include "qemu/bswap.h"
 #include "exec/tswap.h"
+#include "exec/target_page.h"
 #include "system/memory.h"
 #include "system/ram_addr.h"
 #include "qemu/event_notifier.h"
Signature · 1 line
2.51.0
#3 lore raw

PATCH v2 3/18 hw/s390x/s390-stattrib: Include missing 'exec/target_page.h' header

In reply to Philippe Mathieu-Daudé

The "exec/target_page.h" header is indirectly pulled from "system/ram_addr.h". Include it explicitly, in order to avoid unrelated issues when refactoring "system/ram_addr.h":

hw/s390x/s390-stattrib-kvm.c: In function ‘kvm_s390_stattrib_set_stattr’:
hw/s390x/s390-stattrib-kvm.c:89:57: error: ‘TARGET_PAGE_SIZE’ undeclared (first use in this function); did you mean ‘TARGET_PAGE_BITS’?

     89 |     unsigned long max = s390_get_memory_limit(s390ms) / TARGET_PAGE_SIZE;
        |                                                         ^~~~~~~~~~~~~~~~
        |                                                         TARGET_PAGE_BITS

Since "system/ram_addr.h" is actually not needed, remove it.

---
 hw/s390x/s390-stattrib-kvm.c | 2 +-
 hw/s390x/s390-stattrib.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
hw/s390x/s390-stattrib-kvm.c +1 -1
index e1fee361dc3..73df1f600b9 100644
@@ -10,13 +10,13 @@
  */
 
 #include "qemu/osdep.h"
+#include "exec/target_page.h"
 #include "hw/s390x/s390-virtio-ccw.h"
 #include "migration/qemu-file.h"
 #include "hw/s390x/storage-attributes.h"
 #include "qemu/error-report.h"
 #include "system/kvm.h"
 #include "system/memory_mapping.h"
-#include "system/ram_addr.h"
 #include "kvm/kvm_s390x.h"
 #include "qapi/error.h"
 
hw/s390x/s390-stattrib.c +1 -1
index 13a678a8037..aa185372914 100644
@@ -11,12 +11,12 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
+#include "exec/target_page.h"
 #include "migration/qemu-file.h"
 #include "migration/register.h"
 #include "hw/qdev-properties.h"
 #include "hw/s390x/storage-attributes.h"
 #include "qemu/error-report.h"
-#include "system/ram_addr.h"
 #include "qapi/error.h"
 #include "qobject/qdict.h"
 #include "cpu.h"
Signature · 1 line
2.51.0
Reviewed-by on v2 3/18
#4 lore raw

Re: [PATCH v2 03/18] hw/s390x/s390-stattrib: Include missing 'exec/target_page.h' header

Quoted 6 lines · Philippe Mathieu-Daudé

The "exec/target_page.h" header is indirectly pulled from "system/ram_addr.h". Include it explicitly, in order to avoid unrelated issues when refactoring "system/ram_addr.h":

hw/s390x/s390-stattrib-kvm.c: In function ‘kvm_s390_stattrib_set_stattr’:
hw/s390x/s390-stattrib-kvm.c:89:57: error: ‘TARGET_PAGE_SIZE’ undeclared (first use in this function); did you mean ‘TARGET_PAGE_BITS’?

Quoted 8 lines
     89 |     unsigned long max = s390_get_memory_limit(s390ms) / TARGET_PAGE_SIZE;
        |                                                         ^~~~~~~~~~~~~~~~
        |                                                         TARGET_PAGE_BITS

Since "system/ram_addr.h" is actually not needed, remove it.

#5 lore raw

PATCH v2 4/18 hw/vfio/listener: Include missing 'exec/target_page.h' header

In reply to Philippe Mathieu-Daudé

The "exec/target_page.h" header is indirectly pulled from "system/ram_addr.h". Include it explicitly, in order to avoid unrelated issues when refactoring "system/ram_addr.h":

hw/vfio/listener.c: In function ‘vfio_ram_discard_register_listener’:
hw/vfio/listener.c:258:28: error: implicit declaration of function ‘qemu_target_page_size’; did you mean ‘qemu_ram_pagesize’?

    258 |     int target_page_size = qemu_target_page_size();
        |                            ^~~~~~~~~~~~~~~~~~~~~
        |                            qemu_ram_pagesize
---
 hw/vfio/listener.c | 1 +
 1 file changed, 1 insertion(+)
hw/vfio/listener.c +1 -0
index a2c19a3cec1..b5cefc9395c 100644
@@ -25,6 +25,7 @@
 #endif
 #include <linux/vfio.h>
 
+#include "exec/target_page.h"
 #include "hw/vfio/vfio-device.h"
 #include "hw/vfio/pci.h"
 #include "system/address-spaces.h"
Signature · 1 line
2.51.0
Reviewed-by on v2 4/18
#6 lore raw

Re: [PATCH v2 04/18] hw/vfio/listener: Include missing 'exec/target_page.h' header

Quoted 21 lines · Philippe Mathieu-Daudé

The "exec/target_page.h" header is indirectly pulled from "system/ram_addr.h". Include it explicitly, in order to avoid unrelated issues when refactoring "system/ram_addr.h":

hw/vfio/listener.c: In function ‘vfio_ram_discard_register_listener’:

   hw/vfio/listener.c:258:28: error: implicit declaration of function ‘qemu_target_page_size’; did you mean ‘qemu_ram_pagesize’?
     258 |     int target_page_size = qemu_target_page_size();
         |                            ^~~~~~~~~~~~~~~~~~~~~
         |                            qemu_ram_pagesize
---
  hw/vfio/listener.c | 1 +
  1 file changed, 1 insertion(+)
hw/vfio/listener.c +0 -0
index a2c19a3cec1..b5cefc9395c 100644

hw/vfio/listener.c line 31

Quoted 7 lines
hw/vfio/listener.c +1 -0
@@ -25,6 +25,7 @@
  #endif
  #include <linux/vfio.h>
 
+#include "exec/target_page.h"
  #include "hw/vfio/vfio-device.h"
  #include "hw/vfio/pci.h"
  #include "system/address-spaces.h"

Thanks,

C.

#7 lore raw

PATCH v2 5/18 target/arm/tcg/mte: Include missing 'exec/target_page.h' header

In reply to Philippe Mathieu-Daudé

The "exec/target_page.h" header is indirectly pulled from "system/ram_addr.h". Include it explicitly, in order to avoid unrelated issues when refactoring "system/ram_addr.h":

target/arm/tcg/mte_helper.c:815:23: error: use of undeclared identifier 'TARGET_PAGE_MASK'

    815 |     prev_page = ptr & TARGET_PAGE_MASK;
        |                       ^
  target/arm/tcg/mte_helper.c:816:29: error: use of undeclared identifier 'TARGET_PAGE_SIZE'
    816 |     next_page = prev_page + TARGET_PAGE_SIZE;
        |                             ^
---
 target/arm/tcg/mte_helper.c | 1 +
 1 file changed, 1 insertion(+)
target/arm/tcg/mte_helper.c +1 -0
index 302e899287c..7d80244788e 100644
@@ -21,6 +21,7 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "internals.h"
+#include "exec/target_page.h"
 #include "exec/page-protection.h"
 #ifdef CONFIG_USER_ONLY
 #include "user/cpu_loop.h"
Signature · 1 line
2.51.0
#8 lore raw

PATCH v2 6/18 hw: Remove unnecessary 'system/ram_addr.h' header

In reply to Philippe Mathieu-Daudé

None of these files require definition exposed by "system/ram_addr.h", remove its inclusion.

---
 hw/ppc/spapr.c                    | 1 -
 hw/ppc/spapr_caps.c               | 1 -
 hw/ppc/spapr_pci.c                | 1 -
 hw/remote/memory.c                | 1 -
 hw/remote/proxy-memory-listener.c | 1 -
 hw/s390x/s390-virtio-ccw.c        | 1 -
 hw/vfio/spapr.c                   | 1 -
 hw/virtio/virtio-mem.c            | 1 -
 8 files changed, 8 deletions(-)
hw/ppc/spapr.c +0 -1
index 82fb23beaa8..97ab6bebd25 100644
@@ -77,7 +77,6 @@
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost-scsi-common.h"
 
-#include "system/ram_addr.h"
 #include "system/confidential-guest-support.h"
 #include "hw/usb.h"
 #include "qemu/config-file.h"
hw/ppc/spapr_caps.c +0 -1
index f2f5722d8ad..0f94c192fd4 100644
@@ -27,7 +27,6 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "system/hw_accel.h"
-#include "system/ram_addr.h"
 #include "target/ppc/cpu.h"
 #include "target/ppc/mmu-hash64.h"
 #include "cpu-models.h"
hw/ppc/spapr_pci.c +0 -1
index 1ac1185825e..f9095552e86 100644
@@ -34,7 +34,6 @@
 #include "hw/pci/pci_host.h"
 #include "hw/ppc/spapr.h"
 #include "hw/pci-host/spapr.h"
-#include "system/ram_addr.h"
 #include <libfdt.h>
 #include "trace.h"
 #include "qemu/error-report.h"
hw/remote/memory.c +0 -1
index 00193a552fa..8195aa5fb83 100644
@@ -11,7 +11,6 @@
 #include "qemu/osdep.h"
 
 #include "hw/remote/memory.h"
-#include "system/ram_addr.h"
 #include "qapi/error.h"
 
 static void remote_sysmem_reset(void)
hw/remote/proxy-memory-listener.c +0 -1
index 30ac74961dd..e1a52d24f0b 100644
@@ -12,7 +12,6 @@
 #include "qemu/range.h"
 #include "system/memory.h"
 #include "exec/cpu-common.h"
-#include "system/ram_addr.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/remote/mpqemu-link.h"
hw/s390x/s390-virtio-ccw.c +0 -1
index d0c6e80cb05..ad2c48188a8 100644
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "system/ram_addr.h"
 #include "system/confidential-guest-support.h"
 #include "hw/boards.h"
 #include "hw/s390x/sclp.h"
hw/vfio/spapr.c +0 -1
index 8d9d68da4ec..0f23681a3f9 100644
@@ -17,7 +17,6 @@
 
 #include "hw/vfio/vfio-container-legacy.h"
 #include "hw/hw.h"
-#include "system/ram_addr.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "trace.h"
hw/virtio/virtio-mem.c +0 -1
index 1de2d3de521..15ba6799f22 100644
@@ -25,7 +25,6 @@
 #include "hw/virtio/virtio-mem.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "system/ram_addr.h"
 #include "migration/misc.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
Signature · 1 line
2.51.0
Reviewed-by on v2 6/18
#9 lore raw

Re: [PATCH v2 06/18] hw: Remove unnecessary 'system/ram_addr.h' header

Quoted 9 lines · Philippe Mathieu-Daudé

None of these files require definition exposed by "system/ram_addr.h", remove its inclusion.

Thanks, Philippe!

Quoted 110 lines

---

hw/ppc/spapr.c                    | 1 -
hw/ppc/spapr_caps.c               | 1 -
hw/ppc/spapr_pci.c                | 1 -
hw/remote/memory.c                | 1 -
hw/remote/proxy-memory-listener.c | 1 -
hw/s390x/s390-virtio-ccw.c        | 1 -
hw/vfio/spapr.c                   | 1 -
hw/virtio/virtio-mem.c            | 1 -
8 files changed, 8 deletions(-)
hw/ppc/spapr.c +0 -1
index 82fb23beaa8..97ab6bebd25 100644
@@ -77,7 +77,6 @@
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost-scsi-common.h"
 
-#include "system/ram_addr.h"
 #include "system/confidential-guest-support.h"
 #include "hw/usb.h"
 #include "qemu/config-file.h"
hw/ppc/spapr_caps.c +0 -1
index f2f5722d8ad..0f94c192fd4 100644
@@ -27,7 +27,6 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "system/hw_accel.h"
-#include "system/ram_addr.h"
 #include "target/ppc/cpu.h"
 #include "target/ppc/mmu-hash64.h"
 #include "cpu-models.h"
hw/ppc/spapr_pci.c +0 -1
index 1ac1185825e..f9095552e86 100644
@@ -34,7 +34,6 @@
 #include "hw/pci/pci_host.h"
 #include "hw/ppc/spapr.h"
 #include "hw/pci-host/spapr.h"
-#include "system/ram_addr.h"
 #include <libfdt.h>
 #include "trace.h"
 #include "qemu/error-report.h"
hw/remote/memory.c +0 -1
index 00193a552fa..8195aa5fb83 100644
@@ -11,7 +11,6 @@
 #include "qemu/osdep.h"
 
 #include "hw/remote/memory.h"
-#include "system/ram_addr.h"
 #include "qapi/error.h"
 
 static void remote_sysmem_reset(void)
hw/remote/proxy-memory-listener.c +0 -1
index 30ac74961dd..e1a52d24f0b 100644
@@ -12,7 +12,6 @@
 #include "qemu/range.h"
 #include "system/memory.h"
 #include "exec/cpu-common.h"
-#include "system/ram_addr.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/remote/mpqemu-link.h"
hw/s390x/s390-virtio-ccw.c +0 -1
index d0c6e80cb05..ad2c48188a8 100644
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "system/ram_addr.h"
 #include "system/confidential-guest-support.h"
 #include "hw/boards.h"
 #include "hw/s390x/sclp.h"
hw/vfio/spapr.c +0 -1
index 8d9d68da4ec..0f23681a3f9 100644
@@ -17,7 +17,6 @@
 
 #include "hw/vfio/vfio-container-legacy.h"
 #include "hw/hw.h"
-#include "system/ram_addr.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "trace.h"
hw/virtio/virtio-mem.c +0 -1
index 1de2d3de521..15ba6799f22 100644
@@ -25,7 +25,6 @@
 #include "hw/virtio/virtio-mem.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "system/ram_addr.h"
 #include "migration/misc.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
Signature · 1 line
2.51.0
Reviewed-by on v2 6/18
#10 lore raw

Re: [PATCH v2 06/18] hw: Remove unnecessary 'system/ram_addr.h' header

In reply to Philippe Mathieu-Daudé
Quoted 93 lines · Philippe Mathieu-Daudé

None of these files require definition exposed by "system/ram_addr.h", remove its inclusion.

---
  hw/ppc/spapr.c                    | 1 -
  hw/ppc/spapr_caps.c               | 1 -
  hw/ppc/spapr_pci.c                | 1 -
  hw/remote/memory.c                | 1 -
  hw/remote/proxy-memory-listener.c | 1 -
  hw/s390x/s390-virtio-ccw.c        | 1 -
  hw/vfio/spapr.c                   | 1 -
  hw/virtio/virtio-mem.c            | 1 -
  8 files changed, 8 deletions(-)
hw/ppc/spapr.c +0 -1
index 82fb23beaa8..97ab6bebd25 100644
@@ -77,7 +77,6 @@
  #include "hw/virtio/virtio-scsi.h"
  #include "hw/virtio/vhost-scsi-common.h"
 
-#include "system/ram_addr.h"
  #include "system/confidential-guest-support.h"
  #include "hw/usb.h"
  #include "qemu/config-file.h"
hw/ppc/spapr_caps.c +0 -1
index f2f5722d8ad..0f94c192fd4 100644
@@ -27,7 +27,6 @@
  #include "qapi/error.h"
  #include "qapi/visitor.h"
  #include "system/hw_accel.h"
-#include "system/ram_addr.h"
  #include "target/ppc/cpu.h"
  #include "target/ppc/mmu-hash64.h"
  #include "cpu-models.h"
hw/ppc/spapr_pci.c +0 -1
index 1ac1185825e..f9095552e86 100644
@@ -34,7 +34,6 @@
  #include "hw/pci/pci_host.h"
  #include "hw/ppc/spapr.h"
  #include "hw/pci-host/spapr.h"
-#include "system/ram_addr.h"
  #include <libfdt.h>
  #include "trace.h"
  #include "qemu/error-report.h"
hw/remote/memory.c +0 -1
index 00193a552fa..8195aa5fb83 100644
@@ -11,7 +11,6 @@
  #include "qemu/osdep.h"
 
  #include "hw/remote/memory.h"
-#include "system/ram_addr.h"
  #include "qapi/error.h"
 
  static void remote_sysmem_reset(void)
hw/remote/proxy-memory-listener.c +0 -1
index 30ac74961dd..e1a52d24f0b 100644
@@ -12,7 +12,6 @@
  #include "qemu/range.h"
  #include "system/memory.h"
  #include "exec/cpu-common.h"
-#include "system/ram_addr.h"
  #include "qapi/error.h"
  #include "qemu/error-report.h"
  #include "hw/remote/mpqemu-link.h"
hw/s390x/s390-virtio-ccw.c +0 -1
index d0c6e80cb05..ad2c48188a8 100644
@@ -13,7 +13,6 @@
 
  #include "qemu/osdep.h"
  #include "qapi/error.h"
-#include "system/ram_addr.h"
  #include "system/confidential-guest-support.h"
  #include "hw/boards.h"
  #include "hw/s390x/sclp.h"
hw/vfio/spapr.c +0 -0
index 8d9d68da4ec..0f23681a3f9 100644

hw/vfio/spapr.c line 22

Quoted 7 lines
hw/vfio/spapr.c +0 -1
@@ -17,7 +17,6 @@
 
  #include "hw/vfio/vfio-container-legacy.h"
  #include "hw/hw.h"
-#include "system/ram_addr.h"
  #include "qemu/error-report.h"
  #include "qapi/error.h"
  #include "trace.h"

For vfio,

Thanks,

C.

Quoted 12 lines
hw/virtio/virtio-mem.c +0 -1
index 1de2d3de521..15ba6799f22 100644
@@ -25,7 +25,6 @@
  #include "hw/virtio/virtio-mem.h"
  #include "qapi/error.h"
  #include "qapi/visitor.h"
-#include "system/ram_addr.h"
  #include "migration/misc.h"
  #include "hw/boards.h"
  #include "hw/qdev-properties.h"
#11 lore raw

Re: [PATCH v2 06/18] hw: Remove unnecessary 'system/ram_addr.h' header

In reply to Philippe Mathieu-Daudé
Quoted 45 lines · Philippe Mathieu-Daudé

None of these files require definition exposed by "system/ram_addr.h", remove its inclusion.

---
  hw/ppc/spapr.c                    | 1 -
  hw/ppc/spapr_caps.c               | 1 -
  hw/ppc/spapr_pci.c                | 1 -
  hw/remote/memory.c                | 1 -
  hw/remote/proxy-memory-listener.c | 1 -
  hw/s390x/s390-virtio-ccw.c        | 1 -
  hw/vfio/spapr.c                   | 1 -
  hw/virtio/virtio-mem.c            | 1 -
  8 files changed, 8 deletions(-)
hw/ppc/spapr.c +0 -1
index 82fb23beaa8..97ab6bebd25 100644
@@ -77,7 +77,6 @@
  #include "hw/virtio/virtio-scsi.h"
  #include "hw/virtio/vhost-scsi-common.h"
 
-#include "system/ram_addr.h"
  #include "system/confidential-guest-support.h"
  #include "hw/usb.h"
  #include "qemu/config-file.h"
hw/ppc/spapr_caps.c +0 -1
index f2f5722d8ad..0f94c192fd4 100644
@@ -27,7 +27,6 @@
  #include "qapi/error.h"
  #include "qapi/visitor.h"
  #include "system/hw_accel.h"
-#include "system/ram_addr.h"
  #include "target/ppc/cpu.h"
  #include "target/ppc/mmu-hash64.h"
  #include "cpu-models.h"
hw/ppc/spapr_pci.c +0 -0
index 1ac1185825e..f9095552e86 100644

hw/ppc/spapr_pci.c line 39

Quoted 7 lines
hw/ppc/spapr_pci.c +0 -1
@@ -34,7 +34,6 @@
  #include "hw/pci/pci_host.h"
  #include "hw/ppc/spapr.h"
  #include "hw/pci-host/spapr.h"
-#include "system/ram_addr.h"
  #include <libfdt.h>
  #include "trace.h"
  #include "qemu/error-report.h"

I am seeing error while applying patch series:

harshpb:patches$ git log --oneline -n1
29b77c1a2d (HEAD -> review-20251002, upstream/master, master) Merge tag 'rust-ci-pull-request' of https://gitlab.com/marcandre.lureau/qemu into staging

harshpb:patches$ git am ./v2_20251001_philmd_system_physmem_extract_api_out_of_system_ram_addr_h_header.mbx

Applying: system/ram_addr: Remove unnecessary 'exec/cpu-common.h' header
Applying: accel/kvm: Include missing 'exec/target_page.h' header
Applying: hw/s390x/s390-stattrib: Include missing 'exec/target_page.h' header
Applying: hw/vfio/listener: Include missing 'exec/target_page.h' header
Applying: target/arm/tcg/mte: Include missing 'exec/target_page.h' header
Applying: hw: Remove unnecessary 'system/ram_addr.h' header
Applying: system/physmem: Un-inline cpu_physical_memory_get_dirty_flag()
Applying: system/physmem: Un-inline cpu_physical_memory_is_clean()
Applying: system/physmem: Un-inline cpu_physical_memory_range_includes_clean()
Applying: system/physmem: Un-inline cpu_physical_memory_set_dirty_flag()
Applying: system/physmem: Un-inline cpu_physical_memory_set_dirty_range()
Applying: system/physmem: Remove _WIN32 #ifdef'ry
Applying: system/physmem: Un-inline cpu_physical_memory_set_dirty_lebitmap()
Applying: system/physmem: Un-inline cpu_physical_memory_dirty_bits_cleared()
Applying: system/physmem: Reduce cpu_physical_memory_clear_dirty_range() scope
Applying: system/physmem: Reduce cpu_physical_memory_sync_dirty_bitmap() scope
Applying: system/physmem: Drop 'cpu_' prefix in Physical Memory API
error: patch failed: hw/vfio/container.c:255
error: hw/vfio/container.c: patch does not apply
Patch failed at 0017 system/physmem: Drop 'cpu_' prefix in Physical Memory API
hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort". harshpb:patches$

However, changes for ppc/spapr looks fine to me.

Thanks
Harsh

Quoted 60 lines
hw/remote/memory.c +0 -1
index 00193a552fa..8195aa5fb83 100644
@@ -11,7 +11,6 @@
  #include "qemu/osdep.h"
 
  #include "hw/remote/memory.h"
-#include "system/ram_addr.h"
  #include "qapi/error.h"
 
  static void remote_sysmem_reset(void)
hw/remote/proxy-memory-listener.c +0 -1
index 30ac74961dd..e1a52d24f0b 100644
@@ -12,7 +12,6 @@
  #include "qemu/range.h"
  #include "system/memory.h"
  #include "exec/cpu-common.h"
-#include "system/ram_addr.h"
  #include "qapi/error.h"
  #include "qemu/error-report.h"
  #include "hw/remote/mpqemu-link.h"
hw/s390x/s390-virtio-ccw.c +0 -1
index d0c6e80cb05..ad2c48188a8 100644
@@ -13,7 +13,6 @@
 
  #include "qemu/osdep.h"
  #include "qapi/error.h"
-#include "system/ram_addr.h"
  #include "system/confidential-guest-support.h"
  #include "hw/boards.h"
  #include "hw/s390x/sclp.h"
hw/vfio/spapr.c +0 -1
index 8d9d68da4ec..0f23681a3f9 100644
@@ -17,7 +17,6 @@
 
  #include "hw/vfio/vfio-container-legacy.h"
  #include "hw/hw.h"
-#include "system/ram_addr.h"
  #include "qemu/error-report.h"
  #include "qapi/error.h"
  #include "trace.h"
hw/virtio/virtio-mem.c +0 -1
index 1de2d3de521..15ba6799f22 100644
@@ -25,7 +25,6 @@
  #include "hw/virtio/virtio-mem.h"
  #include "qapi/error.h"
  #include "qapi/visitor.h"
-#include "system/ram_addr.h"
  #include "migration/misc.h"
  #include "hw/boards.h"
  #include "hw/qdev-properties.h"
#12 lore raw

Re: [PATCH v2 06/18] hw: Remove unnecessary 'system/ram_addr.h' header

Quoted 88 lines · Harsh Prateek Bora
Quoted 44 lines · Philippe Mathieu-Daudé

None of these files require definition exposed by "system/ram_addr.h", remove its inclusion.

---
  hw/ppc/spapr.c                    | 1 -
  hw/ppc/spapr_caps.c               | 1 -
  hw/ppc/spapr_pci.c                | 1 -
  hw/remote/memory.c                | 1 -
  hw/remote/proxy-memory-listener.c | 1 -
  hw/s390x/s390-virtio-ccw.c        | 1 -
  hw/vfio/spapr.c                   | 1 -
  hw/virtio/virtio-mem.c            | 1 -

  8 files changed, 8 deletions(-)
hw/ppc/spapr.c +0 -1
index 82fb23beaa8..97ab6bebd25 100644
@@ -77,7 +77,6 @@
   #include "hw/virtio/virtio-scsi.h"
   #include "hw/virtio/vhost-scsi-common.h"
-#include "system/ram_addr.h"
   #include "system/confidential-guest-support.h"
   #include "hw/usb.h"
   #include "qemu/config-file.h"
hw/ppc/spapr_caps.c +0 -1
index f2f5722d8ad..0f94c192fd4 100644
@@ -27,7 +27,6 @@
   #include "qapi/error.h"
   #include "qapi/visitor.h"
   #include "system/hw_accel.h"
-#include "system/ram_addr.h"
   #include "target/ppc/cpu.h"
   #include "target/ppc/mmu-hash64.h"
   #include "cpu-models.h"
hw/ppc/spapr_pci.c +0 -0
index 1ac1185825e..f9095552e86 100644

hw/ppc/spapr_pci.c line 39

Quoted 7 lines
hw/ppc/spapr_pci.c +0 -1
@@ -34,7 +34,6 @@
   #include "hw/pci/pci_host.h"
   #include "hw/ppc/spapr.h"
   #include "hw/pci-host/spapr.h"
-#include "system/ram_addr.h"
   #include <libfdt.h>
   #include "trace.h"
   #include "qemu/error-report.h"

I am seeing error while applying patch series:

harshpb:patches$ git log --oneline -n1
29b77c1a2d (HEAD -> review-20251002, upstream/master, master) Merge tag 'rust-ci-pull-request' of https://gitlab.com/marcandre.lureau/qemu into staging harshpb:patches$ git am ./ v2_20251001_philmd_system_physmem_extract_api_out_of_system_ram_addr_h_header.mbx

Applying: system/ram_addr: Remove unnecessary 'exec/cpu-common.h' header
Applying: accel/kvm: Include missing 'exec/target_page.h' header
Applying: hw/s390x/s390-stattrib: Include missing 'exec/target_page.h' header
Applying: hw/vfio/listener: Include missing 'exec/target_page.h' header
Applying: target/arm/tcg/mte: Include missing 'exec/target_page.h' header
Applying: hw: Remove unnecessary 'system/ram_addr.h' header
Applying: system/physmem: Un-inline cpu_physical_memory_get_dirty_flag()
Applying: system/physmem: Un-inline cpu_physical_memory_is_clean()
Applying: system/physmem: Un-inline cpu_physical_memory_range_includes_clean()
Applying: system/physmem: Un-inline cpu_physical_memory_set_dirty_flag()
Applying: system/physmem: Un-inline cpu_physical_memory_set_dirty_range()
Applying: system/physmem: Remove _WIN32 #ifdef'ry
Applying: system/physmem: Un-inline cpu_physical_memory_set_dirty_lebitmap()
Applying: system/physmem: Un-inline cpu_physical_memory_dirty_bits_cleared()
Applying: system/physmem: Reduce cpu_physical_memory_clear_dirty_range() scope
Applying: system/physmem: Reduce cpu_physical_memory_sync_dirty_bitmap() scope
Applying: system/physmem: Drop 'cpu_' prefix in Physical Memory API
error: patch failed: hw/vfio/container.c:255
error: hw/vfio/container.c: patch does not apply
Patch failed at 0017 system/physmem: Drop 'cpu_' prefix in Physical Memory API
hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort". harshpb:patches$

Quoted 1 line

However, changes for ppc/spapr looks fine to me.

Sorry, I forgot the 'Based-on' tag on v1 and added it separately:
https://lore.kernel.org/qemu-devel/[email protected]/
then forgot to add it again on v2 :/

Quoted 3 lines

Thanks
Harsh

Reviewed-by on v2 6/18
#13 lore raw

Re: [PATCH v2 06/18] hw: Remove unnecessary 'system/ram_addr.h' header

In reply to Philippe Mathieu-Daudé
Quoted 16 lines · Philippe Mathieu-Daudé

None of these files require definition exposed by "system/ram_addr.h", remove its inclusion.

---
 hw/ppc/spapr.c                    | 1 -
 hw/ppc/spapr_caps.c               | 1 -
 hw/ppc/spapr_pci.c                | 1 -
 hw/remote/memory.c                | 1 -
 hw/remote/proxy-memory-listener.c | 1 -
 hw/s390x/s390-virtio-ccw.c        | 1 -
 hw/vfio/spapr.c                   | 1 -
 hw/virtio/virtio-mem.c            | 1 -
 8 files changed, 8 deletions(-)

...snip...

hw/s390x/s390-virtio-ccw.c line 18

Quoted 12 lines
hw/s390x/s390-virtio-ccw.c +0 -1
index d0c6e80cb05..ad2c48188a8 100644
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "system/ram_addr.h"
 #include "system/confidential-guest-support.h"
 #include "hw/boards.h"
 #include "hw/s390x/sclp.h"

This was added in 9138977b18 ("s390x/kvm: Configure page size after memory has actually been initialized") for the purposes of calling qemu_getrampagesize(), but that got renamed and later moved by c6cd30fead ("system: Declare qemu_[min/max]rampagesize() in 'system/hostmem.h'"). So I agree this is no longer needed.

#14 lore raw

PATCH v2 7/18 system/physmem: Un-inline cpu_physical_memory_get_dirty_flag()

In reply to Philippe Mathieu-Daudé

Avoid maintaining large functions in header, rely on the linker to optimize at linking time.

cpu_physical_memory_get_dirty() doesn't involve any CPU, remove the 'cpu_' prefix.

---
 include/system/ram_addr.h | 46 +--------------------------------------
 system/physmem.c          | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 45 deletions(-)
include/system/ram_addr.h +1 -45
index f74a0ecee56..f8a307d1a3d 100644
@@ -142,46 +142,6 @@ static inline void qemu_ram_block_writeback(RAMBlock *block)
 #define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
 #define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
 
-static inline bool cpu_physical_memory_get_dirty(ram_addr_t start,
-                                                 ram_addr_t length,
-                                                 unsigned client)
-{
-    DirtyMemoryBlocks *blocks;
-    unsigned long end, page;
-    unsigned long idx, offset, base;
-    bool dirty = false;
-
-    assert(client < DIRTY_MEMORY_NUM);
-
-    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;
-    page = start >> TARGET_PAGE_BITS;
-
-    WITH_RCU_READ_LOCK_GUARD() {
-        blocks = qatomic_rcu_read(&ram_list.dirty_memory[client]);
-
-        idx = page / DIRTY_MEMORY_BLOCK_SIZE;
-        offset = page % DIRTY_MEMORY_BLOCK_SIZE;
-        base = page - offset;
-        while (page < end) {
-            unsigned long next = MIN(end, base + DIRTY_MEMORY_BLOCK_SIZE);
-            unsigned long num = next - base;
-            unsigned long found = find_next_bit(blocks->blocks[idx],
-                                                num, offset);
-            if (found < num) {
-                dirty = true;
-                break;
-            }
-
-            page = next;
-            idx++;
-            offset = 0;
-            base += DIRTY_MEMORY_BLOCK_SIZE;
-        }
-    }
-
-    return dirty;
-}
-
 static inline bool cpu_physical_memory_all_dirty(ram_addr_t start,
                                                  ram_addr_t length,
                                                  unsigned client)
@@ -221,11 +181,7 @@ static inline bool cpu_physical_memory_all_dirty(ram_addr_t start,
     return dirty;
 }
 
-static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
-                                                      unsigned client)
-{
-    return cpu_physical_memory_get_dirty(addr, 1, client);
-}
+bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
 
 static inline bool cpu_physical_memory_is_clean(ram_addr_t addr)
 {
system/physmem.c +44 -0

50 lines not on this page · raw message

Signature · 1 line
2.51.0
#15 lore raw

PATCH v2 8/18 system/physmem: Un-inline cpu_physical_memory_is_clean()

In reply to Philippe Mathieu-Daudé

Avoid maintaining large functions in header, rely on the linker to optimize at linking time.

---
 include/system/ram_addr.h | 9 +--------
 system/physmem.c          | 9 +++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)
include/system/ram_addr.h +1 -8
index f8a307d1a3d..cdf25c315be 100644
@@ -183,14 +183,7 @@ static inline bool cpu_physical_memory_all_dirty(ram_addr_t start,
 
 bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
 
-static inline bool cpu_physical_memory_is_clean(ram_addr_t addr)
-{
-    bool vga = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);
-    bool code = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);
-    bool migration =
-        cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
-    return !(vga && code && migration);
-}
+bool cpu_physical_memory_is_clean(ram_addr_t addr);
 
 static inline uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
                                                                ram_addr_t length,
system/physmem.c +9 -0
index a8d201d7048..fb6a7378ff7 100644
@@ -945,6 +945,15 @@ bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client)
     return physical_memory_get_dirty(addr, 1, client);
 }
 
+bool cpu_physical_memory_is_clean(ram_addr_t addr)
+{
+    bool vga = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);
+    bool code = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);
+    bool migration =
+        cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
+    return !(vga && code && migration);
+}
+
 /* Note: start and end must be within the same ram block.  */
 bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
                                               ram_addr_t length,
Signature · 1 line
2.51.0
#16 lore raw

PATCH v2 9/18 system/physmem: Un-inline cpu_physical_memory_range_includes_clean()

In reply to Philippe Mathieu-Daudé

Avoid maintaining large functions in header, rely on the linker to optimize at linking time.

cpu_physical_memory_all_dirty() doesn't involve any CPU, remove the 'cpu_' prefix.

---
 include/system/ram_addr.h | 62 ++-------------------------------------
 system/physmem.c          | 60 +++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 59 deletions(-)
include/system/ram_addr.h +3 -59
index cdf25c315be..2dcca260b2b 100644
@@ -142,69 +142,13 @@ static inline void qemu_ram_block_writeback(RAMBlock *block)
 #define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
 #define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
 
-static inline bool cpu_physical_memory_all_dirty(ram_addr_t start,
-                                                 ram_addr_t length,
-                                                 unsigned client)
-{
-    DirtyMemoryBlocks *blocks;
-    unsigned long end, page;
-    unsigned long idx, offset, base;
-    bool dirty = true;
-
-    assert(client < DIRTY_MEMORY_NUM);
-
-    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;
-    page = start >> TARGET_PAGE_BITS;
-
-    RCU_READ_LOCK_GUARD();
-
-    blocks = qatomic_rcu_read(&ram_list.dirty_memory[client]);
-
-    idx = page / DIRTY_MEMORY_BLOCK_SIZE;
-    offset = page % DIRTY_MEMORY_BLOCK_SIZE;
-    base = page - offset;
-    while (page < end) {
-        unsigned long next = MIN(end, base + DIRTY_MEMORY_BLOCK_SIZE);
-        unsigned long num = next - base;
-        unsigned long found = find_next_zero_bit(blocks->blocks[idx], num, offset);
-        if (found < num) {
-            dirty = false;
-            break;
-        }
-
-        page = next;
-        idx++;
-        offset = 0;
-        base += DIRTY_MEMORY_BLOCK_SIZE;
-    }
-
-    return dirty;
-}
-
 bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
 
 bool cpu_physical_memory_is_clean(ram_addr_t addr);
 
-static inline uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
-                                                               ram_addr_t length,
-                                                               uint8_t mask)
-{
-    uint8_t ret = 0;
-
-    if (mask & (1 << DIRTY_MEMORY_VGA) &&
-        !cpu_physical_memory_all_dirty(start, length, DIRTY_MEMORY_VGA)) {
-        ret |= (1 << DIRTY_MEMORY_VGA);
-    }
-    if (mask & (1 << DIRTY_MEMORY_CODE) &&
-        !cpu_physical_memory_all_dirty(start, length, DIRTY_MEMORY_CODE)) {
-        ret |= (1 << DIRTY_MEMORY_CODE);
-    }
-    if (mask & (1 << DIRTY_MEMORY_MIGRATION) &&
-        !cpu_physical_memory_all_dirty(start, length, DIRTY_MEMORY_MIGRATION)) {
-        ret |= (1 << DIRTY_MEMORY_MIGRATION);
-    }
-    return ret;
-}
+uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
+                                                 ram_addr_t length,
+                                                 uint8_t mask);
 
 static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,
                                                       unsigned client)
system/physmem.c +60 -0

66 lines not on this page · raw message

Signature · 1 line
2.51.0
#17 lore raw

PATCH v2 10/18 system/physmem: Un-inline cpu_physical_memory_set_dirty_flag()

In reply to Philippe Mathieu-Daudé

Avoid maintaining large functions in header, rely on the linker to optimize at linking time.

---
 include/system/ram_addr.h | 19 +------------------
 system/physmem.c          | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)
include/system/ram_addr.h +1 -18
index 2dcca260b2b..81d26eb1492 100644
@@ -150,24 +150,7 @@ uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
                                                  ram_addr_t length,
                                                  uint8_t mask);
 
-static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,
-                                                      unsigned client)
-{
-    unsigned long page, idx, offset;
-    DirtyMemoryBlocks *blocks;
-
-    assert(client < DIRTY_MEMORY_NUM);
-
-    page = addr >> TARGET_PAGE_BITS;
-    idx = page / DIRTY_MEMORY_BLOCK_SIZE;
-    offset = page % DIRTY_MEMORY_BLOCK_SIZE;
-
-    RCU_READ_LOCK_GUARD();
-
-    blocks = qatomic_rcu_read(&ram_list.dirty_memory[client]);
-
-    set_bit_atomic(offset, blocks->blocks[idx]);
-}
+void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
 
 static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
                                                        ram_addr_t length,
system/physmem.c +18 -0
index 2667f289044..96d23630a12 100644
@@ -1014,6 +1014,24 @@ uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
     return ret;
 }
 
+void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client)
+{
+    unsigned long page, idx, offset;
+    DirtyMemoryBlocks *blocks;
+
+    assert(client < DIRTY_MEMORY_NUM);
+
+    page = addr >> TARGET_PAGE_BITS;
+    idx = page / DIRTY_MEMORY_BLOCK_SIZE;
+    offset = page % DIRTY_MEMORY_BLOCK_SIZE;
+
+    RCU_READ_LOCK_GUARD();
+
+    blocks = qatomic_rcu_read(&ram_list.dirty_memory[client]);
+
+    set_bit_atomic(offset, blocks->blocks[idx]);
+}
+
 /* Note: start and end must be within the same ram block.  */
 bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
                                               ram_addr_t length,
Signature · 1 line
2.51.0
#18 lore raw

PATCH v2 11/18 system/physmem: Un-inline cpu_physical_memory_set_dirty_range()

In reply to Philippe Mathieu-Daudé

Avoid maintaining large functions in header, rely on the linker to optimize at linking time.

---
 include/system/ram_addr.h | 53 ++-------------------------------------
 system/physmem.c          | 51 +++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 51 deletions(-)
include/system/ram_addr.h +2 -51
index 81d26eb1492..ca5ae842442 100644
@@ -152,57 +152,8 @@ uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
 
 void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
 
-static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
-                                                       ram_addr_t length,
-                                                       uint8_t mask)
-{
-    DirtyMemoryBlocks *blocks[DIRTY_MEMORY_NUM];
-    unsigned long end, page;
-    unsigned long idx, offset, base;
-    int i;
-
-    if (!mask && !xen_enabled()) {
-        return;
-    }
-
-    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;
-    page = start >> TARGET_PAGE_BITS;
-
-    WITH_RCU_READ_LOCK_GUARD() {
-        for (i = 0; i < DIRTY_MEMORY_NUM; i++) {
-            blocks[i] = qatomic_rcu_read(&ram_list.dirty_memory[i]);
-        }
-
-        idx = page / DIRTY_MEMORY_BLOCK_SIZE;
-        offset = page % DIRTY_MEMORY_BLOCK_SIZE;
-        base = page - offset;
-        while (page < end) {
-            unsigned long next = MIN(end, base + DIRTY_MEMORY_BLOCK_SIZE);
-
-            if (likely(mask & (1 << DIRTY_MEMORY_MIGRATION))) {
-                bitmap_set_atomic(blocks[DIRTY_MEMORY_MIGRATION]->blocks[idx],
-                                  offset, next - page);
-            }
-            if (unlikely(mask & (1 << DIRTY_MEMORY_VGA))) {
-                bitmap_set_atomic(blocks[DIRTY_MEMORY_VGA]->blocks[idx],
-                                  offset, next - page);
-            }
-            if (unlikely(mask & (1 << DIRTY_MEMORY_CODE))) {
-                bitmap_set_atomic(blocks[DIRTY_MEMORY_CODE]->blocks[idx],
-                                  offset, next - page);
-            }
-
-            page = next;
-            idx++;
-            offset = 0;
-            base += DIRTY_MEMORY_BLOCK_SIZE;
-        }
-    }
-
-    if (xen_enabled()) {
-        xen_hvm_modified_memory(start, length);
-    }
-}
+void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
+                                         uint8_t mask);
 
 #if !defined(_WIN32)
 
system/physmem.c +51 -0

57 lines not on this page · raw message

Signature · 1 line
2.51.0
#19 lore raw

PATCH v2 12/18 system/physmem: Remove _WIN32 #ifdef'ry

In reply to Philippe Mathieu-Daudé

Commit fb3ecb7ea40 ("exec: Exclude non portable function for MinGW") guarded cpu_physical_memory_set_dirty_lebitmap() within _WIN32 #ifdef'ry because of the non-portable ffsl() call, which was later replaced for the same reason by commit 7224f66ec3c ("exec: replace ffsl with ctzl"); we don't need that anymore.

---
 include/system/ram_addr.h | 3 ---
 1 file changed, 3 deletions(-)
include/system/ram_addr.h +0 -3
index ca5ae842442..fbf57a05b2a 100644
@@ -155,8 +155,6 @@ void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
 void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
                                          uint8_t mask);
 
-#if !defined(_WIN32)
-
 /*
  * Contrary to cpu_physical_memory_sync_dirty_bitmap() this function returns
  * the number of dirty pages in @bitmap passed as argument. On the other hand,
@@ -265,7 +263,6 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
 
     return num_dirty;
 }
-#endif /* not _WIN32 */
 
 static inline void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start,
                                                           ram_addr_t length)
Signature · 1 line
2.51.0
Reviewed-by on v2 12/18
#20 lore raw

Re: [PATCH v2 12/18] system/physmem: Remove _WIN32 #ifdef'ry

Quoted 11 lines · Philippe Mathieu-Daudé

Commit fb3ecb7ea40 ("exec: Exclude non portable function for MinGW") guarded cpu_physical_memory_set_dirty_lebitmap() within _WIN32 #ifdef'ry because of the non-portable ffsl() call, which was later replaced for the same reason by commit 7224f66ec3c ("exec: replace ffsl with ctzl"); we don't need that anymore.

---
  include/system/ram_addr.h | 3 ---
  1 file changed, 3 deletions(-)

r~

#21 lore raw

PATCH v2 13/18 system/physmem: Un-inline cpu_physical_memory_set_dirty_lebitmap()

In reply to Philippe Mathieu-Daudé

Avoid maintaining large functions in header, rely on the linker to optimize at linking time.

Remove the now unneeded "system/xen.h" header.

---
 include/system/ram_addr.h | 102 +------------------------------------
 system/physmem.c          | 103 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 101 deletions(-)
include/system/ram_addr.h +1 -101
index fbf57a05b2a..49e9a9c66d8 100644
@@ -19,7 +19,6 @@
 #ifndef SYSTEM_RAM_ADDR_H
 #define SYSTEM_RAM_ADDR_H
 
-#include "system/xen.h"
 #include "system/tcg.h"
 #include "exec/cputlb.h"
 #include "exec/ramlist.h"
@@ -161,108 +160,9 @@ void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
  * cpu_physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
  * weren't set in the global migration bitmap.
  */
-static inline
 uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
                                                 ram_addr_t start,
-                                                ram_addr_t pages)
-{
-    unsigned long i, j;
-    unsigned long page_number, c, nbits;
-    hwaddr addr;
-    ram_addr_t ram_addr;
-    uint64_t num_dirty = 0;
-    unsigned long len = (pages + HOST_LONG_BITS - 1) / HOST_LONG_BITS;
-    unsigned long hpratio = qemu_real_host_page_size() / TARGET_PAGE_SIZE;
-    unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);
-
-    /* start address is aligned at the start of a word? */
-    if ((((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) &&
-        (hpratio == 1)) {
-        unsigned long **blocks[DIRTY_MEMORY_NUM];
-        unsigned long idx;
-        unsigned long offset;
-        long k;
-        long nr = BITS_TO_LONGS(pages);
-
-        idx = (start >> TARGET_PAGE_BITS) / DIRTY_MEMORY_BLOCK_SIZE;
-        offset = BIT_WORD((start >> TARGET_PAGE_BITS) %
-                          DIRTY_MEMORY_BLOCK_SIZE);
-
-        WITH_RCU_READ_LOCK_GUARD() {
-            for (i = 0; i < DIRTY_MEMORY_NUM; i++) {
-                blocks[i] =
-                    qatomic_rcu_read(&ram_list.dirty_memory[i])->blocks;
-            }
-
-            for (k = 0; k < nr; k++) {
-                if (bitmap[k]) {
-                    unsigned long temp = leul_to_cpu(bitmap[k]);
-
-                    nbits = ctpopl(temp);
-                    qatomic_or(&blocks[DIRTY_MEMORY_VGA][idx][offset], temp);
-
-                    if (global_dirty_tracking) {
-                        qatomic_or(
-                                &blocks[DIRTY_MEMORY_MIGRATION][idx][offset],
-                                temp);
-                        if (unlikely(
-                            global_dirty_tracking & GLOBAL_DIRTY_DIRTY_RATE)) {
-                            total_dirty_pages += nbits;
-                        }
-                    }
-
-                    num_dirty += nbits;
-
-                    if (tcg_enabled()) {
-                        qatomic_or(&blocks[DIRTY_MEMORY_CODE][idx][offset],
-                                   temp);
-                    }
-                }
-
-                if (++offset >= BITS_TO_LONGS(DIRTY_MEMORY_BLOCK_SIZE)) {
-                    offset = 0;
-                    idx++;
-                }
-            }
-        }
-
-        if (xen_enabled()) {
-            xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS);
-        }
-    } else {
-        uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE;
-
-        if (!global_dirty_tracking) {
-            clients &= ~(1 << DIRTY_MEMORY_MIGRATION);
-        }
-
-        /*
-         * bitmap-traveling is faster than memory-traveling (for addr...)
-         * especially when most of the memory is not dirty.
-         */
-        for (i = 0; i < len; i++) {
-            if (bitmap[i] != 0) {
-                c = leul_to_cpu(bitmap[i]);
-                nbits = ctpopl(c);
-                if (unlikely(global_dirty_tracking & GLOBAL_DIRTY_DIRTY_RATE)) {
-                    total_dirty_pages += nbits;
-                }
-                num_dirty += nbits;
-                do {
-                    j = ctzl(c);
-                    c &= ~(1ul << j);
-                    page_number = (i * HOST_LONG_BITS + j) * hpratio;
-                    addr = page_number * TARGET_PAGE_SIZE;
-                    ram_addr = start + addr;
-                    cpu_physical_memory_set_dirty_range(ram_addr,
-                                       TARGET_PAGE_SIZE * hpratio, clients);
-                } while (c != 0);
-            }
-        }
-    }
-
-    return num_dirty;
-}
+                                                ram_addr_t pages);
 
 static inline void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start,
                                                           ram_addr_t length)
system/physmem.c +103 -0

109 lines not on this page · raw message

Signature · 1 line
2.51.0
#22 lore raw

PATCH v2 14/18 system/physmem: Un-inline cpu_physical_memory_dirty_bits_cleared()

In reply to Philippe Mathieu-Daudé

Avoid maintaining large functions in header, rely on the linker to optimize at linking time.

---
 include/system/ram_addr.h | 10 +---------
 system/physmem.c          |  7 +++++++
 2 files changed, 8 insertions(+), 9 deletions(-)
include/system/ram_addr.h +1 -9
index 49e9a9c66d8..54b5f5ec167 100644
@@ -19,8 +19,6 @@
 #ifndef SYSTEM_RAM_ADDR_H
 #define SYSTEM_RAM_ADDR_H
 
-#include "system/tcg.h"
-#include "exec/cputlb.h"
 #include "exec/ramlist.h"
 #include "system/ramblock.h"
 #include "system/memory.h"
@@ -164,14 +162,8 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
                                                 ram_addr_t start,
                                                 ram_addr_t pages);
 
-static inline void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start,
-                                                          ram_addr_t length)
-{
-    if (tcg_enabled()) {
-        tlb_reset_dirty_range_all(start, length);
-    }
+void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
 
-}
 bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
                                               ram_addr_t length,
                                               unsigned client);
system/physmem.c +7 -0
index e01b27ac252..0daadc185de 100644
@@ -901,6 +901,13 @@ void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t length)
     }
 }
 
+void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length)
+{
+    if (tcg_enabled()) {
+        tlb_reset_dirty_range_all(start, length);
+    }
+}
+
 static bool physical_memory_get_dirty(ram_addr_t start, ram_addr_t length,
                                       unsigned client)
 {
Signature · 1 line
2.51.0
#23 lore raw

PATCH v2 15/18 system/physmem: Reduce cpu_physical_memory_clear_dirty_range() scope

In reply to Philippe Mathieu-Daudé

cpu_physical_memory_clear_dirty_range() is now only called within system/physmem.c, by qemu_ram_resize(). Reduce its scope by making it internal to this file. Since it doesn't involve any CPU, remove the 'cpu_' prefix. As it operates on a range, rename @start as @addr.

---
 include/system/ram_addr.h | 9 ---------
 system/physmem.c          | 9 ++++++++-
 2 files changed, 8 insertions(+), 10 deletions(-)
include/system/ram_addr.h +0 -9
index 54b5f5ec167..cafd258580e 100644
@@ -175,15 +175,6 @@ bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
                                             ram_addr_t start,
                                             ram_addr_t length);
 
-static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start,
-                                                         ram_addr_t length)
-{
-    cpu_physical_memory_test_and_clear_dirty(start, length, DIRTY_MEMORY_MIGRATION);
-    cpu_physical_memory_test_and_clear_dirty(start, length, DIRTY_MEMORY_VGA);
-    cpu_physical_memory_test_and_clear_dirty(start, length, DIRTY_MEMORY_CODE);
-}
-
-
 /* Called with RCU critical section */
 static inline
 uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb,
system/physmem.c +8 -1
index 0daadc185de..ad9705c7726 100644
@@ -1139,6 +1139,13 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
     return dirty;
 }
 
+static void physical_memory_clear_dirty_range(ram_addr_t addr, ram_addr_t length)
+{
+    cpu_physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_MIGRATION);
+    cpu_physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_VGA);
+    cpu_physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_CODE);
+}
+
 DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
     (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client)
 {
@@ -2073,7 +2080,7 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
         ram_block_notify_resize(block->host, oldsize, newsize);
     }
 
-    cpu_physical_memory_clear_dirty_range(block->offset, block->used_length);
+    physical_memory_clear_dirty_range(block->offset, block->used_length);
     block->used_length = newsize;
     cpu_physical_memory_set_dirty_range(block->offset, block->used_length,
                                         DIRTY_CLIENTS_ALL);
Signature · 1 line
2.51.0
#24 lore raw

PATCH v2 16/18 system/physmem: Reduce cpu_physical_memory_sync_dirty_bitmap() scope

In reply to Philippe Mathieu-Daudé

cpu_physical_memory_sync_dirty_bitmap() is now only called within system/physmem.c, by ramblock_sync_dirty_bitmap(). Reduce its scope by making it internal to this file. Since it doesn't involve any CPU, remove the 'cpu_' prefix.
Remove the now unneeded "qemu/rcu.h" and "system/memory.h" headers.

---
 include/system/ram_addr.h | 79 ---------------------------------------
 migration/ram.c           | 77 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 76 insertions(+), 80 deletions(-)
include/system/ram_addr.h +0 -79
index cafd258580e..d2d088bbea6 100644
@@ -21,10 +21,7 @@
 
 #include "exec/ramlist.h"
 #include "system/ramblock.h"
-#include "system/memory.h"
 #include "exec/target_page.h"
-#include "qemu/rcu.h"
-
 #include "exec/hwaddr.h"
 
 extern uint64_t total_dirty_pages;
@@ -175,80 +172,4 @@ bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
                                             ram_addr_t start,
                                             ram_addr_t length);
 
-/* Called with RCU critical section */
-static inline
-uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb,
-                                               ram_addr_t start,
-                                               ram_addr_t length)
-{
-    ram_addr_t addr;
-    unsigned long word = BIT_WORD((start + rb->offset) >> TARGET_PAGE_BITS);
-    uint64_t num_dirty = 0;
-    unsigned long *dest = rb->bmap;
-
-    /* start address and length is aligned at the start of a word? */
-    if (((word * BITS_PER_LONG) << TARGET_PAGE_BITS) ==
-         (start + rb->offset) &&
-        !(length & ((BITS_PER_LONG << TARGET_PAGE_BITS) - 1))) {
-        int k;
-        int nr = BITS_TO_LONGS(length >> TARGET_PAGE_BITS);
-        unsigned long * const *src;
-        unsigned long idx = (word * BITS_PER_LONG) / DIRTY_MEMORY_BLOCK_SIZE;
-        unsigned long offset = BIT_WORD((word * BITS_PER_LONG) %
-                                        DIRTY_MEMORY_BLOCK_SIZE);
-        unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);
-
-        src = qatomic_rcu_read(
-                &ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION])->blocks;
-
-        for (k = page; k < page + nr; k++) {
-            if (src[idx][offset]) {
-                unsigned long bits = qatomic_xchg(&src[idx][offset], 0);
-                unsigned long new_dirty;
-                new_dirty = ~dest[k];
-                dest[k] |= bits;
-                new_dirty &= bits;
-                num_dirty += ctpopl(new_dirty);
-            }
-
-            if (++offset >= BITS_TO_LONGS(DIRTY_MEMORY_BLOCK_SIZE)) {
-                offset = 0;
-                idx++;
-            }
-        }
-        if (num_dirty) {
-            cpu_physical_memory_dirty_bits_cleared(start, length);
-        }
-
-        if (rb->clear_bmap) {
-            /*
-             * Postpone the dirty bitmap clear to the point before we
-             * really send the pages, also we will split the clear
-             * dirty procedure into smaller chunks.
-             */
-            clear_bmap_set(rb, start >> TARGET_PAGE_BITS,
-                           length >> TARGET_PAGE_BITS);
-        } else {
-            /* Slow path - still do that in a huge chunk */
-            memory_region_clear_dirty_bitmap(rb->mr, start, length);
-        }
-    } else {
-        ram_addr_t offset = rb->offset;
-
-        for (addr = 0; addr < length; addr += TARGET_PAGE_SIZE) {
-            if (cpu_physical_memory_test_and_clear_dirty(
-                        start + addr + offset,
-                        TARGET_PAGE_SIZE,
-                        DIRTY_MEMORY_MIGRATION)) {
-                long k = (start + addr) >> TARGET_PAGE_BITS;
-                if (!test_and_set_bit(k, dest)) {
-                    num_dirty++;
-                }
-            }
-        }
-    }
-
-    return num_dirty;
-}
-
 #endif
migration/ram.c +76 -1

87 lines not on this page · raw message

Signature · 1 line
2.51.0
#25 lore raw

PATCH v2 17/18 system/physmem: Drop 'cpu_' prefix in Physical Memory API

In reply to Philippe Mathieu-Daudé

The functions related to the Physical Memory API declared in "system/ram_addr.h" do not operate on vCPU. Remove the 'cpu_' prefix.

---
 include/system/ram_addr.h   | 24 +++++++++----------
 accel/kvm/kvm-all.c         |  2 +-
 accel/tcg/cputlb.c          | 12 +++++-----
 hw/vfio/container-legacy.c  |  8 +++----
 hw/vfio/container.c         |  4 ++--
 migration/ram.c             |  4 ++--
 system/memory.c             |  8 +++----
 system/physmem.c            | 48 ++++++++++++++++++-------------------
 target/arm/tcg/mte_helper.c |  2 +-
 system/memory_ldst.c.inc    |  2 +-
 tests/tsan/ignore.tsan      |  4 ++--
 11 files changed, 59 insertions(+), 59 deletions(-)
include/system/ram_addr.h +12 -12
index d2d088bbea6..3894a84fb9c 100644
@@ -136,39 +136,39 @@ static inline void qemu_ram_block_writeback(RAMBlock *block)
 #define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
 #define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
 
-bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
+bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
 
-bool cpu_physical_memory_is_clean(ram_addr_t addr);
+bool physical_memory_is_clean(ram_addr_t addr);
 
-uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
+uint8_t physical_memory_range_includes_clean(ram_addr_t start,
                                                  ram_addr_t length,
                                                  uint8_t mask);
 
-void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
+void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
 
-void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
+void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
                                          uint8_t mask);
 
 /*
- * Contrary to cpu_physical_memory_sync_dirty_bitmap() this function returns
+ * Contrary to physical_memory_sync_dirty_bitmap() this function returns
  * the number of dirty pages in @bitmap passed as argument. On the other hand,
- * cpu_physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
+ * physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
  * weren't set in the global migration bitmap.
  */
-uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
+uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
                                                 ram_addr_t start,
                                                 ram_addr_t pages);
 
-void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
+void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
 
-bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
+bool physical_memory_test_and_clear_dirty(ram_addr_t start,
                                               ram_addr_t length,
                                               unsigned client);
 
-DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
+DirtyBitmapSnapshot *physical_memory_snapshot_and_clear_dirty
     (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client);
 
-bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
+bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
                                             ram_addr_t start,
                                             ram_addr_t length);
 
accel/kvm/kvm-all.c +1 -1
index 08b2b5a371c..a7ece7db964 100644
@@ -758,7 +758,7 @@ static void kvm_slot_sync_dirty_pages(KVMSlot *slot)
     ram_addr_t start = slot->ram_start_offset;
     ram_addr_t pages = slot->memory_size / qemu_real_host_page_size();
 
-    cpu_physical_memory_set_dirty_lebitmap(slot->dirty_bmap, start, pages);
+    physical_memory_set_dirty_lebitmap(slot->dirty_bmap, start, pages);
 }
 
 static void kvm_slot_reset_dirty_pages(KVMSlot *slot)
accel/tcg/cputlb.c +6 -6
index 2a6aa01c57c..a721235dea6 100644
@@ -858,7 +858,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu,
    can be detected */
 void tlb_protect_code(ram_addr_t ram_addr)
 {
-    cpu_physical_memory_test_and_clear_dirty(ram_addr & TARGET_PAGE_MASK,
+    physical_memory_test_and_clear_dirty(ram_addr & TARGET_PAGE_MASK,
                                              TARGET_PAGE_SIZE,
                                              DIRTY_MEMORY_CODE);
 }
@@ -867,7 +867,7 @@ void tlb_protect_code(ram_addr_t ram_addr)
    tested for self modifying code */
 void tlb_unprotect_code(ram_addr_t ram_addr)
 {
-    cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_CODE);
+    physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_CODE);
 }
 
 
@@ -1085,7 +1085,7 @@ void tlb_set_page_full(CPUState *cpu, int mmu_idx,
         if (prot & PAGE_WRITE) {
             if (section->readonly) {
                 write_flags |= TLB_DISCARD_WRITE;
-            } else if (cpu_physical_memory_is_clean(iotlb)) {
+            } else if (physical_memory_is_clean(iotlb)) {
                 write_flags |= TLB_NOTDIRTY;
             }
         }
@@ -1341,7 +1341,7 @@ static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size,
 
     trace_memory_notdirty_write_access(mem_vaddr, ram_addr, size);
 
-    if (!cpu_physical_memory_get_dirty_flag(ram_addr, DIRTY_MEMORY_CODE)) {
+    if (!physical_memory_get_dirty_flag(ram_addr, DIRTY_MEMORY_CODE)) {
         tb_invalidate_phys_range_fast(cpu, ram_addr, size, retaddr);
     }
 
@@ -1349,10 +1349,10 @@ static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size,
      * Set both VGA and migration bits for simplicity and to remove
      * the notdirty callback faster.
      */
-    cpu_physical_memory_set_dirty_range(ram_addr, size, DIRTY_CLIENTS_NOCODE);
+    physical_memory_set_dirty_range(ram_addr, size, DIRTY_CLIENTS_NOCODE);
 
     /* We remove the notdirty callback only if the code has been flushed. */
-    if (!cpu_physical_memory_is_clean(ram_addr)) {
+    if (!physical_memory_is_clean(ram_addr)) {
         trace_memory_notdirty_set_dirty(mem_vaddr);
         tlb_set_dirty(cpu, mem_vaddr);
     }
hw/vfio/container-legacy.c +4 -4
index 3a710d8265c..eb9911eaeaf 100644
@@ -92,7 +92,7 @@ static int vfio_dma_unmap_bitmap(const VFIOLegacyContainer *container,
     bitmap = (struct vfio_bitmap *)&unmap->data;
 
     /*
-     * cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
+     * physical_memory_set_dirty_lebitmap() supports pages in bitmap of
      * qemu_real_host_page_size to mark those dirty. Hence set bitmap_pgsize
      * to qemu_real_host_page_size.
      */
@@ -108,7 +108,7 @@ static int vfio_dma_unmap_bitmap(const VFIOLegacyContainer *container,
 
     ret = ioctl(container->fd, VFIO_IOMMU_UNMAP_DMA, unmap);
     if (!ret) {
-        cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap,
+        physical_memory_set_dirty_lebitmap(vbmap.bitmap,
                 iotlb->translated_addr, vbmap.pages);
     } else {
         error_report("VFIO_UNMAP_DMA with DIRTY_BITMAP : %m");
@@ -284,7 +284,7 @@ static int vfio_legacy_query_dirty_bitmap(const VFIOContainer *bcontainer,
     range->size = size;
 
     /*
-     * cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
+     * physical_memory_set_dirty_lebitmap() supports pages in bitmap of
      * qemu_real_host_page_size to mark those dirty. Hence set bitmap's pgsize
      * to qemu_real_host_page_size.
      */
@@ -503,7 +503,7 @@ static void vfio_get_iommu_info_migration(VFIOLegacyContainer *container,
                             header);
 
     /*
-     * cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
+     * physical_memory_set_dirty_lebitmap() supports pages in bitmap of
      * qemu_real_host_page_size to mark those dirty.
      */
     if (cap_mig->pgsize_bitmap & qemu_real_host_page_size()) {
hw/vfio/container.c +2 -2
index 41de3439246..3fb19a1c8ad 100644
@@ -255,7 +255,7 @@ int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
     int ret;
 
     if (!bcontainer->dirty_pages_supported && !all_device_dirty_tracking) {
-        cpu_physical_memory_set_dirty_range(translated_addr, size,
+        physical_memory_set_dirty_range(translated_addr, size,
                                             tcg_enabled() ? DIRTY_CLIENTS_ALL :
                                             DIRTY_CLIENTS_NOCODE);
         return 0;
@@ -280,7 +280,7 @@ int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
         goto out;
     }
 
-    dirty_pages = cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap,
+    dirty_pages = physical_memory_set_dirty_lebitmap(vbmap.bitmap,
                                                          translated_addr,
                                                          vbmap.pages);
 
migration/ram.c +2 -2
index 52bdfec91d9..d09591c0600 100644
@@ -976,7 +976,7 @@ static uint64_t physical_memory_sync_dirty_bitmap(RAMBlock *rb,
             }
         }
         if (num_dirty) {
-            cpu_physical_memory_dirty_bits_cleared(start, length);
+            physical_memory_dirty_bits_cleared(start, length);
         }
 
         if (rb->clear_bmap) {
@@ -995,7 +995,7 @@ static uint64_t physical_memory_sync_dirty_bitmap(RAMBlock *rb,
         ram_addr_t offset = rb->offset;
 
         for (addr = 0; addr < length; addr += TARGET_PAGE_SIZE) {
-            if (cpu_physical_memory_test_and_clear_dirty(
+            if (physical_memory_test_and_clear_dirty(
                         start + addr + offset,
                         TARGET_PAGE_SIZE,
                         DIRTY_MEMORY_MIGRATION)) {
system/memory.c +4 -4
index cf8cad69611..dd045da60c0 100644
@@ -2275,7 +2275,7 @@ void memory_region_set_dirty(MemoryRegion *mr, hwaddr addr,
                              hwaddr size)
 {
     assert(mr->ram_block);
-    cpu_physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
+    physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
                                         size,
                                         memory_region_get_dirty_log_mask(mr));
 }
@@ -2379,7 +2379,7 @@ DirtyBitmapSnapshot *memory_region_snapshot_and_clear_dirty(MemoryRegion *mr,
     DirtyBitmapSnapshot *snapshot;
     assert(mr->ram_block);
     memory_region_sync_dirty_bitmap(mr, false);
-    snapshot = cpu_physical_memory_snapshot_and_clear_dirty(mr, addr, size, client);
+    snapshot = physical_memory_snapshot_and_clear_dirty(mr, addr, size, client);
     memory_global_after_dirty_log_sync();
     return snapshot;
 }
@@ -2388,7 +2388,7 @@ bool memory_region_snapshot_get_dirty(MemoryRegion *mr, DirtyBitmapSnapshot *sna
                                       hwaddr addr, hwaddr size)
 {
     assert(mr->ram_block);
-    return cpu_physical_memory_snapshot_get_dirty(snap,
+    return physical_memory_snapshot_get_dirty(snap,
                 memory_region_get_ram_addr(mr) + addr, size);
 }
 
@@ -2426,7 +2426,7 @@ void memory_region_reset_dirty(MemoryRegion *mr, hwaddr addr,
                                hwaddr size, unsigned client)
 {
     assert(mr->ram_block);
-    cpu_physical_memory_test_and_clear_dirty(
+    physical_memory_test_and_clear_dirty(
         memory_region_get_ram_addr(mr) + addr, size, client);
 }
 
system/physmem.c +24 -24

156 lines not on this page · raw message

target/arm/tcg/mte_helper.c +1 -1
index 7d80244788e..077ff4b2b2c 100644
@@ -189,7 +189,7 @@ uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx,
      */
     if (tag_access == MMU_DATA_STORE) {
         ram_addr_t tag_ra = memory_region_get_ram_addr(mr) + xlat;
-        cpu_physical_memory_set_dirty_flag(tag_ra, DIRTY_MEMORY_MIGRATION);
+        physical_memory_set_dirty_flag(tag_ra, DIRTY_MEMORY_MIGRATION);
     }
 
     return memory_region_get_ram_ptr(mr) + xlat;
system/memory_ldst.c.inc +1 -1
index 7f32d3d9ff3..333da209d1a 100644
@@ -287,7 +287,7 @@ void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL,
 
         dirty_log_mask = memory_region_get_dirty_log_mask(mr);
         dirty_log_mask &= ~(1 << DIRTY_MEMORY_CODE);
-        cpu_physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
+        physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
                                             4, dirty_log_mask);
         r = MEMTX_OK;
     }
tests/tsan/ignore.tsan +2 -2
index 423e482d2f9..8fa00a2c49b 100644
@@ -4,7 +4,7 @@
 # The eventual goal would be to fix these warnings.
 
 # TSan is not happy about setting/getting of dirty bits,
-# for example, cpu_physical_memory_set_dirty_range,
-# and cpu_physical_memory_get_dirty.
+# for example, physical_memory_set_dirty_range,
+# and physical_memory_get_dirty.
 src:bitops.c
 src:bitmap.c
Signature · 1 line
2.51.0
Reviewed-by on v2 17/18
#26 lore raw

Re: [PATCH v2 17/18] system/physmem: Drop 'cpu_' prefix in Physical Memory API

Quoted 6 lines · Philippe Mathieu-Daudé

The functions related to the Physical Memory API declared in "system/ram_addr.h" do not operate on vCPU. Remove the 'cpu_' prefix.

Quoted 13 lines
---
  include/system/ram_addr.h   | 24 +++++++++----------
  accel/kvm/kvm-all.c         |  2 +-
  accel/tcg/cputlb.c          | 12 +++++-----
  hw/vfio/container-legacy.c  |  8 +++----
  hw/vfio/container.c         |  4 ++--
  migration/ram.c             |  4 ++--
  system/memory.c             |  8 +++----
  system/physmem.c            | 48 ++++++++++++++++++-------------------
  target/arm/tcg/mte_helper.c |  2 +-
  system/memory_ldst.c.inc    |  2 +-
  tests/tsan/ignore.tsan      |  4 ++--
  11 files changed, 59 insertions(+), 59 deletions(-)

For vfio,

Thanks,

C.

Quoted 461 lines
include/system/ram_addr.h +12 -12
index d2d088bbea6..3894a84fb9c 100644
@@ -136,39 +136,39 @@ static inline void qemu_ram_block_writeback(RAMBlock *block)
  #define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
  #define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
 
-bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
+bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
 
-bool cpu_physical_memory_is_clean(ram_addr_t addr);
+bool physical_memory_is_clean(ram_addr_t addr);
 
-uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
+uint8_t physical_memory_range_includes_clean(ram_addr_t start,
                                                   ram_addr_t length,
                                                   uint8_t mask);
 
-void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
+void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
 
-void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
+void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
                                           uint8_t mask);
 
  /*
- * Contrary to cpu_physical_memory_sync_dirty_bitmap() this function returns
+ * Contrary to physical_memory_sync_dirty_bitmap() this function returns
   * the number of dirty pages in @bitmap passed as argument. On the other hand,
- * cpu_physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
+ * physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
   * weren't set in the global migration bitmap.
   */
-uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
+uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
                                                  ram_addr_t start,
                                                  ram_addr_t pages);
 
-void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
+void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
 
-bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
+bool physical_memory_test_and_clear_dirty(ram_addr_t start,
                                                ram_addr_t length,
                                                unsigned client);
 
-DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
+DirtyBitmapSnapshot *physical_memory_snapshot_and_clear_dirty
      (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client);
 
-bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
+bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
                                              ram_addr_t start,
                                              ram_addr_t length);
 
accel/kvm/kvm-all.c +1 -1
index 08b2b5a371c..a7ece7db964 100644
@@ -758,7 +758,7 @@ static void kvm_slot_sync_dirty_pages(KVMSlot *slot)
      ram_addr_t start = slot->ram_start_offset;
      ram_addr_t pages = slot->memory_size / qemu_real_host_page_size();
 
-    cpu_physical_memory_set_dirty_lebitmap(slot->dirty_bmap, start, pages);
+    physical_memory_set_dirty_lebitmap(slot->dirty_bmap, start, pages);
  }
 
  static void kvm_slot_reset_dirty_pages(KVMSlot *slot)
accel/tcg/cputlb.c +6 -6
index 2a6aa01c57c..a721235dea6 100644
@@ -858,7 +858,7 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu,
     can be detected */
  void tlb_protect_code(ram_addr_t ram_addr)
  {
-    cpu_physical_memory_test_and_clear_dirty(ram_addr & TARGET_PAGE_MASK,
+    physical_memory_test_and_clear_dirty(ram_addr & TARGET_PAGE_MASK,
                                               TARGET_PAGE_SIZE,
                                               DIRTY_MEMORY_CODE);
  }
@@ -867,7 +867,7 @@ void tlb_protect_code(ram_addr_t ram_addr)
     tested for self modifying code */
  void tlb_unprotect_code(ram_addr_t ram_addr)
  {
-    cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_CODE);
+    physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_CODE);
  }
 
 
@@ -1085,7 +1085,7 @@ void tlb_set_page_full(CPUState *cpu, int mmu_idx,
          if (prot & PAGE_WRITE) {
              if (section->readonly) {
                  write_flags |= TLB_DISCARD_WRITE;
-            } else if (cpu_physical_memory_is_clean(iotlb)) {
+            } else if (physical_memory_is_clean(iotlb)) {
                  write_flags |= TLB_NOTDIRTY;
              }
          }
@@ -1341,7 +1341,7 @@ static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size,
 
      trace_memory_notdirty_write_access(mem_vaddr, ram_addr, size);
 
-    if (!cpu_physical_memory_get_dirty_flag(ram_addr, DIRTY_MEMORY_CODE)) {
+    if (!physical_memory_get_dirty_flag(ram_addr, DIRTY_MEMORY_CODE)) {
          tb_invalidate_phys_range_fast(cpu, ram_addr, size, retaddr);
      }
 
@@ -1349,10 +1349,10 @@ static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size,
       * Set both VGA and migration bits for simplicity and to remove
       * the notdirty callback faster.
       */
-    cpu_physical_memory_set_dirty_range(ram_addr, size, DIRTY_CLIENTS_NOCODE);
+    physical_memory_set_dirty_range(ram_addr, size, DIRTY_CLIENTS_NOCODE);
 
      /* We remove the notdirty callback only if the code has been flushed. */
-    if (!cpu_physical_memory_is_clean(ram_addr)) {
+    if (!physical_memory_is_clean(ram_addr)) {
          trace_memory_notdirty_set_dirty(mem_vaddr);
          tlb_set_dirty(cpu, mem_vaddr);
      }
hw/vfio/container-legacy.c +4 -4
index 3a710d8265c..eb9911eaeaf 100644
@@ -92,7 +92,7 @@ static int vfio_dma_unmap_bitmap(const VFIOLegacyContainer *container,
      bitmap = (struct vfio_bitmap *)&unmap->data;
 
      /*
-     * cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
+     * physical_memory_set_dirty_lebitmap() supports pages in bitmap of
       * qemu_real_host_page_size to mark those dirty. Hence set bitmap_pgsize
       * to qemu_real_host_page_size.
       */
@@ -108,7 +108,7 @@ static int vfio_dma_unmap_bitmap(const VFIOLegacyContainer *container,
 
      ret = ioctl(container->fd, VFIO_IOMMU_UNMAP_DMA, unmap);
      if (!ret) {
-        cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap,
+        physical_memory_set_dirty_lebitmap(vbmap.bitmap,
                  iotlb->translated_addr, vbmap.pages);
      } else {
          error_report("VFIO_UNMAP_DMA with DIRTY_BITMAP : %m");
@@ -284,7 +284,7 @@ static int vfio_legacy_query_dirty_bitmap(const VFIOContainer *bcontainer,
      range->size = size;
 
      /*
-     * cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
+     * physical_memory_set_dirty_lebitmap() supports pages in bitmap of
       * qemu_real_host_page_size to mark those dirty. Hence set bitmap's pgsize
       * to qemu_real_host_page_size.
       */
@@ -503,7 +503,7 @@ static void vfio_get_iommu_info_migration(VFIOLegacyContainer *container,
                              header);
 
      /*
-     * cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
+     * physical_memory_set_dirty_lebitmap() supports pages in bitmap of
       * qemu_real_host_page_size to mark those dirty.
       */
      if (cap_mig->pgsize_bitmap & qemu_real_host_page_size()) {
hw/vfio/container.c +2 -2
index 41de3439246..3fb19a1c8ad 100644
@@ -255,7 +255,7 @@ int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
      int ret;
 
      if (!bcontainer->dirty_pages_supported && !all_device_dirty_tracking) {
-        cpu_physical_memory_set_dirty_range(translated_addr, size,
+        physical_memory_set_dirty_range(translated_addr, size,
                                              tcg_enabled() ? DIRTY_CLIENTS_ALL :
                                              DIRTY_CLIENTS_NOCODE);
          return 0;
@@ -280,7 +280,7 @@ int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer,
          goto out;
      }
 
-    dirty_pages = cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap,
+    dirty_pages = physical_memory_set_dirty_lebitmap(vbmap.bitmap,
                                                           translated_addr,
                                                           vbmap.pages);
 
migration/ram.c +2 -2
index 52bdfec91d9..d09591c0600 100644
@@ -976,7 +976,7 @@ static uint64_t physical_memory_sync_dirty_bitmap(RAMBlock *rb,
              }
          }
          if (num_dirty) {
-            cpu_physical_memory_dirty_bits_cleared(start, length);
+            physical_memory_dirty_bits_cleared(start, length);
          }
 
          if (rb->clear_bmap) {
@@ -995,7 +995,7 @@ static uint64_t physical_memory_sync_dirty_bitmap(RAMBlock *rb,
          ram_addr_t offset = rb->offset;
 
          for (addr = 0; addr < length; addr += TARGET_PAGE_SIZE) {
-            if (cpu_physical_memory_test_and_clear_dirty(
+            if (physical_memory_test_and_clear_dirty(
                          start + addr + offset,
                          TARGET_PAGE_SIZE,
                          DIRTY_MEMORY_MIGRATION)) {
system/memory.c +4 -4
index cf8cad69611..dd045da60c0 100644
@@ -2275,7 +2275,7 @@ void memory_region_set_dirty(MemoryRegion *mr, hwaddr addr,
                               hwaddr size)
  {
      assert(mr->ram_block);
-    cpu_physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
+    physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
                                          size,
                                          memory_region_get_dirty_log_mask(mr));
  }
@@ -2379,7 +2379,7 @@ DirtyBitmapSnapshot *memory_region_snapshot_and_clear_dirty(MemoryRegion *mr,
      DirtyBitmapSnapshot *snapshot;
      assert(mr->ram_block);
      memory_region_sync_dirty_bitmap(mr, false);
-    snapshot = cpu_physical_memory_snapshot_and_clear_dirty(mr, addr, size, client);
+    snapshot = physical_memory_snapshot_and_clear_dirty(mr, addr, size, client);
      memory_global_after_dirty_log_sync();
      return snapshot;
  }
@@ -2388,7 +2388,7 @@ bool memory_region_snapshot_get_dirty(MemoryRegion *mr, DirtyBitmapSnapshot *sna
                                        hwaddr addr, hwaddr size)
  {
      assert(mr->ram_block);
-    return cpu_physical_memory_snapshot_get_dirty(snap,
+    return physical_memory_snapshot_get_dirty(snap,
                  memory_region_get_ram_addr(mr) + addr, size);
  }
 
@@ -2426,7 +2426,7 @@ void memory_region_reset_dirty(MemoryRegion *mr, hwaddr addr,
                                 hwaddr size, unsigned client)
  {
      assert(mr->ram_block);
-    cpu_physical_memory_test_and_clear_dirty(
+    physical_memory_test_and_clear_dirty(
          memory_region_get_ram_addr(mr) + addr, size, client);
  }
 
system/physmem.c +24 -24
index ad9705c7726..1a075da2bdd 100644
@@ -901,7 +901,7 @@ void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t length)
      }
  }
 
-void cpu_physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length)
+void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length)
  {
      if (tcg_enabled()) {
          tlb_reset_dirty_range_all(start, length);
@@ -947,17 +947,17 @@ static bool physical_memory_get_dirty(ram_addr_t start, ram_addr_t length,
      return dirty;
  }
 
-bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client)
+bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client)
  {
      return physical_memory_get_dirty(addr, 1, client);
  }
 
-bool cpu_physical_memory_is_clean(ram_addr_t addr)
+bool physical_memory_is_clean(ram_addr_t addr)
  {
-    bool vga = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);
-    bool code = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);
+    bool vga = physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);
+    bool code = physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);
      bool migration =
-        cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
+        physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
      return !(vga && code && migration);
  }
 
@@ -1000,7 +1000,7 @@ static bool physical_memory_all_dirty(ram_addr_t start, ram_addr_t length,
      return dirty;
  }
 
-uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
+uint8_t physical_memory_range_includes_clean(ram_addr_t start,
                                                   ram_addr_t length,
                                                   uint8_t mask)
  {
@@ -1021,7 +1021,7 @@ uint8_t cpu_physical_memory_range_includes_clean(ram_addr_t start,
      return ret;
  }
 
-void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client)
+void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client)
  {
      unsigned long page, idx, offset;
      DirtyMemoryBlocks *blocks;
@@ -1039,7 +1039,7 @@ void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client)
      set_bit_atomic(offset, blocks->blocks[idx]);
  }
 
-void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
+void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
                                           uint8_t mask)
  {
      DirtyMemoryBlocks *blocks[DIRTY_MEMORY_NUM];
@@ -1091,7 +1091,7 @@ void cpu_physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
  }
 
  /* Note: start and end must be within the same ram block.  */
-bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
+bool physical_memory_test_and_clear_dirty(ram_addr_t start,
                                                ram_addr_t length,
                                                unsigned client)
  {
@@ -1133,7 +1133,7 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
      }
 
      if (dirty) {
-        cpu_physical_memory_dirty_bits_cleared(start, length);
+        physical_memory_dirty_bits_cleared(start, length);
      }
 
      return dirty;
@@ -1141,12 +1141,12 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_t start,
 
  static void physical_memory_clear_dirty_range(ram_addr_t addr, ram_addr_t length)
  {
-    cpu_physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_MIGRATION);
-    cpu_physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_VGA);
-    cpu_physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_CODE);
+    physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_MIGRATION);
+    physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_VGA);
+    physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_CODE);
  }
 
-DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
+DirtyBitmapSnapshot *physical_memory_snapshot_and_clear_dirty
      (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client)
  {
      DirtyMemoryBlocks *blocks;
@@ -1193,14 +1193,14 @@ DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty
          }
      }
 
-    cpu_physical_memory_dirty_bits_cleared(start, length);
+    physical_memory_dirty_bits_cleared(start, length);
 
      memory_region_clear_dirty_bitmap(mr, offset, length);
 
      return snap;
  }
 
-bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
+bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
                                              ram_addr_t start,
                                              ram_addr_t length)
  {
@@ -1221,7 +1221,7 @@ bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
      return false;
  }
 
-uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
+uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
                                                  ram_addr_t start,
                                                  ram_addr_t pages)
  {
@@ -1314,7 +1314,7 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
                      page_number = (i * HOST_LONG_BITS + j) * hpratio;
                      addr = page_number * TARGET_PAGE_SIZE;
                      ram_addr = start + addr;
-                    cpu_physical_memory_set_dirty_range(ram_addr,
+                    physical_memory_set_dirty_range(ram_addr,
                                         TARGET_PAGE_SIZE * hpratio, clients);
                  } while (c != 0);
              }
@@ -2082,7 +2082,7 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
 
      physical_memory_clear_dirty_range(block->offset, block->used_length);
      block->used_length = newsize;
-    cpu_physical_memory_set_dirty_range(block->offset, block->used_length,
+    physical_memory_set_dirty_range(block->offset, block->used_length,
                                          DIRTY_CLIENTS_ALL);
      memory_region_set_size(block->mr, unaligned_size);
      if (block->resized) {
@@ -2287,7 +2287,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
      ram_list.version++;
      qemu_mutex_unlock_ramlist();
 
-    cpu_physical_memory_set_dirty_range(new_block->offset,
+    physical_memory_set_dirty_range(new_block->offset,
                                          new_block->used_length,
                                          DIRTY_CLIENTS_ALL);
 
@@ -3136,19 +3136,19 @@ static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr,
      addr += ramaddr;
 
      /* No early return if dirty_log_mask is or becomes 0, because
-     * cpu_physical_memory_set_dirty_range will still call
+     * physical_memory_set_dirty_range will still call
       * xen_modified_memory.
       */
      if (dirty_log_mask) {
          dirty_log_mask =
-            cpu_physical_memory_range_includes_clean(addr, length, dirty_log_mask);
+            physical_memory_range_includes_clean(addr, length, dirty_log_mask);
      }
      if (dirty_log_mask & (1 << DIRTY_MEMORY_CODE)) {
          assert(tcg_enabled());
          tb_invalidate_phys_range(NULL, addr, addr + length - 1);
          dirty_log_mask &= ~(1 << DIRTY_MEMORY_CODE);
      }
-    cpu_physical_memory_set_dirty_range(addr, length, dirty_log_mask);
+    physical_memory_set_dirty_range(addr, length, dirty_log_mask);
  }
 
  void memory_region_flush_rom_device(MemoryRegion *mr, hwaddr addr, hwaddr size)
target/arm/tcg/mte_helper.c +1 -1
index 7d80244788e..077ff4b2b2c 100644
@@ -189,7 +189,7 @@ uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx,
       */
      if (tag_access == MMU_DATA_STORE) {
          ram_addr_t tag_ra = memory_region_get_ram_addr(mr) + xlat;
-        cpu_physical_memory_set_dirty_flag(tag_ra, DIRTY_MEMORY_MIGRATION);
+        physical_memory_set_dirty_flag(tag_ra, DIRTY_MEMORY_MIGRATION);
      }
 
      return memory_region_get_ram_ptr(mr) + xlat;
system/memory_ldst.c.inc +1 -1
index 7f32d3d9ff3..333da209d1a 100644
@@ -287,7 +287,7 @@ void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL,
 
          dirty_log_mask = memory_region_get_dirty_log_mask(mr);
          dirty_log_mask &= ~(1 << DIRTY_MEMORY_CODE);
-        cpu_physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
+        physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + addr,
                                              4, dirty_log_mask);
          r = MEMTX_OK;
      }
tests/tsan/ignore.tsan +2 -2
index 423e482d2f9..8fa00a2c49b 100644
@@ -4,7 +4,7 @@
  # The eventual goal would be to fix these warnings.
 
  # TSan is not happy about setting/getting of dirty bits,
-# for example, cpu_physical_memory_set_dirty_range,
-# and cpu_physical_memory_get_dirty.
+# for example, physical_memory_set_dirty_range,
+# and physical_memory_get_dirty.
  src:bitops.c
  src:bitmap.c
#27 lore raw

PATCH v2 18/18 system/physmem: Extract API out of 'system/ram_addr.h' header

In reply to Philippe Mathieu-Daudé

Very few files use the Physical Memory API. Declare its methods in their own header: "system/physmem.h".

---
 MAINTAINERS                 |  1 +
 include/system/physmem.h    | 54 +++++++++++++++++++++++++++++++++++++
 include/system/ram_addr.h   | 40 ---------------------------
 accel/kvm/kvm-all.c         |  2 +-
 accel/tcg/cputlb.c          |  1 +
 hw/vfio/container-legacy.c  |  2 +-
 hw/vfio/container.c         |  1 +
 hw/vfio/listener.c          |  1 -
 migration/ram.c             |  1 +
 system/memory.c             |  1 +
 system/physmem.c            |  1 +
 target/arm/tcg/mte_helper.c |  2 +-
 12 files changed, 63 insertions(+), 44 deletions(-)
 create mode 100644 include/system/physmem.h
MAINTAINERS +1 -0
index 406cef88f0c..9632eb7b440 100644
@@ -3213,6 +3213,7 @@ S: Supported
 F: include/system/ioport.h
 F: include/exec/memop.h
 F: include/system/memory.h
+F: include/system/physmem.h
 F: include/system/ram_addr.h
 F: include/system/ramblock.h
 F: include/system/memory_mapping.h
include/system/physmem.h new file +54 -0

54 lines not on this page · raw message

include/system/ram_addr.h +0 -40
index 3894a84fb9c..683485980ce 100644
@@ -19,7 +19,6 @@
 #ifndef SYSTEM_RAM_ADDR_H
 #define SYSTEM_RAM_ADDR_H
 
-#include "exec/ramlist.h"
 #include "system/ramblock.h"
 #include "exec/target_page.h"
 #include "exec/hwaddr.h"
@@ -133,43 +132,4 @@ static inline void qemu_ram_block_writeback(RAMBlock *block)
     qemu_ram_msync(block, 0, block->used_length);
 }
 
-#define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
-#define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
-
-bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
-
-bool physical_memory_is_clean(ram_addr_t addr);
-
-uint8_t physical_memory_range_includes_clean(ram_addr_t start,
-                                                 ram_addr_t length,
-                                                 uint8_t mask);
-
-void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
-
-void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
-                                         uint8_t mask);
-
-/*
- * Contrary to physical_memory_sync_dirty_bitmap() this function returns
- * the number of dirty pages in @bitmap passed as argument. On the other hand,
- * physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
- * weren't set in the global migration bitmap.
- */
-uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
-                                                ram_addr_t start,
-                                                ram_addr_t pages);
-
-void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
-
-bool physical_memory_test_and_clear_dirty(ram_addr_t start,
-                                              ram_addr_t length,
-                                              unsigned client);
-
-DirtyBitmapSnapshot *physical_memory_snapshot_and_clear_dirty
-    (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client);
-
-bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
-                                            ram_addr_t start,
-                                            ram_addr_t length);
-
 #endif
accel/kvm/kvm-all.c +1 -1
index a7ece7db964..58802f7c3cc 100644
@@ -32,13 +32,13 @@
 #include "system/runstate.h"
 #include "system/cpus.h"
 #include "system/accel-blocker.h"
+#include "system/physmem.h"
 #include "system/ramblock.h"
 #include "accel/accel-ops.h"
 #include "qemu/bswap.h"
 #include "exec/tswap.h"
 #include "exec/target_page.h"
 #include "system/memory.h"
-#include "system/ram_addr.h"
 #include "qemu/event_notifier.h"
 #include "qemu/main-loop.h"
 #include "trace.h"
accel/tcg/cputlb.c +1 -0
index a721235dea6..7214d41cb5d 100644
@@ -25,6 +25,7 @@
 #include "accel/tcg/probe.h"
 #include "exec/page-protection.h"
 #include "system/memory.h"
+#include "system/physmem.h"
 #include "accel/tcg/cpu-ldst-common.h"
 #include "accel/tcg/cpu-mmu-index.h"
 #include "exec/cputlb.h"
hw/vfio/container-legacy.c +1 -1
index eb9911eaeaf..755a407f3e7 100644
@@ -25,7 +25,7 @@
 #include "hw/vfio/vfio-device.h"
 #include "system/address-spaces.h"
 #include "system/memory.h"
-#include "system/ram_addr.h"
+#include "system/physmem.h"
 #include "qemu/error-report.h"
 #include "qemu/range.h"
 #include "system/reset.h"
hw/vfio/container.c +1 -0
index 3fb19a1c8ad..9ddec300e35 100644
@@ -20,6 +20,7 @@
 #include "qemu/error-report.h"
 #include "hw/vfio/vfio-container.h"
 #include "hw/vfio/vfio-device.h" /* vfio_device_reset_handler */
+#include "system/physmem.h"
 #include "system/reset.h"
 #include "vfio-helpers.h"
 
hw/vfio/listener.c +0 -1
index b5cefc9395c..c6bb58f5209 100644
@@ -30,7 +30,6 @@
 #include "hw/vfio/pci.h"
 #include "system/address-spaces.h"
 #include "system/memory.h"
-#include "system/ram_addr.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
migration/ram.c +1 -0
index d09591c0600..12122dda685 100644
@@ -53,6 +53,7 @@
 #include "qemu/rcu_queue.h"
 #include "migration/colo.h"
 #include "system/cpu-throttle.h"
+#include "system/physmem.h"
 #include "system/ramblock.h"
 #include "savevm.h"
 #include "qemu/iov.h"
system/memory.c +1 -0
index dd045da60c0..80656c69568 100644
@@ -25,6 +25,7 @@
 #include "qemu/target-info.h"
 #include "qom/object.h"
 #include "trace.h"
+#include "system/physmem.h"
 #include "system/ram_addr.h"
 #include "system/kvm.h"
 #include "system/runstate.h"
system/physmem.c +1 -0
index 1a075da2bdd..ec3d8027e86 100644
@@ -43,6 +43,7 @@
 #include "system/kvm.h"
 #include "system/tcg.h"
 #include "system/qtest.h"
+#include "system/physmem.h"
 #include "system/ramblock.h"
 #include "qemu/timer.h"
 #include "qemu/config-file.h"
target/arm/tcg/mte_helper.c +1 -1
index 077ff4b2b2c..b96c953f809 100644
@@ -27,7 +27,7 @@
 #include "user/cpu_loop.h"
 #include "user/page-protection.h"
 #else
-#include "system/ram_addr.h"
+#include "system/physmem.h"
 #endif
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
Signature · 1 line
2.51.0
#28 lore raw
Quoted 158 lines · Philippe Mathieu-Daudé

Very few files use the Physical Memory API. Declare its methods in their own header: "system/physmem.h".

---
  MAINTAINERS                 |  1 +
  include/system/physmem.h    | 54 +++++++++++++++++++++++++++++++++++++
  include/system/ram_addr.h   | 40 ---------------------------
  accel/kvm/kvm-all.c         |  2 +-
  accel/tcg/cputlb.c          |  1 +
  hw/vfio/container-legacy.c  |  2 +-
  hw/vfio/container.c         |  1 +
  hw/vfio/listener.c          |  1 -
  migration/ram.c             |  1 +
  system/memory.c             |  1 +
  system/physmem.c            |  1 +
  target/arm/tcg/mte_helper.c |  2 +-
  12 files changed, 63 insertions(+), 44 deletions(-)

create mode 100644 include/system/physmem.h

MAINTAINERS +1 -0
index 406cef88f0c..9632eb7b440 100644
@@ -3213,6 +3213,7 @@ S: Supported
  F: include/system/ioport.h
  F: include/exec/memop.h
  F: include/system/memory.h
+F: include/system/physmem.h
  F: include/system/ram_addr.h
  F: include/system/ramblock.h
  F: include/system/memory_mapping.h
include/system/physmem.h new file +54 -0
new file mode 100644
index 00000000000..879f6eae38b
@@ -0,0 +1,54 @@
+/*
+ * QEMU physical memory interfaces (target independent).
+ *
+ *  Copyright (c) 2003 Fabrice Bellard
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+#ifndef QEMU_SYSTEM_PHYSMEM_H
+#define QEMU_SYSTEM_PHYSMEM_H
+
+#include "exec/hwaddr.h"
+#include "exec/ramlist.h"
+
+#define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
+#define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
+
+bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
+
+bool physical_memory_is_clean(ram_addr_t addr);
+
+uint8_t physical_memory_range_includes_clean(ram_addr_t start,
+                                             ram_addr_t length,
+                                             uint8_t mask);
+
+void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
+
+void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
+                                     uint8_t mask);
+
+/*
+ * Contrary to physical_memory_sync_dirty_bitmap() this function returns
+ * the number of dirty pages in @bitmap passed as argument. On the other hand,
+ * physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
+ * weren't set in the global migration bitmap.
+ */
+uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
+                                            ram_addr_t start,
+                                            ram_addr_t pages);
+
+void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
+
+bool physical_memory_test_and_clear_dirty(ram_addr_t start,
+                                          ram_addr_t length,
+                                          unsigned client);
+
+DirtyBitmapSnapshot *
+physical_memory_snapshot_and_clear_dirty(MemoryRegion *mr, hwaddr offset,
+                                         hwaddr length, unsigned client);
+
+bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
+                                        ram_addr_t start,
+                                        ram_addr_t length);
+
+#endif
include/system/ram_addr.h +0 -40
index 3894a84fb9c..683485980ce 100644
@@ -19,7 +19,6 @@
  #ifndef SYSTEM_RAM_ADDR_H
  #define SYSTEM_RAM_ADDR_H
 
-#include "exec/ramlist.h"
  #include "system/ramblock.h"
  #include "exec/target_page.h"
  #include "exec/hwaddr.h"
@@ -133,43 +132,4 @@ static inline void qemu_ram_block_writeback(RAMBlock *block)
      qemu_ram_msync(block, 0, block->used_length);
  }
 
-#define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
-#define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
-
-bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
-
-bool physical_memory_is_clean(ram_addr_t addr);
-
-uint8_t physical_memory_range_includes_clean(ram_addr_t start,
-                                                 ram_addr_t length,
-                                                 uint8_t mask);
-
-void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
-
-void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
-                                         uint8_t mask);
-
-/*
- * Contrary to physical_memory_sync_dirty_bitmap() this function returns
- * the number of dirty pages in @bitmap passed as argument. On the other hand,
- * physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
- * weren't set in the global migration bitmap.
- */
-uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
-                                                ram_addr_t start,
-                                                ram_addr_t pages);
-
-void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
-
-bool physical_memory_test_and_clear_dirty(ram_addr_t start,
-                                              ram_addr_t length,
-                                              unsigned client);
-
-DirtyBitmapSnapshot *physical_memory_snapshot_and_clear_dirty
-    (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client);
-
-bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
-                                            ram_addr_t start,
-                                            ram_addr_t length);
-
  #endif
accel/kvm/kvm-all.c +1 -0
index a7ece7db964..58802f7c3cc 100644
@@ -32,13 +32,13 @@
  #include "system/runstate.h"
  #include "system/cpus.h"
  #include "system/accel-blocker.h"
+#include "system/physmem.h"

accel/kvm/kvm-all.c line 44

Quoted 10 lines
accel/kvm/kvm-all.c +0 -1
  #include "system/ramblock.h"
  #include "accel/accel-ops.h"
  #include "qemu/bswap.h"
  #include "exec/tswap.h"
  #include "exec/target_page.h"
  #include "system/memory.h"
-#include "system/ram_addr.h"
  #include "qemu/event_notifier.h"
  #include "qemu/main-loop.h"
  #include "trace.h"

hmm, I am seeing build errors :

../accel/kvm/kvm-all.c:1596:41: error: invalid use of incomplete typedef ‘RAMBlock’
1596 | mem->guest_memfd = mr->ram_block->guest_memfd;

May be this is my tree. Can you check ?

C.

Quoted 98 lines
accel/tcg/cputlb.c +1 -0
index a721235dea6..7214d41cb5d 100644
@@ -25,6 +25,7 @@
  #include "accel/tcg/probe.h"
  #include "exec/page-protection.h"
  #include "system/memory.h"
+#include "system/physmem.h"
  #include "accel/tcg/cpu-ldst-common.h"
  #include "accel/tcg/cpu-mmu-index.h"
  #include "exec/cputlb.h"
hw/vfio/container-legacy.c +1 -1
index eb9911eaeaf..755a407f3e7 100644
@@ -25,7 +25,7 @@
  #include "hw/vfio/vfio-device.h"
  #include "system/address-spaces.h"
  #include "system/memory.h"
-#include "system/ram_addr.h"
+#include "system/physmem.h"
  #include "qemu/error-report.h"
  #include "qemu/range.h"
  #include "system/reset.h"
hw/vfio/container.c +1 -0
index 3fb19a1c8ad..9ddec300e35 100644
@@ -20,6 +20,7 @@
  #include "qemu/error-report.h"
  #include "hw/vfio/vfio-container.h"
  #include "hw/vfio/vfio-device.h" /* vfio_device_reset_handler */
+#include "system/physmem.h"
  #include "system/reset.h"
  #include "vfio-helpers.h"
 
hw/vfio/listener.c +0 -1
index b5cefc9395c..c6bb58f5209 100644
@@ -30,7 +30,6 @@
  #include "hw/vfio/pci.h"
  #include "system/address-spaces.h"
  #include "system/memory.h"
-#include "system/ram_addr.h"
  #include "hw/hw.h"
  #include "qemu/error-report.h"
  #include "qemu/main-loop.h"
migration/ram.c +1 -0
index d09591c0600..12122dda685 100644
@@ -53,6 +53,7 @@
  #include "qemu/rcu_queue.h"
  #include "migration/colo.h"
  #include "system/cpu-throttle.h"
+#include "system/physmem.h"
  #include "system/ramblock.h"
  #include "savevm.h"
  #include "qemu/iov.h"
system/memory.c +1 -0
index dd045da60c0..80656c69568 100644
@@ -25,6 +25,7 @@
  #include "qemu/target-info.h"
  #include "qom/object.h"
  #include "trace.h"
+#include "system/physmem.h"
  #include "system/ram_addr.h"
  #include "system/kvm.h"
  #include "system/runstate.h"
system/physmem.c +1 -0
index 1a075da2bdd..ec3d8027e86 100644
@@ -43,6 +43,7 @@
  #include "system/kvm.h"
  #include "system/tcg.h"
  #include "system/qtest.h"
+#include "system/physmem.h"
  #include "system/ramblock.h"
  #include "qemu/timer.h"
  #include "qemu/config-file.h"
target/arm/tcg/mte_helper.c +1 -1
index 077ff4b2b2c..b96c953f809 100644
@@ -27,7 +27,7 @@
  #include "user/cpu_loop.h"
  #include "user/page-protection.h"
  #else
-#include "system/ram_addr.h"
+#include "system/physmem.h"
  #endif
  #include "accel/tcg/cpu-ldst.h"
  #include "accel/tcg/probe.h"
Reviewed-by on v2 18/18
#29 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 19 lines · Philippe Mathieu-Daudé

Very few files use the Physical Memory API. Declare its methods in their own header: "system/physmem.h".

---
  MAINTAINERS                 |  1 +
  include/system/physmem.h    | 54 +++++++++++++++++++++++++++++++++++++
  include/system/ram_addr.h   | 40 ---------------------------
  accel/kvm/kvm-all.c         |  2 +-
  accel/tcg/cputlb.c          |  1 +
  hw/vfio/container-legacy.c  |  2 +-
  hw/vfio/container.c         |  1 +
  hw/vfio/listener.c          |  1 -
  migration/ram.c             |  1 +
  system/memory.c             |  1 +
  system/physmem.c            |  1 +
  target/arm/tcg/mte_helper.c |  2 +-
  12 files changed, 63 insertions(+), 44 deletions(-)
Quoted 1 line

create mode 100644 include/system/physmem.h

for vfio,

Thanks,

C.

Quoted 246 lines
MAINTAINERS +1 -0
index 406cef88f0c..9632eb7b440 100644
@@ -3213,6 +3213,7 @@ S: Supported
  F: include/system/ioport.h
  F: include/exec/memop.h
  F: include/system/memory.h
+F: include/system/physmem.h
  F: include/system/ram_addr.h
  F: include/system/ramblock.h
  F: include/system/memory_mapping.h
include/system/physmem.h new file +54 -0
new file mode 100644
index 00000000000..879f6eae38b
@@ -0,0 +1,54 @@
+/*
+ * QEMU physical memory interfaces (target independent).
+ *
+ *  Copyright (c) 2003 Fabrice Bellard
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+#ifndef QEMU_SYSTEM_PHYSMEM_H
+#define QEMU_SYSTEM_PHYSMEM_H
+
+#include "exec/hwaddr.h"
+#include "exec/ramlist.h"
+
+#define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
+#define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
+
+bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
+
+bool physical_memory_is_clean(ram_addr_t addr);
+
+uint8_t physical_memory_range_includes_clean(ram_addr_t start,
+                                             ram_addr_t length,
+                                             uint8_t mask);
+
+void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
+
+void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
+                                     uint8_t mask);
+
+/*
+ * Contrary to physical_memory_sync_dirty_bitmap() this function returns
+ * the number of dirty pages in @bitmap passed as argument. On the other hand,
+ * physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
+ * weren't set in the global migration bitmap.
+ */
+uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
+                                            ram_addr_t start,
+                                            ram_addr_t pages);
+
+void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
+
+bool physical_memory_test_and_clear_dirty(ram_addr_t start,
+                                          ram_addr_t length,
+                                          unsigned client);
+
+DirtyBitmapSnapshot *
+physical_memory_snapshot_and_clear_dirty(MemoryRegion *mr, hwaddr offset,
+                                         hwaddr length, unsigned client);
+
+bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
+                                        ram_addr_t start,
+                                        ram_addr_t length);
+
+#endif
include/system/ram_addr.h +0 -40
index 3894a84fb9c..683485980ce 100644
@@ -19,7 +19,6 @@
  #ifndef SYSTEM_RAM_ADDR_H
  #define SYSTEM_RAM_ADDR_H
 
-#include "exec/ramlist.h"
  #include "system/ramblock.h"
  #include "exec/target_page.h"
  #include "exec/hwaddr.h"
@@ -133,43 +132,4 @@ static inline void qemu_ram_block_writeback(RAMBlock *block)
      qemu_ram_msync(block, 0, block->used_length);
  }
 
-#define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)
-#define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))
-
-bool physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client);
-
-bool physical_memory_is_clean(ram_addr_t addr);
-
-uint8_t physical_memory_range_includes_clean(ram_addr_t start,
-                                                 ram_addr_t length,
-                                                 uint8_t mask);
-
-void physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client);
-
-void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length,
-                                         uint8_t mask);
-
-/*
- * Contrary to physical_memory_sync_dirty_bitmap() this function returns
- * the number of dirty pages in @bitmap passed as argument. On the other hand,
- * physical_memory_sync_dirty_bitmap() returns newly dirtied pages that
- * weren't set in the global migration bitmap.
- */
-uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
-                                                ram_addr_t start,
-                                                ram_addr_t pages);
-
-void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length);
-
-bool physical_memory_test_and_clear_dirty(ram_addr_t start,
-                                              ram_addr_t length,
-                                              unsigned client);
-
-DirtyBitmapSnapshot *physical_memory_snapshot_and_clear_dirty
-    (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client);
-
-bool physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
-                                            ram_addr_t start,
-                                            ram_addr_t length);
-
  #endif
accel/kvm/kvm-all.c +1 -1
index a7ece7db964..58802f7c3cc 100644
@@ -32,13 +32,13 @@
  #include "system/runstate.h"
  #include "system/cpus.h"
  #include "system/accel-blocker.h"
+#include "system/physmem.h"
  #include "system/ramblock.h"
  #include "accel/accel-ops.h"
  #include "qemu/bswap.h"
  #include "exec/tswap.h"
  #include "exec/target_page.h"
  #include "system/memory.h"
-#include "system/ram_addr.h"
  #include "qemu/event_notifier.h"
  #include "qemu/main-loop.h"
  #include "trace.h"
accel/tcg/cputlb.c +1 -0
index a721235dea6..7214d41cb5d 100644
@@ -25,6 +25,7 @@
  #include "accel/tcg/probe.h"
  #include "exec/page-protection.h"
  #include "system/memory.h"
+#include "system/physmem.h"
  #include "accel/tcg/cpu-ldst-common.h"
  #include "accel/tcg/cpu-mmu-index.h"
  #include "exec/cputlb.h"
hw/vfio/container-legacy.c +1 -1
index eb9911eaeaf..755a407f3e7 100644
@@ -25,7 +25,7 @@
  #include "hw/vfio/vfio-device.h"
  #include "system/address-spaces.h"
  #include "system/memory.h"
-#include "system/ram_addr.h"
+#include "system/physmem.h"
  #include "qemu/error-report.h"
  #include "qemu/range.h"
  #include "system/reset.h"
hw/vfio/container.c +1 -0
index 3fb19a1c8ad..9ddec300e35 100644
@@ -20,6 +20,7 @@
  #include "qemu/error-report.h"
  #include "hw/vfio/vfio-container.h"
  #include "hw/vfio/vfio-device.h" /* vfio_device_reset_handler */
+#include "system/physmem.h"
  #include "system/reset.h"
  #include "vfio-helpers.h"
 
hw/vfio/listener.c +0 -1
index b5cefc9395c..c6bb58f5209 100644
@@ -30,7 +30,6 @@
  #include "hw/vfio/pci.h"
  #include "system/address-spaces.h"
  #include "system/memory.h"
-#include "system/ram_addr.h"
  #include "hw/hw.h"
  #include "qemu/error-report.h"
  #include "qemu/main-loop.h"
migration/ram.c +1 -0
index d09591c0600..12122dda685 100644
@@ -53,6 +53,7 @@
  #include "qemu/rcu_queue.h"
  #include "migration/colo.h"
  #include "system/cpu-throttle.h"
+#include "system/physmem.h"
  #include "system/ramblock.h"
  #include "savevm.h"
  #include "qemu/iov.h"
system/memory.c +1 -0
index dd045da60c0..80656c69568 100644
@@ -25,6 +25,7 @@
  #include "qemu/target-info.h"
  #include "qom/object.h"
  #include "trace.h"
+#include "system/physmem.h"
  #include "system/ram_addr.h"
  #include "system/kvm.h"
  #include "system/runstate.h"
system/physmem.c +1 -0
index 1a075da2bdd..ec3d8027e86 100644
@@ -43,6 +43,7 @@
  #include "system/kvm.h"
  #include "system/tcg.h"
  #include "system/qtest.h"
+#include "system/physmem.h"
  #include "system/ramblock.h"
  #include "qemu/timer.h"
  #include "qemu/config-file.h"
target/arm/tcg/mte_helper.c +1 -1
index 077ff4b2b2c..b96c953f809 100644
@@ -27,7 +27,7 @@
  #include "user/cpu_loop.h"
  #include "user/page-protection.h"
  #else
-#include "system/ram_addr.h"
+#include "system/physmem.h"
  #endif
  #include "accel/tcg/cpu-ldst.h"
  #include "accel/tcg/probe.h"
#30 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 11 lines · Philippe Mathieu-Daudé

Philippe Mathieu-Daudé (18):
system/ram_addr: Remove unnecessary 'exec/cpu-common.h' header accel/kvm: Include missing 'exec/target_page.h' header hw/s390x/s390-stattrib: Include missing 'exec/target_page.h' header hw/vfio/listener: Include missing 'exec/target_page.h' header target/arm/tcg/mte: Include missing 'exec/target_page.h' header
hw: Remove unnecessary 'system/ram_addr.h' header system/physmem: Un-inline cpu_physical_memory_get_dirty_flag() system/physmem: Un-inline cpu_physical_memory_is_clean() system/physmem: Un-inline cpu_physical_memory_range_includes_clean() system/physmem: Un-inline cpu_physical_memory_set_dirty_flag()

Quoted 8 lines

system/physmem: Un-inline cpu_physical_memory_set_dirty_range() system/physmem: Remove _WIN32 #ifdef'ry
system/physmem: Un-inline cpu_physical_memory_set_dirty_lebitmap() system/physmem: Un-inline cpu_physical_memory_dirty_bits_cleared() system/physmem: Reduce cpu_physical_memory_clear_dirty_range() scope system/physmem: Reduce cpu_physical_memory_sync_dirty_bitmap() scope system/physmem: Drop 'cpu_' prefix in Physical Memory API system/physmem: Extract API out of 'system/ram_addr.h' header

Series queued, thanks.