Patchwork [14/16] dma-debug: add checks for sync_single_sg_*

login
register
mail settings
Submitter Joerg Roedel
Date Jan. 9, 2009, 4:19 p.m.
Message ID <1231517970-20288-15-git-send-email-joerg.roedel@amd.com>
Download mbox | patch
Permalink /patch/17554/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Joerg Roedel - Jan. 9, 2009, 4:19 p.m.
Impact: add debug callbacks for dma_sync_sg_* functions

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 include/linux/dma-debug.h |   19 +++++++++++++++++++
 lib/dma-debug.c           |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 0 deletions(-)
Ingo Molnar - Jan. 10, 2009, 11:46 p.m.
* Joerg Roedel <joerg.roedel@amd.com> wrote:

> +void debug_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> +			   int nelems, int direction)
> +{
> +	struct scatterlist *s;
> +	int i;
> +
> +	if (global_disable)
> +		return;

"if (unlikely(global_disable))" i suspect?

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Joerg Roedel - Jan. 11, 2009, 8 a.m.
On Sun, Jan 11, 2009 at 12:46:41AM +0100, Ingo Molnar wrote:
> 
> * Joerg Roedel <joerg.roedel@amd.com> wrote:
> 
> > +void debug_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> > +			   int nelems, int direction)
> > +{
> > +	struct scatterlist *s;
> > +	int i;
> > +
> > +	if (global_disable)
> > +		return;
> 
> "if (unlikely(global_disable))" i suspect?

True. I  will add unlikely() to all global_disable checks.

Joerg
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
index b9c221a..bdba8c8 100644
--- a/include/linux/dma-debug.h
+++ b/include/linux/dma-debug.h
@@ -64,6 +64,13 @@  extern void debug_sync_single_range_for_device(struct device *dev,
 					       unsigned long offset,
 					       size_t size, int direction);
 
+extern void debug_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
+				  int nelems, int direction);
+
+extern void debug_sync_sg_for_device(struct device *dev,
+				     struct scatterlist *sg,
+				     int nelems, int direction);
+
 #else /* CONFIG_DMA_API_DEBUG */
 
 static inline void dma_debug_init(u32 num_entries)
@@ -130,6 +137,18 @@  static inline void debug_sync_single_range_for_device(struct device *dev,
 {
 }
 
+static inline void debug_sync_sg_for_cpu(struct device *dev,
+					 struct scatterlist *sg,
+					 int nelems, int direction)
+{
+}
+
+static inline void debug_sync_sg_for_device(struct device *dev,
+					    struct scatterlist *sg,
+					    int nelems, int direction)
+{
+}
+
 #endif /* CONFIG_DMA_API_DEBUG */
 
 #endif /* __DMA_DEBUG_H */
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 6f73bed..e40c88c 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -692,3 +692,35 @@  void debug_sync_single_range_for_device(struct device *dev,
 }
 EXPORT_SYMBOL(debug_sync_single_range_for_device);
 
+void debug_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
+			   int nelems, int direction)
+{
+	struct scatterlist *s;
+	int i;
+
+	if (global_disable)
+		return;
+
+	for_each_sg(sg, s, nelems, i) {
+		check_sync(dev, s->dma_address, s->dma_length, 0,
+				direction, true);
+	}
+}
+EXPORT_SYMBOL(debug_sync_sg_for_cpu);
+
+void debug_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
+			      int nelems, int direction)
+{
+	struct scatterlist *s;
+	int i;
+
+	if (global_disable)
+		return;
+
+	for_each_sg(sg, s, nelems, i) {
+		check_sync(dev, s->dma_address, s->dma_length, 0,
+				direction, false);
+	}
+}
+EXPORT_SYMBOL(debug_sync_sg_for_device);
+