iommu/tegra241-cmdqv: Reject a VCMDQ base above the 48-bit hardware limit
Subsystems (4)
PATCH v3 1/1 iommu/tegra241-cmdqv: Reject a VCMDQ base above the 48-bit hardware limit
tegra241_vcmdq_alloc_smmu_cmdq() allocates the VCMDQ buffer via the common arm_smmu_init_one_queue(), which uses smmu->dev and its coherent DMA mask of DMA_BIT_MASK(smmu->oas). An SMMUv3 queue base holds a 52-bit address in Q_BASE_ADDR_MASK, but the VCMDQ_BASE register holds only 48 (VCMDQ_ADDR), so the masked write "q_base = base_dma & VCMDQ_ADDR" silently drops bits 48 and up. The HW would then fetch its commands from a wrong memory location, which likely raises VCMDQ errors.
Real hardware always pairs an SMMU OAS with a matching VCMDQ address field, so this cannot happen; it takes a VMM that gives a guest a mismatched OAS. Nor can the guest rely on the VMM to catch it: an SMMU CMDQ base keeps bits 48 and up in Q_BASE_ADDR_MASK, so a trapped CMDQ_BASE write still carries them, while a VCMDQ base goes straight to the hardware and loses them.
Reject a base_dma with bits set outside VCMDQ_ADDR, the way the user-VCMDQ path already does for its base_addr_pa, failing the queue init rather than silently truncating the base. Use dev_warn_once() rather than WARN_ON(), as the OAS is VMM-controlled and a WARN_ON() would let it panic a guest booted with panic_on_warn.
---
Changelog
v3
* Rebase on arm/smmu/updates branch
* Update subject, commit message, and inline notes
v2
https://lore.kernel.org/all/4e638ec1bbff46a358b4129e264fef66b4f37703.1784059577.git.nicolinc@nvidia.com/
* No change
v1
https://lore.kernel.org/all/0dc3a146a3d274d7c47e525385830343cea0f675.1783054570.git.nicolinc@nvidia.com/
drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +14 -0
@@ -672,6 +672,20 @@ static int tegra241_vcmdq_alloc_smmu_cmdq(struct tegra241_vcmdq *vcmdq)if (ret)return ret; +/* +* The q->base_dma is bounded by DMA_BIT_MASK of SMMU's IDR5.OAS. On a +* real hardware, VCMDQ_ADDR mask and IDR5.OAS are always aligned. But +* a buggy VMM might give a guest a mismatched IDR5.OAS. Spit a warning +* instead of a silent truncation that would make the HW fetch commands +* from a wrong memory location. +*/ +if (q->base_dma & ~VCMDQ_ADDR ) { +dev_warn_once ( + vcmdq->cmdqv->dev, +"VCMDQ base %pad exceeds the 48-bit VCMDQ_ADDR limit\n" , + &q->base_dma); +return -EINVAL ; + }/* ...override q_base to write VCMDQ_BASE registers */ q->q_base = q->base_dma &VCMDQ_ADDR ; q->q_base |=FIELD_PREP (VCMDQ_LOG2SIZE , q->llq.max_n_shift);
base-commit: a86c36163c9722545d27e92bdad8418fdcaa8b1d
Signature · 1 line
2.43.0
Will Deacon
maintainerQuoted 20 lines · Nicolin Chen
tegra241_vcmdq_alloc_smmu_cmdq()allocates the VCMDQ buffer via the commonarm_smmu_init_one_queue(), which usessmmu->devand its coherent DMA mask ofDMA_BIT_MASK(smmu->oas). An SMMUv3 queue base holds a 52-bit address inQ_BASE_ADDR_MASK, but theVCMDQ_BASEregister holds only 48 (VCMDQ_ADDR), so the masked write "q_base=base_dma&VCMDQ_ADDR" silently drops bits 48 and up. The HW would then fetch its commands from a wrong memory location, which likely raises VCMDQ errors.Real hardware always pairs an SMMU OAS with a matching VCMDQ address field, so this cannot happen; it takes a VMM that gives a guest a mismatched OAS. Nor can the guest rely on the VMM to catch it: an SMMU CMDQ base keeps bits 48 and up in
Q_BASE_ADDR_MASK, so a trappedCMDQ_BASEwrite still carries them, while a VCMDQ base goes straight to the hardware and loses them.Reject a
base_dmawith bits set outsideVCMDQ_ADDR, the way the user-VCMDQ path already does for itsbase_addr_pa, failing the queue init rather than silently truncating the base. Usedev_warn_once()rather thanWARN_ON(), as the OAS is VMM-controlled and aWARN_ON()would let it panic a guest booted withpanic_on_warn.
Quoted 3 lines
Assisted-by Claude:claude-opus-5Signed-off-by Nicolin Chen <[email protected]>---
This still just sounds like something that a VMM shouldn't do?
Will
Robin Murphy
reviewerQuoted 21 lines · Will Deacon
Quoted 20 lines · Nicolin Chen
tegra241_vcmdq_alloc_smmu_cmdq()allocates the VCMDQ buffer via the commonarm_smmu_init_one_queue(), which usessmmu->devand its coherent DMA mask ofDMA_BIT_MASK(smmu->oas). An SMMUv3 queue base holds a 52-bit address inQ_BASE_ADDR_MASK, but theVCMDQ_BASEregister holds only 48 (VCMDQ_ADDR), so the masked write "q_base=base_dma&VCMDQ_ADDR" silently drops bits 48 and up. The HW would then fetch its commands from a wrong memory location, which likely raises VCMDQ errors.Real hardware always pairs an SMMU OAS with a matching VCMDQ address field, so this cannot happen; it takes a VMM that gives a guest a mismatched OAS. Nor can the guest rely on the VMM to catch it: an SMMU CMDQ base keeps bits 48 and up in
Q_BASE_ADDR_MASK, so a trappedCMDQ_BASEwrite still carries them, while a VCMDQ base goes straight to the hardware and loses them.Reject a
base_dmawith bits set outsideVCMDQ_ADDR, the way the user-VCMDQ path already does for itsbase_addr_pa, failing the queue init rather than silently truncating the base. Usedev_warn_once()rather thanWARN_ON(), as the OAS is VMM-controlled and aWARN_ON()would let it panic a guest booted withpanic_on_warn.
Quoted 5 lines
Quoted 3 lines
Assisted-by Claude:claude-opus-5Signed-off-by Nicolin Chen <[email protected]>---
This still just sounds like something that a VMM shouldn't do?
Yeah, if a VMM is going out of its way to emulate obviously-broken hardware, then in my opinion we should just give it what it wants and let it deal with the consequences of its brokenness.
But if we really do want to bother sanity-checking emulations, then why allow them to still get away with being broken in the case that we do happen to allocate queue memory at a sufficiently low PA anyway? Why not actually validate smmu->oas itself (plus anything else relevant) in __tegra241_cmdqv_probe()?
Thanks,
Robin.
Quoted 5 lines · Robin Murphy
But if we really do want to bother sanity-checking emulations, then why allow them to still get away with being broken in the case that we do happen to allocate queue memory at a sufficiently low PA anyway? Why not actually validate
smmu->oasitself (plus anything else relevant) in__tegra241_cmdqv_probe()?
Yeah, if the VMM has setup the SMMU so it cannot access all of DRAM then it is going to be really broken across the entire driver. This just doesn't work at all. No reason to add any special cases to look for it only in vcmdq.
IMHO the error here is masking the base:
q->q_base = q->base_dma & VCMDQ_ADDR;
That's sort of a HW bug to design like that, the base should be a full 64 bit value and programming any base that falls outside the S2 should always generate the same HW fault forwarded toward the VM. The HW should have captured the unsupported upper bits and compressed them into a 'fail all DMA' flag.
Jason
Quoted 8 lines · Jason Gunthorpe
Quoted 5 lines · Robin Murphy
But if we really do want to bother sanity-checking emulations, then why allow them to still get away with being broken in the case that we do happen to allocate queue memory at a sufficiently low PA anyway? Why not actually validate
smmu->oasitself (plus anything else relevant) in__tegra241_cmdqv_probe()?
Quoted 4 lines
Yeah, if the VMM has setup the SMMU so it cannot access all of DRAM then it is going to be really broken across the entire driver. This just doesn't work at all. No reason to add any special cases to look for it only in vcmdq.
It sounds that a rejection in __tegra241_cmdqv_probe() wouldn't be necessary either.
Let's drop the patch then.
Thanks
Nicolin