From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E09EC7EE23 for ; Tue, 9 May 2023 21:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235890AbjEIVU2 (ORCPT ); Tue, 9 May 2023 17:20:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235709AbjEIVTu (ORCPT ); Tue, 9 May 2023 17:19:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F11D74498; Tue, 9 May 2023 14:19:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6B5F063721; Tue, 9 May 2023 21:19:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 789B0C433A8; Tue, 9 May 2023 21:19:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683667188; bh=fRwd69zb9+3RSJv/qGvPHOdZRlbsg/MK58VjbrYRlgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O+HjpE98abESaOofBqYf+Cd5iQWg9TCOTa1Ia0gHeXhBlPG9HIRSQNglIp2EW1NB+ O8F7xyCW3yC2PSIvSgnQxdg7+uQRFZsPoMHPvkTLhrN0APCpwZU+3/zanoH6k/l0XZ b/HJjAkTyS/XCoB+2WlU7CkQnnzE2AwJbgRWKZhksmVd2TVCzV/S9Ln6VUVc5GCDj4 gCxYqOutNFL7RRz25orDB8P3iUNituvck+wSNC8dwHViiYrM8YFtXkK0NQ7wB6dhLT gVpUyjU/xvKXvjSQU5/vCXhBcwwVtRii3UdBKk5cCqaaD8kIj2U45fyLCtF4KpggAz V6oNh6aj97wUw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chunyan Zhang , Joerg Roedel , Sasha Levin , joro@8bytes.org, will@kernel.org, orsonzhai@gmail.com, zhang.lyra@gmail.com, iommu@lists.linux.dev Subject: [PATCH AUTOSEL 6.3 13/18] iommu/sprd: Release dma buffer to avoid memory leak Date: Tue, 9 May 2023 17:19:21 -0400 Message-Id: <20230509211928.21010-13-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230509211928.21010-1-sashal@kernel.org> References: <20230509211928.21010-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chunyan Zhang [ Upstream commit 9afea57384d4ae7b2034593eac7fa76c7122762a ] When attaching to a domain, the driver would alloc a DMA buffer which is used to store address mapping table, and it need to be released when the IOMMU domain is freed. Signed-off-by: Chunyan Zhang Link: https://lore.kernel.org/r/20230331033124.864691-2-zhang.lyra@gmail.com Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/sprd-iommu.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/sprd-iommu.c b/drivers/iommu/sprd-iommu.c index ae94d74b73f46..7df1f730c778e 100644 --- a/drivers/iommu/sprd-iommu.c +++ b/drivers/iommu/sprd-iommu.c @@ -151,13 +151,6 @@ static struct iommu_domain *sprd_iommu_domain_alloc(unsigned int domain_type) return &dom->domain; } -static void sprd_iommu_domain_free(struct iommu_domain *domain) -{ - struct sprd_iommu_domain *dom = to_sprd_domain(domain); - - kfree(dom); -} - static void sprd_iommu_first_vpn(struct sprd_iommu_domain *dom) { struct sprd_iommu_device *sdev = dom->sdev; @@ -230,6 +223,28 @@ static void sprd_iommu_hw_en(struct sprd_iommu_device *sdev, bool en) sprd_iommu_update_bits(sdev, reg_cfg, mask, 0, val); } +static void sprd_iommu_cleanup(struct sprd_iommu_domain *dom) +{ + size_t pgt_size; + + /* Nothing need to do if the domain hasn't been attached */ + if (!dom->sdev) + return; + + pgt_size = sprd_iommu_pgt_size(&dom->domain); + dma_free_coherent(dom->sdev->dev, pgt_size, dom->pgt_va, dom->pgt_pa); + dom->sdev = NULL; + sprd_iommu_hw_en(dom->sdev, false); +} + +static void sprd_iommu_domain_free(struct iommu_domain *domain) +{ + struct sprd_iommu_domain *dom = to_sprd_domain(domain); + + sprd_iommu_cleanup(dom); + kfree(dom); +} + static int sprd_iommu_attach_device(struct iommu_domain *domain, struct device *dev) { -- 2.39.2