Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp7194021rwl; Mon, 9 Jan 2023 19:52:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXuYVop+2Ov8SipMgYerKAA2g0R/OfGyInr7C2kx2z7kAuQpTHAW4CKE/86iDGIdjsLLF9hA X-Received: by 2002:aa7:9886:0:b0:582:5460:19c5 with SMTP id r6-20020aa79886000000b00582546019c5mr30031077pfl.23.1673322753948; Mon, 09 Jan 2023 19:52:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673322753; cv=none; d=google.com; s=arc-20160816; b=eOqZf/rByBhOkxKYQNvJoO/5eXdtwuRtkXcAizoUsf/R5+fIHUV9fBXcOvNooMuXKP xnWFxaZDXZZHLmnnw3yYXO/RFb0xz0/CYClyid7aifrvi8EomJ4ltaHmYTqzUJjVGfcj Wd2pG6BJWP/dZ9NDeFj4S1+bv3fhwtIN54wkvXTG9/leYcHwDeEwviBZnIhoiW+9+j3n UxZeCTDJgN4COKGOu36C1LG2XfQJ0mwm43TrzcB2NcZzJI9D/pvJ9kTsc16PHgiMpAwT +1LuF4H8bN2DNasHx81ToiAxN99xhjEkUJLotYuGhsE/D95hDNqGNhl2GKl99ofKuO+2 xG7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=caEfItdQWpVj+fuiik43+VdkGacH8lf0lx+JRcXQKVg=; b=tJEELtA7G/FKfXVAyHourv7ErMrY+nd35CiDNUu0ALdPdv5Oi9TSTjYz2U1nFKfrPV bPM1+qib0lrBSVtmU9PFFiMkCVzAiA8igkNEV7q8JrIENg6jJxwxbolsjlCq//okYG5B GLdJlSCXJZWrtsCyOeA6WKTfy6rO7c0kbn2XQOiG/H3tAUqirnIc4gG1trkDimye4Ia7 82HVMv/ZcJ/HXjhUZnZJjkvrFKXabMncyG18EPW+WJh23kI84F+kBE9ztiaUKwgo67Ju 9vhJanZX13L9InSgknZN68Y1IbLElqKiIWN0TUKAqt8n1U5JLgcbTH97sXIQvMXNqAo6 bVQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aJycYGwt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m9-20020a056a00080900b0057791522cb6si11298529pfk.275.2023.01.09.19.52.27; Mon, 09 Jan 2023 19:52:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aJycYGwt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230235AbjAJDCJ (ORCPT + 53 others); Mon, 9 Jan 2023 22:02:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229843AbjAJDCH (ORCPT ); Mon, 9 Jan 2023 22:02:07 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DFE7766E for ; Mon, 9 Jan 2023 19:02:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673319727; x=1704855727; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6bn4beizOPeijT8dk3imP015mVfFKneeaHWm9eqB0jo=; b=aJycYGwtxqloAkMp0a/RbyERiunittBzbQ1rDMl+DD/drzNayoyunn5J AYTkUxAHpGHxa9CA3WqEWu8fZfgc1FFWhA0IB0JIXcW3EaPD1mgBEmqdf sP777deBUY8bAk4ZRQnLPERkJH3iJLL8Oldl4TVfnbjPJBJObyrLAe4XA +Tmdbk6b1yHj9IOFzqS2JgVOgaJ2Uf21/5HmxyOcGbJb8C5MFj1V/6Me7 JxSdhStvav6MobRLNJs3wjsvqdu0pHCak/n8HM3xbu2Sva1/ol5cGGQ5n W7l8zpJYHYgoWPhk83i5bbRo+UlfrJbb7Yn2ePmZ7SlXHpLHMcStNFdVT g==; X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="324289040" X-IronPort-AV: E=Sophos;i="5.96,313,1665471600"; d="scan'208";a="324289040" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 19:02:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="830841914" X-IronPort-AV: E=Sophos;i="5.96,313,1665471600"; d="scan'208";a="830841914" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga005.jf.intel.com with ESMTP; 09 Jan 2023 19:01:59 -0800 From: Lu Baolu To: Joerg Roedel , Jason Gunthorpe , Christoph Hellwig , Kevin Tian , Will Deacon , Robin Murphy , Jean-Philippe Brucker Cc: Suravee Suthikulpanit , Vasant Hegde , Hector Martin , Sven Peter , Rob Clark , Marek Szyprowski , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Yong Wu , Matthias Brugger , Heiko Stuebner , Matthew Rosato , Orson Zhai , Baolin Wang , Chunyan Zhang , Chen-Yu Tsai , Thierry Reding , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v5 0/5] iommu: Retire detach_dev callback Date: Tue, 10 Jan 2023 10:54:03 +0800 Message-Id: <20230110025408.667767-1-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi folks, The iommu core calls the driver's detach_dev domain op callback only when a device is finished assigning to user space and iommu_group_release_dma_owner() is called to return the device to the kernel, where iommu core wants to set the default domain to the device but the driver didn't provide one. The code looks like: /* * New drivers should support default domains and so the detach_dev() op * will never be called. Otherwise the NULL domain represents some * platform specific behavior. */ if (!new_domain) { if (WARN_ON(!group->domain->ops->detach_dev)) return -EINVAL; __iommu_group_for_each_dev(group, group->domain, iommu_group_do_detach_device); group->domain = NULL; return 0; } In other words, if the iommu driver provides default domains, the .detach_dev callback will never be called; Otherwise, the .detach_dev callback is actually called to return control back to the platform DMA ops, other than detaching the domain from device. This series cleanups this by: - If the IOMMU driver provides default domains, remove .detach_dev callback. - Adds a new set_platform_dma iommu op. Any IOMMU driver that doesn't provide default domain should implement set_platform_dma callback instead. - Retire .detach_dev callback. This series originates from various discussion in the community. Thanks to Jason, Robin and all others for their ideas. The whole series is available on github: https://github.com/LuBaolu/intel-iommu/commits/iommu-retire-detach_dev-v5 Change log: v5: - Merge some patches to make the series cute. No functionality changes. - Check the op directly and WARN_ON the lack of any necessary callbacks. Get rid of the ret and EINVAL. v4: - https://lore.kernel.org/linux-iommu/20230104125725.271850-1-baolu.lu@linux.intel.com/ - Drop the patch which renamed .attach_dev to .set_dev. As Robin said, "... I also wouldn't say that "attach" loses its meaning in a context where an equivalent "detach" operation is only ever implicit in reattaching to something else...". If we have a better name in the future, we can do it in other series. - Adjust the patch of "iommu: Add set_platform_dma_ops iommu ops" according to Jason's following suggestion " ... This is a bit ugly, it would be better to make the previous patch call set_platform_dma if it is set instead of detach_dev and then these patches should just rename the driver's fsl_pamu_detach_device to fsl_pamu_set_platform_dma ..." - Add a new patch to remove deferred attach check from __iommu_detach_domain() path. Make it a separate patch as the prerequisite to remove __iommu_detach_device() helper. - Rename set_platform_dma to set_platform_dma_ops to make it more meaningful. v3: - https://lore.kernel.org/linux-iommu/20221128064648.1934720-1-baolu.lu@linux.intel.com/ - Setting blocking domain is not conceptually equal to detach_dev. Dropped all blocking domain related staffs in the previous version. v2: - https://lore.kernel.org/linux-iommu/20220826123014.52709-1-baolu.lu@linux.intel.com/ - Replace .detach_dev callback with static block domain ops; - Rename .attach_dev to .set_dev. v1: - https://lore.kernel.org/linux-iommu/20220516015759.2952771-1-baolu.lu@linux.intel.com/ Jason Gunthorpe (1): iommu: Remove deferred attach check from __iommu_detach_device() Lu Baolu (4): iommu: Remove detach_dev callbacks iommu: Add set_platform_dma_ops iommu ops iommu: Add set_platform_dma_ops callbacks iommu: Remove detach_dev callback include/linux/iommu.h | 8 ++- include/trace/events/iommu.h | 7 -- drivers/iommu/amd/iommu.c | 26 ------- drivers/iommu/apple-dart.c | 24 ------- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 23 ------ drivers/iommu/exynos-iommu.c | 1 - drivers/iommu/fsl_pamu_domain.c | 6 +- drivers/iommu/iommu-traces.c | 1 - drivers/iommu/iommu.c | 94 ++++++++++++------------- drivers/iommu/ipmmu-vmsa.c | 16 ----- drivers/iommu/msm_iommu.c | 6 +- drivers/iommu/mtk_iommu.c | 9 --- drivers/iommu/mtk_iommu_v1.c | 4 +- drivers/iommu/omap-iommu.c | 6 +- drivers/iommu/rockchip-iommu.c | 1 - drivers/iommu/s390-iommu.c | 7 +- drivers/iommu/sprd-iommu.c | 16 ----- drivers/iommu/sun50i-iommu.c | 1 - drivers/iommu/tegra-gart.c | 6 +- drivers/iommu/tegra-smmu.c | 5 +- 20 files changed, 69 insertions(+), 198 deletions(-) -- 2.34.1