svn commit: r271547 - in stable/8/sys: net sys

[Navdeep Parhar]

Author: np
Date: Sat Sep 13 19:37:11 2014
New Revision: 271547
URL: http://svnweb.freebsd.org/changeset/base/271547

Log:
  MFC r234098 (jhb) and r255047.
  
  r234098:
  Add media types for 40G media that might be used with FreeBSD.
  
  r255047:
  Add a routine for attaching an mbuf to a buffer with an external
  refcount.  This one is willing to work with buffers that may already be
  referenced.  MEXTADD/m_extadd are suitable only for the first attachment
  to a cluster -- they initialize the refcount to 1.

Modified:
  stable/8/sys/net/if_media.h
  stable/8/sys/sys/mbuf.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/net/   (props changed)
  stable/8/sys/sys/   (props changed)

Modified: stable/8/sys/net/if_media.h
==============================================================================
--- stable/8/sys/net/if_media.h	Sat Sep 13 19:03:32 2014	(r271546)
+++ stable/8/sys/net/if_media.h	Sat Sep 13 19:37:11 2014	(r271547)
@@ -150,6 +150,9 @@ uint64_t	ifmedia_baudrate(int);
 #define	IFM_10G_LRM	24		/* 10GBase-LRM 850nm Multi-mode */
 #define	IFM_UNKNOWN	25		/* media types not defined yet */
 #define	IFM_10G_T	26		/* 10GBase-T - RJ45 */
+#define	IFM_40G_CR4	27		/* 40GBase-CR4 */
+#define	IFM_40G_SR4	28		/* 40GBase-SR4 */
+#define	IFM_40G_LR4	29		/* 40GBase-LR4 */
 /*
  * Please update ieee8023ad_lacp.c:lacp_compose_key()
  * after adding new Ethernet media types.
@@ -369,6 +372,9 @@ struct ifmedia_description {
 	{ IFM_10G_TWINAX_LONG,	"10Gbase-Twinax-Long" },		\
 	{ IFM_UNKNOWN,	"Unknown" },					\
 	{ IFM_10G_T,	"10Gbase-T" },					\
+	{ IFM_40G_CR4,	"40Gbase-CR4" },				\
+	{ IFM_40G_SR4,	"40Gbase-SR4" },				\
+	{ IFM_40G_LR4,	"40Gbase-LR4" },				\
 	{ 0, NULL },							\
 }
 
@@ -665,6 +671,9 @@ struct ifmedia_baudrate {
 	{ IFM_ETHER | IFM_10G_TWINAX_LONG,	IF_Gbps(10ULL) },	\
 	{ IFM_ETHER | IFM_10G_LRM,	IF_Gbps(10ULL) },		\
 	{ IFM_ETHER | IFM_10G_T,	IF_Gbps(10ULL) },		\
+	{ IFM_ETHER | IFM_40G_CR4,	IF_Gbps(40ULL) },		\
+	{ IFM_ETHER | IFM_40G_SR4,	IF_Gbps(40ULL) },		\
+	{ IFM_ETHER | IFM_40G_LR4,	IF_Gbps(40ULL) },		\
 									\
 	{ IFM_TOKEN | IFM_TOK_STP4,	IF_Mbps(4) },			\
 	{ IFM_TOKEN | IFM_TOK_STP16,	IF_Mbps(16) },			\

Modified: stable/8/sys/sys/mbuf.h
==============================================================================
--- stable/8/sys/sys/mbuf.h	Sat Sep 13 19:03:32 2014	(r271546)
+++ stable/8/sys/sys/mbuf.h	Sat Sep 13 19:37:11 2014	(r271547)
@@ -406,6 +406,28 @@ m_gettype(int size)
 	return (type);
 }
 
+/*
+ * Associated an external reference counted buffer with an mbuf.
+ */
+static __inline void
+m_extaddref(struct mbuf *m, caddr_t buf, u_int size, u_int *ref_cnt,
+    void (*freef)(void *, void *), void *arg1, void *arg2)
+{
+
+	KASSERT(ref_cnt != NULL, ("%s: ref_cnt not provided", __func__));
+
+	atomic_add_int(ref_cnt, 1);
+	m->m_flags |= M_EXT;
+	m->m_ext.ext_buf = buf;
+	m->m_ext.ref_cnt = ref_cnt;
+	m->m_data = m->m_ext.ext_buf;
+	m->m_ext.ext_size = size;
+	m->m_ext.ext_free = freef;
+	m->m_ext.ext_arg1 = arg1;
+	m->m_ext.ext_arg2 = arg2;
+	m->m_ext.ext_type = EXT_EXTREF;
+}
+
 static __inline uma_zone_t
 m_getzone(int size)
 {