Commit 4e51361d authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Alex Williamson
Browse files

cpu-all: complete "real" host page size API 



Currently the "host" page size alignment API is really aligning to both
host and target page sizes. There is the qemu_real_page_size which can
be used for the actual host page size but it's missing a mask and ALIGN
macro as provided for qemu_page_size. Complete the API. This allows
system level code that cares about the host page size to use a
consistent alignment interface without having to un-needingly align to
the target page size. This also reduces system level code dependency
on the cpu specific TARGET_PAGE_SIZE.

Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Tested-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 7d489dcd

include/exec/cpu-all.h

+3 −0
Original line number Diff line number Diff line
@@ -183,10 +183,13 @@ extern unsigned long reserved_va; 


/* ??? These should be the larger of uintptr_t and target_ulong.  */

extern uintptr_t qemu_real_host_page_size;

extern uintptr_t qemu_real_host_page_mask;

extern uintptr_t qemu_host_page_size;

extern uintptr_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)



/* same as PROT_xxx */

#define PAGE_READ      0x0001

translate-all.c

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ typedef struct PageDesc { 
#define V_L1_SHIFT (L1_MAP_ADDR_SPACE_BITS - TARGET_PAGE_BITS - V_L1_BITS)



uintptr_t qemu_real_host_page_size;

uintptr_t qemu_real_host_page_mask;

uintptr_t qemu_host_page_size;

uintptr_t qemu_host_page_mask;
@@ -307,6 +308,7 @@ void page_size_init(void) 
    /* NOTE: we can always suppose that qemu_host_page_size >=

       TARGET_PAGE_SIZE */

    qemu_real_host_page_size = getpagesize();

    qemu_real_host_page_mask = ~(qemu_real_host_page_size - 1);

    if (qemu_host_page_size == 0) {

        qemu_host_page_size = qemu_real_host_page_size;

    }