]> Pileus Git - ~andy/linux/commit
iommu/arm-smmu: really fix page table locking
authorWill Deacon <will.deacon@arm.com>
Tue, 4 Feb 2014 22:12:42 +0000 (22:12 +0000)
committerWill Deacon <will.deacon@arm.com>
Mon, 10 Feb 2014 17:00:49 +0000 (17:00 +0000)
commitc9d09e2748eaa55cac2af274574baa6368189bc1
treeff3b8dc58a149f1949083a0a89cf497611bb0905
parent97a644208d1a08b7104d1fe2ace8cef011222711
iommu/arm-smmu: really fix page table locking

Commit a44a9791e778 ("iommu/arm-smmu: use mutex instead of spinlock for
locking page tables") replaced the page table spinlock with a mutex, to
allow blocking allocations to satisfy lazy mapping requests.

Unfortunately, it turns out that IOMMU mappings are created from atomic
context (e.g. spinlock held during a dma_map), so this change doesn't
really help us in practice.

This patch is a partial revert of the offending commit, bringing back
the original spinlock but replacing our page table allocations for any
levels below the pgd (which is allocated during domain init) with
GFP_ATOMIC instead of GFP_KERNEL.

Cc: <stable@vger.kernel.org>
Reported-by: Andreas Herrmann <andreas.herrmann@calxeda.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
drivers/iommu/arm-smmu.c