This is a note to let you know that I've just added the patch titled iommu/amd: Handle IOMMU_DOMAIN_DMA in ops->domain_free call-back to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: iommu-amd-handle-iommu_domain_dma-in-ops-domain_free-call-back.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From cda7005ba2cbd0744fea343dd5b2aa637eba5b9e Mon Sep 17 00:00:00 2001 From: Joerg Roedel <jroedel@xxxxxxx> Date: Thu, 7 Jul 2016 15:57:04 +0200 Subject: iommu/amd: Handle IOMMU_DOMAIN_DMA in ops->domain_free call-back From: Joerg Roedel <jroedel@xxxxxxx> commit cda7005ba2cbd0744fea343dd5b2aa637eba5b9e upstream. This domain type is not yet handled in the iommu_ops->domain_free() call-back. Fix that. Fixes: 0bb6e243d7fb ('iommu/amd: Support IOMMU_DOMAIN_DMA type allocation') Signed-off-by: Joerg Roedel <jroedel@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/iommu/amd_iommu.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2970,9 +2970,7 @@ static struct iommu_domain *amd_iommu_do static void amd_iommu_domain_free(struct iommu_domain *dom) { struct protection_domain *domain; - - if (!dom) - return; + struct dma_ops_domain *dma_dom; domain = to_pdomain(dom); @@ -2981,13 +2979,24 @@ static void amd_iommu_domain_free(struct BUG_ON(domain->dev_cnt != 0); - if (domain->mode != PAGE_MODE_NONE) - free_pagetable(domain); - - if (domain->flags & PD_IOMMUV2_MASK) - free_gcr3_table(domain); + if (!dom) + return; - protection_domain_free(domain); + switch (dom->type) { + case IOMMU_DOMAIN_DMA: + dma_dom = domain->priv; + dma_ops_domain_free(dma_dom); + break; + default: + if (domain->mode != PAGE_MODE_NONE) + free_pagetable(domain); + + if (domain->flags & PD_IOMMUV2_MASK) + free_gcr3_table(domain); + + protection_domain_free(domain); + break; + } } static void amd_iommu_detach_device(struct iommu_domain *dom, Patches currently in stable-queue which might be from jroedel@xxxxxxx are queue-4.4/iommu-amd-handle-iommu_domain_dma-in-ops-domain_free-call-back.patch queue-4.4/iommu-amd-update-alias-dte-in-update_device_table.patch queue-4.4/iommu-amd-init-unity-mappings-only-for-dma_ops-domains.patch queue-4.4/iommu-vt-d-return-error-code-in-domain_context_mapping_one.patch queue-4.4/iommu-exynos-suppress-unbinding-to-prevent-system-failure.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html