From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEzEl-0005BP-Kq for qemu-devel@nongnu.org; Tue, 14 Jul 2015 08:23:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEzEg-0002Iq-AP for qemu-devel@nongnu.org; Tue, 14 Jul 2015 08:23:03 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:58019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEzEf-0002Hq-Mf for qemu-devel@nongnu.org; Tue, 14 Jul 2015 08:22:58 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 14 Jul 2015 22:22:55 +1000 From: Alexey Kardashevskiy Date: Tue, 14 Jul 2015 22:21:51 +1000 Message-Id: <1436876514-2946-2-git-send-email-aik@ozlabs.ru> In-Reply-To: <1436876514-2946-1-git-send-email-aik@ozlabs.ru> References: <1436876514-2946-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [RFC PATCH qemu v3 1/4] memory: Add reporting of supported page sizes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , Alexey Kardashevskiy , Michael Roth , Alex Williamson , qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson Every IOMMU has some granularity which MemoryRegionIOMMUOps::translate uses when translating, however this information is not available outside the translate context for various checks. This adds a get_page_sizes callback to MemoryRegionIOMMUOps and a wrapper for it so IOMMU users (such as VFIO) can know the actual page size(s) used by an IOMMU. TARGET_PAGE_BITS shift is used as fallback. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr_iommu.c | 8 ++++++++ include/exec/memory.h | 11 +++++++++++ memory.c | 9 +++++++++ 3 files changed, 28 insertions(+) diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index f61504e..a2572c4 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -104,6 +104,13 @@ static IOMMUTLBEntry spapr_tce_translate_iommu(MemoryRegion *iommu, hwaddr addr, return ret; } +static uint64_t spapr_tce_get_page_sizes(MemoryRegion *iommu) +{ + sPAPRTCETable *tcet = container_of(iommu, sPAPRTCETable, iommu); + + return 1ULL << tcet->page_shift; +} + static int spapr_tce_table_post_load(void *opaque, int version_id) { sPAPRTCETable *tcet = SPAPR_TCE_TABLE(opaque); @@ -135,6 +142,7 @@ static const VMStateDescription vmstate_spapr_tce_table = { static MemoryRegionIOMMUOps spapr_iommu_ops = { .translate = spapr_tce_translate_iommu, + .get_page_sizes = spapr_tce_get_page_sizes, }; static int spapr_tce_table_realize(DeviceState *dev) diff --git a/include/exec/memory.h b/include/exec/memory.h index 1394715..9ca74e3 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -152,6 +152,8 @@ typedef struct MemoryRegionIOMMUOps MemoryRegionIOMMUOps; struct MemoryRegionIOMMUOps { /* Return a TLB entry that contains a given address. */ IOMMUTLBEntry (*translate)(MemoryRegion *iommu, hwaddr addr, bool is_write); + /* Returns supported page sizes */ + uint64_t (*get_page_sizes)(MemoryRegion *iommu); }; typedef struct CoalescedMemoryRange CoalescedMemoryRange; @@ -552,6 +554,15 @@ static inline bool memory_region_is_romd(MemoryRegion *mr) bool memory_region_is_iommu(MemoryRegion *mr); /** + * memory_region_iommu_get_page_sizes: get supported page sizes in an iommu + * + * Returns %bitmap of supported page sizes for an iommu. + * + * @mr: the memory region being queried + */ +uint64_t memory_region_iommu_get_page_sizes(MemoryRegion *mr); + +/** * memory_region_notify_iommu: notify a change in an IOMMU translation entry. * * @mr: the memory region that was changed diff --git a/memory.c b/memory.c index 5a0cc66..0732763 100644 --- a/memory.c +++ b/memory.c @@ -1413,6 +1413,15 @@ bool memory_region_is_iommu(MemoryRegion *mr) return mr->iommu_ops; } +uint64_t memory_region_iommu_get_page_sizes(MemoryRegion *mr) +{ + assert(memory_region_is_iommu(mr)); + if (mr->iommu_ops && mr->iommu_ops->get_page_sizes) { + return mr->iommu_ops->get_page_sizes(mr); + } + return 1ULL << TARGET_PAGE_BITS; +} + void memory_region_register_iommu_notifier(MemoryRegion *mr, Notifier *n) { notifier_list_add(&mr->iommu_notify, n); -- 2.4.0.rc3.8.gfb3e7d5