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 03/31] vfio: powerpc/spapr: Check that TCE page size is equal to it_page_size
Date: Sat, 28 Mar 2015 01:54:47 +1100 [thread overview]
Message-ID: <1427468115-2224-4-git-send-email-aik@ozlabs.ru> (raw)
In-Reply-To: <1427468115-2224-1-git-send-email-aik@ozlabs.ru>
This checks that the TCE table page size is not bigger that the size of
a page we just pinned and going to put its physical address to the table.
Otherwise the hardware gets unwanted access to physical memory between
the end of the actual page and the end of the aligned up TCE page.
Since compound_order() and compound_head() work correctly on non-huge
pages, there is no need for additional check whether the page is huge.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
Changes:
v6:
* the helper is simplified to one line
v4:
* s/tce_check_page_size/tce_page_is_contained/
---
drivers/vfio/vfio_iommu_spapr_tce.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c
index e9b4d7d..f835e63 100644
--- a/drivers/vfio/vfio_iommu_spapr_tce.c
+++ b/drivers/vfio/vfio_iommu_spapr_tce.c
@@ -47,6 +47,16 @@ struct tce_container {
bool enabled;
};
+static bool tce_page_is_contained(struct page *page, unsigned page_shift)
+{
+ /*
+ * Check that the TCE table granularity is not bigger than the size of
+ * a page we just found. Otherwise the hardware can get access to
+ * a bigger memory chunk that it should.
+ */
+ return (PAGE_SHIFT + compound_order(compound_head(page))) >= page_shift;
+}
+
static int tce_iommu_enable(struct tce_container *container)
{
int ret = 0;
@@ -195,6 +205,12 @@ static long tce_iommu_build(struct tce_container *container,
ret = -EFAULT;
break;
}
+
+ if (!tce_page_is_contained(page, tbl->it_page_shift)) {
+ ret = -EPERM;
+ break;
+ }
+
hva = (unsigned long) page_address(page) +
(tce & IOMMU_PAGE_MASK(tbl) & ~PAGE_MASK);
--
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 ` Alexey Kardashevskiy [this message]
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 ` [PATCH kernel v7 27/31] powerpc/iommu/ioda2: Add get_table_size() to calculate the size of fiture table Alexey Kardashevskiy
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-4-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).