Skip to contentSkip to conversation

iommu/arm-smmu-qcom: Fix mask extraction for bootloader programmed SMRs

PATCH Applied Isaac J. Manjarres 3 participants 3 messages Jan 25, 2021 – Jan 26, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iommu/arm-smmu-qcom: Fix mask extraction for bootloader programmed SMRs

When extracting the mask for a SMR that was programmed by the bootloader, the SMR's valid bit is also extracted and is treated as part of the mask, which is not correct. Consider the scenario where an SMMU master whose context is determined by a bootloader programmed SMR is removed (omitting parts of device/driver core):

->iommu_release_device()
-> arm_smmu_release_device()
-> arm_smmu_master_free_smes()
-> arm_smmu_free_sme() /* Assume that the SME is now free */ -> arm_smmu_write_sme()

    -> arm_smmu_write_smr() /* Construct SMR value using mask and SID */

Since the valid bit was considered as part of the mask, the SMR will be programmed as valid.

Fix the SMR mask extraction step for bootloader programmed SMRs by masking out the valid bit when we know that we're already working with a valid SMR.

Fixes 07a7f2caaa5a ("iommu/arm-smmu-qcom: Read back stream mappings")
---
 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +2 -0
index bcda170..abb1d2f 100644
@@ -206,6 +206,8 @@ static int qcom_smmu_cfg_probe(struct arm_smmu_device *smmu)
 		smr = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_SMR(i));
 
 		if (FIELD_GET(ARM_SMMU_SMR_VALID, smr)) {
+			/* Ignore valid bit for SMR mask extraction. */
+			smr &= ~ARM_SMMU_SMR_VALID;
 			smmu->smrs[i].id = FIELD_GET(ARM_SMMU_SMR_ID, smr);
 			smmu->smrs[i].mask = FIELD_GET(ARM_SMMU_SMR_MASK, smr);
 			smmu->smrs[i].valid = true;
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Isaac J. Manjarres

When extracting the mask for a SMR that was programmed by the bootloader, the SMR's valid bit is also extracted and is treated as part of the mask, which is not correct. Consider the scenario where an SMMU master whose context is determined by a bootloader programmed SMR is removed (omitting parts of device/driver core):

->iommu_release_device()
-> arm_smmu_release_device()
-> arm_smmu_master_free_smes()

Quoted 6 lines
    -> arm_smmu_free_sme() /* Assume that the SME is now free */
    -> arm_smmu_write_sme()
     -> arm_smmu_write_smr() /* Construct SMR value using mask and SID */

Since the valid bit was considered as part of the mask, the SMR will be programmed as valid.

Ah, right, because ARM_SMMU_SMR_{ID,MASK} are 16-bit fields to accommodate EXIDS, which doesn't matter normally when the IDs are strictly validated in arm_smmu_probe_device()...

Quoted 3 lines

Fix the SMR mask extraction step for bootloader programmed SMRs by masking out the valid bit when we know that we're already working with a valid SMR.

This seems like the neatest approach to me.

Quoted 13 lines
Fixes 07a7f2caaa5a ("iommu/arm-smmu-qcom: Read back stream mappings")
---
  drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +0 -0
index bcda170..abb1d2f 100644

drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c static int qcom_smmu_cfg_probe(struct arm_smmu_device *smmu) · line 213

Quoted 8 lines
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +2 -0
@@ -206,6 +206,8 @@ static int qcom_smmu_cfg_probe(struct arm_smmu_device *smmu)
  		smr = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_SMR(i));
 
  		if (FIELD_GET(ARM_SMMU_SMR_VALID, smr)) {
+			/* Ignore valid bit for SMR mask extraction. */
+			smr &= ~ARM_SMMU_SMR_VALID;
  			smmu->smrs[i].id = FIELD_GET(ARM_SMMU_SMR_ID, smr);
  			smmu->smrs[i].mask = FIELD_GET(ARM_SMMU_SMR_MASK, smr);
  			smmu->smrs[i].valid = true;

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

maintainer Applied
#2 lore raw
In reply to Isaac J. Manjarres
Quoted 6 lines · Isaac J. Manjarres

When extracting the mask for a SMR that was programmed by the bootloader, the SMR's valid bit is also extracted and is treated as part of the mask, which is not correct. Consider the scenario where an SMMU master whose context is determined by a bootloader programmed SMR is removed (omitting parts of device/driver core):

Quoted 8 lines

->iommu_release_device()
-> arm_smmu_release_device()
-> arm_smmu_master_free_smes()
-> arm_smmu_free_sme() /* Assume that the SME is now free */ -> arm_smmu_write_sme()

    -> arm_smmu_write_smr() /* Construct SMR value using mask and SID */

[...]

Applied to will (for-joerg/arm-smmu/updates), thanks!

[1/1] iommu/arm-smmu-qcom: Fix mask extraction for bootloader programmed SMRs

      https://git.kernel.org/will/c/dead723e6f04

Cheers,

Signature · 9 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu