svn commit: r267163 - head/sys/dev/netmap
Luigi Rizzo
luigi at FreeBSD.org
Fri Jun 6 14:57:17 UTC 2014
Author: luigi
Date: Fri Jun 6 14:57:16 2014
New Revision: 267163
URL: http://svnweb.freebsd.org/changeset/base/267163
Log:
remove two debugging messages, align comments with the code
in our development trunk
Modified:
head/sys/dev/netmap/netmap_generic.c
Modified: head/sys/dev/netmap/netmap_generic.c
==============================================================================
--- head/sys/dev/netmap/netmap_generic.c Fri Jun 6 14:49:00 2014 (r267162)
+++ head/sys/dev/netmap/netmap_generic.c Fri Jun 6 14:57:16 2014 (r267163)
@@ -81,18 +81,25 @@ __FBSDID("$FreeBSD$");
#include <dev/netmap/netmap_kern.h>
#include <dev/netmap/netmap_mem2.h>
-#define rtnl_lock() D("rtnl_lock called");
-#define rtnl_unlock() D("rtnl_unlock called");
+#define rtnl_lock() ND("rtnl_lock called");
+#define rtnl_unlock() ND("rtnl_unlock called");
#define MBUF_TXQ(m) ((m)->m_pkthdr.flowid)
#define MBUF_RXQ(m) ((m)->m_pkthdr.flowid)
#define smp_mb()
/*
- * mbuf wrappers
+ * FreeBSD mbuf allocator/deallocator in emulation mode:
+ *
+ * We allocate EXT_PACKET mbuf+clusters, but need to set M_NOFREE
+ * so that the destructor, if invoked, will not free the packet.
+ * In principle we should set the destructor only on demand,
+ * but since there might be a race we better do it on allocation.
+ * As a consequence, we also need to set the destructor or we
+ * would leak buffers.
*/
/*
- * we allocate an EXT_PACKET
+ * mbuf wrappers
*/
#define netmap_get_mbuf(len) m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR|M_NOFREE)
@@ -808,5 +815,5 @@ generic_netmap_attach(struct ifnet *ifp)
struct netmap_adapter *
netmap_getna(if_t ifp)
{
- return (NA((struct ifnet *)ifp));
+ return (NA((struct ifnet *)ifp));
}
More information about the svn-src-head
mailing list