dmaengine: idxd: Check for driver name match before sva user feature

Currently if the user driver is probed on a workqueue configured for
another driver with SVA not enabled on the system, it will print
out a number of probe failing messages like the following:

    [   264.831140] user: probe of wq13.0 failed with error -95

On some systems, such as GNR, the number of messages can
reach over 100.

Move the SVA feature check to be after the driver name match
check.

Cc: Vinod Koul <vkoul@kernel.org>
Cc: dmaengine@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Fenghua Yu <fenghua.yu@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/20240405213941.3629709-1-jsnitsel@redhat.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/idxd/cdev.c b/drivers/dma/idxd/cdev.c
index 8078ab9acfbc37da0c5f633b0af9bb8529a559fe..a4b771781afcdfe9d025607cd03d18334cf6690f 100644 (file)
--- a/drivers/dma/idxd/cdev.c
+++ b/drivers/dma/idxd/cdev.c
@@ -517,6 +517,14 @@ static int idxd_user_drv_probe(struct idxd_dev *idxd_dev)
        if (idxd->state != IDXD_DEV_ENABLED)
                return -ENXIO;
 
+       mutex_lock(&wq->wq_lock);
+
+       if (!idxd_wq_driver_name_match(wq, dev)) {
+               idxd->cmd_status = IDXD_SCMD_WQ_NO_DRV_NAME;
+               rc = -ENODEV;
+               goto wq_err;
+       }
+
        /*
         * User type WQ is enabled only when SVA is enabled for two reasons:
         *   - If no IOMMU or IOMMU Passthrough without SVA, userspace
@@ -532,14 +540,7 @@ static int idxd_user_drv_probe(struct idxd_dev *idxd_dev)
                dev_dbg(&idxd->pdev->dev,
                        "User type WQ cannot be enabled without SVA.\n");
 
-               return -EOPNOTSUPP;
-       }
-
-       mutex_lock(&wq->wq_lock);
-
-       if (!idxd_wq_driver_name_match(wq, dev)) {
-               idxd->cmd_status = IDXD_SCMD_WQ_NO_DRV_NAME;
-               rc = -ENODEV;
+               rc = -EOPNOTSUPP;
                goto wq_err;
        }