lkml.org 
[lkml]   [2022]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 3/5] iommu: Regulate EINVAL in ->attach_dev callback functions
    Date
    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.

    Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
    Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
    Reviewed-by: Kevin Tian <kevin.tian@intel.com>
    Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
    ---
    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 fa20f4b03e12..4408ac3c49b6 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 c30ddac40ee5..95d73f19ab61 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 5a4e00e4bbbc..f3dc2aba188e 100644
    --- a/drivers/iommu/mtk_iommu.c
    +++ b/drivers/iommu/mtk_iommu.c
    @@ -609,7 +609,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 07ee2600113c..3f153f9e0ac5 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 b7c22802f57c..f0caf9a4f6f8 100644
    --- a/drivers/iommu/virtio-iommu.c
    +++ b/drivers/iommu/virtio-iommu.c
    @@ -668,7 +668,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,
    --
    2.17.1
    \
     
     \ /
      Last update: 2022-10-18 01:12    [W:2.968 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site