Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aba4e0dd authored by Antonios Motakis's avatar Antonios Motakis Committed by Matt Wagantall
Browse files

iommu/arm-smmu: change IOMMU_EXEC to IOMMU_NOEXEC 



Exposing the XN flag of the SMMU driver as IOMMU_NOEXEC instead of
IOMMU_EXEC makes it enforceable, since for IOMMUs that don't support
the XN flag pages will always be executable.

Change-Id: Ic6b1f0ae8873035dcb798e9c996396fb2bc4921e
Signed-off-by: default avatarAntonios Motakis <a.motakis@virtualopensystems.com>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Git-commit: a720b41c41f5a7e4c51558cf087882c57331581f
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[mitchelh: context fixups]
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
parent 31185d66

drivers/iommu/arm-smmu.c

+5 −4
Original line number Diff line number Diff line
@@ -1641,7 +1641,7 @@ static int arm_smmu_alloc_init_pte(struct arm_smmu_domain *smmu_domain, 
				   unsigned long pfn, int prot, int stage)

{

	pte_t *pte, *start;

	pteval_t pteval = ARM_SMMU_PTE_PAGE | ARM_SMMU_PTE_AF | ARM_SMMU_PTE_XN;

	pteval_t pteval = ARM_SMMU_PTE_PAGE | ARM_SMMU_PTE_AF;



	if (pmd_none(*pmd)) {

		/* Allocate a new set of tables */
@@ -1677,10 +1677,11 @@ static int arm_smmu_alloc_init_pte(struct arm_smmu_domain *smmu_domain, 
			pteval |= ARM_SMMU_PTE_MEMATTR_NC;

	}



	if (prot & IOMMU_NOEXEC)

		pteval |= ARM_SMMU_PTE_XN;



	/* If no access, create a faulting entry to avoid TLB fills */

	if (prot & IOMMU_EXEC)

		pteval &= ~ARM_SMMU_PTE_XN;

	else if (!(prot & (IOMMU_READ | IOMMU_WRITE)))

	if (!(prot & (IOMMU_READ | IOMMU_WRITE)))

		pteval &= ~ARM_SMMU_PTE_PAGE;



	pteval |= ARM_SMMU_PTE_SH_IS;

include/linux/iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define IOMMU_READ	(1 << 0)

#define IOMMU_WRITE	(1 << 1)

#define IOMMU_CACHE	(1 << 2) /* DMA cache coherency */

#define IOMMU_EXEC	(1 << 3)

#define IOMMU_NOEXEC	(1 << 3)

#define IOMMU_PRIV	(1 << 4)

#define IOMMU_DEVICE	(1 << 5) /* Indicates access to device memory */