iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
* drop a few unused DMA exports
@ 2020-09-08 16:39 Christoph Hellwig
  2020-09-08 16:39 ` [PATCH 1/2] dma-mapping: remove the dma_dummy_ops export Christoph Hellwig
  2020-09-08 16:39 ` [PATCH 2/2] dma-debug: remove all exports Christoph Hellwig
  0 siblings, 2 replies; 6+ messages in thread
From: Christoph Hellwig @ 2020-09-08 16:39 UTC (permalink / raw)
  To: iommu; +Cc: Robin Murphy

Hi all,

this series removes a bunch of (now) unused exports in the DMA mapping
subsystem.
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/2] dma-mapping: remove the dma_dummy_ops export
  2020-09-08 16:39 drop a few unused DMA exports Christoph Hellwig
@ 2020-09-08 16:39 ` Christoph Hellwig
  2020-09-10 11:22   ` Robin Murphy
  2020-09-08 16:39 ` [PATCH 2/2] dma-debug: remove all exports Christoph Hellwig
  1 sibling, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2020-09-08 16:39 UTC (permalink / raw)
  To: iommu; +Cc: Robin Murphy

dma_dummy_ops is only used by the ACPI code, which can't be modular.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 kernel/dma/dummy.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/dma/dummy.c b/kernel/dma/dummy.c
index 05607642c888d9..6974b1bd7d0b88 100644
--- a/kernel/dma/dummy.c
+++ b/kernel/dma/dummy.c
@@ -36,4 +36,3 @@ const struct dma_map_ops dma_dummy_ops = {
 	.map_sg                 = dma_dummy_map_sg,
 	.dma_supported          = dma_dummy_supported,
 };
-EXPORT_SYMBOL(dma_dummy_ops);
-- 
2.28.0

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/2] dma-debug: remove all exports
  2020-09-08 16:39 drop a few unused DMA exports Christoph Hellwig
  2020-09-08 16:39 ` [PATCH 1/2] dma-mapping: remove the dma_dummy_ops export Christoph Hellwig
@ 2020-09-08 16:39 ` Christoph Hellwig
  2020-09-10 11:45   ` Robin Murphy
  1 sibling, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2020-09-08 16:39 UTC (permalink / raw)
  To: iommu; +Cc: Robin Murphy

Now that the main dma mapping entry points are out of line none
of these functions can be called from modular code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 kernel/dma/debug.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index 8e9f7b301c6d39..9e5370e3700c08 100644
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -1199,7 +1199,6 @@ void debug_dma_map_single(struct device *dev, const void *addr,
 		err_printk(dev, NULL, "device driver maps memory from vmalloc area [addr=%p] [len=%lu]\n",
 			   addr, len);
 }
-EXPORT_SYMBOL(debug_dma_map_single);
 
 void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
 			size_t size, int direction, dma_addr_t dma_addr)
@@ -1235,7 +1234,6 @@ void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
 
 	add_dma_entry(entry);
 }
-EXPORT_SYMBOL(debug_dma_map_page);
 
 void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
@@ -1273,7 +1271,6 @@ void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 
 	put_hash_bucket(bucket, flags);
 }
-EXPORT_SYMBOL(debug_dma_mapping_error);
 
 void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
 			  size_t size, int direction)
@@ -1290,7 +1287,6 @@ void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
 		return;
 	check_unmap(&ref);
 }
-EXPORT_SYMBOL(debug_dma_unmap_page);
 
 void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
 		      int nents, int mapped_ents, int direction)
@@ -1328,7 +1324,6 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
 		add_dma_entry(entry);
 	}
 }
-EXPORT_SYMBOL(debug_dma_map_sg);
 
 static int get_nr_mapped_entries(struct device *dev,
 				 struct dma_debug_entry *ref)
@@ -1380,7 +1375,6 @@ void debug_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,
 		check_unmap(&ref);
 	}
 }
-EXPORT_SYMBOL(debug_dma_unmap_sg);
 
 void debug_dma_alloc_coherent(struct device *dev, size_t size,
 			      dma_addr_t dma_addr, void *virt)
@@ -1466,7 +1460,6 @@ void debug_dma_map_resource(struct device *dev, phys_addr_t addr, size_t size,
 
 	add_dma_entry(entry);
 }
