Skip to content

Commit a45dd34

Browse files
nicolincwilldeacon
authored andcommitted
iommu/arm-smmu-v3: Do not set disable_ats unless vSTE is Translate
A vSTE may have three configuration types: Abort, Bypass, and Translate. An Abort vSTE wouldn't enable ATS, but the other two might. It makes sense for a Transalte vSTE to rely on the guest vSTE.EATS field. For a Bypass vSTE, it would end up with an S2-only physical STE, similar to an attachment to a regular S2 domain. However, the nested case always disables ATS following the Bypass vSTE, while the regular S2 case always enables ATS so long as arm_smmu_ats_supported(master) == true. Note that ATS is needed for certain VM centric workloads and historically non-vSMMU cases have relied on this automatic enablement. So, having the nested case behave differently causes problems. To fix that, add a condition to disable_ats, so that it might enable ATS for a Bypass vSTE, aligning with the regular S2 case. Fixes: f27298a ("iommu/arm-smmu-v3: Allow ATS for IOMMU_DOMAIN_NESTED") Cc: stable@vger.kernel.org Suggested-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Nicolin Chen <nicolinc@nvidia.com> Reviewed-by: Pranjal Shrivastava <praan@google.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Will Deacon <will@kernel.org>
1 parent a4f976e commit a45dd34

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,9 @@ static int arm_smmu_attach_dev_nested(struct iommu_domain *domain,
177177
* config bit here base this off the EATS value in the STE. If the EATS
178178
* is set then the VM must generate ATC flushes.
179179
*/
180-
state.disable_ats = !nested_domain->enable_ats;
180+
if (FIELD_GET(STRTAB_STE_0_CFG, le64_to_cpu(nested_domain->ste[0])) ==
181+
STRTAB_STE_0_CFG_S1_TRANS)
182+
state.disable_ats = !nested_domain->enable_ats;
181183
ret = arm_smmu_attach_prepare(&state, domain);
182184
if (ret) {
183185
mutex_unlock(&arm_smmu_asid_lock);

0 commit comments

Comments
 (0)