[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/11] cpu-all: complete "real" host page size API
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PULL 02/11] cpu-all: complete "real" host page size API |
Date: |
Mon, 06 Jul 2015 12:34:49 -0600 |
User-agent: |
StGit/0.17.1-dirty |
From: Peter Crosthwaite <address@hidden>
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: Peter Crosthwaite <address@hidden>
Tested-by: Alexey Kardashevskiy <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>
---
include/exec/cpu-all.h | 3 +++
translate-all.c | 2 ++
2 files changed, 5 insertions(+)
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 8999634..ea6a9a6 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -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
diff --git a/translate-all.c b/translate-all.c
index 412bc90..50d53fd 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -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;
}
- [Qemu-devel] [PULL 00/11] VFIO updates for 2.4-rc0, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 02/11] cpu-all: complete "real" host page size API,
Alex Williamson <=
- [Qemu-devel] [PULL 06/11] intc: arm_gic_kvm: set the qemu_irq/gsi mapping, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 07/11] sysbus: add irq_routing_notifier, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 08/11] kvm: some fixes to kvm_resamplefds_allowed, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 09/11] hw/vfio/platform: add irqfd support, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 10/11] vfio: Unregister IOMMU notifiers when container is destroyed, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 11/11] vfio/pci : Add pba_offset PCI quirk for Chelsio T5 devices, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 01/11] vfio: fix return type of pread, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 03/11] vfio: cpu: Use "real" page size API, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 05/11] kvm-all.c: add qemu_irq/gsi hash table and utility routines, Alex Williamson, 2015/07/06
- [Qemu-devel] [PULL 04/11] kvm: rename kvm_irqchip_[add, remove]_irqfd_notifier with gsi suffix, Alex Williamson, 2015/07/06