-EXPORT_SYMBOL(debug_dma_map_resource);
 
 void debug_dma_unmap_resource(struct device *dev, dma_addr_t dma_addr,
 			      size_t size, int direction)
@@ -1484,7 +1477,6 @@ void debug_dma_unmap_resource(struct device *dev, dma_addr_t dma_addr,
 
 	check_unmap(&ref);
 }
-EXPORT_SYMBOL(debug_dma_unmap_resource);
 
 void debug_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
 				   size_t size, int direction)
@@ -1503,7 +1495,6 @@ void debug_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
 
 	check_sync(dev, &ref, true);
 }
-EXPORT_SYMBOL(debug_dma_sync_single_for_cpu);
 
 void debug_dma_sync_single_for_device(struct device *dev,
 				      dma_addr_t dma_handle, size_t size,
@@ -1523,7 +1514,6 @@ void debug_dma_sync_single_for_device(struct device *dev,
 
 	check_sync(dev, &ref, false);
 }
-EXPORT_SYMBOL(debug_dma_sync_single_for_device);
 
 void debug_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
 			       int nelems, int direction)
@@ -1556,7 +1546,6 @@ void debug_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
 		check_sync(dev, &ref, true);
 	}
 }
-EXPORT_SYMBOL(debug_dma_sync_sg_for_cpu);
 
 void debug_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
 				  int nelems, int direction)
@@ -1588,7 +1577,6 @@ void debug_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
 		check_sync(dev, &ref, false);
 	}
 }
-EXPORT_SYMBOL(debug_dma_sync_sg_for_device);
 
 static int __init dma_debug_driver_setup(char *str)
 {
-- 
2.28.0

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] dma-mapping: remove the dma_dummy_ops export
  2020-09-08 16:39 ` [PATCH 1/2] dma-mapping: remove the dma_dummy_ops export Christoph Hellwig
@ 2020-09-10 11:22   ` Robin Murphy
  0 siblings, 0 replies; 6+ messages in thread
From: Robin Murphy @ 2020-09-10 11:22 UTC (permalink / raw)
  To: Christoph Hellwig, iommu

On 2020-09-08 17:39, Christoph Hellwig wrote:
> dma_dummy_ops is only used by the ACPI code, which can't be modular.

Reviewed-by: Robin Murphy <robin.murphy@arm.com>

> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>   kernel/dma/dummy.c | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/kernel/dma/dummy.c b/kernel/dma/dummy.c
> index 05607642c888d9..6974b1bd7d0b88 100644
> --- a/kernel/dma/dummy.c
> +++ b/kernel/dma/dummy.c
> @@ -36,4 +36,3 @@ const struct dma_map_ops dma_dummy_ops = {
>   	.map_sg                 = dma_dummy_map_sg,
>   	.dma_supported          = dma_dummy_supported,
>   };
> -EXPORT_SYMBOL(dma_dummy_ops);
> 
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] dma-debug: remove all exports
  2020-09-08 16:39 ` [PATCH 2/2] dma-debug: remove all exports Christoph Hellwig
@ 2020-09-10 11:45   ` Robin Murphy
  2020-09-10 11:51     ` Christoph Hellwig
  0 siblings, 1 reply; 6+ messages in thread
From: Robin Murphy @ 2020-09-10 11:45 UTC (permalink / raw)
  To: Christoph Hellwig, iommu

On 2020-09-08 17:39, Christoph Hellwig wrote:
> Now that the main dma mapping entry points are out of line none
> of these functions can be called from modular code.

FWIW I did briefly look at how much of dma-debug we could drop from 
dma-mapping.h and make entirely private to kernel/dma/, but couldn't 
convince myself that an awkward split with a few calls still needing to 
be public would be worthwhile.

> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>   kernel/dma/debug.c | 12 ------------
>   1 file changed, 12 deletions(-)
> 
> diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
> index 8e9f7b301c6d39..9e5370e3700c08 100644
> --- a/kernel/dma/debug.c
> +++ b/kernel/dma/debug.c
> @@ -1199,7 +1199,6 @@ void debug_dma_map_single(struct device *dev, const void *addr,
>   		err_printk(dev, NULL, "device driver maps memory from vmalloc area [addr=%p] [len=%lu]\n",
>   			   addr, len);
>   }
> -EXPORT_SYMBOL(debug_dma_map_single);

This is still called inline via dma_map_single_attrs(), no?

>   void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
>   			size_t size, int direction, dma_addr_t dma_addr)
> @@ -1235,7 +1234,6 @@ void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
>   
>   	add_dma_entry(entry);
>   }
> -EXPORT_SYMBOL(debug_dma_map_page);
>   
>   void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
>   {
> @@ -1273,7 +1271,6 @@ void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
>   
>   	put_hash_bucket(bucket, flags);
>   }
> -EXPORT_SYMBOL(debug_dma_mapping_error);

Ditto this for dma_mapping_error(). We hardly want to discourage modules 
from calling that ;)

With those fixed (unless I've missed some other preceding change),

Reviewed-by: Robin Murphy <robin.murphy@arm.com>

Cheers,
Robin.

>   void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
>   			  size_t size, int direction)
> @@ -1290,7 +1287,6 @@ void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
>   		return;
>   	check_unmap(&ref);
>   }
> -EXPORT_SYMBOL(debug_dma_unmap_page);
>   
>   void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
>   		      int nents, int mapped_ents, int direction)
> @@ -1328,7 +1324,6 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
>   		add_dma_entry(entry);
>   	}
>   }
> -EXPORT_SYMBOL(debug_dma_map_sg);
>   
>   static int get_nr_mapped_entries(struct device *dev,
>   				 struct dma_debug_entry *ref)
> @@ -1380,7 +1375,6 @@ void debug_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,
>   		check_unmap(&ref);
>   	}
>   }
> -EXPORT_SYMBOL(debug_dma_unmap_sg);
>   
>   void debug_dma_alloc_coherent(struct device *dev, size_t size,
>   			      dma_addr_t dma_addr, void *virt)
> @@ -1466,7 +1460,6 @@ void debug_dma_map_resource(struct device *dev, phys_addr_t addr, size_t size,
>   
>   	add_dma_entry(entry);
>   }
> -EXPORT_SYMBOL(debug_dma_map_resource);
>   
>   void debug_dma_unmap_resource(struct device *dev, dma_addr_t dma_addr,
>   			      size_t size, int direction)
> @@ -1484,7 +1477,6 @@ void debug_dma_unmap_resource(struct device *dev, dma_addr_t dma_addr,
>   
>   	check_unmap(&ref);
>   }
> -EXPORT_SYMBOL(debug_dma_unmap_resource);
>   
>   void debug_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
>   				   size_t size, int direction)
> @@ -1503,7 +1495,6 @@ void debug_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
>   
>   	check_sync(dev, &ref, true);
>   }
> -EXPORT_SYMBOL(debug_dma_sync_single_for_cpu);
>   
>   void debug_dma_sync_single_for_device(struct device *dev,
>   				      dma_addr_t dma_handle, size_t size,
> @@ -1523,7 +1514,6 @@ void debug_dma_sync_single_for_device(struct device *dev,
>   
>   	check_sync(dev, &ref, false);
>   }
> -EXPORT_SYMBOL(debug_dma_sync_single_for_device);
>   
>   void debug_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
>   			       int nelems, int direction)
> @@ -1556,7 +1546,6 @@ void debug_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
>   		check_sync(dev, &ref, true);
>   	}
>   }
> -EXPORT_SYMBOL(debug_dma_sync_sg_for_cpu);
>   
>   void debug_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
>   				  int nelems, int direction)
> @@ -1588,7 +1577,6 @@ void debug_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
>   		check_sync(dev, &ref, false);
>   	}
>   }
> -EXPORT_SYMBOL(debug_dma_sync_sg_for_device);
>   
>   static int __init dma_debug_driver_setup(char *str)
>   {
> 
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] dma-debug: remove all exports
  2020-09-10 11:45   ` Robin Murphy
