iommu/io-pgtable-arm: Fix race handling in split_blk_unmap()
Subsystems (2)
Robin Murphy
reviewerPATCH 1/1 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.
--- drivers/iommu/io-pgtable-arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/io-pgtable-arm.c +1 -1
@@ -575,7 +575,7 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, tablep =iopte_deref (pte, data); } -if (unmap_idx <0 ) +if (unmap_idx <0 || pte != blk_pte)return __arm_lpae_unmap (data, iova, size, lvl, tablep);io_pgtable_tlb_add_flush (&data->iop, iova, size, size, true);
Signature · 1 line
2.17.1.dirty
PATCH 1/1 iommu/io-pgtable-arm: Fix race handling in split_blk_unmap()
Hi Robin,
Quoted 15 lines · Robin Murphy
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_idxis valid) then the unmap won't actually happen. Fix that to properly account for both the race and recursive cases.
Quoted 5 lines
Fixes 2c3d273eabe8 ("iommu/io-pgtable-arm: Support lockless operation")Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/io-pgtable-arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Well spotted! Did you just find this by inspection?
drivers/iommu/io-pgtable-arm.c static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, · line 579
Quoted 11 lines
drivers/iommu/io-pgtable-arm.c +1
-1@@ -575,7 +575,7 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, tablep =iopte_deref (pte, data); } -if (unmap_idx <0 ) +if (unmap_idx <0 || pte != blk_pte)return __arm_lpae_unmap (data, iova, size, lvl, tablep);
Can we tidy up the control flow a bit here to avoid re-checking the status of the cmpxchg? See below.
Will
--->8
drivers/iommu/io-pgtable-arm.c +4 -5
@@ -574,13 +574,12 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,return 0 ; tablep =iopte_deref (pte, data); + }else if (unmap_idx >=0 ) { +io_pgtable_tlb_add_flush (&data->iop, iova, size, size, true); +return size; } -if (unmap_idx <0 ) -return __arm_lpae_unmap (data, iova, size, lvl, tablep); - -io_pgtable_tlb_add_flush (&data->iop, iova, size, size, true); -return size; +return __arm_lpae_unmap (data, iova, size, lvl, tablep); } static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
Robin Murphy
reviewerPATCH 1/1 iommu/io-pgtable-arm: Fix race handling in split_blk_unmap()
Quoted 18 lines · Will Deacon
Hi Robin,
Quoted 15 lines · Robin Murphy
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_idxis valid) then the unmap won't actually happen. Fix that to properly account for both the race and recursive cases.
Quoted 7 lines
Quoted 5 lines
Fixes 2c3d273eabe8 ("iommu/io-pgtable-arm: Support lockless operation")Signed-off-by Robin Murphy <[email protected]>--- drivers/iommu/io-pgtable-arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Well spotted! Did you just find this by inspection?
Indeed - I just kept seeing this bit in the context of the other patches and thinking "hang on, how do we actually use that new tablep after the deref?".
IIRC I actually implemented the new logic for v7s first, so clearly made the blunder in adding the recursive case when porting the change to LPAE.
Quoted 8 lines
Quoted 8 lines
drivers/iommu/io-pgtable-arm.c +0
-0@@ -575,7 +575,7 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, tablep =iopte_deref (pte, data); }
Quoted 6 lines
drivers/iommu/io-pgtable-arm.c static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, · line 579
Quoted 3 lines
drivers/iommu/io-pgtable-arm.c +1
-1-if (unmap_idx <0 ) +if (unmap_idx <0 || pte != blk_pte)return __arm_lpae_unmap (data, iova, size, lvl, tablep);Can we tidy up the control flow a bit here to avoid re-checking the status of the cmpxchg? See below.
Sure, I just made the minimal change for correctness so as not to overcomplicate matters, but I'm pretty sure that diff looks correct. Feel free to squash it in if you're planning on taking this (yes it's nominally a fix, but it's absolutely non-urgent on account of nobody will ever realistically hit this).
Robin.
Quoted 28 lines
Will
--->8
drivers/iommu/io-pgtable-arm.c +4
-5@@ -574,13 +574,12 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,return 0 ; tablep =iopte_deref (pte, data); + }else if (unmap_idx >=0 ) { +io_pgtable_tlb_add_flush (&data->iop, iova, size, size, true); +return size; } -if (unmap_idx <0 ) -return __arm_lpae_unmap (data, iova, size, lvl, tablep); - -io_pgtable_tlb_add_flush (&data->iop, iova, size, size, true); -return size; +return __arm_lpae_unmap (data, iova, size, lvl, tablep); } static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
Joerg Roedel
maintainerPATCH 1/1 iommu/io-pgtable-arm: Fix race handling in split_blk_unmap()
In reply to Robin MurphyHey Robin,
Quoted 2 lines · Robin Murphy
Fixes 2c3d273eabe8 ("iommu/io-pgtable-arm: Support lockless operation")Signed-off-by Robin Murphy <[email protected]>
I can't find a newer version of this in my inbox, do you plan to send one or has it been addressed differently?
Regards,
Joerg
Robin Murphy
reviewerPATCH 1/1 iommu/io-pgtable-arm: Fix race handling in split_blk_unmap()
Hi Joerg,
Quoted 8 lines · Joerg Roedel
Hey Robin,
Quoted 2 lines · Robin Murphy
Fixes 2c3d273eabe8 ("iommu/io-pgtable-arm: Support lockless operation")Signed-off-by Robin Murphy <[email protected]>I can't find a newer version of this in my inbox, do you plan to send one or has it been addressed differently?
Will has the cleaned-up version in his tree along with a couple of other SMMU fixes, which I assume he's planning to send you a pull for (he's off at yet another conference just now so I can't confirm offline). We were planning for the non-strict stuff to come in as SMMU updates on top of that (p.s. please shout if you have any objections on that series so I can get on them ASAP!)
Thanks,
Robin.
Joerg Roedel
maintainerPATCH 1/1 iommu/io-pgtable-arm: Fix race handling in split_blk_unmap()
Hi Robin,
Quoted 3 lines · Robin Murphy
Will has the cleaned-up version in his tree along with a couple of other SMMU fixes, which I assume he's planning to send you a pull for (he's off at yet another conference just now so I can't confirm offline).
Okay, less work for me, fine.
Quoted 3 lines
We were planning for the non-strict stuff to come in as SMMU updates on top of that (p.s. please shout if you have any objections on that series so I can get on them ASAP!)
No objections, I have suggested this change for quite some time now. Cool to see you implmented it :) I also looked at the patches and they look good to me.
Regards,
Joerg