linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: linuxppc-dev@lists.ozlabs.org
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>,
	Alex Williamson <alex.williamson@redhat.com>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	David Gibson <david@gibson.dropbear.id.au>,
	Gavin Shan <gwshan@linux.vnet.ibm.com>,
	Paul Mackerras <paulus@samba.org>,
	kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH kernel v11 07/34] vfio: powerpc/spapr: Check that IOMMU page is fully contained by system page
Date: Fri, 29 May 2015 18:44:31 +1000	[thread overview]
Message-ID: <1432889098-22924-8-git-send-email-aik@ozlabs.ru> (raw)
In-Reply-To: <1432889098-22924-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>
[aw: for the vfio related changes]
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
Changes:
v8: changed subject

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 b95fa2b..735b308 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;
@@ -189,6 +199,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) + offset;
 
 		ret = iommu_tce_build(tbl, entry + i, hva, direction);
-- 
2.4.0.rc3.8.gfb3e7d5

  parent reply	other threads:[~2015-05-29  8:46 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-29  8:44 [PATCH kernel v11 00/34] powerpc/iommu/vfio: Enable Dynamic DMA windows Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 01/34] powerpc/eeh/ioda2: Use device::iommu_group to check IOMMU group Alexey Kardashevskiy
2015-06-01  3:40   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 02/34] powerpc/iommu/powernv: Get rid of set_iommu_table_base_and_group Alexey Kardashevskiy
2015-06-01  3:47   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 03/34] powerpc/powernv/ioda: Clean up IOMMU group registration Alexey Kardashevskiy
2015-06-01  3:55   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 04/34] powerpc/iommu: Put IOMMU group explicitly Alexey Kardashevskiy
2015-06-01  3:58   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 05/34] powerpc/iommu: Always release iommu_table in iommu_free_table() Alexey Kardashevskiy
2015-06-01  4:03   ` David Gibson
2015-06-05  0:10   ` Gavin Shan
2015-05-29  8:44 ` [PATCH kernel v11 06/34] vfio: powerpc/spapr: Move page pinning from arch code to VFIO IOMMU driver Alexey Kardashevskiy
2015-05-29  8:44 ` Alexey Kardashevskiy [this message]
2015-05-29  8:44 ` [PATCH kernel v11 08/34] vfio: powerpc/spapr: Use it_page_size Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 09/34] vfio: powerpc/spapr: Move locked_vm accounting to helpers Alexey Kardashevskiy
2015-06-01  4:28   ` David Gibson
2015-06-03 11:11     ` Alexey Kardashevskiy
2015-06-04  1:00       ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 10/34] vfio: powerpc/spapr: Disable DMA mappings on disabled container Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 11/34] vfio: powerpc/spapr: Moving pinning/unpinning to helpers Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 12/34] vfio: powerpc/spapr: Rework groups attaching Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 13/34] powerpc/powernv: Do not set "read" flag if direction==DMA_NONE Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 14/34] powerpc/iommu: Move tce_xxx callbacks from ppc_md to iommu_table Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 15/34] powerpc/powernv/ioda/ioda2: Rework TCE invalidation in tce_build()/tce_free() Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 16/34] powerpc/spapr: vfio: Replace iommu_table with iommu_table_group Alexey Kardashevskiy
2015-06-01  5:11   ` David Gibson
2015-06-05  0:19   ` Gavin Shan
2015-05-29  8:44 ` [PATCH kernel v11 17/34] powerpc/spapr: vfio: Switch from iommu_table to new iommu_table_group Alexey Kardashevskiy
2015-06-01  6:24   ` David Gibson
2015-06-04  9:14     ` Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 18/34] vfio: powerpc/spapr/iommu/powernv/ioda2: Rework IOMMU ownership control Alexey Kardashevskiy
2015-06-01  6:34   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 19/34] powerpc/iommu: Fix IOMMU ownership control functions Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 20/34] powerpc/powernv/ioda2: Move TCE kill register address to PE Alexey Kardashevskiy
2015-06-01  6:47   ` David Gibson
2015-06-05  0:22   ` Gavin Shan
2015-05-29  8:44 ` [PATCH kernel v11 21/34] powerpc/powernv/ioda2: Add TCE invalidation for all attached groups Alexey Kardashevskiy
2015-06-01  6:49   ` David Gibson
2015-06-05  0:27   ` Gavin Shan
2015-06-05  2:54     ` Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 22/34] powerpc/powernv: Implement accessor to TCE entry Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 23/34] powerpc/iommu/powernv: Release replaced TCE Alexey Kardashevskiy
2015-06-01  7:04   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 24/34] powerpc/powernv/ioda2: Rework iommu_table creation Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 25/34] powerpc/powernv/ioda2: Introduce helpers to allocate TCE pages Alexey Kardashevskiy
2015-06-01  7:29   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 26/34] powerpc/powernv/ioda2: Introduce pnv_pci_ioda2_set_window Alexey Kardashevskiy
2015-06-01 23:30   ` David Gibson
2015-06-03 11:18     ` Alexey Kardashevskiy
2015-05-29  8:44 ` [PATCH kernel v11 27/34] powerpc/powernv: Implement multilevel TCE tables Alexey Kardashevskiy
2015-06-01 23:50   ` David Gibson
2015-06-03 11:27     ` Alexey Kardashevskiy
2015-06-04  1:16       ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 28/34] vfio: powerpc/spapr: powerpc/powernv/ioda: Define and implement DMA windows API Alexey Kardashevskiy
2015-06-02  0:24   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 29/34] powerpc/powernv/ioda2: Use new helpers to do proper cleanup on PE release Alexey Kardashevskiy
2015-06-02  0:47   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 30/34] powerpc/iommu/ioda2: Add get_table_size() to calculate the size of future table Alexey Kardashevskiy
2015-06-02  0:54   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 31/34] vfio: powerpc/spapr: powerpc/powernv/ioda2: Use DMA windows API in ownership control Alexey Kardashevskiy
2015-06-02  1:09   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 32/34] powerpc/mmu: Add userspace-to-physical addresses translation cache Alexey Kardashevskiy
2015-06-02  1:40   ` David Gibson
2015-05-29  8:44 ` [PATCH kernel v11 33/34] vfio: powerpc/spapr: Register memory and define IOMMU v2 Alexey Kardashevskiy
2015-06-02  4:17   ` David Gibson
2015-06-03 11:40     ` Alexey Kardashevskiy
2015-06-04  1:20       ` David Gibson
2015-06-05  0:01   ` Gavin Shan
2015-05-29  8:44 ` [PATCH kernel v11 34/34] vfio: powerpc/spapr: Support Dynamic DMA windows Alexey Kardashevskiy
2015-06-02  4:37   ` David Gibson

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=1432889098-22924-8-git-send-email-aik@ozlabs.ru \
    --to=aik@ozlabs.ru \
    --cc=alex.williamson@redhat.com \
    --cc=benh@kernel.crashing.org \
    --cc=david@gibson.dropbear.id.au \
    --cc=gwshan@linux.vnet.ibm.com \
    --cc=kvm@vger.kernel.org \
    --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).