Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   "Tian, Kevin" <kevin.tian@intel.com>
To:     Lu Baolu <baolu.lu@linux.intel.com>,
        Joerg Roedel <joro@8bytes.org>,
        "Raj, Ashok" <ashok.raj@intel.com>,
        Christoph Hellwig <hch@infradead.org>,
        "Jason Gunthorpe" <jgg@nvidia.com>
CC:     Will Deacon <will@kernel.org>, Robin Murphy <robin.murphy@arm.com>,
        "Liu, Yi L" <yi.l.liu@intel.com>,
        "Pan, Jacob jun" <jacob.jun.pan@intel.com>,
        "iommu@lists.linux-foundation.org" <iommu@lists.linux-foundation.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 04/12] iommu/vt-d: Use pci_get_domain_bus_and_slot() in
 pgtable_walk()
Thread-Topic: [PATCH 04/12] iommu/vt-d: Use pci_get_domain_bus_and_slot() in
 pgtable_walk()
Thread-Index: AQHYcZPOC4tEV3ebJEK9SGlZ5uddJ606R6PA
Date:   Wed, 1 Jun 2022 08:56:23 +0000
Message-ID: <BN9PR11MB52760466E3E4AAD92DB0F91B8CDF9@BN9PR11MB5276.namprd11.prod.outlook.com>
References: <20220527063019.3112905-1-baolu.lu@linux.intel.com>
 <20220527063019.3112905-5-baolu.lu@linux.intel.com>
