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 94D71C32771 for ; Thu, 22 Sep 2022 02:20:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229453AbiIVCUW (ORCPT ); Wed, 21 Sep 2022 22:20:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229630AbiIVCUU (ORCPT ); Wed, 21 Sep 2022 22:20:20 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0015C5F6D for ; Wed, 21 Sep 2022 19:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663813218; x=1695349218; h=message-id:date:mime-version:cc:subject:to:references: from:in-reply-to:content-transfer-encoding; bh=/ZCkZ9qbjMv6wNMGQi+YkA+SN2H5Rof2Wg8t+DjEiZA=; b=jB/Pm1a+to2AC811x7gaaJDGFsgB2EjHox9n1N18Iy0skSLc4PE3UB9i JiHz/wDzX3tmk9JUyHjvZVqqXy5iDYiwS+D/JwPLk2DFS3z7HR5MnDWoa +PZCYpVxtyZxrKB7O2oBUwDKLSSRDM9ezDOyHt3eDs3ni6N365UUJY3Wo mDU9IrJf6ePTJllWn5i4JY7Tyx+ZxfMUpLFTcoEv94jKvjEcFwjx0ausI E7v3bTtdrT0TIEyWs5nFxZzgiJEsMV3nTa6DheO5uwuDoP8SaIKwWAjMD bTPKcDdfVIFoiflXespOxHrd6d5RWq6fGSlqJJfkGmrSTzuva7LFsCEtx A==; X-IronPort-AV: E=McAfee;i="6500,9779,10477"; a="364153204" X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="364153204" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2022 19:20:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="794910032" Received: from allen-box.sh.intel.com (HELO [10.239.159.48]) ([10.239.159.48]) by orsmga005.jf.intel.com with ESMTP; 21 Sep 2022 19:20:15 -0700 Message-ID: <01645bfa-a897-05cd-9934-a057e1d79fff@linux.intel.com> Date: Thu, 22 Sep 2022 10:14:19 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Cc: baolu.lu@linux.intel.com, jgg@nvidia.com, kevin.tian@intel.com, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v4 4/6] iommu: Regulate EINVAL in ->attach_dev callback functions Content-Language: en-US To: Nicolin Chen , joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, dwmw2@infradead.org, yong.wu@mediatek.com, matthias.bgg@gmail.com References: <6c48822600154314778157ab7f72a7b55f5e2c65.1663744983.git.nicolinc@nvidia.com> From: Baolu Lu In-Reply-To: <6c48822600154314778157ab7f72a7b55f5e2c65.1663744983.git.nicolinc@nvidia.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/21/22 4:23 PM, Nicolin Chen wrote: > Following the new rules in include/linux/iommu.h kdocs, EINVAL now can be > used to indicate that domain and device are incompatible by a caller that > treats it as a soft failure and tries attaching to another domain. > > On the other hand, there are ->attach_dev callback functions returning it > for obvious device-specific errors. They will result in some inefficiency > in the caller handling routine. > > Update these places to corresponding errnos following the new rules. > > Signed-off-by: Nicolin Chen > --- > drivers/iommu/fsl_pamu.c | 2 +- > drivers/iommu/fsl_pamu_domain.c | 4 ++-- > drivers/iommu/intel/pasid.c | 6 ++++-- > drivers/iommu/mtk_iommu.c | 2 +- > drivers/iommu/omap-iommu.c | 4 ++-- > drivers/iommu/virtio-iommu.c | 2 +- > 6 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c > index 0d03f837a5d4..2eb3211c8167 100644 > --- a/drivers/iommu/fsl_pamu.c > +++ b/drivers/iommu/fsl_pamu.c > @@ -211,7 +211,7 @@ int pamu_config_ppaace(int liodn, u32 omi, u32 stashid, int prot) > ppaace->op_encode.index_ot.omi = omi; > } else if (~omi != 0) { > pr_debug("bad operation mapping index: %d\n", omi); > - return -EINVAL; > + return -ENODEV; > } > > /* configure stash id */ > diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c > index 011f9ab7f743..b4a1c0f79c3e 100644 > --- a/drivers/iommu/fsl_pamu_domain.c > +++ b/drivers/iommu/fsl_pamu_domain.c > @@ -258,7 +258,7 @@ static int fsl_pamu_attach_device(struct iommu_domain *domain, > liodn = of_get_property(dev->of_node, "fsl,liodn", &len); > if (!liodn) { > pr_debug("missing fsl,liodn property at %pOF\n", dev->of_node); > - return -EINVAL; > + return -ENODEV; > } > > spin_lock_irqsave(&dma_domain->domain_lock, flags); > @@ -267,7 +267,7 @@ static int fsl_pamu_attach_device(struct iommu_domain *domain, > if (liodn[i] >= PAACE_NUMBER_ENTRIES) { > pr_debug("Invalid liodn %d, attach device failed for %pOF\n", > liodn[i], dev->of_node); > - ret = -EINVAL; > + ret = -ENODEV; > break; > } > > diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c > index c5e7e8b020a5..aff1a9caa496 100644 > --- a/drivers/iommu/intel/pasid.c > +++ b/drivers/iommu/intel/pasid.c > @@ -101,8 +101,10 @@ int intel_pasid_alloc_table(struct device *dev) > > might_sleep(); > info = dev_iommu_priv_get(dev); > - if (WARN_ON(!info || !dev_is_pci(dev) || info->pasid_table)) > - return -EINVAL; > + if (WARN_ON(!info || !dev_is_pci(dev))) > + return -ENODEV; > + if (WARN_ON(info->pasid_table)) > + return -EEXIST; > > pasid_table = kzalloc(sizeof(*pasid_table), GFP_KERNEL); > if (!pasid_table) > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 7e363b1f24df..be1a7d1cc630 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -607,7 +607,7 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, > dom->iop = alloc_io_pgtable_ops(ARM_V7S, &dom->cfg, data); > if (!dom->iop) { > dev_err(data->dev, "Failed to alloc io pgtable\n"); > - return -EINVAL; > + return -ENOMEM; > } > > /* Update our support page sizes bitmap */ > diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c > index d9cf2820c02e..447e40d55918 100644 > --- a/drivers/iommu/omap-iommu.c > +++ b/drivers/iommu/omap-iommu.c > @@ -1414,7 +1414,7 @@ static int omap_iommu_attach_init(struct device *dev, > > odomain->num_iommus = omap_iommu_count(dev); > if (!odomain->num_iommus) > - return -EINVAL; > + return -ENODEV; > > odomain->iommus = kcalloc(odomain->num_iommus, sizeof(*iommu), > GFP_ATOMIC); > @@ -1464,7 +1464,7 @@ omap_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) > > if (!arch_data || !arch_data->iommu_dev) { > dev_err(dev, "device doesn't have an associated iommu\n"); > - return -EINVAL; > + return -ENODEV; > } > > spin_lock(&omap_domain->lock); > diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c > index 80151176ba12..4c652773fd6c 100644 > --- a/drivers/iommu/virtio-iommu.c > +++ b/drivers/iommu/virtio-iommu.c > @@ -669,7 +669,7 @@ static int viommu_domain_finalise(struct viommu_endpoint *vdev, > dev_err(vdev->dev, > "granule 0x%lx larger than system page size 0x%lx\n", > viommu_page_size, PAGE_SIZE); > - return -EINVAL; > + return -ENODEV; > } > > ret = ida_alloc_range(&viommu->domain_ids, viommu->first_domain, For iommu/vt-d changes: Reviewed-by: Lu Baolu Best regards, baolu