From patchwork Sat Dec 1 19:19:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 10707767 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8172913AD for ; Sat, 1 Dec 2018 19:20:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 709A02C8DD for ; Sat, 1 Dec 2018 19:20:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 642562C8FD; Sat, 1 Dec 2018 19:20:24 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DC7CD2C8DD for ; Sat, 1 Dec 2018 19:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=k18S6+5ZkEFsrMBMfc2AKcqRpDx2zNf7HPdbvTt7xBA=; b=R53ciw79taXrb3 07IKWoRsc3IiRIr5MKCQ75HPXQRUmXlbfKixPeJbmhviT10l0Lvf95UlS74zj02vat6+EB7SLNVvh 4o/XGQJBVTv3MKq75ku0W3SDNQOOUd0tBMZAiXr0evp7rUXr6PZk2V9Lzf2PLAbHIEdoX5zQMRdwV gzBgbDf9Jt5DkpK6Fn8l/43gv7nTPCmZ5FQLCAMejAAqvWIzIiukrzzPGg/fJxloHrTSvuVDBvmaY yl8kKlrbGwQCLibGhbVgzMxXIgdvRmmAgc6CyfBkIUhvbaMO6w+ZeU1ucvr3S+o49vL6IU2dTiXl3 VsBZXzrrwV2cuWeOVFWA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gTAoL-00017f-5t; Sat, 01 Dec 2018 19:20:17 +0000 Received: from mail.windriver.com ([147.11.1.11]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gTAo9-00088q-1S; Sat, 01 Dec 2018 19:20:09 +0000 Received: from ALA-HCA.corp.ad.wrs.com ([147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id wB1JJSY8025132 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Sat, 1 Dec 2018 11:19:28 -0800 (PST) Received: from yow-cube1.wrs.com (128.224.56.98) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.408.0; Sat, 1 Dec 2018 11:19:27 -0800 From: Paul Gortmaker To: Joerg Roedel Subject: [PATCH v2 0/9] iommu: clean up/remove modular stuff from non-modules. Date: Sat, 1 Dec 2018 14:19:08 -0500 Message-ID: <1543691957-17608-1-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181201_112005_263004_6078DA18 X-CRM114-Status: GOOD ( 14.93 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , Will Deacon , Daniel Kurtz , Paul Gortmaker , Thierry Reding , Laurent Pinchart , Alexandre Courbot , Simon Xue , Rob Clark , linux-rockchip@lists.infradead.org, linux-tegra@vger.kernel.org, Stephen Warren , linux-arm-msm@vger.kernel.org, Jeffy Chen , linux-mediatek@lists.infradead.org, Stepan Moskovchenko , Honghui Zhang , Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Robin Murphy , Nate Watterson , Hiroshi Doyu Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The work here represents a scan over the iommu dir, looking for files/drivers that have nothing to do with a modular use case, but are using modular infrastructure regardless. We are trying to make driver code consistent with the Makefiles/Kconfigs that control them. This means not using modular functions/macros for drivers that can never be built as a module. I've done this in other subsystem dirs already, and some of this has already happened in drivers/iommu by others; such as 98b72b94def9 ("iommu/rockchip: Prohibit unbind and remove"). Using modular infrastructure in non-modules might seem harmless, but some of the downfalls this leads to are: (1) it is easy to accidentally write unused module_exit and remove code (2) it can be misleading when reading the source, thinking it can be modular when the Makefile and/or Kconfig prohibit it (3) it requires the include of the module.h header file which in turn includes nearly everything else, thus adding to CPP overhead. (4) it gets copied/replicated into other drivers and spreads quickly. The last two commits (arm-smmu related ones) deserve an extra mention, and I put them at the end in case they want to be deferred for later or altered. Normally a "module-ectomy" allows us to delete the ".remove" function, as per the rockchip commit above, but ... A kexec commit (7aa8619a66ae) tried to improve reliability by trying to shutdown the iommu in the compromised/crashing kernel, but of course the better solution is to have the recovery kernel be able to handle all of the possible initial conditions. It appears this was done later in the commit b63b3439b856 - but I don't know if that means relying on an orderly shutdown is no longer required - I don't have the platform and am only going on what is in git history. So, as the kexec commit recycled the ".remove" handle to also be the ".shutdown" handle, in this series the remove function was renamed to shutdown, and the ".remove" handle was deleted. This was IMHO the most back compatible way to make this update. If the reliance on the compromised kernel to run ".shutdown" is no longer necessary, then it can be removed in a future change. Patches were build tested on top of next-20181128 for ARM, ARM64, x86-64 on an allyesconfig. Paul. --- [ v2: use recommended iommu subject format, add Acks, trivial tweaks. ] Cc: Alexandre Courbot Cc: Daniel Kurtz Cc: Heiko Stuebner Cc: Hiroshi Doyu Cc: Honghui Zhang Cc: Jeffy Chen Cc: Joerg Roedel Cc: Laurent Pinchart Cc: Matthias Brugger Cc: Nate Watterson Cc: Rob Clark Cc: Robin Murphy Cc: Simon Xue Cc: Stepan Moskovchenko Cc: Stephen Warren Cc: Thierry Reding Cc: Will Deacon Cc: iommu@lists.linux-foundation.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-arm-msm@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: linux-tegra@vger.kernel.org Paul Gortmaker (9): iommu: audit and remove any unnecessary uses of module.h iommu/rockchip: Make it explicitly non-modular iommu/msm: Make it explicitly non-modular iommu/mediatek: Make it explicitly non-modular iommu/ipmmu-vmsa: Make it explicitly non-modular iommu/qcom: Make it explicitly non-modular iommu/tegra: Make it explicitly non-modular iommu/arm-smmu: Make arm-smmu explicitly non-modular iommu/arm-smmu: Make arm-smmu-v3 explicitly non-modular drivers/iommu/arm-smmu-v3.c | 25 +++++++++---------------- drivers/iommu/arm-smmu.c | 32 +++++++++++++------------------- drivers/iommu/iommu-sysfs.c | 2 +- drivers/iommu/iommu.c | 3 ++- drivers/iommu/ipmmu-vmsa.c | 18 +++--------------- drivers/iommu/msm_iommu.c | 13 +++---------- drivers/iommu/mtk_iommu_v1.c | 15 +++------------ drivers/iommu/qcom_iommu.c | 16 ++-------------- drivers/iommu/rockchip-iommu.c | 13 ++++++------- drivers/iommu/tegra-gart.c | 37 +++++++------------------------------ 10 files changed, 49 insertions(+), 125 deletions(-)