iommu/io-pgtable-arm: Fix race handling in split_blk_unmap()
authorRobin Murphy <robin.murphy@arm.com>
Thu, 6 Sep 2018 16:59:50 +0000 (17:59 +0100)
committerWill Deacon <will.deacon@arm.com>
Mon, 1 Oct 2018 12:01:29 +0000 (13:01 +0100)
commit85c7a0f1ef624ef58173ef52ea77780257bdfe04
treeacc3fa5ad56723d21acd5ca1dbb9e3b52dd1c44c
parent657135f3108122556c3cf60a78c6f0e76aeb60e6
iommu/io-pgtable-arm: Fix race handling in split_blk_unmap()

In removing the pagetable-wide lock, we gained the possibility of the
vanishingly unlikely case where we have a race between two concurrent
unmappers splitting the same block entry. The logic to handle this is
fairly straightforward - whoever loses the race frees their partial
next-level table and instead dereferences the winner's newly-installed
entry in order to fall back to a regular unmap, which intentionally
echoes the pre-existing case of recursively splitting a 1GB block down
to 4KB pages by installing a full table of 2MB blocks first.

Unfortunately, the chump who implemented that logic failed to update the
condition check for that fallback, meaning that if said race occurs at
the last level (where the loser's unmap_idx is valid) then the unmap
won't actually happen. Fix that to properly account for both the race
and recursive cases.

Fixes: 2c3d273eabe8 ("iommu/io-pgtable-arm: Support lockless operation")
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
[will: re-jig control flow to avoid duplicate cmpxchg test]
Signed-off-by: Will Deacon <will.deacon@arm.com>
drivers/iommu/io-pgtable-arm.c