From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A15D3C04FE1 for ; Sat, 12 Aug 2023 04:57:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229475AbjHLE5b (ORCPT ); Sat, 12 Aug 2023 00:57:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231685AbjHLE5a (ORCPT ); Sat, 12 Aug 2023 00:57:30 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4239C1736; Fri, 11 Aug 2023 21:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691816250; x=1723352250; h=message-id:date:mime-version:cc:subject:to:references: from:in-reply-to:content-transfer-encoding; bh=+iNjZB2u/KnDtQIHQv6xVfauWGpLAEIKP+FIowSusMs=; b=LtmhX+thexG4HHij1H8Pk73mYq7FQMb30XdUf1qu04zIwcD+8qT5kIwD K3JKlZIunYr8moK7iavfzJO1rao+AYEAFiWa6J/XTTakSPL6EjBiKd3YD r2Iu40FcwqutM8VmyBNRn5AvasUJR5rraUvnIKyoBOh7W9Xqe4XX3heT6 idMiE75SQShCgP7JS81NpaLYvJIbmY4da4HMXOVGf8wk1F5plFUK5Z6hw lk7gShID27KiQdKQIgdty30EpazmW/ZceJR+/xXmhtA/BpmbUezfVE/iz VO+taH1fooR+4WrheO8BZEYOjRKkfrzh28PZp1C3pA+NEhDTiT/ymw3JF A==; X-IronPort-AV: E=McAfee;i="6600,9927,10799"; a="374569537" X-IronPort-AV: E=Sophos;i="6.01,167,1684825200"; d="scan'208";a="374569537" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2023 21:57:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10799"; a="856493438" X-IronPort-AV: E=Sophos;i="6.01,167,1684825200"; d="scan'208";a="856493438" Received: from blu2-mobl.ccr.corp.intel.com (HELO [10.254.214.60]) ([10.254.214.60]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2023 21:57:18 -0700 Message-ID: <0e47dc9e-1cee-c1c5-5d1a-5f861095b5a0@linux.intel.com> Date: Sat, 12 Aug 2023 12:57:16 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Cc: baolu.lu@linux.intel.com, Dmitry Osipenko , Marek Szyprowski , Nicolin Chen , Niklas Schnelle , Steven Price , Thierry Reding Subject: Re: [PATCH v6 15/25] iommufd/selftest: Make the mock iommu driver into a real driver To: Jason Gunthorpe , Andy Gross , Alim Akhtar , Bjorn Andersson , AngeloGioacchino Del Regno , Baolin Wang , Christophe Leroy , Gerald Schaefer , Heiko Stuebner , iommu@lists.linux.dev, Jernej Skrabec , Jonathan Hunter , Joerg Roedel , Kevin Tian , Konrad Dybcio , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-s390@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, Russell King , linuxppc-dev@lists.ozlabs.org, Matthias Brugger , Matthew Rosato , Michael Ellerman , Nicholas Piggin , Orson Zhai , Rob Clark , Robin Murphy , Samuel Holland , Thierry Reding , Krishna Reddy , Chen-Yu Tsai , Will Deacon , Yong Wu , Chunyan Zhang References: <15-v6-e8114faedade+425-iommu_all_defdom_jgg@nvidia.com> Content-Language: en-US From: Baolu Lu In-Reply-To: <15-v6-e8114faedade+425-iommu_all_defdom_jgg@nvidia.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2023/8/3 8:08, Jason Gunthorpe wrote: > I've avoided doing this because there is no way to make this happen > without an intrusion into the core code. Up till now this has avoided > needing the core code's probe path with some hackery - but now that > default domains are becoming mandatory it is unavoidable. The core probe > path must be run to set the default_domain, only it can do it. Without > a default domain iommufd can't use the group. > > Make it so that iommufd selftest can create a real iommu driver and bind > it only to is own private bus. Add iommu_device_register_bus() as a core > code helper to make this possible. It simply sets the right pointers and > registers the notifier block. The mock driver then works like any normal > driver should, with probe triggered by the bus ops > > When the bus->iommu_ops stuff is fully unwound we can probably do better > here and remove this special case. > > Remove set_platform_dma_ops from selftest and make it use a BLOCKED > default domain. > > Signed-off-by: Jason Gunthorpe > --- > drivers/iommu/iommu-priv.h | 16 +++ > drivers/iommu/iommu.c | 43 +++++++ > drivers/iommu/iommufd/iommufd_private.h | 5 +- > drivers/iommu/iommufd/main.c | 8 +- > drivers/iommu/iommufd/selftest.c | 149 +++++++++++++----------- > 5 files changed, 152 insertions(+), 69 deletions(-) > create mode 100644 drivers/iommu/iommu-priv.h > > diff --git a/drivers/iommu/iommu-priv.h b/drivers/iommu/iommu-priv.h > new file mode 100644 > index 00000000000000..1cbc04b9cf7297 > --- /dev/null > +++ b/drivers/iommu/iommu-priv.h > @@ -0,0 +1,16 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. > + */ > +#ifndef __IOMMU_PRIV_H > +#define __IOMMU_PRIV_H > + > +#include > + > +int iommu_device_register_bus(struct iommu_device *iommu, > + const struct iommu_ops *ops, struct bus_type *bus, > + struct notifier_block *nb); > +void iommu_device_unregister_bus(struct iommu_device *iommu, > + struct bus_type *bus, > + struct notifier_block *nb); > + > +#endif > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index a1a93990b3a211..7fae866af0db7a 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -36,6 +36,7 @@ > #include "dma-iommu.h" > > #include "iommu-sva.h" > +#include "iommu-priv.h" > > static struct kset *iommu_group_kset; > static DEFINE_IDA(iommu_group_ida); > @@ -290,6 +291,48 @@ void iommu_device_unregister(struct iommu_device *iommu) > } > EXPORT_SYMBOL_GPL(iommu_device_unregister); > > +#if IS_ENABLED(CONFIG_IOMMUFD_TEST) > +void iommu_device_unregister_bus(struct iommu_device *iommu, > + struct bus_type *bus, > + struct notifier_block *nb) > +{ > + bus_unregister_notifier(bus, nb); > + iommu_device_unregister(iommu); > +} > +EXPORT_SYMBOL_GPL(iommu_device_unregister_bus); > + > +/* > + * Register an iommu driver against a single bus. This is only used by iommufd > + * selftest to create a mock iommu driver. The caller must provide > + * some memory to hold a notifier_block. > + */ > +int iommu_device_register_bus(struct iommu_device *iommu, > + const struct iommu_ops *ops, struct bus_type *bus, > + struct notifier_block *nb) > +{ > + int err; > + > + iommu->ops = ops; > + nb->notifier_call = iommu_bus_notifier; > + err = bus_register_notifier(bus, nb); > + if (err) > + return err; > + > + spin_lock(&iommu_device_lock); > + list_add_tail(&iommu->list, &iommu_device_list); > + spin_unlock(&iommu_device_lock); > + > + bus->iommu_ops = ops; > + err = bus_iommu_probe(bus); > + if (err) { > + iommu_device_unregister_bus(iommu, bus, nb); > + return err; > + } > + return 0; > +} > +EXPORT_SYMBOL_GPL(iommu_device_register_bus); > +#endif Although #if IS_ENABLED(CONFIG_IOMMUFD_TEST) ... ... #endif doesn't look so comfortable, this is also the most concise method that I can think of. So, Reviewed-by: Lu Baolu Best regards, baolu