svn commit: r189333 - in user/kmacy/HEAD_fast_net_merge/sys: dev/cxgb net netinet sys

[Kip Macy]

Author: kmacy
Date: Wed Mar  4 01:47:50 2009
New Revision: 189333
URL: http://svn.freebsd.org/changeset/base/189333

Log:
  enable flowid usage
  186588, 186591, 186592, 186594
  
  186588: (included)
  - enabled flowid usage for supporting multiple
    transmit queues
  
  186591, 186592: (included)
  - validate so before checking options in tcp_input
  - so isn't set yet, reference inp_socket
  
  186594: (included)
  - set flowid valid flag in cxgb

Modified:
  user/kmacy/HEAD_fast_net_merge/sys/dev/cxgb/cxgb_sge.c
  user/kmacy/HEAD_fast_net_merge/sys/net/flowtable.c
  user/kmacy/HEAD_fast_net_merge/sys/netinet/in_pcb.h
  user/kmacy/HEAD_fast_net_merge/sys/netinet/ip_output.c
  user/kmacy/HEAD_fast_net_merge/sys/netinet/tcp_input.c
  user/kmacy/HEAD_fast_net_merge/sys/sys/mbuf.h

Modified: user/kmacy/HEAD_fast_net_merge/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- user/kmacy/HEAD_fast_net_merge/sys/dev/cxgb/cxgb_sge.c	Wed Mar  4 01:33:16 2009	(r189332)
+++ user/kmacy/HEAD_fast_net_merge/sys/dev/cxgb/cxgb_sge.c	Wed Mar  4 01:47:50 2009	(r189333)
@@ -2879,6 +2879,7 @@ process_responses(adapter_t *adap, struc
 			eop = get_packet(adap, drop_thresh, qs, &rspq->rspq_mbuf, r);
 #endif
 #ifdef IFNET_MULTIQUEUE
+			rspq->rspq_mh.mh_head->m_flags |= M_FLOWID;
 			rspq->rspq_mh.mh_head->m_pkthdr.flowid = rss_hash;
 #endif			
 			ethpad = 2;

Modified: user/kmacy/HEAD_fast_net_merge/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_fast_net_merge/sys/net/flowtable.c	Wed Mar  4 01:33:16 2009	(r189332)
+++ user/kmacy/HEAD_fast_net_merge/sys/net/flowtable.c	Wed Mar  4 01:47:50 2009	(r189333)
@@ -402,11 +402,7 @@ ipv4_flow_lookup_hash_internal(struct mb
 
 skipports:
 	hash = hashword(key, 3, hashjitter + proto);
-#ifdef notyet
 	if (m != NULL && (m->m_flags & M_FLOWID) == 0)
-#else
-	if (m != NULL && m->m_pkthdr.flowid != 0)
-#endif
 		m->m_pkthdr.flowid = hash;
 	
 	CTR5(KTR_SPARE3, "proto=%d hash=%x key[0]=%x sport=%d dport=%d\n", proto, hash, key[0], sport, dport);

Modified: user/kmacy/HEAD_fast_net_merge/sys/netinet/in_pcb.h
==============================================================================
--- user/kmacy/HEAD_fast_net_merge/sys/netinet/in_pcb.h	Wed Mar  4 01:33:16 2009	(r189332)
+++ user/kmacy/HEAD_fast_net_merge/sys/netinet/in_pcb.h	Wed Mar  4 01:47:50 2009	(r189333)
@@ -169,7 +169,7 @@ struct inpcb {
 	u_char	inp_ip_ttl;		/* (i) time to live proto */
 	u_char	inp_ip_p;		/* (c) protocol proto */
 	u_char	inp_ip_minttl;		/* (i) minimum TTL or drop */
-	uint32_t inp_ispare1;		/* (x) connection id / queue id */
+	uint32_t inp_flowid;		/* (x) flow id / queue id */
 	u_int	inp_refcount;		/* (i) refcount */
 	struct llentry	*inp_lle;	/* L2 information */
 	struct rtentry	*inp_rt;	/* L3 information */
@@ -420,6 +420,8 @@ void 	inp_4tuple_get(struct inpcb *inp, 
 #define	INP_DONTFRAG		0x800	/* don't fragment packet */
 #define	INP_NONLOCALOK		0x1000	/* Allow bind to spoof any address */
 #define	INP_LLE_VALID		0x2000	/* L2 entry is set */
+#define	INP_SW_FLOWID		0x2000	/* software generated flow id */
+#define	INP_HW_FLOWID		0x4000	/* hardware generated flow id */
 
 #define IN6P_IPV6_V6ONLY	0x008000 /* restrict AF_INET6 socket for v6 */
 

Modified: user/kmacy/HEAD_fast_net_merge/sys/netinet/ip_output.c
==============================================================================
--- user/kmacy/HEAD_fast_net_merge/sys/netinet/ip_output.c	Wed Mar  4 01:33:16 2009	(r189332)
+++ user/kmacy/HEAD_fast_net_merge/sys/netinet/ip_output.c	Wed Mar  4 01:47:50 2009	(r189333)
@@ -157,6 +157,10 @@ ip_output(struct mbuf *m, struct mbuf *o
 	if (inp != NULL) {
 		M_SETFIB(m, inp->inp_inc.inc_fibnum);
 		INP_LOCK_ASSERT(inp);
+		if (inp->inp_flags & (INP_HW_FLOWID|INP_SW_FLOWID)) {
+			m->m_pkthdr.flowid = inp->inp_flowid;
+			m->m_flags |= M_FLOWID;
+		}
 		if ((ro == &iproute) && (inp->inp_vflag & INP_RT_VALID)) {
 			if (inp->inp_rt->rt_flags & RTF_UP) {
 				sin = (struct sockaddr_in *)&ro->ro_dst;

Modified: user/kmacy/HEAD_fast_net_merge/sys/netinet/tcp_input.c
==============================================================================
--- user/kmacy/HEAD_fast_net_merge/sys/netinet/tcp_input.c	Wed Mar  4 01:33:16 2009	(r189332)
+++ user/kmacy/HEAD_fast_net_merge/sys/netinet/tcp_input.c	Wed Mar  4 01:47:50 2009	(r189333)
@@ -594,7 +594,14 @@ findpcb:
 		goto dropwithreset;
 	}
 	INP_WLOCK(inp);
-
+	if (!(inp->inp_flags & INP_HW_FLOWID)
+	    && (m->m_flags & M_FLOWID)
+	    && ((inp->inp_socket == NULL)
+		|| !(inp->inp_socket->so_options & SO_ACCEPTCONN))) {
+		inp->inp_flags |= INP_HW_FLOWID;
+		inp->inp_flags &= ~INP_SW_FLOWID;
+		inp->inp_flowid = m->m_pkthdr.flowid;
+	}
 #ifdef IPSEC
 #ifdef INET6
 	if (isipv6 && ipsec6_in_reject(m, inp)) {

Modified: user/kmacy/HEAD_fast_net_merge/sys/sys/mbuf.h
==============================================================================
--- user/kmacy/HEAD_fast_net_merge/sys/sys/mbuf.h	Wed Mar  4 01:33:16 2009	(r189332)
+++ user/kmacy/HEAD_fast_net_merge/sys/sys/mbuf.h	Wed Mar  4 01:47:50 2009	(r189333)
@@ -195,6 +195,7 @@ struct mbuf {
 #define	M_PROTO6	0x00080000 /* protocol-specific */
 #define	M_PROTO7	0x00100000 /* protocol-specific */
 #define	M_PROTO8	0x00200000 /* protocol-specific */
+#define	M_FLOWID	0x00400000 /* flowid is valid */
 /*
  * For RELENG_{6,7} steal these flags for limited multiple routing table
  * support. In RELENG_8 and beyond, use just one flag and a tag.