cleanup on page size
Subsystems (2)
cover cleanup on page size
Patch 1 simplify the definition of xxx_PAGE_ALIGN.
Patch 2 replaces getpagesize() with qemu_real_host_page_size. This one touch a volume of code. If some point is not correct, I'd appreciate your notification.
Wei Yang (2):
cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
core: replace getpagesize() with qemu_real_host_page_size
accel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- hw/vfio/spapr.c | 7 ++++--- include/exec/cpu-all.h | 7 +++---- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 26 files changed, 55 insertions(+), 54 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
Use ROUND_UP() to define, which is a little bit easy to read.
--- include/exec/cpu-all.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
include/exec/cpu-all.h +3 -4
@@ -220,7 +220,7 @@ extern int target_page_bits;#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)#define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1) -#define TARGET_PAGE_ALIGN (addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK) +#define TARGET_PAGE_ALIGN (addr) ROUND_UP((addr), TARGET_PAGE_SIZE)/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even * when intptr_t is 32-bit and we are aligning a long long.
@@ -228,9 +228,8 @@ extern int target_page_bits;extern uintptr_t qemu_host_page_size;extern intptr_t qemu_host_page_mask; -#define HOST_PAGE_ALIGN (addr) (((addr) + qemu_host_page_size - 1) & qemu_host_page_mask) -#define REAL_HOST_PAGE_ALIGN (addr) (((addr) + qemu_real_host_page_size - 1) & \ - qemu_real_host_page_mask) +#define HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_host_page_size) +#define REAL_HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_real_host_page_size)/* same as PROT_xxx */ #define PAGE_READ 0x0001
Signature · 1 line
2.17.1
Re: [PATCH 1/2] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
Quoted 3 lines · Wei Yang
Use
ROUND_UP()to define, which is a little bit easy to read.Signed-off-by Wei Yang <[email protected]>
Quoted 31 lines
--- include/exec/cpu-all.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)include/exec/cpu-all.h +3
-4@@ -220,7 +220,7 @@ extern int target_page_bits;#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)#define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1) -#define TARGET_PAGE_ALIGN (addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK) +#define TARGET_PAGE_ALIGN (addr) ROUND_UP((addr), TARGET_PAGE_SIZE)/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even * when intptr_t is 32-bit and we are aligning a long long. @@ -228,9 +228,8 @@ extern int target_page_bits;extern uintptr_t qemu_host_page_size;extern intptr_t qemu_host_page_mask; -#define HOST_PAGE_ALIGN (addr) (((addr) + qemu_host_page_size - 1) & qemu_host_page_mask) -#define REAL_HOST_PAGE_ALIGN (addr) (((addr) + qemu_real_host_page_size - 1) & \ - qemu_real_host_page_mask) +#define HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_host_page_size) +#define REAL_HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_real_host_page_size)/* same as PROT_xxx */ #define PAGE_READ 0x0001Signature · 1 line
2.17.1
Re: [PATCH 1/2] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
In reply to Wei YangQuoted 3 lines · Wei Yang
Use
ROUND_UP()to define, which is a little bit easy to read.Signed-off-by Wei Yang <[email protected]>
Quoted 29 lines
--- include/exec/cpu-all.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)include/exec/cpu-all.h +3
-4@@ -220,7 +220,7 @@ extern int target_page_bits;#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)#define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1) -#define TARGET_PAGE_ALIGN (addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK) +#define TARGET_PAGE_ALIGN (addr) ROUND_UP((addr), TARGET_PAGE_SIZE)/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even * when intptr_t is 32-bit and we are aligning a long long. @@ -228,9 +228,8 @@ extern int target_page_bits;extern uintptr_t qemu_host_page_size;extern intptr_t qemu_host_page_mask; -#define HOST_PAGE_ALIGN (addr) (((addr) + qemu_host_page_size - 1) & qemu_host_page_mask) -#define REAL_HOST_PAGE_ALIGN (addr) (((addr) + qemu_real_host_page_size - 1) & \ - qemu_real_host_page_mask) +#define HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_host_page_size) +#define REAL_HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_real_host_page_size)/* same as PROT_xxx */ #define PAGE_READ 0x0001
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH 1/2] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
In reply to Wei YangQuoted 21 lines · Wei Yang
Use
ROUND_UP()to define, which is a little bit easy to read.Signed-off-by Wei Yang <[email protected]>--- include/exec/cpu-all.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)include/exec/cpu-all.h +1
-1@@ -220,7 +220,7 @@ extern int target_page_bits;#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)#define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1) -#define TARGET_PAGE_ALIGN (addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK) +#define TARGET_PAGE_ALIGN (addr) ROUND_UP((addr), TARGET_PAGE_SIZE)/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even * when intptr_t is 32-bit and we are aligning a long long.
include/exec/cpu-all.h extern int target_page_bits; · line 232
Quoted 8 lines
include/exec/cpu-all.h +2
-3@@ -228,9 +228,8 @@ extern int target_page_bits;extern uintptr_t qemu_host_page_size;extern intptr_t qemu_host_page_mask; -#define HOST_PAGE_ALIGN (addr) (((addr) + qemu_host_page_size - 1) & qemu_host_page_mask) -#define REAL_HOST_PAGE_ALIGN (addr) (((addr) + qemu_real_host_page_size - 1) & \ - qemu_real_host_page_mask) +#define HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_host_page_size) +#define REAL_HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_real_host_page_size)
No, please.
(1) The compiler does not know that qemu_*host_page_size is a power of 2, and will generate a real division at runtime. The same is true for TARGET_PAGE_SIZE when TARGET_PAGE_BITS_VARY.
(2) The first hunk conflicts with an in-flight patch of mine:
https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg04526.html
r~
Re: [PATCH 1/2] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
Quoted 34 lines · Richard Henderson
Quoted 21 lines · Wei Yang
Use
ROUND_UP()to define, which is a little bit easy to read.Signed-off-by Wei Yang <[email protected]>--- include/exec/cpu-all.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)include/exec/cpu-all.h +1
-1@@ -220,7 +220,7 @@ extern int target_page_bits;#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)#define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1) -#define TARGET_PAGE_ALIGN (addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK) +#define TARGET_PAGE_ALIGN (addr) ROUND_UP((addr), TARGET_PAGE_SIZE)/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even * when intptr_t is 32-bit and we are aligning a long long. include/exec/cpu-all.h extern int target_page_bits; · line 232
Quoted 8 lines
include/exec/cpu-all.h +2
-3@@ -228,9 +228,8 @@ extern int target_page_bits;extern uintptr_t qemu_host_page_size;extern intptr_t qemu_host_page_mask; -#define HOST_PAGE_ALIGN (addr) (((addr) + qemu_host_page_size - 1) & qemu_host_page_mask) -#define REAL_HOST_PAGE_ALIGN (addr) (((addr) + qemu_real_host_page_size - 1) & \ - qemu_real_host_page_mask) +#define HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_host_page_size) +#define REAL_HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_real_host_page_size)No, please.
Quoted 3 lines
(1) The compiler does not know that qemu_*host_page_size is a power of 2, and will generate a real division at runtime. The same is true for
TARGET_PAGE_SIZEwhenTARGET_PAGE_BITS_VARY.
Ouch, good point, I didn't think of that when I gave an R-b.
Quoted 7 lines
(2) The first hunk conflicts with an in-flight patch of mine:
https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg04526.html
r~
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH 1/2] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
In reply to Richard HendersonQuoted 34 lines · Richard Henderson
Quoted 21 lines · Wei Yang
Use
ROUND_UP()to define, which is a little bit easy to read.Signed-off-by Wei Yang <[email protected]>--- include/exec/cpu-all.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)include/exec/cpu-all.h +1
-1@@ -220,7 +220,7 @@ extern int target_page_bits;#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)#define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1) -#define TARGET_PAGE_ALIGN (addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK) +#define TARGET_PAGE_ALIGN (addr) ROUND_UP((addr), TARGET_PAGE_SIZE)/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even * when intptr_t is 32-bit and we are aligning a long long. include/exec/cpu-all.h extern int target_page_bits; · line 232
Quoted 8 lines
include/exec/cpu-all.h +2
-3@@ -228,9 +228,8 @@ extern int target_page_bits;extern uintptr_t qemu_host_page_size;extern intptr_t qemu_host_page_mask; -#define HOST_PAGE_ALIGN (addr) (((addr) + qemu_host_page_size - 1) & qemu_host_page_mask) -#define REAL_HOST_PAGE_ALIGN (addr) (((addr) + qemu_real_host_page_size - 1) & \ - qemu_real_host_page_mask) +#define HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_host_page_size) +#define REAL_HOST_PAGE_ALIGN (addr) ROUND_UP((addr), qemu_real_host_page_size)No, please.
Quoted 4 lines
(1) The compiler does not know that qemu_*host_page_size is a power of 2, and will generate a real division at runtime. The same is true for
TARGET_PAGE_SIZEwhenTARGET_PAGE_BITS_VARY.
Confused
The definition of ROUND_UP is:
#define ROUND_UP(n, d) (((n) + (d) - 1) & -(0 ? (n) : (d)))
Why it will do division? This will be expanded to the same form as the original code, if my understanding is correct. Would you mind telling me more?
Quoted 6 lines
(2) The first hunk conflicts with an in-flight patch of mine:
https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg04526.html
r~
Signature · 2 lines
Wei Yang Help you, Help me
Richard Henderson
Reviewed-byRe: [PATCH 1/2] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
Quoted 7 lines · Wei Yang
Quoted 6 lines
No, please.
(1) The compiler does not know that qemu_*host_page_size is a power of 2, and will generate a real division at runtime. The same is true for
TARGET_PAGE_SIZEwhenTARGET_PAGE_BITS_VARY.
Quoted 5 lines
Confused
The definition of
ROUND_UPis:#define
ROUND_UP(n, d)(((n) + (d) - 1) & -(0 ? (n) : (d)))
Ah, my bad, I did confuse this with QEMU_ALIGN_UP.
Hmm.
lea -1(n, size), t neg size and size, t
vs
mov mask, t
not t
add n, t
and mask, t
which is what I proposed here
Quoted 1 line
I'm ok with your version.
r~
Re: [PATCH 1/2] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
Quoted 29 lines · Richard Henderson
Quoted 7 lines · Wei Yang
Quoted 6 lines
No, please.
(1) The compiler does not know that qemu_*host_page_size is a power of 2, and will generate a real division at runtime. The same is true for
TARGET_PAGE_SIZEwhenTARGET_PAGE_BITS_VARY.Quoted 5 lines
Confused
The definition of
ROUND_UPis:#define
ROUND_UP(n, d)(((n) + (d) - 1) & -(0 ? (n) : (d)))Ah, my bad, I did confuse this with
QEMU_ALIGN_UP.Hmm.
lea -1(n, size), t neg size and size, tvs
mov mask, t
not t
add n, t
and mask, t
Quoted 8 lines
which is what I proposed here
Quoted 1 line
I'm ok with your version.
Reviewed-by Richard Henderson <[email protected]>
Thanks for your clarification.
Have a nice day
Quoted 3 lines
r~
Signature · 2 lines
Wei Yang Help you, Help me
Re: [PATCH 1/2] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN
In reply to Wei YangQuoted 3 lines · Wei Yang
Use
ROUND_UP()to define, which is a little bit easy to read.Signed-off-by Wei Yang <[email protected]>
PATCH 2/2 core: replace getpagesize() with qemu_real_host_page_size
In reply to Wei YangThere are three page size in qemu:
real host page size
host page size
target page size
All of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms: qemu_real_host_page_size and getpagesize().
qemu_real_host_page_size is defined to be a replacement of getpagesize(), so let it serve the role.
[Note] Not fully tested for some arch or device.
--- accel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- hw/vfio/spapr.c | 7 ++++--- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 25 files changed, 52 insertions(+), 50 deletions(-)
accel/kvm/kvm-all.c +3 -3
@@ -52,7 +52,7 @@/* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */ -#define PAGE_SIZE getpagesize() +#define PAGE_SIZE qemu_real_host_page_size//#define DEBUG_KVM
@@ -507,7 +507,7 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, {ram_addr_t start = section->offset_within_region +memory_region_get_ram_addr (section->mr); -ram_addr_t pages =int128_get64 (section->size) /getpagesize (); +ram_addr_t pages =int128_get64 (section->size) / qemu_real_host_page_size;cpu_physical_memory_set_dirty_lebitmap (bitmap, start, pages);return 0 ;
@@ -1841,7 +1841,7 @@ static int kvm_init(MachineState *ms)* even with KVM. TARGET_PAGE_SIZE is assumed to be the minimum * page size for the system though. */ -assert (TARGET_PAGE_SIZE <=getpagesize ()); +assert (TARGET_PAGE_SIZE <= qemu_real_host_page_size); s->sigmask_len =8 ;
backends/hostmem.c +1 -1
@@ -304,7 +304,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)#else size_t host_memory_backend_pagesize (HostMemoryBackend *memdev) { -return getpagesize (); +return qemu_real_host_page_size; }#endif
block.c +2 -2
@@ -106,7 +106,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.opt_mem_alignment;
@@ -116,7 +116,7 @@ size_t bdrv_min_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.min_mem_alignment;
block/file-posix.c +5 -4
@@ -322,7 +322,7 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) {BDRVRawState *s = bs->opaque;char *buf; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);size_t alignments[] = {1 ,512 ,1024 ,2048 ,4096 };/* For SCSI generic devices the alignment is not really used.
@@ -1131,13 +1131,14 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) ret =sg_get_max_segments (s->fd);if (ret >0 ) { - bs->bl.max_transfer =MIN (bs->bl.max_transfer, ret *getpagesize ()); + bs->bl.max_transfer =MIN (bs->bl.max_transfer, + ret * qemu_real_host_page_size); } }raw_probe_alignment (bs, s->fd, errp); bs->bl.min_mem_alignment = s->buf_align; - bs->bl.opt_mem_alignment =MAX (s->buf_align,getpagesize ()); + bs->bl.opt_mem_alignment =MAX (s->buf_align, qemu_real_host_page_size); }static int check_for_dasd (int fd)
@@ -1700,7 +1701,7 @@ static int allocate_first_block(int fd, size_t max_size)size_t write_size = (max_size <MAX_BLOCKSIZE ) ?BDRV_SECTOR_SIZE :MAX_BLOCKSIZE ; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);void *buf;ssize_t n;int ret;
block/io.c +1 -1
@@ -159,7 +159,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp)bdrv_merge_limits (&bs->bl, &bs->file->bs->bl); }else { bs->bl.min_mem_alignment =512 ; - bs->bl.opt_mem_alignment =getpagesize (); + bs->bl.opt_mem_alignment = qemu_real_host_page_size;/* Safe default since most protocols use readv()/writev()/etc */ bs->bl.max_iov =IOV_MAX ;
block/parallels.c +1 -1
@@ -847,7 +847,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, } } - s->bat_dirty_block =4 *getpagesize (); + s->bat_dirty_block =4 * qemu_real_host_page_size; s->bat_dirty_bmap =bitmap_new (DIV_ROUND_UP (s->header_size, s->bat_dirty_block));
block/qcow2-cache.c +1 -1
@@ -74,7 +74,7 @@ static void qcow2_cache_table_release(Qcow2Cache *c, int i, int num_tables)/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */ #ifdef CONFIG_LINUX void *t =qcow2_cache_get_table_addr (c, i); -int align =getpagesize (); +int align = qemu_real_host_page_size;size_t mem_size = (size_t ) c->table_size * num_tables;size_t offset =QEMU_ALIGN_UP ((uintptr_t ) t, align) - (uintptr_t ) t;size_t length =QEMU_ALIGN_DOWN (mem_size - offset, align);
contrib/vhost-user-gpu/vugbm.c +1 -1
@@ -52,7 +52,7 @@ struct udmabuf_create {static size_t udmabuf_get_size (struct vugbm_buffer *buf) { -return ROUND_UP (buf->width * buf->height *4 ,getpagesize ()); +return ROUND_UP (buf->width * buf->height *4 , qemu_real_host_page_size); } static bool
exec.c +3 -3
@@ -1762,11 +1762,11 @@ long qemu_maxrampagesize(void)#else long qemu_minrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }long qemu_maxrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }#endif
@@ -2425,7 +2425,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, new_block->max_length = max_size;assert (max_size >= size); new_block->fd =-1 ; - new_block->page_size =getpagesize (); + new_block->page_size = qemu_real_host_page_size; new_block->host = host;if (host) { new_block->flags |=RAM_PREALLOC ;
hw/intc/s390_flic_kvm.c +1 -1
@@ -25,7 +25,7 @@#include "migration/qemu-file-types.h" #include "trace.h" -#define FLIC_SAVE_INITIAL_SIZE getpagesize() +#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size#define FLIC_FAILED (-1UL)#define FLIC_SAVEVM_VERSION 1
hw/ppc/mac_newworld.c +1 -1
@@ -439,7 +439,7 @@ static void ppc_core99_init(MachineState *machine) }/* The NewWorld NVRAM is not located in the MacIO device */ -if (kvm_enabled () &&getpagesize () >4096 ) { +if (kvm_enabled () && qemu_real_host_page_size >4096 ) {/* We can't combine read-write and read-only in a single page, so move the NVRAM out of ROM again for KVM */ nvram_addr =0xFFE00000 ;
hw/ppc/spapr_pci.c +1 -1
@@ -1942,7 +1942,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)* our memory slot is of page size granularity. */ if (kvm_enabled ()) { - msi_window_size =getpagesize (); + msi_window_size = qemu_real_host_page_size; } memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,
hw/rdma/vmw/pvrdma_main.c +1 -1
@@ -601,7 +601,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)rdma_info_report ("Initializing device %s %x.%x" , pdev->name,PCI_SLOT (pdev->devfn),PCI_FUNC (pdev->devfn)); -if (TARGET_PAGE_SIZE !=getpagesize ()) { +if (TARGET_PAGE_SIZE != qemu_real_host_page_size) {error_setg (errp,"Target page size must be the same as host page size" );return ; }
hw/vfio/spapr.c +4 -3
@@ -196,14 +196,15 @@ int vfio_spapr_create_window(VFIOContainer *container,* bits_per_level is a safe guess of how much we can allocate per level: * 8 is the current minimum for CONFIG_FORCE_MAX_ZONEORDER and MAX_ORDER * is usually bigger than that. -* Below we look at getpagesize() as TCEs are allocated from system pages. +* Below we look at qemu_real_host_page_size as TCEs are allocated from +* system pages. */ - bits_per_level =ctz64 (getpagesize ()) +8 ; + bits_per_level =ctz64 (qemu_real_host_page_size) +8 ; create.levels = bits_total / bits_per_level;if (bits_total % bits_per_level) { ++create.levels; } - max_levels = (64 - create.page_shift) /ctz64 (getpagesize ()); + max_levels = (64 - create.page_shift) /ctz64 (qemu_real_host_page_size);for ( ; create.levels <= max_levels; ++create.levels) { ret =ioctl (container->fd,VFIO_IOMMU_SPAPR_TCE_CREATE , &create);if (!ret) {
include/exec/ram_addr.h +1 -1
@@ -380,7 +380,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,hwaddr addr;ram_addr_t ram_addr;unsigned long len = (pages +HOST_LONG_BITS -1 ) /HOST_LONG_BITS ; -unsigned long hpratio =getpagesize () /TARGET_PAGE_SIZE ; +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? */
include/qemu/osdep.h +2 -2
@@ -423,9 +423,9 @@ void qemu_anon_ram_free(void *ptr, size_t size);# define QEMU_VMALLOC_ALIGN (256 * 4096)#elif defined(__linux__) && defined(__sparc__)#include <sys/shm.h> -# define QEMU_VMALLOC_ALIGN MAX(getpagesize(), SHMLBA) +# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)#else -# define QEMU_VMALLOC_ALIGN getpagesize() +# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size#endif #ifdef CONFIG_POSIX
migration/migration.c +1 -1
@@ -2288,7 +2288,7 @@ static struct rp_cmd_args {static void migrate_handle_rp_req_pages (MigrationState *ms,const char * rbname,ram_addr_t start,size_t len) { -long our_host_ps =getpagesize (); +long our_host_ps = qemu_real_host_page_size;trace_migrate_handle_rp_req_pages (rbname, start, len);
migration/postcopy-ram.c +2 -2
@@ -308,7 +308,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)return false; } -if (getpagesize () !=ram_pagesize_summary ()) { +if (qemu_real_host_page_size !=ram_pagesize_summary ()) {bool have_hp = false;/* We've got a huge page */ #ifdef UFFD_FEATURE_MISSING_HUGETLBFS
@@ -346,7 +346,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)*/ bool postcopy_ram_supported_by_host (MigrationIncomingState *mis) { -long pagesize =getpagesize (); +long pagesize = qemu_real_host_page_size;int ufd =-1 ;bool ret = false;/* Error unless we change it */ void *testarea =NULL ;
monitor/misc.c +1 -1
@@ -862,7 +862,7 @@ static uint64_t vtop(void *ptr, Error **errp)uint64_t pinfo;uint64_t ret =-1 ;uintptr_t addr = (uintptr_t ) ptr; -uintptr_t pagesize =getpagesize (); +uintptr_t pagesize = qemu_real_host_page_size;off_t offset = addr / pagesize *sizeof (pinfo);int fd;
target/ppc/kvm.c +1 -1
@@ -411,7 +411,7 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp)* will be a normal mapping, not a special hugepage one used * for RAM. */ -if (getpagesize () <0x10000 ) { +if (qemu_real_host_page_size <0x10000 ) {error_setg (errp,"KVM can't supply 64kiB CI pages, which guest expects" ); }
tests/vhost-user-bridge.c +4 -4
@@ -468,8 +468,8 @@ vubr_queue_set_started(VuDev *dev, int qidx, bool started)if (started && vubr->notifier.fd >=0 ) {vu_set_queue_host_notifier (dev, vq, vubr->notifier.fd, -getpagesize (), - qidx *getpagesize ()); + qemu_real_host_page_size, + qidx * qemu_real_host_page_size); }if (qidx %2 ==1 ) {
@@ -594,7 +594,7 @@ static void *notifier_thread(void *arg) {VuDev *dev = (VuDev *)arg;VubrDev *vubr =container_of (dev, VubrDev, vudev); -int pagesize =getpagesize (); +int pagesize = qemu_real_host_page_size;int qidx;while (true) {
@@ -630,7 +630,7 @@ vubr_host_notifier_setup(VubrDev *dev)void *addr;int fd; - length =getpagesize () *VHOST_USER_BRIDGE_MAX_QUEUES ; + length = qemu_real_host_page_size *VHOST_USER_BRIDGE_MAX_QUEUES ; fd =mkstemp (template);if (fd <0 ) {
util/mmap-alloc.c +5 -5
@@ -48,7 +48,7 @@ size_t qemu_fd_getpagesize(int fd)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; }size_t qemu_mempath_getpagesize (const char *mem_path)
@@ -79,7 +79,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; } void *qemu_ram_mmap(int fd,
@@ -114,7 +114,7 @@ void *qemu_ram_mmap(int fd,*/ flags =MAP_PRIVATE ; pagesize =qemu_fd_getpagesize (fd); -if (fd ==-1 || pagesize ==getpagesize ()) { +if (fd ==-1 || pagesize == qemu_real_host_page_size) { guardfd =-1 ; flags |=MAP_ANONYMOUS ; }else {
@@ -123,7 +123,7 @@ void *qemu_ram_mmap(int fd, }#else guardfd =-1 ; - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size; flags =MAP_PRIVATE |MAP_ANONYMOUS ;#endif
@@ -205,7 +205,7 @@ void qemu_ram_munmap(int fd, void *ptr, size_t size)#if defined(__powerpc64__) && defined(__linux__) pagesize =qemu_fd_getpagesize (fd);#else - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size;#endif munmap (ptr, size + pagesize); }
util/oslib-posix.c +2 -2
@@ -617,7 +617,7 @@ void *qemu_alloc_stack(size_t *sz)#ifdef CONFIG_DEBUG_STACK_USAGE void *ptr2;#endif -size_t pagesz =getpagesize (); +size_t pagesz = qemu_real_host_page_size;#ifdef _SC_THREAD_STACK_MIN/* avoid stacks smaller than _SC_THREAD_STACK_MIN */ long min_stack_sz =sysconf (_SC_THREAD_STACK_MIN);
@@ -679,7 +679,7 @@ void qemu_free_stack(void *stack, size_t sz)unsigned int usage;void *ptr; -for (ptr = stack +getpagesize (); ptr < stack + sz; +for (ptr = stack + qemu_real_host_page_size; ptr < stack + sz; ptr +=sizeof (uint32_t )) {if (*(uint32_t *)ptr !=0xdeadbeaf ) {break ;
util/oslib-win32.c +1 -1
@@ -554,7 +554,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, Error **errp) {int i; -size_t pagesize =getpagesize (); +size_t pagesize = qemu_real_host_page_size; memory = (memory + pagesize -1 ) & -pagesize;for (i =0 ; i < memory / pagesize; i++) {
util/vfio-helpers.c +6 -6
@@ -514,9 +514,9 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,IOVAMapping m = {.host = host, .size = size, .iova = iova};IOVAMapping *insert; -assert (QEMU_IS_ALIGNED (size,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->low_water_mark,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->high_water_mark,getpagesize ())); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->low_water_mark, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->high_water_mark, qemu_real_host_page_size));trace_qemu_vfio_new_mapping (s, host, size, index, iova);assert (index >=0 );
@@ -567,7 +567,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping, index = mapping - s->mappings;assert (mapping->size >0 ); -assert (QEMU_IS_ALIGNED (mapping->size,getpagesize ())); +assert (QEMU_IS_ALIGNED (mapping->size, qemu_real_host_page_size));assert (index >=0 && index < s->nr_mappings);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_setg (errp,"VFIO_UNMAP_DMA failed: %d" , -errno);
@@ -613,8 +613,8 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,IOVAMapping *mapping;uint64_t iova0; -assert (QEMU_PTR_IS_ALIGNED (host,getpagesize ())); -assert (QEMU_IS_ALIGNED (size,getpagesize ())); +assert (QEMU_PTR_IS_ALIGNED (host, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size));trace_qemu_vfio_dma_map (s, host, size, temporary, iova);qemu_mutex_lock (&s->lock); mapping =qemu_vfio_find_mapping (s, host, &index);
Signature · 1 line
2.17.1
Re: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
Quoted 10 lines · Wei Yang
There are three page size in qemu:
real host page size
host page size
target page sizeAll of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms:
qemu_real_host_page_sizeandgetpagesize().
Quoted 6 lines
qemu_real_host_page_sizeis defined to be a replacement ofgetpagesize(), so let it serve the role.[Note] Not fully tested for some arch or device.
Signed-off-by Wei Yang <[email protected]>
Quoted 533 lines
--- accel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- hw/vfio/spapr.c | 7 ++++--- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 25 files changed, 52 insertions(+), 50 deletions(-)accel/kvm/kvm-all.c +3
-3@@ -52,7 +52,7 @@/* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */ -#define PAGE_SIZE getpagesize() +#define PAGE_SIZE qemu_real_host_page_size//#define DEBUG_KVM @@ -507,7 +507,7 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, {ram_addr_t start = section->offset_within_region +memory_region_get_ram_addr (section->mr); -ram_addr_t pages =int128_get64 (section->size) /getpagesize (); +ram_addr_t pages =int128_get64 (section->size) / qemu_real_host_page_size;cpu_physical_memory_set_dirty_lebitmap (bitmap, start, pages);return 0 ;@@ -1841,7 +1841,7 @@ static int kvm_init(MachineState *ms)* even with KVM. TARGET_PAGE_SIZE is assumed to be the minimum * page size for the system though. */ -assert (TARGET_PAGE_SIZE <=getpagesize ()); +assert (TARGET_PAGE_SIZE <= qemu_real_host_page_size); s->sigmask_len =8 ;backends/hostmem.c +1
-1@@ -304,7 +304,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)#else size_t host_memory_backend_pagesize (HostMemoryBackend *memdev) { -return getpagesize (); +return qemu_real_host_page_size; }#endif block.c +2
-2@@ -106,7 +106,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.opt_mem_alignment;@@ -116,7 +116,7 @@ size_t bdrv_min_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.min_mem_alignment;block/file-posix.c +5
-4@@ -322,7 +322,7 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) {BDRVRawState *s = bs->opaque;char *buf; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);size_t alignments[] = {1 ,512 ,1024 ,2048 ,4096 };/* For SCSI generic devices the alignment is not really used. @@ -1131,13 +1131,14 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) ret =sg_get_max_segments (s->fd);if (ret >0 ) { - bs->bl.max_transfer =MIN (bs->bl.max_transfer, ret *getpagesize ()); + bs->bl.max_transfer =MIN (bs->bl.max_transfer, + ret * qemu_real_host_page_size); } }raw_probe_alignment (bs, s->fd, errp); bs->bl.min_mem_alignment = s->buf_align; - bs->bl.opt_mem_alignment =MAX (s->buf_align,getpagesize ()); + bs->bl.opt_mem_alignment =MAX (s->buf_align, qemu_real_host_page_size); }static int check_for_dasd (int fd)@@ -1700,7 +1701,7 @@ static int allocate_first_block(int fd, size_t max_size)size_t write_size = (max_size <MAX_BLOCKSIZE ) ?BDRV_SECTOR_SIZE :MAX_BLOCKSIZE ; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);void *buf;ssize_t n;int ret;block/io.c +1
-1@@ -159,7 +159,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp)bdrv_merge_limits (&bs->bl, &bs->file->bs->bl); }else { bs->bl.min_mem_alignment =512 ; - bs->bl.opt_mem_alignment =getpagesize (); + bs->bl.opt_mem_alignment = qemu_real_host_page_size;/* Safe default since most protocols use readv()/writev()/etc */ bs->bl.max_iov =IOV_MAX ;block/parallels.c +1
-1@@ -847,7 +847,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, } } - s->bat_dirty_block =4 *getpagesize (); + s->bat_dirty_block =4 * qemu_real_host_page_size; s->bat_dirty_bmap =bitmap_new (DIV_ROUND_UP (s->header_size, s->bat_dirty_block));block/qcow2-cache.c +1
-1@@ -74,7 +74,7 @@ static void qcow2_cache_table_release(Qcow2Cache *c, int i, int num_tables)/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */ #ifdef CONFIG_LINUX void *t =qcow2_cache_get_table_addr (c, i); -int align =getpagesize (); +int align = qemu_real_host_page_size;size_t mem_size = (size_t ) c->table_size * num_tables;size_t offset =QEMU_ALIGN_UP ((uintptr_t ) t, align) - (uintptr_t ) t;size_t length =QEMU_ALIGN_DOWN (mem_size - offset, align);contrib/vhost-user-gpu/vugbm.c +1
-1@@ -52,7 +52,7 @@ struct udmabuf_create {static size_t udmabuf_get_size (struct vugbm_buffer *buf) { -return ROUND_UP (buf->width * buf->height *4 ,getpagesize ()); +return ROUND_UP (buf->width * buf->height *4 , qemu_real_host_page_size); } static boolexec.c +3
-3@@ -1762,11 +1762,11 @@ long qemu_maxrampagesize(void)#else long qemu_minrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }long qemu_maxrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }#endif @@ -2425,7 +2425,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, new_block->max_length = max_size;assert (max_size >= size); new_block->fd =-1 ; - new_block->page_size =getpagesize (); + new_block->page_size = qemu_real_host_page_size; new_block->host = host;if (host) { new_block->flags |=RAM_PREALLOC ;hw/intc/s390_flic_kvm.c +1
-1@@ -25,7 +25,7 @@#include "migration/qemu-file-types.h" #include "trace.h" -#define FLIC_SAVE_INITIAL_SIZE getpagesize() +#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size#define FLIC_FAILED (-1UL)#define FLIC_SAVEVM_VERSION 1hw/ppc/mac_newworld.c +1
-1@@ -439,7 +439,7 @@ static void ppc_core99_init(MachineState *machine) }/* The NewWorld NVRAM is not located in the MacIO device */ -if (kvm_enabled () &&getpagesize () >4096 ) { +if (kvm_enabled () && qemu_real_host_page_size >4096 ) {/* We can't combine read-write and read-only in a single page, so move the NVRAM out of ROM again for KVM */ nvram_addr =0xFFE00000 ;hw/ppc/spapr_pci.c +1
-1@@ -1942,7 +1942,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)* our memory slot is of page size granularity. */ if (kvm_enabled ()) { - msi_window_size =getpagesize (); + msi_window_size = qemu_real_host_page_size; } memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,hw/rdma/vmw/pvrdma_main.c +1
-1@@ -601,7 +601,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)rdma_info_report ("Initializing device %s %x.%x" , pdev->name,PCI_SLOT (pdev->devfn),PCI_FUNC (pdev->devfn)); -if (TARGET_PAGE_SIZE !=getpagesize ()) { +if (TARGET_PAGE_SIZE != qemu_real_host_page_size) {error_setg (errp,"Target page size must be the same as host page size" );return ; }hw/vfio/spapr.c +4
-3@@ -196,14 +196,15 @@ int vfio_spapr_create_window(VFIOContainer *container,* bits_per_level is a safe guess of how much we can allocate per level: * 8 is the current minimum for CONFIG_FORCE_MAX_ZONEORDER and MAX_ORDER * is usually bigger than that. -* Below we look at getpagesize() as TCEs are allocated from system pages. +* Below we look at qemu_real_host_page_size as TCEs are allocated from +* system pages. */ - bits_per_level =ctz64 (getpagesize ()) +8 ; + bits_per_level =ctz64 (qemu_real_host_page_size) +8 ; create.levels = bits_total / bits_per_level;if (bits_total % bits_per_level) { ++create.levels; } - max_levels = (64 - create.page_shift) /ctz64 (getpagesize ()); + max_levels = (64 - create.page_shift) /ctz64 (qemu_real_host_page_size);for ( ; create.levels <= max_levels; ++create.levels) { ret =ioctl (container->fd,VFIO_IOMMU_SPAPR_TCE_CREATE , &create);if (!ret) {include/exec/ram_addr.h +1
-1@@ -380,7 +380,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,hwaddr addr;ram_addr_t ram_addr;unsigned long len = (pages +HOST_LONG_BITS -1 ) /HOST_LONG_BITS ; -unsigned long hpratio =getpagesize () /TARGET_PAGE_SIZE ; +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? */ include/qemu/osdep.h +2
-2@@ -423,9 +423,9 @@ void qemu_anon_ram_free(void *ptr, size_t size);# define QEMU_VMALLOC_ALIGN (256 * 4096)#elif defined(__linux__) && defined(__sparc__)#include <sys/shm.h> -# define QEMU_VMALLOC_ALIGN MAX(getpagesize(), SHMLBA) +# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)#else -# define QEMU_VMALLOC_ALIGN getpagesize() +# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size#endif #ifdef CONFIG_POSIX migration/migration.c +1
-1@@ -2288,7 +2288,7 @@ static struct rp_cmd_args {static void migrate_handle_rp_req_pages (MigrationState *ms,const char * rbname,ram_addr_t start,size_t len) { -long our_host_ps =getpagesize (); +long our_host_ps = qemu_real_host_page_size;trace_migrate_handle_rp_req_pages (rbname, start, len);migration/postcopy-ram.c +2
-2@@ -308,7 +308,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)return false; } -if (getpagesize () !=ram_pagesize_summary ()) { +if (qemu_real_host_page_size !=ram_pagesize_summary ()) {bool have_hp = false;/* We've got a huge page */ #ifdef UFFD_FEATURE_MISSING_HUGETLBFS @@ -346,7 +346,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)*/ bool postcopy_ram_supported_by_host (MigrationIncomingState *mis) { -long pagesize =getpagesize (); +long pagesize = qemu_real_host_page_size;int ufd =-1 ;bool ret = false;/* Error unless we change it */ void *testarea =NULL ;monitor/misc.c +1
-1@@ -862,7 +862,7 @@ static uint64_t vtop(void *ptr, Error **errp)uint64_t pinfo;uint64_t ret =-1 ;uintptr_t addr = (uintptr_t ) ptr; -uintptr_t pagesize =getpagesize (); +uintptr_t pagesize = qemu_real_host_page_size;off_t offset = addr / pagesize *sizeof (pinfo);int fd;target/ppc/kvm.c +1
-1@@ -411,7 +411,7 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp)* will be a normal mapping, not a special hugepage one used * for RAM. */ -if (getpagesize () <0x10000 ) { +if (qemu_real_host_page_size <0x10000 ) {error_setg (errp,"KVM can't supply 64kiB CI pages, which guest expects" ); }tests/vhost-user-bridge.c +4
-4@@ -468,8 +468,8 @@ vubr_queue_set_started(VuDev *dev, int qidx, bool started)if (started && vubr->notifier.fd >=0 ) {vu_set_queue_host_notifier (dev, vq, vubr->notifier.fd, -getpagesize (), - qidx *getpagesize ()); + qemu_real_host_page_size, + qidx * qemu_real_host_page_size); }if (qidx %2 ==1 ) {@@ -594,7 +594,7 @@ static void *notifier_thread(void *arg) {VuDev *dev = (VuDev *)arg;VubrDev *vubr =container_of (dev, VubrDev, vudev); -int pagesize =getpagesize (); +int pagesize = qemu_real_host_page_size;int qidx;while (true) {@@ -630,7 +630,7 @@ vubr_host_notifier_setup(VubrDev *dev)void *addr;int fd; - length =getpagesize () *VHOST_USER_BRIDGE_MAX_QUEUES ; + length = qemu_real_host_page_size *VHOST_USER_BRIDGE_MAX_QUEUES ; fd =mkstemp (template);if (fd <0 ) {util/mmap-alloc.c +5
-5@@ -48,7 +48,7 @@ size_t qemu_fd_getpagesize(int fd)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; }size_t qemu_mempath_getpagesize (const char *mem_path)@@ -79,7 +79,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; } void *qemu_ram_mmap(int fd,@@ -114,7 +114,7 @@ void *qemu_ram_mmap(int fd,*/ flags =MAP_PRIVATE ; pagesize =qemu_fd_getpagesize (fd); -if (fd ==-1 || pagesize ==getpagesize ()) { +if (fd ==-1 || pagesize == qemu_real_host_page_size) { guardfd =-1 ; flags |=MAP_ANONYMOUS ; }else {@@ -123,7 +123,7 @@ void *qemu_ram_mmap(int fd, }#else guardfd =-1 ; - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size; flags =MAP_PRIVATE |MAP_ANONYMOUS ;#endif @@ -205,7 +205,7 @@ void qemu_ram_munmap(int fd, void *ptr, size_t size)#if defined(__powerpc64__) && defined(__linux__) pagesize =qemu_fd_getpagesize (fd);#else - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size;#endif munmap (ptr, size + pagesize); }util/oslib-posix.c +2
-2@@ -617,7 +617,7 @@ void *qemu_alloc_stack(size_t *sz)#ifdef CONFIG_DEBUG_STACK_USAGE void *ptr2;#endif -size_t pagesz =getpagesize (); +size_t pagesz = qemu_real_host_page_size;#ifdef _SC_THREAD_STACK_MIN/* avoid stacks smaller than _SC_THREAD_STACK_MIN */ long min_stack_sz =sysconf (_SC_THREAD_STACK_MIN);@@ -679,7 +679,7 @@ void qemu_free_stack(void *stack, size_t sz)unsigned int usage;void *ptr; -for (ptr = stack +getpagesize (); ptr < stack + sz; +for (ptr = stack + qemu_real_host_page_size; ptr < stack + sz; ptr +=sizeof (uint32_t )) {if (*(uint32_t *)ptr !=0xdeadbeaf ) {break ;util/oslib-win32.c +1
-1@@ -554,7 +554,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, Error **errp) {int i; -size_t pagesize =getpagesize (); +size_t pagesize = qemu_real_host_page_size; memory = (memory + pagesize -1 ) & -pagesize;for (i =0 ; i < memory / pagesize; i++) {util/vfio-helpers.c +6
-6@@ -514,9 +514,9 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,IOVAMapping m = {.host = host, .size = size, .iova = iova};IOVAMapping *insert; -assert (QEMU_IS_ALIGNED (size,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->low_water_mark,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->high_water_mark,getpagesize ())); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->low_water_mark, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->high_water_mark, qemu_real_host_page_size));trace_qemu_vfio_new_mapping (s, host, size, index, iova);assert (index >=0 );@@ -567,7 +567,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping, index = mapping - s->mappings;assert (mapping->size >0 ); -assert (QEMU_IS_ALIGNED (mapping->size,getpagesize ())); +assert (QEMU_IS_ALIGNED (mapping->size, qemu_real_host_page_size));assert (index >=0 && index < s->nr_mappings);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_setg (errp,"VFIO_UNMAP_DMA failed: %d" , -errno);@@ -613,8 +613,8 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,IOVAMapping *mapping;uint64_t iova0; -assert (QEMU_PTR_IS_ALIGNED (host,getpagesize ())); -assert (QEMU_IS_ALIGNED (size,getpagesize ())); +assert (QEMU_PTR_IS_ALIGNED (host, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size));trace_qemu_vfio_dma_map (s, host, size, temporary, iova);qemu_mutex_lock (&s->lock); mapping =qemu_vfio_find_mapping (s, host, &index);Signature · 1 line
2.17.1
Re: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
In reply to Wei YangQuoted 10 lines · Wei Yang
There are three page size in qemu:
real host page size
host page size
target page sizeAll of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms:
qemu_real_host_page_sizeandgetpagesize().
Quoted 6 lines
qemu_real_host_page_sizeis defined to be a replacement ofgetpagesize(), so let it serve the role.[Note] Not fully tested for some arch or device.
Signed-off-by Wei Yang <[email protected]>
Although the chances of someone messing this up again are almost 100%.
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
Quoted 14 lines · David Gibson
Quoted 13 lines · Wei Yang
There are three page size in qemu:
real host page size
host page size
target page sizeAll of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms:
qemu_real_host_page_sizeandgetpagesize().
qemu_real_host_page_sizeis defined to be a replacement ofgetpagesize(), so let it serve the role.
Quoted 8 lines
Quoted 3 lines
[Note] Not fully tested for some arch or device.
Signed-off-by Wei Yang <[email protected]>Reviewed-by David Gibson <[email protected]>Although the chances of someone messing this up again are almost 100%.
Hi, David
I found put a check in checkpatch.pl may be a good way to prevent it.
Just draft a patch, hope you would like it.
Quoted 5 lines
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Signature · 2 lines
Wei Yang Help you, Help me
Re: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
In reply to Wei YangQuoted 10 lines · Wei Yang
There are three page size in qemu:
real host page size
host page size
target page sizeAll of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms:
qemu_real_host_page_sizeandgetpagesize().
Quoted 7 lines
qemu_real_host_page_sizeis defined to be a replacement ofgetpagesize(), so let it serve the role.[Note] Not fully tested for some arch or device.
Signed-off-by Wei Yang <[email protected]>---
r~
Re: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
In reply to Wei YangQuoted 6 lines · * Wei Yang ([email protected]) wrote:
There are three page size in qemu:
real host page size
host page size
target page size
Quoted 6 lines
All of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms:
qemu_real_host_page_sizeandgetpagesize().
qemu_real_host_page_sizeis defined to be a replacement ofgetpagesize(), so let it serve the role.
We also use sysconf(_SC_PAGESIZE) in a few places.
Dave
Quoted 538 lines
[Note] Not fully tested for some arch or device.
Signed-off-by Wei Yang <[email protected]>--- accel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- hw/vfio/spapr.c | 7 ++++--- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 25 files changed, 52 insertions(+), 50 deletions(-)accel/kvm/kvm-all.c +3
-3@@ -52,7 +52,7 @@/* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */ -#define PAGE_SIZE getpagesize() +#define PAGE_SIZE qemu_real_host_page_size//#define DEBUG_KVM @@ -507,7 +507,7 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, {ram_addr_t start = section->offset_within_region +memory_region_get_ram_addr (section->mr); -ram_addr_t pages =int128_get64 (section->size) /getpagesize (); +ram_addr_t pages =int128_get64 (section->size) / qemu_real_host_page_size;cpu_physical_memory_set_dirty_lebitmap (bitmap, start, pages);return 0 ;@@ -1841,7 +1841,7 @@ static int kvm_init(MachineState *ms)* even with KVM. TARGET_PAGE_SIZE is assumed to be the minimum * page size for the system though. */ -assert (TARGET_PAGE_SIZE <=getpagesize ()); +assert (TARGET_PAGE_SIZE <= qemu_real_host_page_size); s->sigmask_len =8 ;backends/hostmem.c +1
-1@@ -304,7 +304,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)#else size_t host_memory_backend_pagesize (HostMemoryBackend *memdev) { -return getpagesize (); +return qemu_real_host_page_size; }#endif block.c +2
-2@@ -106,7 +106,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.opt_mem_alignment;@@ -116,7 +116,7 @@ size_t bdrv_min_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.min_mem_alignment;block/file-posix.c +5
-4@@ -322,7 +322,7 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) {BDRVRawState *s = bs->opaque;char *buf; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);size_t alignments[] = {1 ,512 ,1024 ,2048 ,4096 };/* For SCSI generic devices the alignment is not really used. @@ -1131,13 +1131,14 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) ret =sg_get_max_segments (s->fd);if (ret >0 ) { - bs->bl.max_transfer =MIN (bs->bl.max_transfer, ret *getpagesize ()); + bs->bl.max_transfer =MIN (bs->bl.max_transfer, + ret * qemu_real_host_page_size); } }raw_probe_alignment (bs, s->fd, errp); bs->bl.min_mem_alignment = s->buf_align; - bs->bl.opt_mem_alignment =MAX (s->buf_align,getpagesize ()); + bs->bl.opt_mem_alignment =MAX (s->buf_align, qemu_real_host_page_size); }static int check_for_dasd (int fd)@@ -1700,7 +1701,7 @@ static int allocate_first_block(int fd, size_t max_size)size_t write_size = (max_size <MAX_BLOCKSIZE ) ?BDRV_SECTOR_SIZE :MAX_BLOCKSIZE ; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);void *buf;ssize_t n;int ret;block/io.c +1
-1@@ -159,7 +159,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp)bdrv_merge_limits (&bs->bl, &bs->file->bs->bl); }else { bs->bl.min_mem_alignment =512 ; - bs->bl.opt_mem_alignment =getpagesize (); + bs->bl.opt_mem_alignment = qemu_real_host_page_size;/* Safe default since most protocols use readv()/writev()/etc */ bs->bl.max_iov =IOV_MAX ;block/parallels.c +1
-1@@ -847,7 +847,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, } } - s->bat_dirty_block =4 *getpagesize (); + s->bat_dirty_block =4 * qemu_real_host_page_size; s->bat_dirty_bmap =bitmap_new (DIV_ROUND_UP (s->header_size, s->bat_dirty_block));block/qcow2-cache.c +1
-1@@ -74,7 +74,7 @@ static void qcow2_cache_table_release(Qcow2Cache *c, int i, int num_tables)/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */ #ifdef CONFIG_LINUX void *t =qcow2_cache_get_table_addr (c, i); -int align =getpagesize (); +int align = qemu_real_host_page_size;size_t mem_size = (size_t ) c->table_size * num_tables;size_t offset =QEMU_ALIGN_UP ((uintptr_t ) t, align) - (uintptr_t ) t;size_t length =QEMU_ALIGN_DOWN (mem_size - offset, align);contrib/vhost-user-gpu/vugbm.c +1
-1@@ -52,7 +52,7 @@ struct udmabuf_create {static size_t udmabuf_get_size (struct vugbm_buffer *buf) { -return ROUND_UP (buf->width * buf->height *4 ,getpagesize ()); +return ROUND_UP (buf->width * buf->height *4 , qemu_real_host_page_size); } static boolexec.c +3
-3@@ -1762,11 +1762,11 @@ long qemu_maxrampagesize(void)#else long qemu_minrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }long qemu_maxrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }#endif @@ -2425,7 +2425,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, new_block->max_length = max_size;assert (max_size >= size); new_block->fd =-1 ; - new_block->page_size =getpagesize (); + new_block->page_size = qemu_real_host_page_size; new_block->host = host;if (host) { new_block->flags |=RAM_PREALLOC ;hw/intc/s390_flic_kvm.c +1
-1@@ -25,7 +25,7 @@#include "migration/qemu-file-types.h" #include "trace.h" -#define FLIC_SAVE_INITIAL_SIZE getpagesize() +#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size#define FLIC_FAILED (-1UL)#define FLIC_SAVEVM_VERSION 1hw/ppc/mac_newworld.c +1
-1@@ -439,7 +439,7 @@ static void ppc_core99_init(MachineState *machine) }/* The NewWorld NVRAM is not located in the MacIO device */ -if (kvm_enabled () &&getpagesize () >4096 ) { +if (kvm_enabled () && qemu_real_host_page_size >4096 ) {/* We can't combine read-write and read-only in a single page, so move the NVRAM out of ROM again for KVM */ nvram_addr =0xFFE00000 ;hw/ppc/spapr_pci.c +1
-1@@ -1942,7 +1942,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)* our memory slot is of page size granularity. */ if (kvm_enabled ()) { - msi_window_size =getpagesize (); + msi_window_size = qemu_real_host_page_size; } memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,hw/rdma/vmw/pvrdma_main.c +1
-1@@ -601,7 +601,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)rdma_info_report ("Initializing device %s %x.%x" , pdev->name,PCI_SLOT (pdev->devfn),PCI_FUNC (pdev->devfn)); -if (TARGET_PAGE_SIZE !=getpagesize ()) { +if (TARGET_PAGE_SIZE != qemu_real_host_page_size) {error_setg (errp,"Target page size must be the same as host page size" );return ; }hw/vfio/spapr.c +4
-3@@ -196,14 +196,15 @@ int vfio_spapr_create_window(VFIOContainer *container,* bits_per_level is a safe guess of how much we can allocate per level: * 8 is the current minimum for CONFIG_FORCE_MAX_ZONEORDER and MAX_ORDER * is usually bigger than that. -* Below we look at getpagesize() as TCEs are allocated from system pages. +* Below we look at qemu_real_host_page_size as TCEs are allocated from +* system pages. */ - bits_per_level =ctz64 (getpagesize ()) +8 ; + bits_per_level =ctz64 (qemu_real_host_page_size) +8 ; create.levels = bits_total / bits_per_level;if (bits_total % bits_per_level) { ++create.levels; } - max_levels = (64 - create.page_shift) /ctz64 (getpagesize ()); + max_levels = (64 - create.page_shift) /ctz64 (qemu_real_host_page_size);for ( ; create.levels <= max_levels; ++create.levels) { ret =ioctl (container->fd,VFIO_IOMMU_SPAPR_TCE_CREATE , &create);if (!ret) {include/exec/ram_addr.h +1
-1@@ -380,7 +380,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,hwaddr addr;ram_addr_t ram_addr;unsigned long len = (pages +HOST_LONG_BITS -1 ) /HOST_LONG_BITS ; -unsigned long hpratio =getpagesize () /TARGET_PAGE_SIZE ; +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? */ include/qemu/osdep.h +2
-2@@ -423,9 +423,9 @@ void qemu_anon_ram_free(void *ptr, size_t size);# define QEMU_VMALLOC_ALIGN (256 * 4096)#elif defined(__linux__) && defined(__sparc__)#include <sys/shm.h> -# define QEMU_VMALLOC_ALIGN MAX(getpagesize(), SHMLBA) +# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)#else -# define QEMU_VMALLOC_ALIGN getpagesize() +# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size#endif #ifdef CONFIG_POSIX migration/migration.c +1
-1@@ -2288,7 +2288,7 @@ static struct rp_cmd_args {static void migrate_handle_rp_req_pages (MigrationState *ms,const char * rbname,ram_addr_t start,size_t len) { -long our_host_ps =getpagesize (); +long our_host_ps = qemu_real_host_page_size;trace_migrate_handle_rp_req_pages (rbname, start, len);migration/postcopy-ram.c +2
-2@@ -308,7 +308,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)return false; } -if (getpagesize () !=ram_pagesize_summary ()) { +if (qemu_real_host_page_size !=ram_pagesize_summary ()) {bool have_hp = false;/* We've got a huge page */ #ifdef UFFD_FEATURE_MISSING_HUGETLBFS @@ -346,7 +346,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)*/ bool postcopy_ram_supported_by_host (MigrationIncomingState *mis) { -long pagesize =getpagesize (); +long pagesize = qemu_real_host_page_size;int ufd =-1 ;bool ret = false;/* Error unless we change it */ void *testarea =NULL ;monitor/misc.c +1
-1@@ -862,7 +862,7 @@ static uint64_t vtop(void *ptr, Error **errp)uint64_t pinfo;uint64_t ret =-1 ;uintptr_t addr = (uintptr_t ) ptr; -uintptr_t pagesize =getpagesize (); +uintptr_t pagesize = qemu_real_host_page_size;off_t offset = addr / pagesize *sizeof (pinfo);int fd;target/ppc/kvm.c +1
-1@@ -411,7 +411,7 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp)* will be a normal mapping, not a special hugepage one used * for RAM. */ -if (getpagesize () <0x10000 ) { +if (qemu_real_host_page_size <0x10000 ) {error_setg (errp,"KVM can't supply 64kiB CI pages, which guest expects" ); }tests/vhost-user-bridge.c +4
-4@@ -468,8 +468,8 @@ vubr_queue_set_started(VuDev *dev, int qidx, bool started)if (started && vubr->notifier.fd >=0 ) {vu_set_queue_host_notifier (dev, vq, vubr->notifier.fd, -getpagesize (), - qidx *getpagesize ()); + qemu_real_host_page_size, + qidx * qemu_real_host_page_size); }if (qidx %2 ==1 ) {@@ -594,7 +594,7 @@ static void *notifier_thread(void *arg) {VuDev *dev = (VuDev *)arg;VubrDev *vubr =container_of (dev, VubrDev, vudev); -int pagesize =getpagesize (); +int pagesize = qemu_real_host_page_size;int qidx;while (true) {@@ -630,7 +630,7 @@ vubr_host_notifier_setup(VubrDev *dev)void *addr;int fd; - length =getpagesize () *VHOST_USER_BRIDGE_MAX_QUEUES ; + length = qemu_real_host_page_size *VHOST_USER_BRIDGE_MAX_QUEUES ; fd =mkstemp (template);if (fd <0 ) {util/mmap-alloc.c +5
-5@@ -48,7 +48,7 @@ size_t qemu_fd_getpagesize(int fd)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; }size_t qemu_mempath_getpagesize (const char *mem_path)@@ -79,7 +79,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; } void *qemu_ram_mmap(int fd,@@ -114,7 +114,7 @@ void *qemu_ram_mmap(int fd,*/ flags =MAP_PRIVATE ; pagesize =qemu_fd_getpagesize (fd); -if (fd ==-1 || pagesize ==getpagesize ()) { +if (fd ==-1 || pagesize == qemu_real_host_page_size) { guardfd =-1 ; flags |=MAP_ANONYMOUS ; }else {@@ -123,7 +123,7 @@ void *qemu_ram_mmap(int fd, }#else guardfd =-1 ; - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size; flags =MAP_PRIVATE |MAP_ANONYMOUS ;#endif @@ -205,7 +205,7 @@ void qemu_ram_munmap(int fd, void *ptr, size_t size)#if defined(__powerpc64__) && defined(__linux__) pagesize =qemu_fd_getpagesize (fd);#else - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size;#endif munmap (ptr, size + pagesize); }util/oslib-posix.c +2
-2@@ -617,7 +617,7 @@ void *qemu_alloc_stack(size_t *sz)#ifdef CONFIG_DEBUG_STACK_USAGE void *ptr2;#endif -size_t pagesz =getpagesize (); +size_t pagesz = qemu_real_host_page_size;#ifdef _SC_THREAD_STACK_MIN/* avoid stacks smaller than _SC_THREAD_STACK_MIN */ long min_stack_sz =sysconf (_SC_THREAD_STACK_MIN);@@ -679,7 +679,7 @@ void qemu_free_stack(void *stack, size_t sz)unsigned int usage;void *ptr; -for (ptr = stack +getpagesize (); ptr < stack + sz; +for (ptr = stack + qemu_real_host_page_size; ptr < stack + sz; ptr +=sizeof (uint32_t )) {if (*(uint32_t *)ptr !=0xdeadbeaf ) {break ;util/oslib-win32.c +1
-1@@ -554,7 +554,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, Error **errp) {int i; -size_t pagesize =getpagesize (); +size_t pagesize = qemu_real_host_page_size; memory = (memory + pagesize -1 ) & -pagesize;for (i =0 ; i < memory / pagesize; i++) {util/vfio-helpers.c +6
-6@@ -514,9 +514,9 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,IOVAMapping m = {.host = host, .size = size, .iova = iova};IOVAMapping *insert; -assert (QEMU_IS_ALIGNED (size,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->low_water_mark,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->high_water_mark,getpagesize ())); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->low_water_mark, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->high_water_mark, qemu_real_host_page_size));trace_qemu_vfio_new_mapping (s, host, size, index, iova);assert (index >=0 );@@ -567,7 +567,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping, index = mapping - s->mappings;assert (mapping->size >0 ); -assert (QEMU_IS_ALIGNED (mapping->size,getpagesize ())); +assert (QEMU_IS_ALIGNED (mapping->size, qemu_real_host_page_size));assert (index >=0 && index < s->nr_mappings);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_setg (errp,"VFIO_UNMAP_DMA failed: %d" , -errno);@@ -613,8 +613,8 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,IOVAMapping *mapping;uint64_t iova0; -assert (QEMU_PTR_IS_ALIGNED (host,getpagesize ())); -assert (QEMU_IS_ALIGNED (size,getpagesize ())); +assert (QEMU_PTR_IS_ALIGNED (host, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size));trace_qemu_vfio_dma_map (s, host, size, temporary, iova);qemu_mutex_lock (&s->lock); mapping =qemu_vfio_find_mapping (s, host, &index);Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
Quoted 7 lines · Dr. David Alan Gilbert
Quoted 6 lines · * Wei Yang ([email protected]) wrote:
There are three page size in qemu:
real host page size
host page size
target page size
Quoted 8 lines
Quoted 6 lines
All of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms:
qemu_real_host_page_sizeandgetpagesize().
qemu_real_host_page_sizeis defined to be a replacement ofgetpagesize(), so let it serve the role.We also use
sysconf(_SC_PAGESIZE)in a few places.
You mean need to replace them too?
Quoted 543 lines
Dave
Quoted 538 lines
[Note] Not fully tested for some arch or device.
Signed-off-by Wei Yang <[email protected]>--- accel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- hw/vfio/spapr.c | 7 ++++--- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 25 files changed, 52 insertions(+), 50 deletions(-)accel/kvm/kvm-all.c +3
-3@@ -52,7 +52,7 @@/* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */ -#define PAGE_SIZE getpagesize() +#define PAGE_SIZE qemu_real_host_page_size//#define DEBUG_KVM @@ -507,7 +507,7 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, {ram_addr_t start = section->offset_within_region +memory_region_get_ram_addr (section->mr); -ram_addr_t pages =int128_get64 (section->size) /getpagesize (); +ram_addr_t pages =int128_get64 (section->size) / qemu_real_host_page_size;cpu_physical_memory_set_dirty_lebitmap (bitmap, start, pages);return 0 ;@@ -1841,7 +1841,7 @@ static int kvm_init(MachineState *ms)* even with KVM. TARGET_PAGE_SIZE is assumed to be the minimum * page size for the system though. */ -assert (TARGET_PAGE_SIZE <=getpagesize ()); +assert (TARGET_PAGE_SIZE <= qemu_real_host_page_size); s->sigmask_len =8 ;backends/hostmem.c +1
-1@@ -304,7 +304,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)#else size_t host_memory_backend_pagesize (HostMemoryBackend *memdev) { -return getpagesize (); +return qemu_real_host_page_size; }#endif block.c +2
-2@@ -106,7 +106,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.opt_mem_alignment;@@ -116,7 +116,7 @@ size_t bdrv_min_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.min_mem_alignment;block/file-posix.c +5
-4@@ -322,7 +322,7 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) {BDRVRawState *s = bs->opaque;char *buf; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);size_t alignments[] = {1 ,512 ,1024 ,2048 ,4096 };/* For SCSI generic devices the alignment is not really used. @@ -1131,13 +1131,14 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) ret =sg_get_max_segments (s->fd);if (ret >0 ) { - bs->bl.max_transfer =MIN (bs->bl.max_transfer, ret *getpagesize ()); + bs->bl.max_transfer =MIN (bs->bl.max_transfer, + ret * qemu_real_host_page_size); } }raw_probe_alignment (bs, s->fd, errp); bs->bl.min_mem_alignment = s->buf_align; - bs->bl.opt_mem_alignment =MAX (s->buf_align,getpagesize ()); + bs->bl.opt_mem_alignment =MAX (s->buf_align, qemu_real_host_page_size); }static int check_for_dasd (int fd)@@ -1700,7 +1701,7 @@ static int allocate_first_block(int fd, size_t max_size)size_t write_size = (max_size <MAX_BLOCKSIZE ) ?BDRV_SECTOR_SIZE :MAX_BLOCKSIZE ; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);void *buf;ssize_t n;int ret;block/io.c +1
-1@@ -159,7 +159,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp)bdrv_merge_limits (&bs->bl, &bs->file->bs->bl); }else { bs->bl.min_mem_alignment =512 ; - bs->bl.opt_mem_alignment =getpagesize (); + bs->bl.opt_mem_alignment = qemu_real_host_page_size;/* Safe default since most protocols use readv()/writev()/etc */ bs->bl.max_iov =IOV_MAX ;block/parallels.c +1
-1@@ -847,7 +847,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, } } - s->bat_dirty_block =4 *getpagesize (); + s->bat_dirty_block =4 * qemu_real_host_page_size; s->bat_dirty_bmap =bitmap_new (DIV_ROUND_UP (s->header_size, s->bat_dirty_block));block/qcow2-cache.c +1
-1@@ -74,7 +74,7 @@ static void qcow2_cache_table_release(Qcow2Cache *c, int i, int num_tables)/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */ #ifdef CONFIG_LINUX void *t =qcow2_cache_get_table_addr (c, i); -int align =getpagesize (); +int align = qemu_real_host_page_size;size_t mem_size = (size_t ) c->table_size * num_tables;size_t offset =QEMU_ALIGN_UP ((uintptr_t ) t, align) - (uintptr_t ) t;size_t length =QEMU_ALIGN_DOWN (mem_size - offset, align);contrib/vhost-user-gpu/vugbm.c +1
-1@@ -52,7 +52,7 @@ struct udmabuf_create {static size_t udmabuf_get_size (struct vugbm_buffer *buf) { -return ROUND_UP (buf->width * buf->height *4 ,getpagesize ()); +return ROUND_UP (buf->width * buf->height *4 , qemu_real_host_page_size); } static boolexec.c +3
-3@@ -1762,11 +1762,11 @@ long qemu_maxrampagesize(void)#else long qemu_minrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }long qemu_maxrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }#endif @@ -2425,7 +2425,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, new_block->max_length = max_size;assert (max_size >= size); new_block->fd =-1 ; - new_block->page_size =getpagesize (); + new_block->page_size = qemu_real_host_page_size; new_block->host = host;if (host) { new_block->flags |=RAM_PREALLOC ;hw/intc/s390_flic_kvm.c +1
-1@@ -25,7 +25,7 @@#include "migration/qemu-file-types.h" #include "trace.h" -#define FLIC_SAVE_INITIAL_SIZE getpagesize() +#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size#define FLIC_FAILED (-1UL)#define FLIC_SAVEVM_VERSION 1hw/ppc/mac_newworld.c +1
-1@@ -439,7 +439,7 @@ static void ppc_core99_init(MachineState *machine) }/* The NewWorld NVRAM is not located in the MacIO device */ -if (kvm_enabled () &&getpagesize () >4096 ) { +if (kvm_enabled () && qemu_real_host_page_size >4096 ) {/* We can't combine read-write and read-only in a single page, so move the NVRAM out of ROM again for KVM */ nvram_addr =0xFFE00000 ;hw/ppc/spapr_pci.c +1
-1@@ -1942,7 +1942,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)* our memory slot is of page size granularity. */ if (kvm_enabled ()) { - msi_window_size =getpagesize (); + msi_window_size = qemu_real_host_page_size; } memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,hw/rdma/vmw/pvrdma_main.c +1
-1@@ -601,7 +601,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)rdma_info_report ("Initializing device %s %x.%x" , pdev->name,PCI_SLOT (pdev->devfn),PCI_FUNC (pdev->devfn)); -if (TARGET_PAGE_SIZE !=getpagesize ()) { +if (TARGET_PAGE_SIZE != qemu_real_host_page_size) {error_setg (errp,"Target page size must be the same as host page size" );return ; }hw/vfio/spapr.c +4
-3@@ -196,14 +196,15 @@ int vfio_spapr_create_window(VFIOContainer *container,* bits_per_level is a safe guess of how much we can allocate per level: * 8 is the current minimum for CONFIG_FORCE_MAX_ZONEORDER and MAX_ORDER * is usually bigger than that. -* Below we look at getpagesize() as TCEs are allocated from system pages. +* Below we look at qemu_real_host_page_size as TCEs are allocated from +* system pages. */ - bits_per_level =ctz64 (getpagesize ()) +8 ; + bits_per_level =ctz64 (qemu_real_host_page_size) +8 ; create.levels = bits_total / bits_per_level;if (bits_total % bits_per_level) { ++create.levels; } - max_levels = (64 - create.page_shift) /ctz64 (getpagesize ()); + max_levels = (64 - create.page_shift) /ctz64 (qemu_real_host_page_size);for ( ; create.levels <= max_levels; ++create.levels) { ret =ioctl (container->fd,VFIO_IOMMU_SPAPR_TCE_CREATE , &create);if (!ret) {include/exec/ram_addr.h +1
-1@@ -380,7 +380,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,hwaddr addr;ram_addr_t ram_addr;unsigned long len = (pages +HOST_LONG_BITS -1 ) /HOST_LONG_BITS ; -unsigned long hpratio =getpagesize () /TARGET_PAGE_SIZE ; +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? */ include/qemu/osdep.h +2
-2@@ -423,9 +423,9 @@ void qemu_anon_ram_free(void *ptr, size_t size);# define QEMU_VMALLOC_ALIGN (256 * 4096)#elif defined(__linux__) && defined(__sparc__)#include <sys/shm.h> -# define QEMU_VMALLOC_ALIGN MAX(getpagesize(), SHMLBA) +# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)#else -# define QEMU_VMALLOC_ALIGN getpagesize() +# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size#endif #ifdef CONFIG_POSIX migration/migration.c +1
-1@@ -2288,7 +2288,7 @@ static struct rp_cmd_args {static void migrate_handle_rp_req_pages (MigrationState *ms,const char * rbname,ram_addr_t start,size_t len) { -long our_host_ps =getpagesize (); +long our_host_ps = qemu_real_host_page_size;trace_migrate_handle_rp_req_pages (rbname, start, len);migration/postcopy-ram.c +2
-2@@ -308,7 +308,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)return false; } -if (getpagesize () !=ram_pagesize_summary ()) { +if (qemu_real_host_page_size !=ram_pagesize_summary ()) {bool have_hp = false;/* We've got a huge page */ #ifdef UFFD_FEATURE_MISSING_HUGETLBFS @@ -346,7 +346,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)*/ bool postcopy_ram_supported_by_host (MigrationIncomingState *mis) { -long pagesize =getpagesize (); +long pagesize = qemu_real_host_page_size;int ufd =-1 ;bool ret = false;/* Error unless we change it */ void *testarea =NULL ;monitor/misc.c +1
-1@@ -862,7 +862,7 @@ static uint64_t vtop(void *ptr, Error **errp)uint64_t pinfo;uint64_t ret =-1 ;uintptr_t addr = (uintptr_t ) ptr; -uintptr_t pagesize =getpagesize (); +uintptr_t pagesize = qemu_real_host_page_size;off_t offset = addr / pagesize *sizeof (pinfo);int fd;target/ppc/kvm.c +1
-1@@ -411,7 +411,7 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp)* will be a normal mapping, not a special hugepage one used * for RAM. */ -if (getpagesize () <0x10000 ) { +if (qemu_real_host_page_size <0x10000 ) {error_setg (errp,"KVM can't supply 64kiB CI pages, which guest expects" ); }tests/vhost-user-bridge.c +4
-4@@ -468,8 +468,8 @@ vubr_queue_set_started(VuDev *dev, int qidx, bool started)if (started && vubr->notifier.fd >=0 ) {vu_set_queue_host_notifier (dev, vq, vubr->notifier.fd, -getpagesize (), - qidx *getpagesize ()); + qemu_real_host_page_size, + qidx * qemu_real_host_page_size); }if (qidx %2 ==1 ) {@@ -594,7 +594,7 @@ static void *notifier_thread(void *arg) {VuDev *dev = (VuDev *)arg;VubrDev *vubr =container_of (dev, VubrDev, vudev); -int pagesize =getpagesize (); +int pagesize = qemu_real_host_page_size;int qidx;while (true) {@@ -630,7 +630,7 @@ vubr_host_notifier_setup(VubrDev *dev)void *addr;int fd; - length =getpagesize () *VHOST_USER_BRIDGE_MAX_QUEUES ; + length = qemu_real_host_page_size *VHOST_USER_BRIDGE_MAX_QUEUES ; fd =mkstemp (template);if (fd <0 ) {util/mmap-alloc.c +5
-5@@ -48,7 +48,7 @@ size_t qemu_fd_getpagesize(int fd)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; }size_t qemu_mempath_getpagesize (const char *mem_path)@@ -79,7 +79,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; } void *qemu_ram_mmap(int fd,@@ -114,7 +114,7 @@ void *qemu_ram_mmap(int fd,*/ flags =MAP_PRIVATE ; pagesize =qemu_fd_getpagesize (fd); -if (fd ==-1 || pagesize ==getpagesize ()) { +if (fd ==-1 || pagesize == qemu_real_host_page_size) { guardfd =-1 ; flags |=MAP_ANONYMOUS ; }else {@@ -123,7 +123,7 @@ void *qemu_ram_mmap(int fd, }#else guardfd =-1 ; - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size; flags =MAP_PRIVATE |MAP_ANONYMOUS ;#endif @@ -205,7 +205,7 @@ void qemu_ram_munmap(int fd, void *ptr, size_t size)#if defined(__powerpc64__) && defined(__linux__) pagesize =qemu_fd_getpagesize (fd);#else - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size;#endif munmap (ptr, size + pagesize); }util/oslib-posix.c +2
-2@@ -617,7 +617,7 @@ void *qemu_alloc_stack(size_t *sz)#ifdef CONFIG_DEBUG_STACK_USAGE void *ptr2;#endif -size_t pagesz =getpagesize (); +size_t pagesz = qemu_real_host_page_size;#ifdef _SC_THREAD_STACK_MIN/* avoid stacks smaller than _SC_THREAD_STACK_MIN */ long min_stack_sz =sysconf (_SC_THREAD_STACK_MIN);@@ -679,7 +679,7 @@ void qemu_free_stack(void *stack, size_t sz)unsigned int usage;void *ptr; -for (ptr = stack +getpagesize (); ptr < stack + sz; +for (ptr = stack + qemu_real_host_page_size; ptr < stack + sz; ptr +=sizeof (uint32_t )) {if (*(uint32_t *)ptr !=0xdeadbeaf ) {break ;util/oslib-win32.c +1
-1@@ -554,7 +554,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, Error **errp) {int i; -size_t pagesize =getpagesize (); +size_t pagesize = qemu_real_host_page_size; memory = (memory + pagesize -1 ) & -pagesize;for (i =0 ; i < memory / pagesize; i++) {util/vfio-helpers.c +6
-6@@ -514,9 +514,9 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,IOVAMapping m = {.host = host, .size = size, .iova = iova};IOVAMapping *insert; -assert (QEMU_IS_ALIGNED (size,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->low_water_mark,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->high_water_mark,getpagesize ())); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->low_water_mark, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->high_water_mark, qemu_real_host_page_size));trace_qemu_vfio_new_mapping (s, host, size, index, iova);assert (index >=0 );@@ -567,7 +567,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping, index = mapping - s->mappings;assert (mapping->size >0 ); -assert (QEMU_IS_ALIGNED (mapping->size,getpagesize ())); +assert (QEMU_IS_ALIGNED (mapping->size, qemu_real_host_page_size));assert (index >=0 && index < s->nr_mappings);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_setg (errp,"VFIO_UNMAP_DMA failed: %d" , -errno);@@ -613,8 +613,8 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,IOVAMapping *mapping;uint64_t iova0; -assert (QEMU_PTR_IS_ALIGNED (host,getpagesize ())); -assert (QEMU_IS_ALIGNED (size,getpagesize ())); +assert (QEMU_PTR_IS_ALIGNED (host, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size));trace_qemu_vfio_dma_map (s, host, size, temporary, iova);qemu_mutex_lock (&s->lock); mapping =qemu_vfio_find_mapping (s, host, &index);Signature · 1 line
2.17.1--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Signature · 2 lines
Wei Yang Help you, Help me
Re: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
Quoted 4 lines · Wei Yang
Quoted 1 line · Dr. David Alan Gilbert
We also use
sysconf(_SC_PAGESIZE)in a few places.You mean need to replace them too?
I would say so, as a separate patch.
r~
Re: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
In reply to Wei YangQuoted 16 lines · Wei Yang
There are three page size in qemu:
real host page size
host page size
target page sizeAll of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms:
qemu_real_host_page_sizeandgetpagesize().
qemu_real_host_page_sizeis defined to be a replacement ofgetpagesize(), so let it serve the role.[Note] Not fully tested for some arch or device.
Signed-off-by Wei Yang <[email protected]>
Quoted 14 lines
--- accel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +-
for pvrdma stuff:
Quoted 520 lines
hw/vfio/spapr.c | 7 ++++--- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 25 files changed, 52 insertions(+), 50 deletions(-)accel/kvm/kvm-all.c +3
-3@@ -52,7 +52,7 @@/* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */ -#define PAGE_SIZE getpagesize() +#define PAGE_SIZE qemu_real_host_page_size//#define DEBUG_KVM @@ -507,7 +507,7 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, {ram_addr_t start = section->offset_within_region +memory_region_get_ram_addr (section->mr); -ram_addr_t pages =int128_get64 (section->size) /getpagesize (); +ram_addr_t pages =int128_get64 (section->size) / qemu_real_host_page_size;cpu_physical_memory_set_dirty_lebitmap (bitmap, start, pages);return 0 ;@@ -1841,7 +1841,7 @@ static int kvm_init(MachineState *ms)* even with KVM. TARGET_PAGE_SIZE is assumed to be the minimum * page size for the system though. */ -assert (TARGET_PAGE_SIZE <=getpagesize ()); +assert (TARGET_PAGE_SIZE <= qemu_real_host_page_size); s->sigmask_len =8 ;backends/hostmem.c +1
-1@@ -304,7 +304,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)#else size_t host_memory_backend_pagesize (HostMemoryBackend *memdev) { -return getpagesize (); +return qemu_real_host_page_size; }#endif block.c +2
-2@@ -106,7 +106,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.opt_mem_alignment;@@ -116,7 +116,7 @@ size_t bdrv_min_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.min_mem_alignment;block/file-posix.c +5
-4@@ -322,7 +322,7 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) {BDRVRawState *s = bs->opaque;char *buf; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);size_t alignments[] = {1 ,512 ,1024 ,2048 ,4096 };/* For SCSI generic devices the alignment is not really used. @@ -1131,13 +1131,14 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) ret =sg_get_max_segments (s->fd);if (ret >0 ) { - bs->bl.max_transfer =MIN (bs->bl.max_transfer, ret *getpagesize ()); + bs->bl.max_transfer =MIN (bs->bl.max_transfer, + ret * qemu_real_host_page_size); } }raw_probe_alignment (bs, s->fd, errp); bs->bl.min_mem_alignment = s->buf_align; - bs->bl.opt_mem_alignment =MAX (s->buf_align,getpagesize ()); + bs->bl.opt_mem_alignment =MAX (s->buf_align, qemu_real_host_page_size); }static int check_for_dasd (int fd)@@ -1700,7 +1701,7 @@ static int allocate_first_block(int fd, size_t max_size)size_t write_size = (max_size <MAX_BLOCKSIZE ) ?BDRV_SECTOR_SIZE :MAX_BLOCKSIZE ; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);void *buf;ssize_t n;int ret;block/io.c +1
-1@@ -159,7 +159,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp)bdrv_merge_limits (&bs->bl, &bs->file->bs->bl); }else { bs->bl.min_mem_alignment =512 ; - bs->bl.opt_mem_alignment =getpagesize (); + bs->bl.opt_mem_alignment = qemu_real_host_page_size;/* Safe default since most protocols use readv()/writev()/etc */ bs->bl.max_iov =IOV_MAX ;block/parallels.c +1
-1@@ -847,7 +847,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, } } - s->bat_dirty_block =4 *getpagesize (); + s->bat_dirty_block =4 * qemu_real_host_page_size; s->bat_dirty_bmap =bitmap_new (DIV_ROUND_UP (s->header_size, s->bat_dirty_block));block/qcow2-cache.c +1
-1@@ -74,7 +74,7 @@ static void qcow2_cache_table_release(Qcow2Cache *c, int i, int num_tables)/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */ #ifdef CONFIG_LINUX void *t =qcow2_cache_get_table_addr (c, i); -int align =getpagesize (); +int align = qemu_real_host_page_size;size_t mem_size = (size_t ) c->table_size * num_tables;size_t offset =QEMU_ALIGN_UP ((uintptr_t ) t, align) - (uintptr_t ) t;size_t length =QEMU_ALIGN_DOWN (mem_size - offset, align);contrib/vhost-user-gpu/vugbm.c +1
-1@@ -52,7 +52,7 @@ struct udmabuf_create {static size_t udmabuf_get_size (struct vugbm_buffer *buf) { -return ROUND_UP (buf->width * buf->height *4 ,getpagesize ()); +return ROUND_UP (buf->width * buf->height *4 , qemu_real_host_page_size); } static boolexec.c +3
-3@@ -1762,11 +1762,11 @@ long qemu_maxrampagesize(void)#else long qemu_minrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }long qemu_maxrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }#endif @@ -2425,7 +2425,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, new_block->max_length = max_size;assert (max_size >= size); new_block->fd =-1 ; - new_block->page_size =getpagesize (); + new_block->page_size = qemu_real_host_page_size; new_block->host = host;if (host) { new_block->flags |=RAM_PREALLOC ;hw/intc/s390_flic_kvm.c +1
-1@@ -25,7 +25,7 @@#include "migration/qemu-file-types.h" #include "trace.h" -#define FLIC_SAVE_INITIAL_SIZE getpagesize() +#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size#define FLIC_FAILED (-1UL)#define FLIC_SAVEVM_VERSION 1hw/ppc/mac_newworld.c +1
-1@@ -439,7 +439,7 @@ static void ppc_core99_init(MachineState *machine) }/* The NewWorld NVRAM is not located in the MacIO device */ -if (kvm_enabled () &&getpagesize () >4096 ) { +if (kvm_enabled () && qemu_real_host_page_size >4096 ) {/* We can't combine read-write and read-only in a single page, so move the NVRAM out of ROM again for KVM */ nvram_addr =0xFFE00000 ;hw/ppc/spapr_pci.c +1
-1@@ -1942,7 +1942,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)* our memory slot is of page size granularity. */ if (kvm_enabled ()) { - msi_window_size =getpagesize (); + msi_window_size = qemu_real_host_page_size; } memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,hw/rdma/vmw/pvrdma_main.c +1
-1@@ -601,7 +601,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)rdma_info_report ("Initializing device %s %x.%x" , pdev->name,PCI_SLOT (pdev->devfn),PCI_FUNC (pdev->devfn)); -if (TARGET_PAGE_SIZE !=getpagesize ()) { +if (TARGET_PAGE_SIZE != qemu_real_host_page_size) {error_setg (errp,"Target page size must be the same as host page size" );return ; }hw/vfio/spapr.c +4
-3@@ -196,14 +196,15 @@ int vfio_spapr_create_window(VFIOContainer *container,* bits_per_level is a safe guess of how much we can allocate per level: * 8 is the current minimum for CONFIG_FORCE_MAX_ZONEORDER and MAX_ORDER * is usually bigger than that. -* Below we look at getpagesize() as TCEs are allocated from system pages. +* Below we look at qemu_real_host_page_size as TCEs are allocated from +* system pages. */ - bits_per_level =ctz64 (getpagesize ()) +8 ; + bits_per_level =ctz64 (qemu_real_host_page_size) +8 ; create.levels = bits_total / bits_per_level;if (bits_total % bits_per_level) { ++create.levels; } - max_levels = (64 - create.page_shift) /ctz64 (getpagesize ()); + max_levels = (64 - create.page_shift) /ctz64 (qemu_real_host_page_size);for ( ; create.levels <= max_levels; ++create.levels) { ret =ioctl (container->fd,VFIO_IOMMU_SPAPR_TCE_CREATE , &create);if (!ret) {include/exec/ram_addr.h +1
-1@@ -380,7 +380,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,hwaddr addr;ram_addr_t ram_addr;unsigned long len = (pages +HOST_LONG_BITS -1 ) /HOST_LONG_BITS ; -unsigned long hpratio =getpagesize () /TARGET_PAGE_SIZE ; +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? */ include/qemu/osdep.h +2
-2@@ -423,9 +423,9 @@ void qemu_anon_ram_free(void *ptr, size_t size);# define QEMU_VMALLOC_ALIGN (256 * 4096)#elif defined(__linux__) && defined(__sparc__)#include <sys/shm.h> -# define QEMU_VMALLOC_ALIGN MAX(getpagesize(), SHMLBA) +# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)#else -# define QEMU_VMALLOC_ALIGN getpagesize() +# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size#endif #ifdef CONFIG_POSIX migration/migration.c +1
-1@@ -2288,7 +2288,7 @@ static struct rp_cmd_args {static void migrate_handle_rp_req_pages (MigrationState *ms,const char * rbname,ram_addr_t start,size_t len) { -long our_host_ps =getpagesize (); +long our_host_ps = qemu_real_host_page_size;trace_migrate_handle_rp_req_pages (rbname, start, len);migration/postcopy-ram.c +2
-2@@ -308,7 +308,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)return false; } -if (getpagesize () !=ram_pagesize_summary ()) { +if (qemu_real_host_page_size !=ram_pagesize_summary ()) {bool have_hp = false;/* We've got a huge page */ #ifdef UFFD_FEATURE_MISSING_HUGETLBFS @@ -346,7 +346,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)*/ bool postcopy_ram_supported_by_host (MigrationIncomingState *mis) { -long pagesize =getpagesize (); +long pagesize = qemu_real_host_page_size;int ufd =-1 ;bool ret = false;/* Error unless we change it */ void *testarea =NULL ;monitor/misc.c +1
-1@@ -862,7 +862,7 @@ static uint64_t vtop(void *ptr, Error **errp)uint64_t pinfo;uint64_t ret =-1 ;uintptr_t addr = (uintptr_t ) ptr; -uintptr_t pagesize =getpagesize (); +uintptr_t pagesize = qemu_real_host_page_size;off_t offset = addr / pagesize *sizeof (pinfo);int fd;target/ppc/kvm.c +1
-1@@ -411,7 +411,7 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp)* will be a normal mapping, not a special hugepage one used * for RAM. */ -if (getpagesize () <0x10000 ) { +if (qemu_real_host_page_size <0x10000 ) {error_setg (errp,"KVM can't supply 64kiB CI pages, which guest expects" ); }tests/vhost-user-bridge.c +4
-4@@ -468,8 +468,8 @@ vubr_queue_set_started(VuDev *dev, int qidx, bool started)if (started && vubr->notifier.fd >=0 ) {vu_set_queue_host_notifier (dev, vq, vubr->notifier.fd, -getpagesize (), - qidx *getpagesize ()); + qemu_real_host_page_size, + qidx * qemu_real_host_page_size); }if (qidx %2 ==1 ) {@@ -594,7 +594,7 @@ static void *notifier_thread(void *arg) {VuDev *dev = (VuDev *)arg;VubrDev *vubr =container_of (dev, VubrDev, vudev); -int pagesize =getpagesize (); +int pagesize = qemu_real_host_page_size;int qidx;while (true) {@@ -630,7 +630,7 @@ vubr_host_notifier_setup(VubrDev *dev)void *addr;int fd; - length =getpagesize () *VHOST_USER_BRIDGE_MAX_QUEUES ; + length = qemu_real_host_page_size *VHOST_USER_BRIDGE_MAX_QUEUES ; fd =mkstemp (template);if (fd <0 ) {util/mmap-alloc.c +5
-5@@ -48,7 +48,7 @@ size_t qemu_fd_getpagesize(int fd)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; }size_t qemu_mempath_getpagesize (const char *mem_path)@@ -79,7 +79,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; } void *qemu_ram_mmap(int fd,@@ -114,7 +114,7 @@ void *qemu_ram_mmap(int fd,*/ flags =MAP_PRIVATE ; pagesize =qemu_fd_getpagesize (fd); -if (fd ==-1 || pagesize ==getpagesize ()) { +if (fd ==-1 || pagesize == qemu_real_host_page_size) { guardfd =-1 ; flags |=MAP_ANONYMOUS ; }else {@@ -123,7 +123,7 @@ void *qemu_ram_mmap(int fd, }#else guardfd =-1 ; - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size; flags =MAP_PRIVATE |MAP_ANONYMOUS ;#endif @@ -205,7 +205,7 @@ void qemu_ram_munmap(int fd, void *ptr, size_t size)#if defined(__powerpc64__) && defined(__linux__) pagesize =qemu_fd_getpagesize (fd);#else - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size;#endif munmap (ptr, size + pagesize); }util/oslib-posix.c +2
-2@@ -617,7 +617,7 @@ void *qemu_alloc_stack(size_t *sz)#ifdef CONFIG_DEBUG_STACK_USAGE void *ptr2;#endif -size_t pagesz =getpagesize (); +size_t pagesz = qemu_real_host_page_size;#ifdef _SC_THREAD_STACK_MIN/* avoid stacks smaller than _SC_THREAD_STACK_MIN */ long min_stack_sz =sysconf (_SC_THREAD_STACK_MIN);@@ -679,7 +679,7 @@ void qemu_free_stack(void *stack, size_t sz)unsigned int usage;void *ptr; -for (ptr = stack +getpagesize (); ptr < stack + sz; +for (ptr = stack + qemu_real_host_page_size; ptr < stack + sz; ptr +=sizeof (uint32_t )) {if (*(uint32_t *)ptr !=0xdeadbeaf ) {break ;util/oslib-win32.c +1
-1@@ -554,7 +554,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, Error **errp) {int i; -size_t pagesize =getpagesize (); +size_t pagesize = qemu_real_host_page_size; memory = (memory + pagesize -1 ) & -pagesize;for (i =0 ; i < memory / pagesize; i++) {util/vfio-helpers.c +6
-6@@ -514,9 +514,9 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,IOVAMapping m = {.host = host, .size = size, .iova = iova};IOVAMapping *insert; -assert (QEMU_IS_ALIGNED (size,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->low_water_mark,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->high_water_mark,getpagesize ())); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->low_water_mark, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->high_water_mark, qemu_real_host_page_size));trace_qemu_vfio_new_mapping (s, host, size, index, iova);assert (index >=0 );@@ -567,7 +567,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping, index = mapping - s->mappings;assert (mapping->size >0 ); -assert (QEMU_IS_ALIGNED (mapping->size,getpagesize ())); +assert (QEMU_IS_ALIGNED (mapping->size, qemu_real_host_page_size));assert (index >=0 && index < s->nr_mappings);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_setg (errp,"VFIO_UNMAP_DMA failed: %d" , -errno);@@ -613,8 +613,8 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,IOVAMapping *mapping;uint64_t iova0; -assert (QEMU_PTR_IS_ALIGNED (host,getpagesize ())); -assert (QEMU_IS_ALIGNED (size,getpagesize ())); +assert (QEMU_PTR_IS_ALIGNED (host, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size));trace_qemu_vfio_dma_map (s, host, size, temporary, iova);qemu_mutex_lock (&s->lock); mapping =qemu_vfio_find_mapping (s, host, &index);Signature · 1 line
2.17.1
Re: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
Quoted 32 lines · Yuval Shaia
Quoted 16 lines · Wei Yang
There are three page size in qemu:
real host page size
host page size
target page sizeAll of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms:
qemu_real_host_page_sizeandgetpagesize().
qemu_real_host_page_sizeis defined to be a replacement ofgetpagesize(), so let it serve the role.[Note] Not fully tested for some arch or device.
Signed-off-by Wei Yang <[email protected]>Quoted 14 lines
--- accel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +-
Quoted 4 lines
for pvrdma stuff:
Reviewed-by Yuval Shaia <[email protected]>Tested-by Yuval Shaia <[email protected]>
Thanks
Quoted 521 lines
Quoted 521 lines
hw/vfio/spapr.c | 7 ++++--- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 25 files changed, 52 insertions(+), 50 deletions(-)accel/kvm/kvm-all.c +3
-3@@ -52,7 +52,7 @@/* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */ -#define PAGE_SIZE getpagesize() +#define PAGE_SIZE qemu_real_host_page_size//#define DEBUG_KVM @@ -507,7 +507,7 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, {ram_addr_t start = section->offset_within_region +memory_region_get_ram_addr (section->mr); -ram_addr_t pages =int128_get64 (section->size) /getpagesize (); +ram_addr_t pages =int128_get64 (section->size) / qemu_real_host_page_size;cpu_physical_memory_set_dirty_lebitmap (bitmap, start, pages);return 0 ;@@ -1841,7 +1841,7 @@ static int kvm_init(MachineState *ms)* even with KVM. TARGET_PAGE_SIZE is assumed to be the minimum * page size for the system though. */ -assert (TARGET_PAGE_SIZE <=getpagesize ()); +assert (TARGET_PAGE_SIZE <= qemu_real_host_page_size); s->sigmask_len =8 ;backends/hostmem.c +1
-1@@ -304,7 +304,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)#else size_t host_memory_backend_pagesize (HostMemoryBackend *memdev) { -return getpagesize (); +return qemu_real_host_page_size; }#endif block.c +2
-2@@ -106,7 +106,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.opt_mem_alignment;@@ -116,7 +116,7 @@ size_t bdrv_min_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.min_mem_alignment;block/file-posix.c +5
-4@@ -322,7 +322,7 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) {BDRVRawState *s = bs->opaque;char *buf; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);size_t alignments[] = {1 ,512 ,1024 ,2048 ,4096 };/* For SCSI generic devices the alignment is not really used. @@ -1131,13 +1131,14 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) ret =sg_get_max_segments (s->fd);if (ret >0 ) { - bs->bl.max_transfer =MIN (bs->bl.max_transfer, ret *getpagesize ()); + bs->bl.max_transfer =MIN (bs->bl.max_transfer, + ret * qemu_real_host_page_size); } }raw_probe_alignment (bs, s->fd, errp); bs->bl.min_mem_alignment = s->buf_align; - bs->bl.opt_mem_alignment =MAX (s->buf_align,getpagesize ()); + bs->bl.opt_mem_alignment =MAX (s->buf_align, qemu_real_host_page_size); }static int check_for_dasd (int fd)@@ -1700,7 +1701,7 @@ static int allocate_first_block(int fd, size_t max_size)size_t write_size = (max_size <MAX_BLOCKSIZE ) ?BDRV_SECTOR_SIZE :MAX_BLOCKSIZE ; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);void *buf;ssize_t n;int ret;block/io.c +1
-1@@ -159,7 +159,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp)bdrv_merge_limits (&bs->bl, &bs->file->bs->bl); }else { bs->bl.min_mem_alignment =512 ; - bs->bl.opt_mem_alignment =getpagesize (); + bs->bl.opt_mem_alignment = qemu_real_host_page_size;/* Safe default since most protocols use readv()/writev()/etc */ bs->bl.max_iov =IOV_MAX ;block/parallels.c +1
-1@@ -847,7 +847,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, } } - s->bat_dirty_block =4 *getpagesize (); + s->bat_dirty_block =4 * qemu_real_host_page_size; s->bat_dirty_bmap =bitmap_new (DIV_ROUND_UP (s->header_size, s->bat_dirty_block));block/qcow2-cache.c +1
-1@@ -74,7 +74,7 @@ static void qcow2_cache_table_release(Qcow2Cache *c, int i, int num_tables)/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */ #ifdef CONFIG_LINUX void *t =qcow2_cache_get_table_addr (c, i); -int align =getpagesize (); +int align = qemu_real_host_page_size;size_t mem_size = (size_t ) c->table_size * num_tables;size_t offset =QEMU_ALIGN_UP ((uintptr_t ) t, align) - (uintptr_t ) t;size_t length =QEMU_ALIGN_DOWN (mem_size - offset, align);contrib/vhost-user-gpu/vugbm.c +1
-1@@ -52,7 +52,7 @@ struct udmabuf_create {static size_t udmabuf_get_size (struct vugbm_buffer *buf) { -return ROUND_UP (buf->width * buf->height *4 ,getpagesize ()); +return ROUND_UP (buf->width * buf->height *4 , qemu_real_host_page_size); } static boolexec.c +3
-3@@ -1762,11 +1762,11 @@ long qemu_maxrampagesize(void)#else long qemu_minrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }long qemu_maxrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }#endif @@ -2425,7 +2425,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, new_block->max_length = max_size;assert (max_size >= size); new_block->fd =-1 ; - new_block->page_size =getpagesize (); + new_block->page_size = qemu_real_host_page_size; new_block->host = host;if (host) { new_block->flags |=RAM_PREALLOC ;hw/intc/s390_flic_kvm.c +1
-1@@ -25,7 +25,7 @@#include "migration/qemu-file-types.h" #include "trace.h" -#define FLIC_SAVE_INITIAL_SIZE getpagesize() +#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size#define FLIC_FAILED (-1UL)#define FLIC_SAVEVM_VERSION 1hw/ppc/mac_newworld.c +1
-1@@ -439,7 +439,7 @@ static void ppc_core99_init(MachineState *machine) }/* The NewWorld NVRAM is not located in the MacIO device */ -if (kvm_enabled () &&getpagesize () >4096 ) { +if (kvm_enabled () && qemu_real_host_page_size >4096 ) {/* We can't combine read-write and read-only in a single page, so move the NVRAM out of ROM again for KVM */ nvram_addr =0xFFE00000 ;hw/ppc/spapr_pci.c +1
-1@@ -1942,7 +1942,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)* our memory slot is of page size granularity. */ if (kvm_enabled ()) { - msi_window_size =getpagesize (); + msi_window_size = qemu_real_host_page_size; } memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,hw/rdma/vmw/pvrdma_main.c +1
-1@@ -601,7 +601,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)rdma_info_report ("Initializing device %s %x.%x" , pdev->name,PCI_SLOT (pdev->devfn),PCI_FUNC (pdev->devfn)); -if (TARGET_PAGE_SIZE !=getpagesize ()) { +if (TARGET_PAGE_SIZE != qemu_real_host_page_size) {error_setg (errp,"Target page size must be the same as host page size" );return ; }hw/vfio/spapr.c +4
-3@@ -196,14 +196,15 @@ int vfio_spapr_create_window(VFIOContainer *container,* bits_per_level is a safe guess of how much we can allocate per level: * 8 is the current minimum for CONFIG_FORCE_MAX_ZONEORDER and MAX_ORDER * is usually bigger than that. -* Below we look at getpagesize() as TCEs are allocated from system pages. +* Below we look at qemu_real_host_page_size as TCEs are allocated from +* system pages. */ - bits_per_level =ctz64 (getpagesize ()) +8 ; + bits_per_level =ctz64 (qemu_real_host_page_size) +8 ; create.levels = bits_total / bits_per_level;if (bits_total % bits_per_level) { ++create.levels; } - max_levels = (64 - create.page_shift) /ctz64 (getpagesize ()); + max_levels = (64 - create.page_shift) /ctz64 (qemu_real_host_page_size);for ( ; create.levels <= max_levels; ++create.levels) { ret =ioctl (container->fd,VFIO_IOMMU_SPAPR_TCE_CREATE , &create);if (!ret) {include/exec/ram_addr.h +1
-1@@ -380,7 +380,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,hwaddr addr;ram_addr_t ram_addr;unsigned long len = (pages +HOST_LONG_BITS -1 ) /HOST_LONG_BITS ; -unsigned long hpratio =getpagesize () /TARGET_PAGE_SIZE ; +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? */ include/qemu/osdep.h +2
-2@@ -423,9 +423,9 @@ void qemu_anon_ram_free(void *ptr, size_t size);# define QEMU_VMALLOC_ALIGN (256 * 4096)#elif defined(__linux__) && defined(__sparc__)#include <sys/shm.h> -# define QEMU_VMALLOC_ALIGN MAX(getpagesize(), SHMLBA) +# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)#else -# define QEMU_VMALLOC_ALIGN getpagesize() +# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size#endif #ifdef CONFIG_POSIX migration/migration.c +1
-1@@ -2288,7 +2288,7 @@ static struct rp_cmd_args {static void migrate_handle_rp_req_pages (MigrationState *ms,const char * rbname,ram_addr_t start,size_t len) { -long our_host_ps =getpagesize (); +long our_host_ps = qemu_real_host_page_size;trace_migrate_handle_rp_req_pages (rbname, start, len);migration/postcopy-ram.c +2
-2@@ -308,7 +308,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)return false; } -if (getpagesize () !=ram_pagesize_summary ()) { +if (qemu_real_host_page_size !=ram_pagesize_summary ()) {bool have_hp = false;/* We've got a huge page */ #ifdef UFFD_FEATURE_MISSING_HUGETLBFS @@ -346,7 +346,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)*/ bool postcopy_ram_supported_by_host (MigrationIncomingState *mis) { -long pagesize =getpagesize (); +long pagesize = qemu_real_host_page_size;int ufd =-1 ;bool ret = false;/* Error unless we change it */ void *testarea =NULL ;monitor/misc.c +1
-1@@ -862,7 +862,7 @@ static uint64_t vtop(void *ptr, Error **errp)uint64_t pinfo;uint64_t ret =-1 ;uintptr_t addr = (uintptr_t ) ptr; -uintptr_t pagesize =getpagesize (); +uintptr_t pagesize = qemu_real_host_page_size;off_t offset = addr / pagesize *sizeof (pinfo);int fd;target/ppc/kvm.c +1
-1@@ -411,7 +411,7 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp)* will be a normal mapping, not a special hugepage one used * for RAM. */ -if (getpagesize () <0x10000 ) { +if (qemu_real_host_page_size <0x10000 ) {error_setg (errp,"KVM can't supply 64kiB CI pages, which guest expects" ); }tests/vhost-user-bridge.c +4
-4@@ -468,8 +468,8 @@ vubr_queue_set_started(VuDev *dev, int qidx, bool started)if (started && vubr->notifier.fd >=0 ) {vu_set_queue_host_notifier (dev, vq, vubr->notifier.fd, -getpagesize (), - qidx *getpagesize ()); + qemu_real_host_page_size, + qidx * qemu_real_host_page_size); }if (qidx %2 ==1 ) {@@ -594,7 +594,7 @@ static void *notifier_thread(void *arg) {VuDev *dev = (VuDev *)arg;VubrDev *vubr =container_of (dev, VubrDev, vudev); -int pagesize =getpagesize (); +int pagesize = qemu_real_host_page_size;int qidx;while (true) {@@ -630,7 +630,7 @@ vubr_host_notifier_setup(VubrDev *dev)void *addr;int fd; - length =getpagesize () *VHOST_USER_BRIDGE_MAX_QUEUES ; + length = qemu_real_host_page_size *VHOST_USER_BRIDGE_MAX_QUEUES ; fd =mkstemp (template);if (fd <0 ) {util/mmap-alloc.c +5
-5@@ -48,7 +48,7 @@ size_t qemu_fd_getpagesize(int fd)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; }size_t qemu_mempath_getpagesize (const char *mem_path)@@ -79,7 +79,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; } void *qemu_ram_mmap(int fd,@@ -114,7 +114,7 @@ void *qemu_ram_mmap(int fd,*/ flags =MAP_PRIVATE ; pagesize =qemu_fd_getpagesize (fd); -if (fd ==-1 || pagesize ==getpagesize ()) { +if (fd ==-1 || pagesize == qemu_real_host_page_size) { guardfd =-1 ; flags |=MAP_ANONYMOUS ; }else {@@ -123,7 +123,7 @@ void *qemu_ram_mmap(int fd, }#else guardfd =-1 ; - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size; flags =MAP_PRIVATE |MAP_ANONYMOUS ;#endif @@ -205,7 +205,7 @@ void qemu_ram_munmap(int fd, void *ptr, size_t size)#if defined(__powerpc64__) && defined(__linux__) pagesize =qemu_fd_getpagesize (fd);#else - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size;#endif munmap (ptr, size + pagesize); }util/oslib-posix.c +2
-2@@ -617,7 +617,7 @@ void *qemu_alloc_stack(size_t *sz)#ifdef CONFIG_DEBUG_STACK_USAGE void *ptr2;#endif -size_t pagesz =getpagesize (); +size_t pagesz = qemu_real_host_page_size;#ifdef _SC_THREAD_STACK_MIN/* avoid stacks smaller than _SC_THREAD_STACK_MIN */ long min_stack_sz =sysconf (_SC_THREAD_STACK_MIN);@@ -679,7 +679,7 @@ void qemu_free_stack(void *stack, size_t sz)unsigned int usage;void *ptr; -for (ptr = stack +getpagesize (); ptr < stack + sz; +for (ptr = stack + qemu_real_host_page_size; ptr < stack + sz; ptr +=sizeof (uint32_t )) {if (*(uint32_t *)ptr !=0xdeadbeaf ) {break ;util/oslib-win32.c +1
-1@@ -554,7 +554,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, Error **errp) {int i; -size_t pagesize =getpagesize (); +size_t pagesize = qemu_real_host_page_size; memory = (memory + pagesize -1 ) & -pagesize;for (i =0 ; i < memory / pagesize; i++) {util/vfio-helpers.c +6
-6@@ -514,9 +514,9 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,IOVAMapping m = {.host = host, .size = size, .iova = iova};IOVAMapping *insert; -assert (QEMU_IS_ALIGNED (size,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->low_water_mark,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->high_water_mark,getpagesize ())); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->low_water_mark, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->high_water_mark, qemu_real_host_page_size));trace_qemu_vfio_new_mapping (s, host, size, index, iova);assert (index >=0 );@@ -567,7 +567,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping, index = mapping - s->mappings;assert (mapping->size >0 ); -assert (QEMU_IS_ALIGNED (mapping->size,getpagesize ())); +assert (QEMU_IS_ALIGNED (mapping->size, qemu_real_host_page_size));assert (index >=0 && index < s->nr_mappings);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_setg (errp,"VFIO_UNMAP_DMA failed: %d" , -errno);@@ -613,8 +613,8 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,IOVAMapping *mapping;uint64_t iova0; -assert (QEMU_PTR_IS_ALIGNED (host,getpagesize ())); -assert (QEMU_IS_ALIGNED (size,getpagesize ())); +assert (QEMU_PTR_IS_ALIGNED (host, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size));trace_qemu_vfio_dma_map (s, host, size, temporary, iova);qemu_mutex_lock (&s->lock); mapping =qemu_vfio_find_mapping (s, host, &index);Signature · 1 line
2.17.1
Signature · 2 lines
Wei Yang Help you, Help me
Paolo Bonzini
AppliedRe: [PATCH 2/2] core: replace getpagesize() with qemu_real_host_page_size
In reply to Wei YangQuoted 538 lines · Wei Yang
There are three page size in qemu:
real host page size
host page size
target page sizeAll of them have dedicate variable to represent. For the last two, we use the same form in the whole qemu project, while for the first one we use two forms:
qemu_real_host_page_sizeandgetpagesize().
qemu_real_host_page_sizeis defined to be a replacement ofgetpagesize(), so let it serve the role.[Note] Not fully tested for some arch or device.
Signed-off-by Wei Yang <[email protected]>--- accel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- hw/vfio/spapr.c | 7 ++++--- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 25 files changed, 52 insertions(+), 50 deletions(-)accel/kvm/kvm-all.c +3
-3@@ -52,7 +52,7 @@/* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */ -#define PAGE_SIZE getpagesize() +#define PAGE_SIZE qemu_real_host_page_size//#define DEBUG_KVM @@ -507,7 +507,7 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, {ram_addr_t start = section->offset_within_region +memory_region_get_ram_addr (section->mr); -ram_addr_t pages =int128_get64 (section->size) /getpagesize (); +ram_addr_t pages =int128_get64 (section->size) / qemu_real_host_page_size;cpu_physical_memory_set_dirty_lebitmap (bitmap, start, pages);return 0 ;@@ -1841,7 +1841,7 @@ static int kvm_init(MachineState *ms)* even with KVM. TARGET_PAGE_SIZE is assumed to be the minimum * page size for the system though. */ -assert (TARGET_PAGE_SIZE <=getpagesize ()); +assert (TARGET_PAGE_SIZE <= qemu_real_host_page_size); s->sigmask_len =8 ;backends/hostmem.c +1
-1@@ -304,7 +304,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)#else size_t host_memory_backend_pagesize (HostMemoryBackend *memdev) { -return getpagesize (); +return qemu_real_host_page_size; }#endif block.c +2
-2@@ -106,7 +106,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.opt_mem_alignment;@@ -116,7 +116,7 @@ size_t bdrv_min_mem_align(BlockDriverState *bs) {if (!bs || !bs->drv) {/* page size or 4k (hdd sector size) should be on the safe side */ -return MAX (4096 ,getpagesize ()); +return MAX (4096 , qemu_real_host_page_size); }return bs->bl.min_mem_alignment;block/file-posix.c +5
-4@@ -322,7 +322,7 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) {BDRVRawState *s = bs->opaque;char *buf; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);size_t alignments[] = {1 ,512 ,1024 ,2048 ,4096 };/* For SCSI generic devices the alignment is not really used. @@ -1131,13 +1131,14 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) ret =sg_get_max_segments (s->fd);if (ret >0 ) { - bs->bl.max_transfer =MIN (bs->bl.max_transfer, ret *getpagesize ()); + bs->bl.max_transfer =MIN (bs->bl.max_transfer, + ret * qemu_real_host_page_size); } }raw_probe_alignment (bs, s->fd, errp); bs->bl.min_mem_alignment = s->buf_align; - bs->bl.opt_mem_alignment =MAX (s->buf_align,getpagesize ()); + bs->bl.opt_mem_alignment =MAX (s->buf_align, qemu_real_host_page_size); }static int check_for_dasd (int fd)@@ -1700,7 +1701,7 @@ static int allocate_first_block(int fd, size_t max_size)size_t write_size = (max_size <MAX_BLOCKSIZE ) ?BDRV_SECTOR_SIZE :MAX_BLOCKSIZE ; -size_t max_align =MAX (MAX_BLOCKSIZE ,getpagesize ()); +size_t max_align =MAX (MAX_BLOCKSIZE , qemu_real_host_page_size);void *buf;ssize_t n;int ret;block/io.c +1
-1@@ -159,7 +159,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp)bdrv_merge_limits (&bs->bl, &bs->file->bs->bl); }else { bs->bl.min_mem_alignment =512 ; - bs->bl.opt_mem_alignment =getpagesize (); + bs->bl.opt_mem_alignment = qemu_real_host_page_size;/* Safe default since most protocols use readv()/writev()/etc */ bs->bl.max_iov =IOV_MAX ;block/parallels.c +1
-1@@ -847,7 +847,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, } } - s->bat_dirty_block =4 *getpagesize (); + s->bat_dirty_block =4 * qemu_real_host_page_size; s->bat_dirty_bmap =bitmap_new (DIV_ROUND_UP (s->header_size, s->bat_dirty_block));block/qcow2-cache.c +1
-1@@ -74,7 +74,7 @@ static void qcow2_cache_table_release(Qcow2Cache *c, int i, int num_tables)/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */ #ifdef CONFIG_LINUX void *t =qcow2_cache_get_table_addr (c, i); -int align =getpagesize (); +int align = qemu_real_host_page_size;size_t mem_size = (size_t ) c->table_size * num_tables;size_t offset =QEMU_ALIGN_UP ((uintptr_t ) t, align) - (uintptr_t ) t;size_t length =QEMU_ALIGN_DOWN (mem_size - offset, align);contrib/vhost-user-gpu/vugbm.c +1
-1@@ -52,7 +52,7 @@ struct udmabuf_create {static size_t udmabuf_get_size (struct vugbm_buffer *buf) { -return ROUND_UP (buf->width * buf->height *4 ,getpagesize ()); +return ROUND_UP (buf->width * buf->height *4 , qemu_real_host_page_size); } static boolexec.c +3
-3@@ -1762,11 +1762,11 @@ long qemu_maxrampagesize(void)#else long qemu_minrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }long qemu_maxrampagesize (void ) { -return getpagesize (); +return qemu_real_host_page_size; }#endif @@ -2425,7 +2425,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, new_block->max_length = max_size;assert (max_size >= size); new_block->fd =-1 ; - new_block->page_size =getpagesize (); + new_block->page_size = qemu_real_host_page_size; new_block->host = host;if (host) { new_block->flags |=RAM_PREALLOC ;hw/intc/s390_flic_kvm.c +1
-1@@ -25,7 +25,7 @@#include "migration/qemu-file-types.h" #include "trace.h" -#define FLIC_SAVE_INITIAL_SIZE getpagesize() +#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size#define FLIC_FAILED (-1UL)#define FLIC_SAVEVM_VERSION 1hw/ppc/mac_newworld.c +1
-1@@ -439,7 +439,7 @@ static void ppc_core99_init(MachineState *machine) }/* The NewWorld NVRAM is not located in the MacIO device */ -if (kvm_enabled () &&getpagesize () >4096 ) { +if (kvm_enabled () && qemu_real_host_page_size >4096 ) {/* We can't combine read-write and read-only in a single page, so move the NVRAM out of ROM again for KVM */ nvram_addr =0xFFE00000 ;hw/ppc/spapr_pci.c +1
-1@@ -1942,7 +1942,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)* our memory slot is of page size granularity. */ if (kvm_enabled ()) { - msi_window_size =getpagesize (); + msi_window_size = qemu_real_host_page_size; } memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,hw/rdma/vmw/pvrdma_main.c +1
-1@@ -601,7 +601,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)rdma_info_report ("Initializing device %s %x.%x" , pdev->name,PCI_SLOT (pdev->devfn),PCI_FUNC (pdev->devfn)); -if (TARGET_PAGE_SIZE !=getpagesize ()) { +if (TARGET_PAGE_SIZE != qemu_real_host_page_size) {error_setg (errp,"Target page size must be the same as host page size" );return ; }hw/vfio/spapr.c +4
-3@@ -196,14 +196,15 @@ int vfio_spapr_create_window(VFIOContainer *container,* bits_per_level is a safe guess of how much we can allocate per level: * 8 is the current minimum for CONFIG_FORCE_MAX_ZONEORDER and MAX_ORDER * is usually bigger than that. -* Below we look at getpagesize() as TCEs are allocated from system pages. +* Below we look at qemu_real_host_page_size as TCEs are allocated from +* system pages. */ - bits_per_level =ctz64 (getpagesize ()) +8 ; + bits_per_level =ctz64 (qemu_real_host_page_size) +8 ; create.levels = bits_total / bits_per_level;if (bits_total % bits_per_level) { ++create.levels; } - max_levels = (64 - create.page_shift) /ctz64 (getpagesize ()); + max_levels = (64 - create.page_shift) /ctz64 (qemu_real_host_page_size);for ( ; create.levels <= max_levels; ++create.levels) { ret =ioctl (container->fd,VFIO_IOMMU_SPAPR_TCE_CREATE , &create);if (!ret) {include/exec/ram_addr.h +1
-1@@ -380,7 +380,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,hwaddr addr;ram_addr_t ram_addr;unsigned long len = (pages +HOST_LONG_BITS -1 ) /HOST_LONG_BITS ; -unsigned long hpratio =getpagesize () /TARGET_PAGE_SIZE ; +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? */ include/qemu/osdep.h +2
-2@@ -423,9 +423,9 @@ void qemu_anon_ram_free(void *ptr, size_t size);# define QEMU_VMALLOC_ALIGN (256 * 4096)#elif defined(__linux__) && defined(__sparc__)#include <sys/shm.h> -# define QEMU_VMALLOC_ALIGN MAX(getpagesize(), SHMLBA) +# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)#else -# define QEMU_VMALLOC_ALIGN getpagesize() +# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size#endif #ifdef CONFIG_POSIX migration/migration.c +1
-1@@ -2288,7 +2288,7 @@ static struct rp_cmd_args {static void migrate_handle_rp_req_pages (MigrationState *ms,const char * rbname,ram_addr_t start,size_t len) { -long our_host_ps =getpagesize (); +long our_host_ps = qemu_real_host_page_size;trace_migrate_handle_rp_req_pages (rbname, start, len);migration/postcopy-ram.c +2
-2@@ -308,7 +308,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)return false; } -if (getpagesize () !=ram_pagesize_summary ()) { +if (qemu_real_host_page_size !=ram_pagesize_summary ()) {bool have_hp = false;/* We've got a huge page */ #ifdef UFFD_FEATURE_MISSING_HUGETLBFS @@ -346,7 +346,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)*/ bool postcopy_ram_supported_by_host (MigrationIncomingState *mis) { -long pagesize =getpagesize (); +long pagesize = qemu_real_host_page_size;int ufd =-1 ;bool ret = false;/* Error unless we change it */ void *testarea =NULL ;monitor/misc.c +1
-1@@ -862,7 +862,7 @@ static uint64_t vtop(void *ptr, Error **errp)uint64_t pinfo;uint64_t ret =-1 ;uintptr_t addr = (uintptr_t ) ptr; -uintptr_t pagesize =getpagesize (); +uintptr_t pagesize = qemu_real_host_page_size;off_t offset = addr / pagesize *sizeof (pinfo);int fd;target/ppc/kvm.c +1
-1@@ -411,7 +411,7 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp)* will be a normal mapping, not a special hugepage one used * for RAM. */ -if (getpagesize () <0x10000 ) { +if (qemu_real_host_page_size <0x10000 ) {error_setg (errp,"KVM can't supply 64kiB CI pages, which guest expects" ); }tests/vhost-user-bridge.c +4
-4@@ -468,8 +468,8 @@ vubr_queue_set_started(VuDev *dev, int qidx, bool started)if (started && vubr->notifier.fd >=0 ) {vu_set_queue_host_notifier (dev, vq, vubr->notifier.fd, -getpagesize (), - qidx *getpagesize ()); + qemu_real_host_page_size, + qidx * qemu_real_host_page_size); }if (qidx %2 ==1 ) {@@ -594,7 +594,7 @@ static void *notifier_thread(void *arg) {VuDev *dev = (VuDev *)arg;VubrDev *vubr =container_of (dev, VubrDev, vudev); -int pagesize =getpagesize (); +int pagesize = qemu_real_host_page_size;int qidx;while (true) {@@ -630,7 +630,7 @@ vubr_host_notifier_setup(VubrDev *dev)void *addr;int fd; - length =getpagesize () *VHOST_USER_BRIDGE_MAX_QUEUES ; + length = qemu_real_host_page_size *VHOST_USER_BRIDGE_MAX_QUEUES ; fd =mkstemp (template);if (fd <0 ) {util/mmap-alloc.c +5
-5@@ -48,7 +48,7 @@ size_t qemu_fd_getpagesize(int fd)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; }size_t qemu_mempath_getpagesize (const char *mem_path)@@ -79,7 +79,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path)#endif #endif -return getpagesize (); +return qemu_real_host_page_size; } void *qemu_ram_mmap(int fd,@@ -114,7 +114,7 @@ void *qemu_ram_mmap(int fd,*/ flags =MAP_PRIVATE ; pagesize =qemu_fd_getpagesize (fd); -if (fd ==-1 || pagesize ==getpagesize ()) { +if (fd ==-1 || pagesize == qemu_real_host_page_size) { guardfd =-1 ; flags |=MAP_ANONYMOUS ; }else {@@ -123,7 +123,7 @@ void *qemu_ram_mmap(int fd, }#else guardfd =-1 ; - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size; flags =MAP_PRIVATE |MAP_ANONYMOUS ;#endif @@ -205,7 +205,7 @@ void qemu_ram_munmap(int fd, void *ptr, size_t size)#if defined(__powerpc64__) && defined(__linux__) pagesize =qemu_fd_getpagesize (fd);#else - pagesize =getpagesize (); + pagesize = qemu_real_host_page_size;#endif munmap (ptr, size + pagesize); }util/oslib-posix.c +2
-2@@ -617,7 +617,7 @@ void *qemu_alloc_stack(size_t *sz)#ifdef CONFIG_DEBUG_STACK_USAGE void *ptr2;#endif -size_t pagesz =getpagesize (); +size_t pagesz = qemu_real_host_page_size;#ifdef _SC_THREAD_STACK_MIN/* avoid stacks smaller than _SC_THREAD_STACK_MIN */ long min_stack_sz =sysconf (_SC_THREAD_STACK_MIN);@@ -679,7 +679,7 @@ void qemu_free_stack(void *stack, size_t sz)unsigned int usage;void *ptr; -for (ptr = stack +getpagesize (); ptr < stack + sz; +for (ptr = stack + qemu_real_host_page_size; ptr < stack + sz; ptr +=sizeof (uint32_t )) {if (*(uint32_t *)ptr !=0xdeadbeaf ) {break ;util/oslib-win32.c +1
-1@@ -554,7 +554,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, Error **errp) {int i; -size_t pagesize =getpagesize (); +size_t pagesize = qemu_real_host_page_size; memory = (memory + pagesize -1 ) & -pagesize;for (i =0 ; i < memory / pagesize; i++) {util/vfio-helpers.c +4
-4@@ -514,9 +514,9 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,IOVAMapping m = {.host = host, .size = size, .iova = iova};IOVAMapping *insert; -assert (QEMU_IS_ALIGNED (size,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->low_water_mark,getpagesize ())); -assert (QEMU_IS_ALIGNED (s->high_water_mark,getpagesize ())); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->low_water_mark, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (s->high_water_mark, qemu_real_host_page_size));trace_qemu_vfio_new_mapping (s, host, size, index, iova);assert (index >=0 );@@ -567,7 +567,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping, index = mapping - s->mappings;assert (mapping->size >0 ); -assert (QEMU_IS_ALIGNED (mapping->size,getpagesize ())); +assert (QEMU_IS_ALIGNED (mapping->size, qemu_real_host_page_size));assert (index >=0 && index < s->nr_mappings);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_setg (errp,"VFIO_UNMAP_DMA failed: %d" , -errno);
util/vfio-helpers.c int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size, · line 620
Quoted 10 lines
util/vfio-helpers.c +2
-2@@ -613,8 +613,8 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,IOVAMapping *mapping;uint64_t iova0; -assert (QEMU_PTR_IS_ALIGNED (host,getpagesize ())); -assert (QEMU_IS_ALIGNED (size,getpagesize ())); +assert (QEMU_PTR_IS_ALIGNED (host, qemu_real_host_page_size)); +assert (QEMU_IS_ALIGNED (size, qemu_real_host_page_size));trace_qemu_vfio_dma_map (s, host, size, temporary, iova);qemu_mutex_lock (&s->lock); mapping =qemu_vfio_find_mapping (s, host, &index);
Queued this one, thanks.
Paolo
Quoted 4 lines · Wei Yang
Patch 1 simplify the definition of
xxx_PAGE_ALIGN.
Patch 2 replacesgetpagesize()withqemu_real_host_page_size. This one touch a volume of code. If some point is not correct, I'd appreciate your notification.
Pls queue at the trivial branch.
Quoted 34 lines
Wei Yang (2):
cpu: useROUND_UP()to definexxx_PAGE_ALIGN
core: replacegetpagesize()withqemu_real_host_page_sizeaccel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- hw/vfio/spapr.c | 7 ++++--- include/exec/cpu-all.h | 7 +++---- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 26 files changed, 55 insertions(+), 54 deletions(-)Signature · 1 line
2.17.1
Hi, All,
I got one page size related question, hope to get some hint.
There is one comment in page_size_init().
/* NOTE: we can always suppose that qemu_host_page_size >=
TARGET_PAGE_SIZE */The final result is true, since we compare qemu_host_page_size with TARGET_PAGE_SIZE and if not qemu_host_page_size will be assigned to TARGET_PAGE_SIZE.
Generally, there is no problem, but one corner case for migration.
In function ram_save_host_page(), it tries to save a whole host page. Or to be specific, it tries to save a whole REAL host page.
The potential problem is when qemu_real_host_page_size < TARGET_PAGE_SIZE, this whole host page would be a wrong range.
So I am wondering why we have the assumption written in page_size_init()?
I tried to dig out who and why we have this comment, but found the first commit is
commit 54936004fddc52c321cb3f9a9a51140e782bed5d
Author: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Tue May 13 00:25:15 2003 +0000
mmap emulation
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@158 c046a42c-6fe2-441c-8c8c-71466251a162There is no reason logged.
Quoted 39 lines · Wei Yang
Patch 1 simplify the definition of
xxx_PAGE_ALIGN.
Patch 2 replacesgetpagesize()withqemu_real_host_page_size. This one touch a volume of code. If some point is not correct, I'd appreciate your notification.Wei Yang (2):
cpu: useROUND_UP()to definexxx_PAGE_ALIGN
core: replacegetpagesize()withqemu_real_host_page_sizeaccel/kvm/kvm-all.c | 6 +++--- backends/hostmem.c | 2 +- block.c | 4 ++-- block/file-posix.c | 9 +++++---- block/io.c | 2 +- block/parallels.c | 2 +- block/qcow2-cache.c | 2 +- contrib/vhost-user-gpu/vugbm.c | 2 +- exec.c | 6 +++--- hw/intc/s390_flic_kvm.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- hw/vfio/spapr.c | 7 ++++--- include/exec/cpu-all.h | 7 +++---- include/exec/ram_addr.h | 2 +- include/qemu/osdep.h | 4 ++-- migration/migration.c | 2 +- migration/postcopy-ram.c | 4 ++-- monitor/misc.c | 2 +- target/ppc/kvm.c | 2 +- tests/vhost-user-bridge.c | 8 ++++---- util/mmap-alloc.c | 10 +++++----- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 2 +- util/vfio-helpers.c | 12 ++++++------ 26 files changed, 55 insertions(+), 54 deletions(-)Signature · 1 line
2.17.1
Signature · 2 lines
Wei Yang Help you, Help me