In-Reply-To: <20220527063019.3112905-5-baolu.lu@linux.intel.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?AH8gR7TAjriE/riH341e3iCONtQvQCcSI6qXQi7ArKHiCssJl9w1/xiL+x3f?=
 =?us-ascii?Q?CFVU3kDMHGyrklEEtous7UWWN80jz75xCV/OUfwHF/RtN1uTBoVDdx0Kvh0/?=
 =?us-ascii?Q?enBvXrTYHijnUyNEQ+0Bzyfcq17LYIGTl3EiDJ9oWDfKWl+sg2zWnfsrulJh?=
 =?us-ascii?Q?IuMBJrQFXaOhClWBfgw7cQOsAfhnwdjxW/5TDLl7PQMiwl+2aBXsYKgUHeaP?=
 =?us-ascii?Q?t1+ZKkl22XprAf1pBnzCRXR0LJkZ9eJ5C2kc8OauxoiHk4y/qH3wk0rf+rUO?=
 =?us-ascii?Q?5fJac4mjwby0Jo1DEoR2UeKZcVQVgTz5zua4DoIvJbOfRi/438pVvAGQC4P1?=
 =?us-ascii?Q?8ei4z6eNzQKKL3bPY/J4ZwPHYWw6wC3nh9A+e+n7tahCD0VhE05eNqy887yn?=
 =?us-ascii?Q?xNuSHpH8t0f8s9c32mgDWy6lCg/Vt7jtAZ0GNtHhf2zTKBGSIzgk3zc+4bz8?=
 =?us-ascii?Q?xxWVapFpf7LlsbYP1zFA8WGUFNM+u+VEPLHm7JAgg2O81lBbHn8jLXBOlwP7?=
 =?us-ascii?Q?sSWotGuMymo+4pFY51O7gL7G4yOeEbBrGDMzMiL7wa0kiwGA/E9A5uxojeHx?=
 =?us-ascii?Q?g9QTmMFff06STps1q/I44Z8NnWmoom3TGz+9zhMLnmiYaTHst5uRuonkjKNJ?=
 =?us-ascii?Q?nF3T66Y7cosVudWEHbYCItv43/+buqA2SnJA5eYFVNvNNwwmWDplG4WiSEiI?=
 =?us-ascii?Q?3iSp1fQnbqg+eCM+gWZXRJlCDIZErRLvKZ63H90FA2BlpUwR/gDT3S2uuyV/?=
 =?us-ascii?Q?8gU39My+uTFJn4B1el4aQ9ACs2gcvCD896wM1Rp9pp6dlF9Gurme2FP3ZfIC?=
 =?us-ascii?Q?hpfEJTosFXbDm0Mk4S3VxnwfJ9FUBJkgrU6oeSZ3dX5R3XHdkzdtNiH/cQA1?=
 =?us-ascii?Q?Q5dwHnGmQ5IiuE3e3XOMQszK70oLdjbmCUrS89y1FLdGPtNe3WrxV9Z8uF21?=
 =?us-ascii?Q?PE59aMTXPm+tpxaV9qUJCHpzCZtoIKOnR5nlPJNnqhOEcOfFIHpOMOjABMy7?=
 =?us-ascii?Q?KXt/ocbKfZgFCopmWGMSzjEQDJzZFGam2qzvZ7XFDArKgx+0IybcsiirbdPU?=
 =?us-ascii?Q?AkMjQR5KFqLDy/kUEe8nK8xABVUKLTDOa/jMNlxDs47L5JCxLKiL/SKiz2zP?=
 =?us-ascii?Q?ir9KDXMNgxuQmKFY4Ane/he/RD2Z5jwCc8dSQ0hOKLVHoDtoTsmkKCIrsfMZ?=
 =?us-ascii?Q?WWsbbeEST8O8oR8CExPCtoXd17u/ncSXLaJleljsFgKykmcu0npp4NlNlhD1?=
 =?us-ascii?Q?UY7gWXXtWJ+SV9pMpXE8vnH0byfrL1JsmOe01ngyvTaQ3GJew/g1N8MxNQyA?=
 =?us-ascii?Q?hykyLuEbywQu2e29ilscxypYpuFEg2aCUnQnFx49ibT0W69Z5SCo1pmu7BOJ?=
 =?us-ascii?Q?Qu6yysLpaM/qJ+9+QJOTiHWaibqJf7VKkLU1evMldssDGyGqIyd4CIC1UGHs?=
 =?us-ascii?Q?bs5IrJ7/JQCKgb4TS93f+5EfUkhwHmglaMtiUmUgHfBJyvDpZjDpLw3ZgNEb?=
 =?us-ascii?Q?aARjrDHfqwhHdG8Q+Jr+V3zGFiuLpC+LgBNO+ZNvslFxZ4/g/2IOmo4oiszv?=
 =?us-ascii?Q?Wk5mq5qfqR8sWZCJQ//dtFR+lgzm/mkoYg2T0MrnOOKBs50CwKPUWB00ogNf?=
 =?us-ascii?Q?TavpVnPSigI031Qf9j3oZvU1iLI8dWzxcfrHRIVpCZHWlya7VY0zMqep1Wb5?=
 =?us-ascii?Q?PPclVRrU4gN97ApPKif5WEGjCsdMPObPTmF9+nJMQidAybbFIrRrW8J8JLMn?=
 =?us-ascii?Q?1Gg1AvYCYw=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5276.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 27fdc7e2-795a-4ba2-1dd8-08da43ac9afb
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Jun 2022 08:56:23.9617
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: iO+kAc85vRH6iFCiTErmA2haDipk+3BVyMzyBDW0d3V9AUxfNTAfsu+nnaHc8n0ikWdOsQSs5tnSUa4/4v0PkQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5627
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable 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

> From: Lu Baolu <baolu.lu@linux.intel.com>
> Sent: Friday, May 27, 2022 2:30 PM
>=20
> Use pci_get_domain_bus_and_slot() instead of searching the global list
> to retrieve the pci device pointer. This removes device_domain_list
> global list as there are no consumers anymore.
>=20
> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>

Reviewed-by: Kevin Tian <kevin.tian@intel.com>

