Skip to content

Commit 3fd27df

Browse files
Joe Damatogregkh
authored andcommitted
iommu/amd: Block identity domain when SNP enabled
[ Upstream commit ba17de9 ] Previously, commit 8388f7d ("iommu/amd: Do not support IOMMU_DOMAIN_IDENTITY after SNP is enabled") prevented users from changing the IOMMU domain to identity if SNP was enabled. This resulted in an error when writing to sysfs: # echo "identity" > /sys/kernel/iommu_groups/50/type -bash: echo: write error: Cannot allocate memory However, commit 4402f26 ("iommu/amd: Implement global identity domain") changed the flow of the code, skipping the SNP guard and allowing users to change the IOMMU domain to identity after a machine has booted. Once the user does that, they will probably try to bind and the device/driver will start to do DMA which will trigger errors: iommu ivhd3: AMD-Vi: Event logged [ILLEGAL_DEV_TABLE_ENTRY device=0000:43:00.0 pasid=0x00000 address=0x3737b01000 flags=0x0020] iommu ivhd3: AMD-Vi: Control Reg : 0xc22000142148d AMD-Vi: DTE[0]: 6000000000000003 AMD-Vi: DTE[1]: 0000000000000001 AMD-Vi: DTE[2]: 2000003088b3e013 AMD-Vi: DTE[3]: 0000000000000000 bnxt_en 0000:43:00.0 (unnamed net_device) (uninitialized): Error (timeout: 500015) msg {0x0 0x0} len:0 iommu ivhd3: AMD-Vi: Event logged [ILLEGAL_DEV_TABLE_ENTRY device=0000:43:00.0 pasid=0x00000 address=0x3737b01000 flags=0x0020] iommu ivhd3: AMD-Vi: Control Reg : 0xc22000142148d AMD-Vi: DTE[0]: 6000000000000003 AMD-Vi: DTE[1]: 0000000000000001 AMD-Vi: DTE[2]: 2000003088b3e013 AMD-Vi: DTE[3]: 0000000000000000 bnxt_en 0000:43:00.0: probe with driver bnxt_en failed with error -16 To prevent this from happening, create an attach wrapper for identity_domain_ops which returns EINVAL if amd_iommu_snp_en is true. With this commit applied: # echo "identity" > /sys/kernel/iommu_groups/62/type -bash: echo: write error: Invalid argument Fixes: 4402f26 ("iommu/amd: Implement global identity domain") Signed-off-by: Joe Damato <joe@dama.to> Reviewed-by: Vasant Hegde <vasant.hegde@amd.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent f5daaa2 commit 3fd27df

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

drivers/iommu/amd/iommu.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2854,8 +2854,21 @@ static struct iommu_domain blocked_domain = {
28542854

28552855
static struct protection_domain identity_domain;
28562856

2857+
static int amd_iommu_identity_attach(struct iommu_domain *dom, struct device *dev,
2858+
struct iommu_domain *old)
2859+
{
2860+
/*
2861+
* Don't allow attaching a device to the identity domain if SNP is
2862+
* enabled.
2863+
*/
2864+
if (amd_iommu_snp_en)
2865+
return -EINVAL;
2866+
2867+
return amd_iommu_attach_device(dom, dev, old);
2868+
}
2869+
28572870
static const struct iommu_domain_ops identity_domain_ops = {
2858-
.attach_dev = amd_iommu_attach_device,
2871+
.attach_dev = amd_iommu_identity_attach,
28592872
};
28602873

28612874
void amd_iommu_init_identity_domain(void)

0 commit comments

Comments
 (0)