From owner-p4-projects@FreeBSD.ORG  Tue Aug 14 00:16:31 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7430F16A41B; Tue, 14 Aug 2007 00:16:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30C6416A418
	for <perforce@freebsd.org>; Tue, 14 Aug 2007 00:16:31 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1CD5A13C45D
	for <perforce@freebsd.org>; Tue, 14 Aug 2007 00:16:31 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7E0GU0o027631
	for <perforce@freebsd.org>; Tue, 14 Aug 2007 00:16:30 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7E0GUmV027628
	for perforce@freebsd.org; Tue, 14 Aug 2007 00:16:30 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 14 Aug 2007 00:16:30 GMT
Message-Id: <200708140016.l7E0GUmV027628@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 125126 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Aug 2007 00:16:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=125126

Change 125126 by kmacy@kmacy_home:ethng on 2007/08/14 00:15:29

	track rss_hash as queue cookie so that tx goes out on the same cpu/queue as rx

Affected files ...

.. //depot/projects/ethng/src/sys/netinet/tcp_input.c#2 edit
.. //depot/projects/ethng/src/sys/netinet/tcp_output.c#2 edit

Differences ...

==== //depot/projects/ethng/src/sys/netinet/tcp_input.c#2 (text+ko) ====

@@ -632,6 +632,7 @@
 			INP_UNLOCK(inp);	/* listen socket */
 			inp = sotoinpcb(so);
 			INP_LOCK(inp);		/* new connection */
+			inp->inp_rss_hash = m->m_pkthdr.rss_hash;
 			tp = intotcpcb(inp);
 			KASSERT(tp->t_state == TCPS_SYN_RECEIVED,
 			    ("%s: ", __func__));
@@ -833,8 +834,8 @@
 		 */
 		INP_INFO_UNLOCK_ASSERT(&tcbinfo);
 		return;
-	}
-
+	} else if (inp->inp_rss_hash != m->m_pkthdr.rss_hash && m->m_pkthdr.rss_hash)
+		inp->inp_rss_hash = m->m_pkthdr.rss_hash;
 	/*
 	 * Segment belongs to a connection in SYN_SENT, ESTABLISHED or later
 	 * state.  tcp_do_segment() always consumes the mbuf chain, unlocks

==== //depot/projects/ethng/src/sys/netinet/tcp_output.c#2 (text+ko) ====

@@ -1122,6 +1122,7 @@
 	if (path_mtu_discovery)
 		ip->ip_off |= IP_DF;
 
+	m->m_pkthdr.rss_hash = tp->t_inpcb->inp_rss_hash;
 	error = ip_output(m, tp->t_inpcb->inp_options, NULL,
 	    ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0,
 	    tp->t_inpcb);