> ---
>  drivers/iommu/intel/iommu.h |  1 -
>  drivers/iommu/intel/iommu.c | 33 ++++++---------------------------
>  2 files changed, 6 insertions(+), 28 deletions(-)
>=20
> diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
> index 2f4a5b9509c0..6724703d573b 100644
> --- a/drivers/iommu/intel/iommu.h
> +++ b/drivers/iommu/intel/iommu.h
> @@ -609,7 +609,6 @@ struct intel_iommu {
>  /* PCI domain-device relationship */
>  struct device_domain_info {
>  	struct list_head link;	/* link to domain siblings */
> -	struct list_head global; /* link to global list */
>  	struct list_head table;	/* link to pasid table */
>  	u32 segment;		/* PCI segment number */
>  	u8 bus;			/* PCI bus number */
> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
> index 25d4c5200526..bbdd3417a1b1 100644
> --- a/drivers/iommu/intel/iommu.c
> +++ b/drivers/iommu/intel/iommu.c
> @@ -131,8 +131,6 @@ static struct intel_iommu **g_iommus;
>=20
>  static void __init check_tylersburg_isoch(void);
>  static int rwbf_quirk;
> -static inline struct device_domain_info *
> -dmar_search_domain_by_dev_info(int segment, int bus, int devfn);
>=20
>  /*
>   * set to 1 to panic kernel if can't successfully enable VT-d
> @@ -315,7 +313,6 @@ static int iommu_skip_te_disable;
>  #define IDENTMAP_AZALIA		4
>=20
>  static DEFINE_SPINLOCK(device_domain_lock);
> -static LIST_HEAD(device_domain_list);
>  const struct iommu_ops intel_iommu_ops;
>=20
>  static bool translation_pre_enabled(struct intel_iommu *iommu)
> @@ -845,9 +842,14 @@ static void pgtable_walk(struct intel_iommu
> *iommu, unsigned long pfn, u8 bus, u
>  	struct device_domain_info *info;
>  	struct dma_pte *parent, *pte;
>  	struct dmar_domain *domain;
> +	struct pci_dev *pdev;
>  	int offset, level;
>=20
> -	info =3D dmar_search_domain_by_dev_info(iommu->segment, bus,
> devfn);
> +	pdev =3D pci_get_domain_bus_and_slot(iommu->segment, bus, devfn);
> +	if (!pdev)
> +		return;
> +
> +	info =3D dev_iommu_priv_get(&pdev->dev);
>  	if (!info || !info->domain) {
>  		pr_info("device [%02x:%02x.%d] not probed\n",
>  			bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
> @@ -2348,19 +2350,6 @@ static void domain_remove_dev_info(struct
> dmar_domain *domain)
>  	spin_unlock_irqrestore(&device_domain_lock, flags);
>  }
>=20
> -static inline struct device_domain_info *
> -dmar_search_domain_by_dev_info(int segment, int bus, int devfn)
> -{
> -	struct device_domain_info *info;
> -
> -	list_for_each_entry(info, &device_domain_list, global)
> -		if (info->segment =3D=3D segment && info->bus =3D=3D bus &&
> -		    info->devfn =3D=3D devfn)
> -			return info;
> -
> -	return NULL;
> -}
> -
>  static int domain_setup_first_level(struct intel_iommu *iommu,
>  				    struct dmar_domain *domain,
>  				    struct device *dev,
> @@ -4564,7 +4553,6 @@ static struct iommu_device
> *intel_iommu_probe_device(struct device *dev)
>  	struct pci_dev *pdev =3D dev_is_pci(dev) ? to_pci_dev(dev) : NULL;
>  	struct device_domain_info *info;
>  	struct intel_iommu *iommu;
> -	unsigned long flags;
>  	u8 bus, devfn;
>=20
>  	iommu =3D device_to_iommu(dev, &bus, &devfn);
> @@ -4607,10 +4595,7 @@ static struct iommu_device
> *intel_iommu_probe_device(struct device *dev)
>  		}
>  	}
>=20
> -	spin_lock_irqsave(&device_domain_lock, flags);
> -	list_add(&info->global, &device_domain_list);
>  	dev_iommu_priv_set(dev, info);
> -	spin_unlock_irqrestore(&device_domain_lock, flags);
>=20
>  	return &iommu->iommu;
>  }
> @@ -4618,15 +4603,9 @@ static struct iommu_device
> *intel_iommu_probe_device(struct device *dev)
>  static void intel_iommu_release_device(struct device *dev)
>  {
>  	struct device_domain_info *info =3D dev_iommu_priv_get(dev);
> -	unsigned long flags;
>=20
>  	dmar_remove_one_dev_info(dev);
> -
> -	spin_lock_irqsave(&device_domain_lock, flags);
>  	dev_iommu_priv_set(dev, NULL);
> -	list_del(&info->global);
> -	spin_unlock_irqrestore(&device_domain_lock, flags);
> -
>  	kfree(info);
>  	set_dma_ops(dev, NULL);
>  }
> --
> 2.25.1