iommu/ioasid: Rename INVALID_IOASID

INVALID_IOASID and IOMMU_PASID_INVALID are duplicated. Rename
INVALID_IOASID and consolidate since we are moving away from IOASID
infrastructure.

Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Link: https://lore.kernel.org/r/20230322200803.869130-7-jacob.jun.pan@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/Documentation/x86/sva.rst b/Documentation/x86/sva.rst
index 2e9b8b0f9a0f491c6773db0604f389e6741397c9..33cb05005982028409061ddfcb3c8290e754d410 100644 (file)
--- a/Documentation/x86/sva.rst
+++ b/Documentation/x86/sva.rst
@@ -107,7 +107,7 @@ process share the same page tables, thus the same MSR value.
 PASID Life Cycle Management
 ===========================
 
-PASID is initialized as INVALID_IOASID (-1) when a process is created.
+PASID is initialized as IOMMU_PASID_INVALID (-1) when a process is created.
 
 Only processes that access SVA-capable devices need to have a PASID
 allocated. This allocation happens when a process opens/binds an SVA-capable

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index d317dc3d06a3a3f018f83e0fedfe0c898017e0d5..492a60febb1119dcb80e29d5dd9f4b6d6914e86c 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -40,7 +40,7 @@
 #include <linux/io.h>
 #include <linux/hardirq.h>
 #include <linux/atomic.h>
-#include <linux/ioasid.h>
+#include <linux/iommu.h>
 
 #include <asm/stacktrace.h>
 #include <asm/processor.h>

diff --git a/drivers/dma/idxd/device.c b/drivers/dma/idxd/device.c
index 5f321f3b4242ea0ab1b12bcf231d1ea921f0f44f..6fca8fa8d3a8f5bc61ebb34fd2129169ebc33dad 100644 (file)
--- a/drivers/dma/idxd/device.c
+++ b/drivers/dma/idxd/device.c
@@ -1194,7 +1194,7 @@ static void idxd_device_set_perm_entry(struct idxd_device *idxd,
 {
        union msix_perm mperm;
 
-       if (ie->pasid == INVALID_IOASID)
+       if (ie->pasid == IOMMU_PASID_INVALID)
                return;
 
        mperm.bits = 0;
@@ -1224,7 +1224,7 @@ void idxd_wq_free_irq(struct idxd_wq *wq)
        idxd_device_clear_perm_entry(idxd, ie);
        ie->vector = -1;
        ie->int_handle = INVALID_INT_HANDLE;
-       ie->pasid = INVALID_IOASID;
+       ie->pasid = IOMMU_PASID_INVALID;
 }
 
 int idxd_wq_request_irq(struct idxd_wq *wq)
@@ -1240,7 +1240,7 @@ int idxd_wq_request_irq(struct idxd_wq *wq)
 
        ie = &wq->ie;
        ie->vector = pci_irq_vector(pdev, ie->id);
-       ie->pasid = device_pasid_enabled(idxd) ? idxd->pasid : INVALID_IOASID;
+       ie->pasid = device_pasid_enabled(idxd) ? idxd->pasid : IOMMU_PASID_INVALID;
        idxd_device_set_perm_entry(idxd, ie);
 
        rc = request_threaded_irq(ie->vector, NULL, idxd_wq_thread, 0, "idxd-portal", ie);
@@ -1265,7 +1265,7 @@ err_int_handle:
        free_irq(ie->vector, ie);
 err_irq:
        idxd_device_clear_perm_entry(idxd, ie);
-       ie->pasid = INVALID_IOASID;
+       ie->pasid = IOMMU_PASID_INVALID;
        return rc;
 }
 

diff --git a/drivers/dma/idxd/idxd.h b/drivers/dma/idxd/idxd.h
index 7ced8d283d98b28f071e5ce7f0f5f6c5f71d78c6..417e602a46b6fbf812767ce2a1745be35aee30bf 100644 (file)
--- a/drivers/dma/idxd/idxd.h
+++ b/drivers/dma/idxd/idxd.h
@@ -13,6 +13,7 @@
 #include <linux/ioasid.h>
 #include <linux/bitmap.h>
 #include <linux/perf_event.h>
+#include <linux/iommu.h>
 #include <uapi/linux/idxd.h>
 #include "registers.h"
 

diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
index 640d3048368e98fe67d53ce51bb5f62f417e0993..e6ee267da0ff4ee2646b63429c1322652526d050 100644 (file)
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@ -105,7 +105,7 @@ static int idxd_setup_interrupts(struct idxd_device *idxd)
                ie = idxd_get_ie(idxd, msix_idx);
                ie->id = msix_idx;
                ie->int_handle = INVALID_INT_HANDLE;
-               ie->pasid = INVALID_IOASID;
+               ie->pasid = IOMMU_PASID_INVALID;
 
                spin_lock_init(&ie->list_lock);
                init_llist_head(&ie->pending_llist);

diff --git a/drivers/dma/idxd/irq.c b/drivers/dma/idxd/irq.c
index aa314ebec58783699fd8cd651fb0d5f54b37e25d..242f1f0b9f09f8b9a44fefea88b15cb9d374ec2a 100644 (file)
--- a/drivers/dma/idxd/irq.c
+++ b/drivers/dma/idxd/irq.c
@@ -80,7 +80,7 @@ static void idxd_int_handle_revoke_drain(struct idxd_irq_entry *ie)
        desc.opcode = DSA_OPCODE_DRAIN;
        desc.priv = 1;
 
-       if (ie->pasid != INVALID_IOASID)
+       if (ie->pasid != IOMMU_PASID_INVALID)
                desc.pasid = ie->pasid;
        desc.int_handle = ie->int_handle;
        portal = idxd_wq_portal_addr(wq);

diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
index 0f348439ef0eccc5669368a3fc0307efcadb0719..10bb20ff50fd5ccbeb42388642267f42a14d5267 100644 (file)
--- a/drivers/iommu/intel/dmar.c
+++ b/drivers/iommu/intel/dmar.c
@@ -1958,7 +1958,7 @@ static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
                return 0;
        }
 
-       if (pasid == INVALID_IOASID)
+       if (pasid == IOMMU_PASID_INVALID)
                pr_err("[%s NO_PASID] Request device [%02x:%02x.%d] fault addr 0x%llx [fault reason 0x%02x] %s\n",
                       type ? "DMA Read" : "DMA Write",
                       source_id >> 8, PCI_SLOT(source_id & 0xFF),
@@ -2039,7 +2039,7 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
                if (!ratelimited)
                        /* Using pasid -1 if pasid is not present */
                        dmar_fault_do_one(iommu, type, fault_reason,
-                                         pasid_present ? pasid : INVALID_IOASID,
+                                         pasid_present ? pasid : IOMMU_PASID_INVALID,
                                          source_id, guest_addr);
 
                fault_index++;

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 6c2d1ffb5b0a99ad1c7776cfb000aa7ca4d37f88..350c33605fd351278ac7d8eedf867e515707ecbd 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -876,7 +876,7 @@ void dmar_fault_dump_ptes(struct intel_iommu *iommu, u16 source_id,
                return;
        }
        /* For request-without-pasid, get the pasid from context entry */
-       if (intel_iommu_sm && pasid == INVALID_IOASID)
+       if (intel_iommu_sm && pasid == IOMMU_PASID_INVALID)
                pasid = PASID_RID2PASID;
 
        dir_index = pasid >> PASID_PDE_SHIFT;

diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
index 7367f56c3bad3429c4641d1044c0f03a1997f41d..3848a1b0800cadcdf22a84e227cbc5c8a04c7c7a 100644 (file)
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -273,7 +273,7 @@ static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid,
        if (WARN_ON(!mutex_is_locked(&pasid_mutex)))
                return -EINVAL;
 
-       if (pasid == INVALID_IOASID || pasid >= PASID_MAX)
+       if (pasid == IOMMU_PASID_INVALID || pasid >= PASID_MAX)
                return -EINVAL;
 
        svm = pasid_private_find(pasid);

diff --git a/include/linux/ioasid.h b/include/linux/ioasid.h
index 734bf0e036eed3ee1ff0ac125f0aa2a07afae650..bbc9c6fd331048657706873446ea79ebcca9e35b 100644 (file)
--- a/include/linux/ioasid.h
+++ b/include/linux/ioasid.h
@@ -7,6 +7,7 @@
 #include <linux/iommu.h>
 
 typedef unsigned int ioasid_t;
+#define INVALID_IOASID ((ioasid_t)-1)
 typedef ioasid_t (*ioasid_alloc_fn_t)(ioasid_t min, ioasid_t max, void *data);
 typedef void (*ioasid_free_fn_t)(ioasid_t ioasid, void *data);
 

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index d3f81dc6e4ddc8767bf2103290591878b34b2209..54f535ff9868af700c906b430beb2faa6dabb703 100644 (file)
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -192,7 +192,6 @@ enum iommu_dev_features {
 
 #define IOMMU_PASID_INVALID    (-1U)
 typedef unsigned int ioasid_t;
-#define INVALID_IOASID ((ioasid_t)-1)
 
 #ifdef CONFIG_IOMMU_API
 
@@ -1175,12 +1174,13 @@ static inline bool tegra_dev_iommu_get_stream_id(struct device *dev, u32 *stream
 
 static inline bool pasid_valid(ioasid_t ioasid)
 {
-       return ioasid != INVALID_IOASID;
+       return ioasid != IOMMU_PASID_INVALID;
 }
+
 #ifdef CONFIG_IOMMU_SVA
 static inline void mm_pasid_init(struct mm_struct *mm)
 {
-       mm->pasid = INVALID_IOASID;
+       mm->pasid = IOMMU_PASID_INVALID;
 }
 void mm_pasid_drop(struct mm_struct *mm);
 struct iommu_sva *iommu_sva_bind_device(struct device *dev,

diff --git a/mm/init-mm.c b/mm/init-mm.c
index c9327abb771c54be8ca69273d81cef0b5755e8c7..a084039f55d8253c1276b66824a8454e00ef38dd 100644 (file)
--- a/mm/init-mm.c
+++ b/mm/init-mm.c
@@ -10,7 +10,7 @@
 
 #include <linux/atomic.h>
 #include <linux/user_namespace.h>
-#include <linux/ioasid.h>
+#include <linux/iommu.h>
 #include <asm/mmu.h>
 
 #ifndef INIT_MM_CONTEXT
@@ -40,7 +40,7 @@ struct mm_struct init_mm = {
        .user_ns        = &init_user_ns,
        .cpu_bitmap     = CPU_BITS_NONE,
 #ifdef CONFIG_IOMMU_SVA
-       .pasid          = INVALID_IOASID,
+       .pasid          = IOMMU_PASID_INVALID,
 #endif
        INIT_MM_CONTEXT(init_mm)
 };