Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Date:   Mon, 2 Oct 2023 11:17:04 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Robin Murphy <robin.murphy@arm.com>
Cc:     joro@8bytes.org, will@kernel.org, iommu@lists.linux.dev,
        baolu.lu@linux.intel.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 2/7] iommu: Decouple iommu_present() from bus ops
Message-ID: <20231002141704.GG339126@nvidia.com>
References: <cover.1696253096.git.robin.murphy@arm.com>
 <c734557f46fa5ea79b766ce847b003e31096d0bb.1696253096.git.robin.murphy@arm.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <c734557f46fa5ea79b766ce847b003e31096d0bb.1696253096.git.robin.murphy@arm.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QIVrlFZHg3auLQcHqnG8vNofL/8s9ls5fpvNmvfG91VB+B5V0aEGbMfZIzSH?=
 =?us-ascii?Q?wSReNtMp1afeEnKNqL2O5zDBCkpM0PHtrEDZ4qPuTnG7CmWumf/CF1mTmud6?=
 =?us-ascii?Q?dTwTIQktjm/vjCkwxLpEUChB8r+Pxr+oca6qPEjYEX0Q9QAFAEpIFsFoU4kh?=
 =?us-ascii?Q?dWDLYxQxUJUbYhiaHdzZ/fJ4AKLZG8/g6al2HExbjjSLy9Mibr01MsiinCa7?=
 =?us-ascii?Q?SNLH5jF7gUbydCaggsvC2kuPrb5o82donQDkkXcTFF8DvBtrI8hvOwdVdp9u?=
 =?us-ascii?Q?dAvHzRhmYHCKzYtA6c+uW3xr63stN9ahqPzg5xwrqq6UuAJMQVugDtFGqP8V?=
 =?us-ascii?Q?QkQFJVRDbgGGdMB1ZyPn6whkXBKsN5DpRGaipRSUdcog+P7GvRMxS5ZPFOqv?=
 =?us-ascii?Q?KpmDLd+iQ14bPOoPItSn8Mxc3FTgdTNjIVFBw6MCFPOa8idU1Hb4Tj4d0sfO?=
 =?us-ascii?Q?0QF7QqokDVp7nM/wTSLJhHhYrDkoGS/O+POtgFfcNNTs2B1VEGmqux7QVMg7?=
 =?us-ascii?Q?dJ6j9ZNR+DLp6yUsCoQyA08Q89avS1ljLz8fH+wNVKyjp7tHmYk5EyUzM7mk?=
 =?us-ascii?Q?hd309dUfgMpIHbdFK/ou3LDX9veEigCwb3+VhMKr8Qk9ciioRSJXxV/y+zFm?=
 =?us-ascii?Q?LEAEnndmdJoVte9fbhfDSrO7EceiFGiE3dAc00VIWXo5cmMAwPqPJ0WMddNW?=
 =?us-ascii?Q?N2sQQKaSK9+3OKN9eK5LB/7t5l0qFrcvtYDsxAOt1UuFwzZPMEMakJC7a+HY?=
 =?us-ascii?Q?5T+lSOwOhJH72hyvU3OJs935kFdsZzEzc6qUPUG8q8Mbekkz8aWFw5CiF5sU?=
 =?us-ascii?Q?prkL2uEuP1S7pnWhK7yrfeTRWjy4tUJhZ+NLAJPZlidCaJDD7kVy4Am/12g/?=
 =?us-ascii?Q?cx1BxDfJh+wsrsMpL4nsqrc7fW4kNJyLEE+LgBHxeM7Ji7qGi28hWvj8Gbz/?=
 =?us-ascii?Q?fPsg5/9T62MNNv+VsKS1N9ymqWvfcHA+fuRGaSoIMf8aRCPhd4OAjBiaYcfl?=
 =?us-ascii?Q?wmbzC+SRYFqTFm3/GRfLdMh+RuGMSt+F4AamauhIw831ClLnPSMMadM3bguM?=
 =?us-ascii?Q?WSb0iipv2CNwWve7gTpdY1wet55imW9IY7Vq9lPB1RySQ3bC/G/tzhMd7nmA?=
 =?us-ascii?Q?s86dZqL2r097/u1AlUPVUBzy0lbc6czyPhjdVSKhjCCW4+hfNKGdaIIO+K92?=
 =?us-ascii?Q?elNTtX8vk2FIEfRV8GdRJGbAJiSJej9bAUiyqB/7NswKGHinhq0hbN48Lh2b?=
 =?us-ascii?Q?+sFJ9/qPPhaU9uswdUbUxPbHRHikniXIX+47C8A6a6Ipl/K0t5k5Sz0wFj/x?=
 =?us-ascii?Q?xUCRS/brx14vKV3FrCzGfBtiWJ+5cNJ9zdqxRO+FTI6HqvSxNXssRjqYDD2t?=
 =?us-ascii?Q?wnbXQzQQCTLNdz7um7g48KzsSsN8Go2RgGgg3CNANzSmZ+0Zht4nbqtKZaIF?=
 =?us-ascii?Q?OJVDpzQLa2CupgwdanNrJ74oGaZm5qo9PpPF+aHmiOe14aNGbKiMQSevW2sn?=
 =?us-ascii?Q?7MQXziDz9dpNUBsq2EHuQkLvE9DJavFrVrcuCEtV3l11uA7roNKx0vM9s2qb?=
 =?us-ascii?Q?4/Rsmh+e3cbau5SEdqqRzFiLdPnCe3GQgjtC+cfa?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bf514e74-7f80-4d25-d096-08dbc3524259
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2023 14:17:07.2196
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: N91d+Rgp72at5h6ytWwVzCUCHdheGLEl4w98JeQC6cXdPbHTwtQbblB4l5qOZsZs
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6929
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
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 (lipwig.vger.email [0.0.0.0]); Mon, 02 Oct 2023 07:17:27 -0700 (PDT)

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