From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: linuxppc-dev@lists.ozlabs.org
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>,
Alex Williamson <alex.williamson@redhat.com>,
Paul Mackerras <paulus@samba.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH kernel v7 27/31] powerpc/iommu/ioda2: Add get_table_size() to calculate the size of fiture table
Date: Sat, 28 Mar 2015 01:55:11 +1100 [thread overview]
Message-ID: <1427468115-2224-28-git-send-email-aik@ozlabs.ru> (raw)
In-Reply-To: <1427468115-2224-1-git-send-email-aik@ozlabs.ru>
This adds a way for the IOMMU user to know how much a new table will
use so it can be accounted in the locked_vm limit before allocation
happens.
This stores the allocated table size in pnv_pci_ioda2_create_table()
so the locked_vm counter can be updated correctly when a table is
being disposed.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
arch/powerpc/include/asm/iommu.h | 5 +++
arch/powerpc/platforms/powernv/pci-ioda.c | 54 +++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h
index a768a4d..9027b9e 100644
--- a/arch/powerpc/include/asm/iommu.h
+++ b/arch/powerpc/include/asm/iommu.h
@@ -94,6 +94,7 @@ struct iommu_table {
unsigned long it_size; /* Size of iommu table in entries */
unsigned long it_indirect_levels;
unsigned long it_level_size;
+ unsigned long it_allocated_size;
unsigned long it_offset; /* Offset into global table */
unsigned long it_base; /* mapped address of tce table */
unsigned long it_index; /* which iommu table this is */
@@ -159,6 +160,10 @@ struct iommu_table_group_ops {
void (*set_ownership)(struct iommu_table_group *table_group,
bool enable);
+ unsigned long (*get_table_size)(
+ __u32 page_shift,
+ __u64 window_size,
+ __u32 levels);
long (*create_table)(struct iommu_table_group *table_group,
int num,
__u32 page_shift,
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 036f3c1..e3ee87d 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1373,6 +1373,57 @@ static void pnv_free_tce_table(unsigned long addr, unsigned size,
free_pages(addr, get_order(size << 3));
}
+static unsigned long pnv_get_tce_table_size(unsigned shift, unsigned levels,
+ unsigned long *left)
+{
+ unsigned long ret, chunk = 1UL << shift, i;
+
+ ret = chunk;
+
+ if (!*left)
+ return 0;
+
+ --levels;
+ if (!levels) {
+ /* This is last level, actual TCEs */
+ *left -= min(*left, chunk);
+ return chunk;
+ }
+
+ for (i = 0; i < (chunk >> 3); ++i) {
+ ret += pnv_get_tce_table_size(shift, levels, left);
+ if (!*left)
+ break;
+ }
+
+ return ret;
+}
+
+static unsigned long pnv_ioda2_get_table_size(__u32 page_shift, __u64 window_size,
+ __u32 levels)
+{
+ unsigned long tce_table_size, shift, ret;
+
+ if (!levels || (levels > POWERNV_IOMMU_MAX_LEVELS))
+ return -EINVAL;
+
+ if ((window_size > memory_hotplug_max()) || !is_power_of_2(window_size))
+ return -EINVAL;
+
+ tce_table_size = (window_size >> page_shift) * 8;
+ tce_table_size = max(0x1000UL, tce_table_size);
+
+ /* Allocate TCE table */
+ shift = ROUND_UP(ilog2(window_size) - page_shift, levels) / levels;
+ shift += 3;
+ shift = max_t(unsigned, shift, IOMMU_PAGE_SHIFT_4K);
+
+ ret = tce_table_size; /* tbl->it_userspace */
+ ret += pnv_get_tce_table_size(shift, levels, &tce_table_size);
+
+ return ret;
+}
+
static __be64 *pnv_alloc_tce_table(int nid,
unsigned shift, unsigned levels, unsigned long *left)
{
@@ -1452,6 +1503,8 @@ static long pnv_pci_ioda2_create_table(struct iommu_table_group *table_group,
return -ENOMEM;
tbl->it_indirect_levels = levels - 1;
+ tbl->it_allocated_size = pnv_ioda2_get_table_size(page_shift,
+ window_size, levels);
/* Setup linux iommu table */
pnv_pci_setup_iommu_table(tbl, addr, tce_table_size,
@@ -1679,6 +1732,7 @@ static long pnv_pci_ioda2_create_table_with_uas(
static struct iommu_table_group_ops pnv_pci_ioda2_ops = {
.set_ownership = pnv_ioda2_set_ownership,
+ .get_table_size = pnv_ioda2_get_table_size,
.create_table = pnv_pci_ioda2_create_table_with_uas,
.set_window = pnv_pci_ioda2_set_window,
.unset_window = pnv_pci_ioda2_unset_window,
--
2.0.0
next prev parent reply other threads:[~2015-03-27 14:56 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-27 14:54 [PATCH kernel v7 00/31] powerpc/iommu/vfio: Enable Dynamic DMA windows Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 01/31] vfio: powerpc/spapr: Move page pinning from arch code to VFIO IOMMU driver Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 02/31] vfio: powerpc/spapr: Do cleanup when releasing the group Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 03/31] vfio: powerpc/spapr: Check that TCE page size is equal to it_page_size Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 04/31] vfio: powerpc/spapr: Use it_page_size Alexey Kardashevskiy
2015-04-01 21:48 ` Alex Williamson
2015-04-02 2:30 ` Alexey Kardashevskiy
2015-04-02 2:50 ` Alex Williamson
2015-04-02 3:40 ` Alexey Kardashevskiy
2015-04-02 3:46 ` Alex Williamson
2015-03-27 14:54 ` [PATCH kernel v7 05/31] vfio: powerpc/spapr: Move locked_vm accounting to helpers Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 06/31] vfio: powerpc/spapr: Disable DMA mappings on disabled container Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 07/31] vfio: powerpc/spapr: Moving pinning/unpinning to helpers Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 08/31] vfio: powerpc/spapr: Rework groups attaching Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 09/31] powerpc/powernv: Do not set "read" flag if direction==DMA_NONE Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 10/31] powerpc/iommu: Move tce_xxx callbacks from ppc_md to iommu_table Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 11/31] powerpc/iommu: Introduce iommu_table_alloc() helper Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 12/31] powerpc/spapr: vfio: Switch from iommu_table to new iommu_table_group Alexey Kardashevskiy
2015-03-31 21:34 ` Alex Williamson
2015-04-01 21:48 ` Alex Williamson
2015-04-02 2:33 ` Alexey Kardashevskiy
2015-04-02 2:51 ` Alex Williamson
2015-03-27 14:54 ` [PATCH kernel v7 13/31] vfio: powerpc/spapr: powerpc/iommu: Rework IOMMU ownership control Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 14/31] vfio: powerpc/spapr: powerpc/powernv/ioda2: " Alexey Kardashevskiy
2015-03-27 14:54 ` [PATCH kernel v7 15/31] powerpc/iommu: Fix IOMMU ownership control functions Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 16/31] powerpc/powernv/ioda/ioda2: Rework tce_build()/tce_free() Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 17/31] powerpc/iommu/powernv: Release replaced TCE Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 18/31] powerpc/powernv/ioda2: Rework iommu_table creation Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 19/31] powerpc/powernv/ioda2: Introduce pnv_pci_ioda2_create_table/pnc_pci_free_table Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 20/31] powerpc/powernv/ioda2: Introduce pnv_pci_ioda2_set_window Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 21/31] powerpc/iommu: Split iommu_free_table into 2 helpers Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 22/31] powerpc/powernv: Implement multilevel TCE tables Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 23/31] powerpc/powernv: Change prototypes to receive iommu Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 24/31] powerpc/powernv/ioda: Define and implement DMA table/window management callbacks Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 25/31] vfio: powerpc/spapr: powerpc/powernv/ioda2: Rework ownership Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 26/31] powerpc/iommu: Add userspace view of TCE table Alexey Kardashevskiy
2015-04-02 20:50 ` Alex Williamson
2015-04-08 3:22 ` Alexey Kardashevskiy
2015-04-08 15:43 ` Alex Williamson
2015-04-09 3:21 ` Alexey Kardashevskiy
2015-04-09 3:46 ` Alex Williamson
2015-03-27 14:55 ` Alexey Kardashevskiy [this message]
2015-03-27 14:55 ` [PATCH kernel v7 28/31] powerpc/mmu: Add userspace-to-physical addresses translation cache Alexey Kardashevskiy
2015-04-01 21:48 ` Alex Williamson
2015-04-02 2:35 ` Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 29/31] vfio: powerpc/spapr: Register memory and define IOMMU v2 Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 30/31] vfio: powerpc/spapr: Support multiple groups in one container if possible Alexey Kardashevskiy
2015-03-27 14:55 ` [PATCH kernel v7 31/31] vfio: powerpc/spapr: Support Dynamic DMA windows Alexey Kardashevskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427468115-2224-28-git-send-email-aik@ozlabs.ru \
--to=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).