netdev - Re: [PATCH] net_dma: call dmaengine_get only if NET

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090206.215533.166740686.davem@davemloft.net>
Date:	Fri, 06 Feb 2009 21:55:33 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	dan.j.williams@...el.com
Cc:	anemo@....ocn.ne.jp, maciej.sosnowski@...el.com,
	linux-kernel@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH] net_dma: call dmaengine_get only if NET_DMA enabled

From: David Miller <davem@...emloft.net>
Date: Fri, 06 Feb 2009 19:29:10 -0800 (PST)

> From: Dan Williams <dan.j.williams@...el.com>
> Date: Fri, 6 Feb 2009 15:52:35 -0700
> 
> > Yes, it has been on the todo list for a while, but I eventually want
> > the net case to look more like the raid case.  I.e. have one code path
> > that picks async versus sync at runtime, with the option to compile
> > out async support with header file ifdefs only.
> 
> And how does any of that get us any closer to a fix right now
> for this problem that doesn't require an ifdef?
> 
> Someone please work on this.

I guess that'd end up being me....

How about something like this?

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 3e0f64c..3e68469 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -282,6 +282,18 @@ static inline void dmaengine_put(void)
 }
 #endif
 
+#ifdef CONFIG_NET_DMA
+#define net_dmaengine_get()	dmaengine_get()
+#define net_dmaengine_put()	dmaengine_put()
+#else
+static inline void net_dmaengine_get(void)
+{
+}
+static inline void net_dmaengine_put(void)
+{
+}
+#endif
+
 dma_cookie_t dma_async_memcpy_buf_to_buf(struct dma_chan *chan,
 	void *dest, void *src, size_t len);
 dma_cookie_t dma_async_memcpy_buf_to_pg(struct dma_chan *chan,
diff --git a/net/core/dev.c b/net/core/dev.c
index 5379b0c..a17e006 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1090,7 +1090,7 @@ int dev_open(struct net_device *dev)
 		/*
 		 *	Enable NET_DMA
 		 */
-		dmaengine_get();
+		net_dmaengine_get();
 
 		/*
 		 *	Initialize multicasting status
@@ -1172,7 +1172,7 @@ int dev_close(struct net_device *dev)
 	/*
 	 *	Shutdown NET_DMA
 	 */
-	dmaengine_put();
+	net_dmaengine_put();
 
 	return 0;
 }
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html