From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60230 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947172AbcHRK5u (ORCPT ); Thu, 18 Aug 2016 06:57:50 -0400 Subject: Patch "iommu/amd: Handle IOMMU_DOMAIN_DMA in ops->domain_free call-back" has been added to the 4.7-stable tree To: jroedel@suse.de, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 18 Aug 2016 12:57:36 +0200 Message-ID: <14715178565673@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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.7-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.7 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From cda7005ba2cbd0744fea343dd5b2aa637eba5b9e Mon Sep 17 00:00:00 2001 From: Joerg Roedel 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 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 Signed-off-by: Greg Kroah-Hartman --- 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 @@ -3103,9 +3103,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); @@ -3114,13 +3112,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@suse.de are queue-4.7/iommu-amd-handle-iommu_domain_dma-in-ops-domain_free-call-back.patch queue-4.7/iommu-amd-update-alias-dte-in-update_device_table.patch queue-4.7/iommu-amd-init-unity-mappings-only-for-dma_ops-domains.patch queue-4.7/iommu-vt-d-return-error-code-in-domain_context_mapping_one.patch queue-4.7/iommu-exynos-suppress-unbinding-to-prevent-system-failure.patch