Skip to contentSkip to conversation

iommu/dma: Use NUMA aware memory allocations in __iommu_dma_alloc_pages()

PATCH Superseded John Garry 2 participants 4 messages Nov 8, 2018 – Nov 20, 2018

Subsystems (2)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

John Garry

author
#0 lore raw

PATCH 1/1 iommu/dma: Use NUMA aware memory allocations in __iommu_dma_alloc_pages()

Change function __iommu_dma_alloc_pages() to allocate memory/pages for DMA from respective device NUMA node.

Originally-from: Ganapatrao Kulkarni <[email protected]>

---

This patch was originally posted by Ganapatrao in [1] *.

However, after initial review, it was never reposted (due to lack of cycles, I think). In addition, the functionality in its sibling patches were merged through patches, as mentioned in [2]; this also refers to a discussion on device local allocations vs CPU local allocations for DMA pool, and which is better [3].

However, as mentioned in [3], dma_alloc_coherent() uses the locality information from the device - as in direct DMA - so this patch is just applying this same policy.

[1] https://lore.kernel.org/patchwork/patch/833004/
[2] https://lkml.org/lkml/2018/8/22/391
[3] https://www.mail-archive.com/[email protected]/msg1692998.html

* Authorship on this updated patch may need to be fixed - I add not want to add Ganapatrao's SOB without permission.

drivers/iommu/dma-iommu.c +10 -10
index d1b0475..ada00bc 100644
@@ -449,20 +449,17 @@ static void __iommu_dma_free_pages(struct page **pages, int count)
 	kvfree(pages);
 }
 
