Message ID | c734557f46fa5ea79b766ce847b003e31096d0bb.1696253096.git.robin.murphy@arm.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1577737vqb; Mon, 2 Oct 2023 10:25:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHZXSC7Fl7I9LXtc9sXO9X0uXGPG3/hEpZ1+FDx5zG4tq+Qw7bnDq6fOBcvGt4bZhujRqg X-Received: by 2002:a05:6870:1583:b0:1c0:f8a7:ec14 with SMTP id j3-20020a056870158300b001c0f8a7ec14mr15118842oab.57.1696267548282; Mon, 02 Oct 2023 10:25:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696267548; cv=none; d=google.com; s=arc-20160816; b=QiKNBgPWXIoFq11GrvYL+Sngzz4EBETodR2Gliw+SXBzxo/E2HjOb6YKu2uPAvnrI2 2bIOFcViP8bK06tNSgFSUte0aglrJxFv/ipA2bjtbEb3E97RrcE9r8BexgIng+t9Qzqy n4X7QUhFiaUoHTHel83LNamfMZXTep3UnNHMd/5fZdGWMNA2/JjE6il8IK9tfc6z1Qer W2COGosTdl4vfw2G3oOCTlDulH1XObW73CN+nqDvGqQVlWwF3Q91COb0kjbOWrM9kqsu Zqyfjgbg6y3xrZIHu4LzcSRL/WOfQ7WB6iSdxsfpDtweRZ+eUQyGlGK8jLqM6s3t1yEX sTgA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=dIJFFWvz6n7uUgCBmPfLiKIYdBFSOqRv1Zb0+myHU8Q=; fh=3nQM0QufZPSZ94JO+WDmHkrFziuG1/NJr0OD1jy0Wvc=; b=BvN3SVNOQusI9kx5oBC2xo2f4gbrGFUieF/yZ37IeAT3+hvkFLJ+zRcWdDTFC3qFmo Vv1egAVE+15aBOKLY2qgv2z2w/rIugzzq6qRKnSJnvAfJVAEgxyk1uQ+vnxnbi51SBEc sYwX7laCHKaZh23PNzSOyIMpIIVNZBSzSENJUef+evBAhjVwpXPlYvocLRWTm/Xs9PlL d/Ee2zRH8JMGd5hS/NR65Ia56o2T+RZIXbqBvEZwmAsz/XCnBfrucFf8RjhA6p8rPuxl 89boEXmZcIeWq4tAm0RwpnrELq8CitgNzgi8N2t8qMNPaTUpZha+yFVbxTd/ou0wXa1w Wy5Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id e9-20020a636909000000b0056a9544e894si27128485pgc.397.2023.10.02.10.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:25:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 0CC43802C7C2; Mon, 2 Oct 2023 06:49:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237528AbjJBNt3 (ORCPT <rfc822;pusanteemu@gmail.com> + 18 others); Mon, 2 Oct 2023 09:49:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237514AbjJBNt1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 2 Oct 2023 09:49:27 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8896FD7 for <linux-kernel@vger.kernel.org>; Mon, 2 Oct 2023 06:49:24 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BD10B143D; Mon, 2 Oct 2023 06:50:02 -0700 (PDT) Received: from e121345-lin.cambridge.arm.com (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7384A3F762; Mon, 2 Oct 2023 06:49:23 -0700 (PDT) From: Robin Murphy <robin.murphy@arm.com> To: joro@8bytes.org, will@kernel.org Cc: iommu@lists.linux.dev, jgg@nvidia.com, baolu.lu@linux.intel.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/7] iommu: Decouple iommu_present() from bus ops Date: Mon, 2 Oct 2023 14:49:10 +0100 Message-Id: <c734557f46fa5ea79b766ce847b003e31096d0bb.1696253096.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.39.2.101.g768bb238c484.dirty In-Reply-To: <cover.1696253096.git.robin.murphy@arm.com> References: <cover.1696253096.git.robin.murphy@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 02 Oct 2023 06:49:41 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778655612538535957 X-GMAIL-MSGID: 1778665440818918464 |
Series |
iommu: Retire bus ops
|
|
Commit Message
Robin Murphy
Oct. 2, 2023, 1:49 p.m. UTC
Much as I'd like to remove iommu_present(), the final remaining users
are proving stubbornly difficult to clean up, so kick that can down the
road and just rework it to preserve the current behaviour without
depending on bus ops. Since commit 57365a04c921 ("iommu: Move bus setup
to IOMMU device registration"), any registered IOMMU instance is already
considered "present" for every entry in iommu_buses, so it's simply a
case of validating the bus and checking we have at least once IOMMU.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
v3: Tweak to use the ops-based check rather than group-based, to
properly match the existing behaviour
v4: Just look for IOMMU instances instead of managed devices
---
drivers/iommu/iommu.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
Comments
On Mon, Oct 02, 2023 at 02:49:10PM +0100, Robin Murphy wrote: > Much as I'd like to remove iommu_present(), the final remaining users > are proving stubbornly difficult to clean up, so kick that can down the > road and just rework it to preserve the current behaviour without > depending on bus ops. Since commit 57365a04c921 ("iommu: Move bus setup > to IOMMU device registration"), any registered IOMMU instance is already > considered "present" for every entry in iommu_buses, so it's simply a > case of validating the bus and checking we have at least once IOMMU. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > > --- > > v3: Tweak to use the ops-based check rather than group-based, to > properly match the existing behaviour > v4: Just look for IOMMU instances instead of managed devices > --- > drivers/iommu/iommu.c | 21 ++++++++++++++++++++- > 1 file changed, 20 insertions(+), 1 deletion(-) > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index f7793d1b5c3e..ef7feb0acc34 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -1988,9 +1988,28 @@ int bus_iommu_probe(const struct bus_type *bus) > return 0; > } > > +/** > + * iommu_present() - make platform-specific assumptions about an IOMMU > + * @bus: bus to check > + * > + * Do not use this function. You want device_iommu_mapped() instead. > + * > + * Return: true if some IOMMU is present and aware of devices on the given bus; > + * in general it may not be the only IOMMU, and it may not have anything to do > + * with whatever device you are ultimately interested in. > + */ > bool iommu_present(const struct bus_type *bus) > { > - return bus->iommu_ops != NULL; > + bool ret = false; > + > + for (int i = 0; i < ARRAY_SIZE(iommu_buses); i++) { > + if (iommu_buses[i] == bus) { > + spin_lock(&iommu_device_lock); > + ret = !list_empty(&iommu_device_list); > + spin_unlock(&iommu_device_lock); > + } Add here: return ret; > + } > + return ret; And this becomes return false ? Regardless Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Jason
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index f7793d1b5c3e..ef7feb0acc34 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1988,9 +1988,28 @@ int bus_iommu_probe(const struct bus_type *bus) return 0; } +/** + * iommu_present() - make platform-specific assumptions about an IOMMU + * @bus: bus to check + * + * Do not use this function. You want device_iommu_mapped() instead. + * + * Return: true if some IOMMU is present and aware of devices on the given bus; + * in general it may not be the only IOMMU, and it may not have anything to do + * with whatever device you are ultimately interested in. + */ bool iommu_present(const struct bus_type *bus) { - return bus->iommu_ops != NULL; + bool ret = false; + + for (int i = 0; i < ARRAY_SIZE(iommu_buses); i++) { + if (iommu_buses[i] == bus) { + spin_lock(&iommu_device_lock); + ret = !list_empty(&iommu_device_list); + spin_unlock(&iommu_device_lock); + } + } + return ret; } EXPORT_SYMBOL_GPL(iommu_present);