From: "Cédric Le Goater" <clg@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>, qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Jagannathan Raman <jag.raman@oracle.com>,
	qemu-ppc@nongnu.org, Ilya Leoshkevich <iii@linux.ibm.com>,
	Thomas Huth <thuth@redhat.com>,
	Jason Herne <jjherne@linux.ibm.com>, Peter Xu <peterx@redhat.com>,
	kvm@vger.kernel.org,
	Christian Borntraeger <borntraeger@linux.ibm.com>,
	Halil Pasic <pasic@linux.ibm.com>,
	Matthew Rosato <mjrosato@linux.ibm.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Elena Ufimtseva <elena.ufimtseva@oracle.com>,
	Richard Henderson <richard.henderson@linaro.org>,
	Harsh Prateek Bora <harshpb@linux.ibm.com>,
	Fabiano Rosas <farosas@suse.de>,
	Eric Farman <farman@linux.ibm.com>,
	qemu-arm@nongnu.org, qemu-s390x@nongnu.org,
	David Hildenbrand <david@redhat.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	Nicholas Piggin <npiggin@gmail.com>
Subject: Re: [PATCH v2 18/18] system/physmem: Extract API out of 'system/ram_addr.h' header
Date: Thu, 2 Oct 2025 10:31:57 +0200	[thread overview]
Message-ID: <9d328a5e-119b-494b-9f9e-9a2fe2da4cfe@redhat.com> (raw)
In-Reply-To: <20251001175448.18933-19-philmd@linaro.org>
On 10/1/25 19:54, Philippe Mathieu-Daudé wrote:
> Very few files use the Physical Memory API. Declare its
> methods in their own header: "system/physmem.h".
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   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
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 406cef88f0c..9632eb7b440 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -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
> diff --git a/include/system/physmem.h b/include/system/physmem.h
> new file mode 100644
> index 00000000000..879f6eae38b
> --- /dev/null
> +++ b/include/system/physmem.h
> @@ -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
> diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h
> index 3894a84fb9c..683485980ce 100644
> --- a/include/system/ram_addr.h
> +++ b/include/system/ram_addr.h
> @@ -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
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index a7ece7db964..58802f7c3cc 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -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"
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.
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index a721235dea6..7214d41cb5d 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -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"
> diff --git a/hw/vfio/container-legacy.c b/hw/vfio/container-legacy.c
> index eb9911eaeaf..755a407f3e7 100644
> --- a/hw/vfio/container-legacy.c
> +++ b/hw/vfio/container-legacy.c
> @@ -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"
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index 3fb19a1c8ad..9ddec300e35 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -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"
>   
> diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c
> index b5cefc9395c..c6bb58f5209 100644
> --- a/hw/vfio/listener.c
> +++ b/hw/vfio/listener.c
> @@ -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"
> diff --git a/migration/ram.c b/migration/ram.c
> index d09591c0600..12122dda685 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -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"
> diff --git a/system/memory.c b/system/memory.c
> index dd045da60c0..80656c69568 100644
> --- a/system/memory.c
> +++ b/system/memory.c
> @@ -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"
> diff --git a/system/physmem.c b/system/physmem.c
> index 1a075da2bdd..ec3d8027e86 100644
> --- a/system/physmem.c
> +++ b/system/physmem.c
> @@ -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"
> diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c
> index 077ff4b2b2c..b96c953f809 100644
> --- a/target/arm/tcg/mte_helper.c
> +++ b/target/arm/tcg/mte_helper.c
> @@ -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"
next prev parent reply	other threads:[~2025-10-02  8:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-01 17:54 [PATCH v2 00/18] system/physmem: Extract API out of 'system/ram_addr.h' header Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 01/18] system/ram_addr: Remove unnecessary 'exec/cpu-common.h' header Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 02/18] accel/kvm: Include missing 'exec/target_page.h' header Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 03/18] hw/s390x/s390-stattrib: " Philippe Mathieu-Daudé
2025-10-02 14:18   ` Eric Farman
2025-10-01 17:54 ` [PATCH v2 04/18] hw/vfio/listener: " Philippe Mathieu-Daudé
2025-10-02  8:31   ` Cédric Le Goater
2025-10-01 17:54 ` [PATCH v2 05/18] target/arm/tcg/mte: " Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 06/18] hw: Remove unnecessary 'system/ram_addr.h' header Philippe Mathieu-Daudé
2025-10-01 19:32   ` Jag Raman
2025-10-02  8:37   ` Cédric Le Goater
2025-10-02 15:59   ` Harsh Prateek Bora
2025-10-02 17:38     ` Philippe Mathieu-Daudé
2025-10-02 16:45   ` Eric Farman
2025-10-01 17:54 ` [PATCH v2 07/18] system/physmem: Un-inline cpu_physical_memory_get_dirty_flag() Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 08/18] system/physmem: Un-inline cpu_physical_memory_is_clean() Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 09/18] system/physmem: Un-inline cpu_physical_memory_range_includes_clean() Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 10/18] system/physmem: Un-inline cpu_physical_memory_set_dirty_flag() Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 11/18] system/physmem: Un-inline cpu_physical_memory_set_dirty_range() Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 12/18] system/physmem: Remove _WIN32 #ifdef'ry Philippe Mathieu-Daudé
2025-10-01 21:00   ` Richard Henderson
2025-10-01 17:54 ` [PATCH v2 13/18] system/physmem: Un-inline cpu_physical_memory_set_dirty_lebitmap() Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 14/18] system/physmem: Un-inline cpu_physical_memory_dirty_bits_cleared() Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 15/18] system/physmem: Reduce cpu_physical_memory_clear_dirty_range() scope Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 16/18] system/physmem: Reduce cpu_physical_memory_sync_dirty_bitmap() scope Philippe Mathieu-Daudé
2025-10-01 17:54 ` [PATCH v2 17/18] system/physmem: Drop 'cpu_' prefix in Physical Memory API Philippe Mathieu-Daudé
2025-10-02  8:39   ` Cédric Le Goater
2025-10-01 17:54 ` [PATCH v2 18/18] system/physmem: Extract API out of 'system/ram_addr.h' header Philippe Mathieu-Daudé
2025-10-02  8:31   ` Cédric Le Goater [this message]
2025-10-02  8:40   ` Cédric Le Goater
2025-10-03 20:54 ` [PATCH v2 00/18] " Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox
  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):
  git send-email \
    --in-reply-to=9d328a5e-119b-494b-9f9e-9a2fe2da4cfe@redhat.com \
    --to=clg@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=david@redhat.com \
    --cc=elena.ufimtseva@oracle.com \
    --cc=farman@linux.ibm.com \
    --cc=farosas@suse.de \
    --cc=harshpb@linux.ibm.com \
    --cc=iii@linux.ibm.com \
    --cc=jag.raman@oracle.com \
    --cc=jjherne@linux.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=mjrosato@linux.ibm.com \
    --cc=mst@redhat.com \
    --cc=npiggin@gmail.com \
    --cc=pasic@linux.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY
  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
  Be sure your reply has a Subject: header at the top and a blank line
  before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).