From patchwork Tue Nov 8 13:29:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9417371 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B45BD60720 for ; Tue, 8 Nov 2016 13:30:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6BC129122 for ; Tue, 8 Nov 2016 13:30:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AE7829127; Tue, 8 Nov 2016 13:30:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF4E729125 for ; Tue, 8 Nov 2016 13:30:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752125AbcKHNae (ORCPT ); Tue, 8 Nov 2016 08:30:34 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:11982 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbcKHNaa (ORCPT ); Tue, 8 Nov 2016 08:30:30 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OGB003UDS6IXQ30@mailout1.w1.samsung.com>; Tue, 08 Nov 2016 13:30:19 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20161108133018eucas1p2fa49bf3c9a85254b6bae83b7976100a8~FFZ1yXdNu0086100861eucas1p2H; Tue, 8 Nov 2016 13:30:18 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 84.6C.11330.A63D1285; Tue, 8 Nov 2016 13:30:18 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20161108133017eucas1p28233851f230060cf91d31298bcf69e07~FFZ1C_NV00271602716eucas1p2D; Tue, 8 Nov 2016 13:30:17 +0000 (GMT) X-AuditID: cbfec7f2-f79556d000002c42-21-5821d36a4043 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id ED.97.07726.863D1285; Tue, 8 Nov 2016 13:30:17 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OGB005BFS5J9G30@eusync1.samsung.com>; Tue, 08 Nov 2016 13:30:17 +0000 (GMT) From: Marek Szyprowski To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, Joerg Roedel Cc: Marek Szyprowski , Inki Dae , Kukjin Kim , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , "Rafael J. Wysocki" , Mark Brown , "Luis R. Rodriguez" , Greg Kroah-Hartman , Tomeu Vizoso , Lukas Wunner , Kevin Hilman , Tobias Jakobi , Tomasz Figa Subject: [PATCH v6 5/7] iommu/exynos: Rework and fix internal locking Date: Tue, 08 Nov 2016 14:29:22 +0100 Message-id: <1478611764-6473-6-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1478611764-6473-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSe0hTYRjG+3Z2LtNmh2n2pSY57I+8lanwkZIWRifoDpFIUMOddN7ZVDKk tIu6ZWpqOLNi5LV5bcryhnd0as28JpGZTc0ugihCSkq6o//9Xt7ned73/fgoTKTB7ShZdBwr j5ZEigkLvr5n1egePuIUdHS83xa9Vdfg6Nn0DIEeFNUQKGcqm480bb5IWVhLoizTbwzN1pl4 aHBwsxxpekGg5SfdAKkHW3lo/oc9quqeJNFE9ixA7weGcZRasYgjbdM/gDKrhokAa2am4xWP aZgsBkzj80mS0WmVBNP2spJkcifKALPRQzL1Y2l8JrNeC5hlnSOjTtPjlyyDLfykbKQsgZUf OXHTIixTX4LHNtrenioew5KB0loFBBSkvWHqQjPOsS38+LWGUAELSkSXANiTnYNzxTKAxsaH 2I4jx1DC4xqlABYUtQCuSObBx2+GeFsqgvaEqgWVOcuGLgLQUDhutmB0Ox/+fGoyZ1nTp6Em tYNUAYri04fgaH/wFgrpM1CfS3LTHGFfT655PwHNQEP5tDkG0iskHG39Drb0kD4Ade3b2wXC rL/N215r+Ku3fpsdoDK9g8dxFoD3H7lyrN48bUHIsS/s6h0yz8JoK5ijz8e4eCFMTxVxEgZm LH4BHJ+Eq0ul2y9UCOBk2gyZDRw0YJcW2LDxiqhQVuHloZBEKeKjQz1CYqJ0YPPfDGz0LjWA FcPxTkBTQLxbOJ91MEiESxIUiVGdAFKY2EY4YnQKEgmlksQ7rDzmhjw+klV0AnuKL94nbNGM XhPRoZI4NoJlY1n5TpdHCeySQd9FcS5ZLbjsd0+X6fK6YkVanlHp37lrTuYdEliX4eA/V+1y /rPN9LkU5Z9hwXrB/j2Um9WUPPbwWWPtVUJGQlc753xjV8R6f5L73ojZqltlPk7qtQvhXs7H Gq+fmgpcy2OTQgJMA58+SCwHTHeRtF/2Tu2DY98EV/K6Uny73cR8RZjE0wWTKyT/AY6Tudkz AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAIsWRmVeSWpSXmKPExsVy+t/xy7qZlxUjDL6sZLTYOGM9q8XUh0/Y LJoXr2ezmHR/AovFgv3WFp2zN7Bb9D9+zWzxdPNjJovz54Hcy7vmsFl87j3CaDHj/D4mixfP pS3WHrnLbnFjwlNGizOnL7FatK3+wGqxatcfRou+tZfYHIQ9nhycx+Sx4+4SRo+ds+6ye2xa 1cnmsX/uGnaPyTeWM3r8O8buseVqO4tH35ZVjB6fN8l5zGjfxhrAHeVmk5GamJJapJCal5yf kpmXbqsUGuKma6GkkJeYm2qrFKHrGxKkpFCWmFMK5BkZoAEH5wD3YCV9uwS3jL5tS1kLdopV 3F9ylbmBsVO4i5GTQ0LARGLSiaVMELaYxIV769m6GLk4hASWMEqsPDCHHcJpYpLon3iKDaSK TcBQouttF1iViMBiRomGQ1MYQRxmgWMsEot7DjKDVAkLuEosaDsI1M7BwSKgKnHlVBSIySvg LrFtMjvENjmJk8cms4LYnAIeEidWPAS7Qgio5NeGZ+wTGHkXMDKsYhRJLS3OTc8tNtQrTswt Ls1L10vOz93ECIy9bcd+bt7BeGlj8CFGAQ5GJR7eF/0KEUKsiWXFlbmHGCU4mJVEeC+fU4wQ 4k1JrKxKLcqPLyrNSS0+xGgKdNJEZinR5HxgWsgriTc0MTS3NDQytrAwNzJSEuct+XAlXEgg PbEkNTs1tSC1CKaPiYNTqoFRZarfC6HrIg0N2irNzyeJPXlhLFEpejLiXyjL/1XMexmP/VZf oCyiYtUvF9LJ7e61O3nJ+zurn9rrTZr31/FVE0/8lfnPtTJ+p2V95l/5c9aLuMmCrEzB4qwS phm5Bp76f+2OFOnqZfSqM/IV8ctzOTpeLe25mnRkRfzkjVO/1Xf8vsHCwqrEUpyRaKjFXFSc CABHY58A0wIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161108133017eucas1p28233851f230060cf91d31298bcf69e07 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20161108133017eucas1p28233851f230060cf91d31298bcf69e07 X-RootMTR: 20161108133017eucas1p28233851f230060cf91d31298bcf69e07 References: <1478611764-6473-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch reworks locking in the exynos_iommu_attach/detach_device functions to ensure that all entries of the sysmmu_drvdata and exynos_iommu_owner structure are updated under the respective spinlocks, while runtime pm functions are called without any spinlocks held. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 28e570b..a959443 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -731,10 +731,12 @@ static void exynos_iommu_domain_free(struct iommu_domain *iommu_domain) spin_lock_irqsave(&domain->lock, flags); list_for_each_entry_safe(data, next, &domain->clients, domain_node) { + spin_lock(&data->lock); __sysmmu_disable(data); data->pgtable = 0; data->domain = NULL; list_del_init(&data->domain_node); + spin_unlock(&data->lock); } spin_unlock_irqrestore(&domain->lock, flags); @@ -772,17 +774,22 @@ static void exynos_iommu_detach_device(struct iommu_domain *iommu_domain, if (!has_sysmmu(dev) || owner->domain != iommu_domain) return; + list_for_each_entry(data, &owner->controllers, owner_node) { + __sysmmu_disable(data); + pm_runtime_put(data->sysmmu); + } + spin_lock_irqsave(&domain->lock, flags); list_for_each_entry_safe(data, next, &domain->clients, domain_node) { - __sysmmu_disable(data); + spin_lock(&data->lock); data->pgtable = 0; data->domain = NULL; list_del_init(&data->domain_node); - pm_runtime_put(data->sysmmu); + spin_unlock(&data->lock); } + owner->domain = NULL; spin_unlock_irqrestore(&domain->lock, flags); - owner->domain = NULL; dev_dbg(dev, "%s: Detached IOMMU with pgtable %pa\n", __func__, &pagetable); @@ -803,18 +810,22 @@ static int exynos_iommu_attach_device(struct iommu_domain *iommu_domain, if (owner->domain) exynos_iommu_detach_device(owner->domain, dev); + spin_lock_irqsave(&domain->lock, flags); list_for_each_entry(data, &owner->controllers, owner_node) { + spin_lock(&data->lock); data->pgtable = pagetable; data->domain = domain; + list_add_tail(&data->domain_node, &domain->clients); + spin_unlock(&data->lock); + } + owner->domain = iommu_domain; + spin_unlock_irqrestore(&domain->lock, flags); + + list_for_each_entry(data, &owner->controllers, owner_node) { pm_runtime_get_sync(data->sysmmu); __sysmmu_enable(data); - - spin_lock_irqsave(&domain->lock, flags); - list_add_tail(&data->domain_node, &domain->clients); - spin_unlock_irqrestore(&domain->lock, flags); } - owner->domain = iommu_domain; dev_dbg(dev, "%s: Attached IOMMU with pgtable %pa\n", __func__, &pagetable);