-static struct page **__iommu_dma_alloc_pages(unsigned int count,
-		unsigned long order_mask, gfp_t gfp)
+static struct page **__iommu_dma_alloc_pages(struct device *dev,
+		unsigned int count, unsigned long order_mask, gfp_t gfp)
 {
 	struct page **pages;
-	unsigned int i = 0, array_size = count * sizeof(*pages);
+	unsigned int i = 0, nid = dev_to_node(dev);
 
 	order_mask &= (2U << MAX_ORDER) - 1;
 	if (!order_mask)
 		return NULL;
 
-	if (array_size <= PAGE_SIZE)
-		pages = kzalloc(array_size, GFP_KERNEL);
-	else
-		pages = vzalloc(array_size);
+	pages = kvzalloc_node(count * sizeof(*pages), GFP_KERNEL, nid);
 	if (!pages)
 		return NULL;
 
@@ -483,8 +480,10 @@ static struct page **__iommu_dma_alloc_pages(unsigned int count,
 			unsigned int order = __fls(order_mask);
 
 			order_size = 1U << order;
-			page = alloc_pages((order_mask - order_size) ?
-					   gfp | __GFP_NORETRY : gfp, order);
+			page = alloc_pages_node(nid,
+						(order_mask - order_size) ?
+						gfp | __GFP_NORETRY : gfp,
+						order);
 			if (!page)
 				continue;
 			if (!order)
@@ -569,7 +568,8 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
 		alloc_sizes = min_size;
 
 	count = PAGE_ALIGN(size) >> PAGE_SHIFT;
-	pages = __iommu_dma_alloc_pages(count, alloc_sizes >> PAGE_SHIFT, gfp);
+	pages = __iommu_dma_alloc_pages(dev, count, alloc_sizes >> PAGE_SHIFT,
+					gfp);
 	if (!pages)
 		return NULL;
 
Signature · 1 line
1.9.1
author
#1 lore raw
Quoted 3 lines · John Garry

Change function __iommu_dma_alloc_pages() to allocate memory/pages for DMA from respective device NUMA node.

Ping.... a friendly reminder on this patch.

Thanks

Quoted 76 lines

Originally-from: Ganapatrao Kulkarni <[email protected]>

---

This patch was originally posted by Ganapatrao in [1] *.

However, after initial review, it was never reposted (due to lack of cycles, I think). In addition, the functionality in its sibling patches were merged through patches, as mentioned in [2]; this also refers to a discussion on device local allocations vs CPU local allocations for DMA pool, and which is better [3].

However, as mentioned in [3], dma_alloc_coherent() uses the locality information from the device - as in direct DMA - so this patch is just applying this same policy.

[1] https://lore.kernel.org/patchwork/patch/833004/
[2] https://lkml.org/lkml/2018/8/22/391
[3] https://www.mail-archive.com/[email protected]/msg1692998.html

* Authorship on this updated patch may need to be fixed - I add not want to add Ganapatrao's SOB without permission.

drivers/iommu/dma-iommu.c +10 -10
index d1b0475..ada00bc 100644
@@ -449,20 +449,17 @@ static void __iommu_dma_free_pages(struct page **pages, int count)
 	kvfree(pages);
 }
 
-static struct page **__iommu_dma_alloc_pages(unsigned int count,
-		unsigned long order_mask, gfp_t gfp)
+static struct page **__iommu_dma_alloc_pages(struct device *dev,
+		unsigned int count, unsigned long order_mask, gfp_t gfp)
 {
 	struct page **pages;
-	unsigned int i = 0, array_size = count * sizeof(*pages);
+	unsigned int i = 0, nid = dev_to_node(dev);
 
 	order_mask &= (2U << MAX_ORDER) - 1;
 	if (!order_mask)
 		return NULL;
 
-	if (array_size <= PAGE_SIZE)
-		pages = kzalloc(array_size, GFP_KERNEL);
-	else
-		pages = vzalloc(array_size);
+	pages = kvzalloc_node(count * sizeof(*pages), GFP_KERNEL, nid);
 	if (!pages)
 		return NULL;
 
@@ -483,8 +480,10 @@ static struct page **__iommu_dma_alloc_pages(unsigned int count,
 			unsigned int order = __fls(order_mask);
 
 			order_size = 1U << order;
-			page = alloc_pages((order_mask - order_size) ?
-					   gfp | __GFP_NORETRY : gfp, order);
+			page = alloc_pages_node(nid,
+						(order_mask - order_size) ?
+						gfp | __GFP_NORETRY : gfp,
+						order);
 			if (!page)
 				continue;
 			if (!order)
@@ -569,7 +568,8 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
 		alloc_sizes = min_size;
 
 	count = PAGE_ALIGN(size) >> PAGE_SHIFT;
-	pages = __iommu_dma_alloc_pages(count, alloc_sizes >> PAGE_SHIFT, gfp);
+	pages = __iommu_dma_alloc_pages(dev, count, alloc_sizes >> PAGE_SHIFT,
+					gfp);
 	if (!pages)
 		return NULL;
 
#2 lore raw

Hi John,

Quoted 32 lines · John Garry
Quoted 3 lines · John Garry

Change function __iommu_dma_alloc_pages() to allocate memory/pages for DMA from respective device NUMA node.

Ping.... a friendly reminder on this patch.

Thanks

Quoted 22 lines

Originally-from: Ganapatrao Kulkarni <[email protected]>

---

This patch was originally posted by Ganapatrao in [1] *.

However, after initial review, it was never reposted (due to lack of cycles, I think). In addition, the functionality in its sibling patches were merged through patches, as mentioned in [2]; this also refers to a discussion on device local allocations vs CPU local allocations for DMA pool, and which is better [3].

However, as mentioned in [3], dma_alloc_coherent() uses the locality information from the device - as in direct DMA - so this patch is just applying this same policy.

[1] https://lore.kernel.org/patchwork/patch/833004/
[2] https://lkml.org/lkml/2018/8/22/391
[3] https://www.mail-archive.com/[email protected]/msg1692998.html

* Authorship on this updated patch may need to be fixed - I add not want to add Ganapatrao's SOB without permission.

thanks for taking this up. please feel free to add my SoB.

Quoted 46 lines
Quoted 46 lines
drivers/iommu/dma-iommu.c +8 -9
index d1b0475..ada00bc 100644
@@ -449,20 +449,17 @@ static void __iommu_dma_free_pages(struct page **pages, int count)
      kvfree(pages);
 }
 
-static struct page **__iommu_dma_alloc_pages(unsigned int count,
-             unsigned long order_mask, gfp_t gfp)
+static struct page **__iommu_dma_alloc_pages(struct device *dev,
+             unsigned int count, unsigned long order_mask, gfp_t gfp)
 {
      struct page **pages;
-     unsigned int i = 0, array_size = count * sizeof(*pages);
+     unsigned int i = 0, nid = dev_to_node(dev);
 
      order_mask &= (2U << MAX_ORDER) - 1;
      if (!order_mask)
              return NULL;
 
-     if (array_size <= PAGE_SIZE)
-             pages = kzalloc(array_size, GFP_KERNEL);
-     else
-             pages = vzalloc(array_size);
+     pages = kvzalloc_node(count * sizeof(*pages), GFP_KERNEL, nid);
      if (!pages)
              return NULL;
 
@@ -483,8 +480,10 @@ static struct page **__iommu_dma_alloc_pages(unsigned int count,
                      unsigned int order = __fls(order_mask);
 
                      order_size = 1U << order;
-                     page = alloc_pages((order_mask - order_size) ?
-                                        gfp | __GFP_NORETRY : gfp, order);
+                     page = alloc_pages_node(nid,
+                                             (order_mask - order_size) ?
+                                             gfp | __GFP_NORETRY : gfp,
+                                             order);
                      if (!page)
                              continue;
                      if (!order)
@@ -569,7 +568,8 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
              alloc_sizes = min_size;
 
Quoted 10 lines

drivers/iommu/dma-iommu.c struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp, · line 575

Quoted 8 lines
drivers/iommu/dma-iommu.c +2 -1
      count = PAGE_ALIGN(size) >> PAGE_SHIFT;
-     pages = __iommu_dma_alloc_pages(count, alloc_sizes >> PAGE_SHIFT, gfp);
+     pages = __iommu_dma_alloc_pages(dev, count, alloc_sizes >> PAGE_SHIFT,
+                                     gfp);
      if (!pages)
              return NULL;
 

thanks
Ganapat

author
#3 lore raw
Quoted 29 lines · Ganapatrao Kulkarni

Hi John,

Quoted 26 lines · John Garry
Quoted 3 lines · John Garry

Change function __iommu_dma_alloc_pages() to allocate memory/pages for DMA from respective device NUMA node.

Ping.... a friendly reminder on this patch.

Thanks

Quoted 16 lines

Originally-from: Ganapatrao Kulkarni <ganapatrao.kulkarni-YGCgFSpz5w/[email protected]>

---

This patch was originally posted by Ganapatrao in [1] *.

However, after initial review, it was never reposted (due to lack of cycles, I think). In addition, the functionality in its sibling patches were merged through patches, as mentioned in [2]; this also refers to a discussion on device local allocations vs CPU local allocations for DMA pool, and which is better [3].

However, as mentioned in [3], dma_alloc_coherent() uses the locality information from the device - as in direct DMA - so this patch is just applying this same policy.

Quoted 8 lines
Quoted 6 lines
Quoted 6 lines

[1] https://lore.kernel.org/patchwork/patch/833004/
[2] https://lkml.org/lkml/2018/8/22/391
[3] https://www.mail-archive.com/[email protected]/msg1692998.html

* Authorship on this updated patch may need to be fixed - I add not want to add Ganapatrao's SOB without permission.

thanks for taking this up. please feel free to add my SoB.

OK, I will also make you the author and repost.

Thanks,
John

Quoted 62 lines
Quoted 46 lines
Quoted 46 lines
drivers/iommu/dma-iommu.c +8 -9
index d1b0475..ada00bc 100644
@@ -449,20 +449,17 @@ static void __iommu_dma_free_pages(struct page **pages, int count)
      kvfree(pages);
 }
 
-static struct page **__iommu_dma_alloc_pages(unsigned int count,
-             unsigned long order_mask, gfp_t gfp)
+static struct page **__iommu_dma_alloc_pages(struct device *dev,
+             unsigned int count, unsigned long order_mask, gfp_t gfp)
 {
      struct page **pages;
-     unsigned int i = 0, array_size = count * sizeof(*pages);
+     unsigned int i = 0, nid = dev_to_node(dev);
 
      order_mask &= (2U << MAX_ORDER) - 1;
      if (!order_mask)
              return NULL;
 
-     if (array_size <= PAGE_SIZE)
-             pages = kzalloc(array_size, GFP_KERNEL);
-     else
-             pages = vzalloc(array_size);
+     pages = kvzalloc_node(count * sizeof(*pages), GFP_KERNEL, nid);
      if (!pages)
              return NULL;
 
@@ -483,8 +480,10 @@ static struct page **__iommu_dma_alloc_pages(unsigned int count,
                      unsigned int order = __fls(order_mask);
 
                      order_size = 1U << order;
-                     page = alloc_pages((order_mask - order_size) ?
-                                        gfp | __GFP_NORETRY : gfp, order);
+                     page = alloc_pages_node(nid,
+                                             (order_mask - order_size) ?
+                                             gfp | __GFP_NORETRY : gfp,
+                                             order);
                      if (!page)
                              continue;
                      if (!order)
@@ -569,7 +568,8 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
              alloc_sizes = min_size;
 
Quoted 10 lines

drivers/iommu/dma-iommu.c struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp, · line 575

Quoted 8 lines
drivers/iommu/dma-iommu.c +2 -1
      count = PAGE_ALIGN(size) >> PAGE_SHIFT;
-     pages = __iommu_dma_alloc_pages(count, alloc_sizes >> PAGE_SHIFT, gfp);
+     pages = __iommu_dma_alloc_pages(dev, count, alloc_sizes >> PAGE_SHIFT,
+                                     gfp);
      if (!pages)
              return NULL;
 

thanks
Ganapat

.