Commit 038adc2f authored by Wei Yang's avatar Wei Yang Committed by Paolo Bonzini
Browse files

core: replace getpagesize() with qemu_real_host_page_size 



There 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.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Message-Id: <20191013021145.16011-3-richardw.yang@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 56089565

accel/kvm/kvm-all.c

+3 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -327,7 +327,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.
@@ -1136,13 +1136,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)
@@ -1705,7 +1706,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
Original line number Diff line number Diff line
@@ -160,7 +160,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;