From: Will Deacon <will.deacon@arm.com>
Date: Tue, 4 Feb 2014 22:12:42 +0000 (+0000)
Subject: iommu/arm-smmu: really fix page table locking
X-Git-Tag: v3.14-rc4~18^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9d09e2748eaa55cac2af274574baa6368189bc1;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed