RE: [PATCH 4/9] iommu/vt-d: Move device_domain_info to header

[Liu, Yi L]

> From: Lu Baolu [mailto:baolu...@linux.intel.com]
> Sent: Tuesday, April 17, 2018 11:03 AM
> 
> This allows the per device iommu data to be accessed from other
> files.
> 
> Cc: Ashok Raj 
> Cc: Jacob Pan 
> Cc: Kevin Tian 
> Cc: Liu Yi L 
> Signed-off-by: Lu Baolu 

Looks good to me.
Reviewed-by: Liu, Yi L 

Regards,
Yi Liu
> ---
>  drivers/iommu/intel-iommu.c | 62 +++--
>  include/linux/intel-iommu.h | 68
> +
>  2 files changed, 72 insertions(+), 58 deletions(-)
> 
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index 98c5ae9..caa0b5c 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -381,60 +381,6 @@ static int hw_pass_through = 1;
>   for (idx = 0; idx < g_num_of_iommus; idx++) \
>   if (domain->iommu_refcnt[idx])
> 
> -struct dmar_domain {
> - int nid;/* node id */
> -
> - unsignediommu_refcnt[DMAR_UNITS_SUPPORTED];
> - /* Refcount of devices per iommu */
> -
> -
> - u16 iommu_did[DMAR_UNITS_SUPPORTED];
> - /* Domain ids per IOMMU. Use u16 since
> -  * domain ids are 16 bit wide according
> -  * to VT-d spec, section 9.3 */
> -
> - bool has_iotlb_device;
> - struct list_head devices;   /* all devices' list */
> - struct iova_domain iovad;   /* iova's that belong to this domain */
> -
> - struct dma_pte  *pgd;   /* virtual address */
> - int gaw;/* max guest address width */
> -
> - /* adjusted guest address width, 0 is level 2 30-bit */
> - int agaw;
> -
> - int flags;  /* flags to find out type of domain */
> -
> - int iommu_coherency;/* indicate coherency of iommu access
> */
> - int iommu_snooping; /* indicate snooping control feature*/
> - int iommu_count;/* reference count of iommu */
> - int iommu_superpage;/* Level of superpages supported:
> -0 == 4KiB (no superpages), 1 == 2MiB,
> -2 == 1GiB, 3 == 512GiB, 4 == 1TiB */
> - u64 max_addr;   /* maximum mapped address */
> -
> - struct iommu_domain domain; /* generic domain data structure for
> -iommu core */
> -};
> -
> -/* PCI domain-device relationship */
> -struct device_domain_info {
> - struct list_head link;  /* link to domain siblings */
> - struct list_head global; /* link to global list */
> - u8 bus; /* PCI bus number */
> - u8 devfn;   /* PCI devfn number */
> - u8 pasid_supported:3;
> - u8 pasid_enabled:1;
> - u8 pri_supported:1;
> - u8 pri_enabled:1;
> - u8 ats_supported:1;
> - u8 ats_enabled:1;
> - u8 ats_qdep;
> - struct device *dev; /* it's NULL for PCIe-to-PCI bridge */
> - struct intel_iommu *iommu; /* IOMMU used by this device */
> - struct dmar_domain *domain; /* pointer to domain */
> -};
> -
>  struct dmar_rmrr_unit {
>   struct list_head list;  /* list of rmrr units   */
>   struct acpi_dmar_header *hdr;   /* ACPI header  */
> @@ -631,7 +577,7 @@ static void set_iommu_domain(struct intel_iommu *iommu,
> u16 did,
>   domains[did & 0xff] = domain;
>  }
> 
> -static inline void *alloc_pgtable_page(int node)
> +void *alloc_pgtable_page(int node)
>  {
>   struct page *page;
>   void *vaddr = NULL;
> @@ -642,7 +588,7 @@ static inline void *alloc_pgtable_page(int node)
>   return vaddr;
>  }
> 
> -static inline void free_pgtable_page(void *vaddr)
> +void free_pgtable_page(void *vaddr)
>  {
>   free_page((unsigned long)vaddr);
>  }
> @@ -725,7 +671,7 @@ int iommu_calculate_agaw(struct intel_iommu *iommu)
>  }
> 
>  /* This functionin only returns single iommu in a domain */
> -static struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
> +struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
>  {
>   int iommu_id;
> 
> @@ -3500,7 +3446,7 @@ static unsigned long intel_alloc_iova(struct device 
> *dev,
>   return iova_pfn;
>  }
> 
> -static struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
> +struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
>  {
>   struct dmar_domain *domain, *tmp;
>   struct dmar_rmrr_unit *rmrr;
> diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
> index 6b5ef6c..a4463f0 100644
> --- a/include/linux/intel-iommu.h
> +++ b/include/linux/intel-iommu.h
> @@ -31,6 +31,7 @@
>  

RE: [PATCH 4/9] iommu/vt-d: Move device_domain_info to header

[Liu, Yi L]

> From: Lu Baolu [mailto:baolu...@linux.intel.com]
> Sent: Tuesday, April 17, 2018 11:03 AM
> 
> This allows the per device iommu data to be accessed from other
> files.
> 
> Cc: Ashok Raj 
> Cc: Jacob Pan 
> Cc: Kevin Tian 
> Cc: Liu Yi L 
> Signed-off-by: Lu Baolu 

Looks good to me.
Reviewed-by: Liu, Yi L 

Regards,
Yi Liu
> ---
>  drivers/iommu/intel-iommu.c | 62 +++--
>  include/linux/intel-iommu.h | 68
> +
>  2 files changed, 72 insertions(+), 58 deletions(-)
> 
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index 98c5ae9..caa0b5c 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -381,60 +381,6 @@ static int hw_pass_through = 1;
>   for (idx = 0; idx < g_num_of_iommus; idx++) \
>   if (domain->iommu_refcnt[idx])
> 
> -struct dmar_domain {
> - int nid;/* node id */
> -
> - unsignediommu_refcnt[DMAR_UNITS_SUPPORTED];
> - /* Refcount of devices per iommu */
> -
> -
> - u16 iommu_did[DMAR_UNITS_SUPPORTED];
> - /* Domain ids per IOMMU. Use u16 since
> -  * domain ids are 16 bit wide according
> -  * to VT-d spec, section 9.3 */
> -
> - bool has_iotlb_device;
> - struct list_head devices;   /* all devices' list */
> - struct iova_domain iovad;   /* iova's that belong to this domain */
> -
> - struct dma_pte  *pgd;   /* virtual address */
> - int gaw;/* max guest address width */
> -
> - /* adjusted guest address width, 0 is level 2 30-bit */
> - int agaw;
> -
> - int flags;  /* flags to find out type of domain */
> -
> - int iommu_coherency;/* indicate coherency of iommu access
> */
> - int iommu_snooping; /* indicate snooping control feature*/
> - int iommu_count;/* reference count of iommu */
> - int iommu_superpage;/* Level of superpages supported:
> -0 == 4KiB (no superpages), 1 == 2MiB,
> -2 == 1GiB, 3 == 512GiB, 4 == 1TiB */
> - u64 max_addr;   /* maximum mapped address */
> -
> - struct iommu_domain domain; /* generic domain data structure for
> -iommu core */
> -};
> -
> -/* PCI domain-device relationship */
> -struct device_domain_info {
> - struct list_head link;  /* link to domain siblings */
> - struct list_head global; /* link to global list */
> - u8 bus; /* PCI bus number */
> - u8 devfn;   /* PCI devfn number */
> - u8 pasid_supported:3;
> - u8 pasid_enabled:1;
> - u8 pri_supported:1;
> - u8 pri_enabled:1;
> - u8 ats_supported:1;
> - u8 ats_enabled:1;
> - u8 ats_qdep;
> - struct device *dev; /* it's NULL for PCIe-to-PCI bridge */
> - struct intel_iommu *iommu; /* IOMMU used by this device */
> - struct dmar_domain *domain; /* pointer to domain */
> -};
> -
>  struct dmar_rmrr_unit {
>   struct list_head list;  /* list of rmrr units   */
>   struct acpi_dmar_header *hdr;   /* ACPI header  */
> @@ -631,7 +577,7 @@ static void set_iommu_domain(struct intel_iommu *iommu,
> u16 did,
>   domains[did & 0xff] = domain;
>  }
> 
> -static inline void *alloc_pgtable_page(int node)
> +void *alloc_pgtable_page(int node)
>  {
>   struct page *page;
>   void *vaddr = NULL;
> @@ -642,7 +588,7 @@ static inline void *alloc_pgtable_page(int node)
>   return vaddr;
>  }
> 
> -static inline void free_pgtable_page(void *vaddr)
> +void free_pgtable_page(void *vaddr)
>  {
>   free_page((unsigned long)vaddr);
>  }
> @@ -725,7 +671,7 @@ int iommu_calculate_agaw(struct intel_iommu *iommu)
>  }
> 
>  /* This functionin only returns single iommu in a domain */
> -static struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
> +struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
>  {
>   int iommu_id;
> 
> @@ -3500,7 +3446,7 @@ static unsigned long intel_alloc_iova(struct device 
> *dev,
>   return iova_pfn;
>  }
> 
> -static struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
> +struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
>  {
>   struct dmar_domain *domain, *tmp;
>   struct dmar_rmrr_unit *rmrr;
> diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
> index 6b5ef6c..a4463f0 100644
> --- a/include/linux/intel-iommu.h
> +++ b/include/linux/intel-iommu.h
> @@ -31,6 +31,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
> 
>  #include 
>  #include 
> @@ -385,6 +386,50 @@ struct pasid_entry;
>  struct 

[PATCH 4/9] iommu/vt-d: Move device_domain_info to header

[Lu Baolu]

This allows the per device iommu data to be accessed from other
files.

Cc: Ashok Raj 
Cc: Jacob Pan 
Cc: Kevin Tian 
Cc: Liu Yi L 
Signed-off-by: Lu Baolu 
---
 drivers/iommu/intel-iommu.c | 62 +++--
 include/linux/intel-iommu.h | 68 +
 2 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 98c5ae9..caa0b5c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -381,60 +381,6 @@ static int hw_pass_through = 1;
for (idx = 0; idx < g_num_of_iommus; idx++) \
if (domain->iommu_refcnt[idx])
 
-struct dmar_domain {
-   int nid;/* node id */
-
-   unsignediommu_refcnt[DMAR_UNITS_SUPPORTED];
-   /* Refcount of devices per iommu */
-
-
-   u16 iommu_did[DMAR_UNITS_SUPPORTED];
-   /* Domain ids per IOMMU. Use u16 since
-* domain ids are 16 bit wide according
-* to VT-d spec, section 9.3 */
-
-   bool has_iotlb_device;
-   struct list_head devices;   /* all devices' list */
-   struct iova_domain iovad;   /* iova's that belong to this domain */
-
-   struct dma_pte  *pgd;   /* virtual address */
-   int gaw;/* max guest address width */
-
-   /* adjusted guest address width, 0 is level 2 30-bit */
-   int agaw;
-
-   int flags;  /* flags to find out type of domain */
-
-   int iommu_coherency;/* indicate coherency of iommu access */
-   int iommu_snooping; /* indicate snooping control feature*/
-   int iommu_count;/* reference count of iommu */
-   int iommu_superpage;/* Level of superpages supported:
-  0 == 4KiB (no superpages), 1 == 2MiB,
-  2 == 1GiB, 3 == 512GiB, 4 == 1TiB */
-   u64 max_addr;   /* maximum mapped address */
-
-   struct iommu_domain domain; /* generic domain data structure for
-  iommu core */
-};
-
-/* PCI domain-device relationship */
-struct device_domain_info {
-   struct list_head link;  /* link to domain siblings */
-   struct list_head global; /* link to global list */
-   u8 bus; /* PCI bus number */
-   u8 devfn;   /* PCI devfn number */
-   u8 pasid_supported:3;
-   u8 pasid_enabled:1;
-   u8 pri_supported:1;
-   u8 pri_enabled:1;
-   u8 ats_supported:1;
-   u8 ats_enabled:1;
-   u8 ats_qdep;
-   struct device *dev; /* it's NULL for PCIe-to-PCI bridge */
-   struct intel_iommu *iommu; /* IOMMU used by this device */
-   struct dmar_domain *domain; /* pointer to domain */
-};
-
 struct dmar_rmrr_unit {
struct list_head list;  /* list of rmrr units   */
struct acpi_dmar_header *hdr;   /* ACPI header  */
@@ -631,7 +577,7 @@ static void set_iommu_domain(struct intel_iommu *iommu, u16 
did,
domains[did & 0xff] = domain;
 }
 
-static inline void *alloc_pgtable_page(int node)
+void *alloc_pgtable_page(int node)
 {
struct page *page;
void *vaddr = NULL;
@@ -642,7 +588,7 @@ static inline void *alloc_pgtable_page(int node)
return vaddr;
 }
 
-static inline void free_pgtable_page(void *vaddr)
+void free_pgtable_page(void *vaddr)
 {
free_page((unsigned long)vaddr);
 }
@@ -725,7 +671,7 @@ int iommu_calculate_agaw(struct intel_iommu *iommu)
 }
 
 /* This functionin only returns single iommu in a domain */
-static struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
+struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
 {
int iommu_id;
 
@@ -3500,7 +3446,7 @@ static unsigned long intel_alloc_iova(struct device *dev,
return iova_pfn;
 }
 
-static struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
+struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
 {
struct dmar_domain *domain, *tmp;
struct dmar_rmrr_unit *rmrr;
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 6b5ef6c..a4463f0 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -385,6 +386,50 @@ struct pasid_entry;
 struct pasid_state_entry;
 struct page_req_dsc;
 
+struct dmar_domain {
+   int nid;/* node id */
+
+   unsigned intiommu_refcnt[DMAR_UNITS_SUPPORTED];
+

[PATCH 4/9] iommu/vt-d: Move device_domain_info to header

[Lu Baolu]

This allows the per device iommu data to be accessed from other
files.

Cc: Ashok Raj 
Cc: Jacob Pan 
Cc: Kevin Tian 
Cc: Liu Yi L 
Signed-off-by: Lu Baolu 
---
 drivers/iommu/intel-iommu.c | 62 +++--
 include/linux/intel-iommu.h | 68 +
 2 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 98c5ae9..caa0b5c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -381,60 +381,6 @@ static int hw_pass_through = 1;
for (idx = 0; idx < g_num_of_iommus; idx++) \
if (domain->iommu_refcnt[idx])
 
-struct dmar_domain {
-   int nid;/* node id */
-
-   unsignediommu_refcnt[DMAR_UNITS_SUPPORTED];
-   /* Refcount of devices per iommu */
-
-
-   u16 iommu_did[DMAR_UNITS_SUPPORTED];
-   /* Domain ids per IOMMU. Use u16 since
-* domain ids are 16 bit wide according
-* to VT-d spec, section 9.3 */
-
-   bool has_iotlb_device;
-   struct list_head devices;   /* all devices' list */
-   struct iova_domain iovad;   /* iova's that belong to this domain */
-
-   struct dma_pte  *pgd;   /* virtual address */
-   int gaw;/* max guest address width */
-
-   /* adjusted guest address width, 0 is level 2 30-bit */
-   int agaw;
-
-   int flags;  /* flags to find out type of domain */
-
-   int iommu_coherency;/* indicate coherency of iommu access */
-   int iommu_snooping; /* indicate snooping control feature*/
-   int iommu_count;/* reference count of iommu */
-   int iommu_superpage;/* Level of superpages supported:
-  0 == 4KiB (no superpages), 1 == 2MiB,
-  2 == 1GiB, 3 == 512GiB, 4 == 1TiB */
-   u64 max_addr;   /* maximum mapped address */
-
-   struct iommu_domain domain; /* generic domain data structure for
-  iommu core */
-};
-
-/* PCI domain-device relationship */
-struct device_domain_info {
-   struct list_head link;  /* link to domain siblings */
-   struct list_head global; /* link to global list */
-   u8 bus; /* PCI bus number */
-   u8 devfn;   /* PCI devfn number */
-   u8 pasid_supported:3;
-   u8 pasid_enabled:1;
-   u8 pri_supported:1;
-   u8 pri_enabled:1;
-   u8 ats_supported:1;
-   u8 ats_enabled:1;
-   u8 ats_qdep;
-   struct device *dev; /* it's NULL for PCIe-to-PCI bridge */
-   struct intel_iommu *iommu; /* IOMMU used by this device */
-   struct dmar_domain *domain; /* pointer to domain */
-};
-
 struct dmar_rmrr_unit {
struct list_head list;  /* list of rmrr units   */
struct acpi_dmar_header *hdr;   /* ACPI header  */
@@ -631,7 +577,7 @@ static void set_iommu_domain(struct intel_iommu *iommu, u16 
did,
domains[did & 0xff] = domain;
 }
 
-static inline void *alloc_pgtable_page(int node)
+void *alloc_pgtable_page(int node)
 {
struct page *page;
void *vaddr = NULL;
@@ -642,7 +588,7 @@ static inline void *alloc_pgtable_page(int node)
return vaddr;
 }
 
-static inline void free_pgtable_page(void *vaddr)
+void free_pgtable_page(void *vaddr)
 {
free_page((unsigned long)vaddr);
 }
@@ -725,7 +671,7 @@ int iommu_calculate_agaw(struct intel_iommu *iommu)
 }
 
 /* This functionin only returns single iommu in a domain */
-static struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
+struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
 {
int iommu_id;
 
@@ -3500,7 +3446,7 @@ static unsigned long intel_alloc_iova(struct device *dev,
return iova_pfn;
 }
 
-static struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
+struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
 {
struct dmar_domain *domain, *tmp;
struct dmar_rmrr_unit *rmrr;
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 6b5ef6c..a4463f0 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -385,6 +386,50 @@ struct pasid_entry;
 struct pasid_state_entry;
 struct page_req_dsc;
 
+struct dmar_domain {
+   int nid;/* node id */
+
+   unsigned intiommu_refcnt[DMAR_UNITS_SUPPORTED];
+   /* Refcount of devices per iommu */
+
+   u16 iommu_did[DMAR_UNITS_SUPPORTED];
+