@ 2020-09-10 11:51     ` Christoph Hellwig
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2020-09-10 11:51 UTC (permalink / raw)
  To: Robin Murphy; +Cc: iommu, Christoph Hellwig

On Thu, Sep 10, 2020 at 12:45:09PM +0100, Robin Murphy wrote:
> FWIW I did briefly look at how much of dma-debug we could drop from 
> dma-mapping.h and make entirely private to kernel/dma/, but couldn't 
> convince myself that an awkward split with a few calls still needing to be 
> public would be worthwhile.

I've stared to look into a major dma header reshuffle, basically
have dma-mapping.h only contain the API needed by consumer of the
DMA API, a new linux/dma-map-ops.h for providers, and everyting else
under kernel/dma/.  The initial prototype looks nice, but I need to
finish off a few lose ends.

>> -EXPORT_SYMBOL(debug_dma_map_single);
>
> This is still called inline via dma_map_single_attrs(), no?
>
>>   }
>> -EXPORT_SYMBOL(debug_dma_mapping_error);
>
> Ditto this for dma_mapping_error(). We hardly want to discourage modules 
> from calling that ;)
>
> With those fixed (unless I've missed some other preceding change),

Also yes.  I actually fixed it up locall this morning, this is what
I have now:

---
From 8a310506789611f7a9426e270a8bac647d6f4b1b Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Tue, 8 Sep 2020 18:35:24 +0200
Subject: dma-debug: remove most exports

Now that the main dma mapping entry points are out of line most of the
symbols in dma-debug.c can only be called from built-in code.  Remove
the unused exports.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 kernel/dma/debug.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index 8e9f7b301c6d39..6f53c2e03aa4f8 100644
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -1235,7 +1235,6 @@ void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
 
 	add_dma_entry(entry);
 }
-EXPORT_SYMBOL(debug_dma_map_page);
 
 void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
@@ -1290,7 +1289,6 @@ void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
 		return;
 	check_unmap(&ref);
 }
-EXPORT_SYMBOL(debug_dma_unmap_page);
 
 void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
 		      int nents, int mapped_ents, int direction)
@@ -1328,7 +1326,6 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
 		add_dma_entry(entry);
 	}
 }
-EXPORT_SYMBOL(debug_dma_map_sg);
 
 static int get_nr_mapped_entries(struct device *dev,
 				 struct dma_debug_entry *ref)
@@ -1380,7 +1377,6 @@ void debug_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,
 		check_unmap(&ref);
 	}
 }
-EXPORT_SYMBOL(debug_dma_unmap_sg);
 
 void debug_dma_alloc_coherent(struct device *dev, size_t size,
 			      dma_addr_t dma_addr, void *virt)
@@ -1466,7 +1462,6 @@ void debug_dma_map_resource(struct device *dev, phys_addr_t addr, size_t size,
 
 	add_dma_entry(entry);
 }
-EXPORT_SYMBOL(debug_dma_map_resource);
 
 void debug_dma_unmap_resource(struct device *dev, dma_addr_t dma_addr,
 			      size_t size, int direction)
@@ -1484,7 +1479,6 @@ void debug_dma_unmap_resource(struct device *dev, dma_addr_t dma_addr,
 
 	check_unmap(&ref);
 }
-EXPORT_SYMBOL(debug_dma_unmap_resource);
 
 void debug_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
 				   size_t size, int direction)
@@ -1503,7 +1497,6 @@ void debug_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
 
 	check_sync(dev, &ref, true);
 }
-EXPORT_SYMBOL(debug_dma_sync_single_for_cpu);
 
 void debug_dma_sync_single_for_device(struct device *dev,
 				      dma_addr_t dma_handle, size_t size,
@@ -1523,7 +1516,6 @@ void debug_dma_sync_single_for_device(struct device *dev,
 
 	check_sync(dev, &ref, false);
 }
-EXPORT_SYMBOL(debug_dma_sync_single_for_device);
 
 void debug_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
 			       int nelems, int direction)
@@ -1556,7 +1548,6 @@ void debug_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
 		check_sync(dev, &ref, true);
 	}
 }
-EXPORT_SYMBOL(debug_dma_sync_sg_for_cpu);
 
 void debug_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
 				  int nelems, int direction)
@@ -1588,7 +1579,6 @@ void debug_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
 		check_sync(dev, &ref, false);
 	}
 }
-EXPORT_SYMBOL(debug_dma_sync_sg_for_device);
 
 static int __init dma_debug_driver_setup(char *str)
 {
-- 
2.28.0

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-09-10 11:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-08 16:39 drop a few unused DMA exports Christoph Hellwig
2020-09-08 16:39 ` [PATCH 1/2] dma-mapping: remove the dma_dummy_ops export Christoph Hellwig
2020-09-10 11:22   ` Robin Murphy
2020-09-08 16:39 ` [PATCH 2/2] dma-debug: remove all exports Christoph Hellwig
2020-09-10 11:45   ` Robin Murphy
2020-09-10 11:51     ` Christoph Hellwig

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).