Re: [PATCH 08/10] dma-direct: drop two CONFIG_DMA_RESTRICTED_POOL conditionals

[Robin Murphy]

On 2021-10-21 10:06, Christoph Hellwig wrote:

swiotlb_alloc and swiotlb_free are properly stubbed out if
CONFIG_DMA_RESTRICTED_POOL is not set, so skip the extra checks.


Reviewed-by: Robin Murphy 


Signed-off-by: Christoph Hellwig 
---
  kernel/dma/direct.c | 6 ++
  1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 680fe10410645..f4ac2e1cdf469 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -92,8 +92,7 @@ static int dma_set_encrypted(struct device *dev, void *vaddr, 
size_t size)
  static void __dma_direct_free_pages(struct device *dev, struct page *page,
size_t size)
  {
-   if (IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL) &&
-   swiotlb_free(dev, page, size))
+   if (swiotlb_free(dev, page, size))
return;
dma_free_contiguous(dev, page, size);
  }
@@ -109,8 +108,7 @@ static struct page *__dma_direct_alloc_pages(struct device 
*dev, size_t size,
  
  	gfp |= dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask,

   _limit);
-   if (IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL) &&
-   is_swiotlb_for_alloc(dev)) {
+   if (is_swiotlb_for_alloc(dev)) {
page = swiotlb_alloc(dev, size);
if (page && !dma_coherent_ok(dev, page_to_phys(page), size)) {
__dma_direct_free_pages(dev, page, size);


___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

[PATCH 08/10] dma-direct: drop two CONFIG_DMA_RESTRICTED_POOL conditionals

[Christoph Hellwig]

swiotlb_alloc and swiotlb_free are properly stubbed out if
CONFIG_DMA_RESTRICTED_POOL is not set, so skip the extra checks.

Signed-off-by: Christoph Hellwig 
---
 kernel/dma/direct.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 680fe10410645..f4ac2e1cdf469 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -92,8 +92,7 @@ static int dma_set_encrypted(struct device *dev, void *vaddr, 
size_t size)
 static void __dma_direct_free_pages(struct device *dev, struct page *page,
size_t size)
 {
-   if (IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL) &&
-   swiotlb_free(dev, page, size))
+   if (swiotlb_free(dev, page, size))
return;
dma_free_contiguous(dev, page, size);
 }
@@ -109,8 +108,7 @@ static struct page *__dma_direct_alloc_pages(struct device 
*dev, size_t size,
 
gfp |= dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask,
   _limit);
-   if (IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL) &&
-   is_swiotlb_for_alloc(dev)) {
+   if (is_swiotlb_for_alloc(dev)) {
page = swiotlb_alloc(dev, size);
if (page && !dma_coherent_ok(dev, page_to_phys(page), size)) {
__dma_direct_free_pages(dev, page, size);
-- 
2.30.2

___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu