Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1439872

[PATCH v2 6/6] dmaengine: pl330: Make sure microcode is privileged-executable

Show all headers | View raw

The PL330 can perform privileged instruction fetches.  This can result
in SMMU permission faults on SMMUs that implement the ARMv8 VMSA, which
specifies that mappings that are writeable at one execution level shall
not be executable at any higher-privileged level.  Fix this by using the
DMA_ATTR_PRIVILEGED_EXECUTABLE attribute, which will ensure that the
microcode IOMMU mapping is not writeable.

Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
---
 drivers/dma/pl330.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 372b4359da97..25bc49d47c45 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -1854,14 +1854,17 @@ static int dmac_alloc_resources(struct pl330_dmac *pl330)
 {
 	int chans = pl330->pcfg.num_chan;
 	int ret;
+	DEFINE_DMA_ATTRS(attrs);
 
+	dma_set_attr(DMA_ATTR_PRIVILEGED_EXECUTABLE, &attrs);
 	/*
 	 * Alloc MicroCode buffer for 'chans' Channel threads.
 	 * A channel's buffer offset is (Channel_Id * MCODE_BUFF_PERCHAN)
 	 */
-	pl330->mcode_cpu = dma_alloc_coherent(pl330->ddma.dev,
+	pl330->mcode_cpu = dma_alloc_attrs(pl330->ddma.dev,
 				chans * pl330->mcbufsz,
-				&pl330->mcode_bus, GFP_KERNEL);
+				&pl330->mcode_bus, GFP_KERNEL,
+				&attrs);
 	if (!pl330->mcode_cpu) {
 		dev_err(pl330->ddma.dev, "%s:%d Can't allocate memory!\n",
 			__func__, __LINE__);
-- 
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/6] Add support for privileged mappings Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
  [PATCH v2 5/6] arm64/dma-mapping: Implement DMA_ATTR_PRIVILEGED_EXECUTABLE Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
    Re: [PATCH v2 5/6] arm64/dma-mapping: Implement  DMA_ATTR_PRIVILEGED_EXECUTABLE Robin Murphy <robin.murphy@arm.com> - 2016-07-11 17:10 +0200
  [PATCH v2 3/6] Revert "iommu/arm-smmu: Treat all device transactions as unprivileged" Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
    Re: [PATCH v2 3/6] Revert "iommu/arm-smmu: Treat all device  transactions as unprivileged" Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:30 +0200
  [PATCH v2 4/6] common: DMA-mapping: add DMA_ATTR_PRIVILEGED_EXECUTABLE attribute Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
    Re: [PATCH v2 4/6] common: DMA-mapping: add  DMA_ATTR_PRIVILEGED_EXECUTABLE attribute Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:50 +0200
  [PATCH v2 2/6] iommu/io-pgtable-arm: add support for the IOMMU_PRIV flag Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
    Re: [PATCH v2 2/6] iommu/io-pgtable-arm: add support for the  IOMMU_PRIV flag Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:20 +0200
  [PATCH v2 1/6] iommu: add IOMMU_PRIV attribute Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
    Re: [PATCH v2 1/6] iommu: add IOMMU_PRIV attribute Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:10 +0200
  [PATCH v2 6/6] dmaengine: pl330: Make sure microcode is privileged-executable Mitchel Humpherys <mitchelh@codeaurora.org> - 2016-07-09 04:10 +0200
    Re: [PATCH v2 6/6] dmaengine: pl330: Make sure microcode is  privileged-executable Robin Murphy <robin.murphy@arm.com> - 2016-07-11 17:30 +0200
  Re: [PATCH v2 0/6] Add support for privileged mappings Robin Murphy <robin.murphy@arm.com> - 2016-07-11 16:10 +0200
    Re: [PATCH v2 0/6] Add support for privileged mappings Jordan Crouse <jcrouse@codeaurora.org> - 2016-07-11 17:10 +0200

csiph-web