From owner-svn-src-all@FreeBSD.ORG Sat Jul 12 05:45:54 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D2A5FA0; Sat, 12 Jul 2014 05:45:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3ADFA20F9; Sat, 12 Jul 2014 05:45:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6C5jsVf049601; Sat, 12 Jul 2014 05:45:54 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6C5jsKd049600; Sat, 12 Jul 2014 05:45:54 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201407120545.s6C5jsKd049600@svn.freebsd.org> From: Adrian Chadd Date: Sat, 12 Jul 2014 05:45:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268561 - head/sys/netinet6 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jul 2014 05:45:54 -0000 Author: adrian Date: Sat Jul 12 05:45:53 2014 New Revision: 268561 URL: http://svnweb.freebsd.org/changeset/base/268561 Log: Add INP_RSS_BUCKET_SET awareness for IPv6 pcbgroup entries. This ensures that a listen socket with INP_RSS_BUCKET_SET set will use the pre-determined PCBGROUP rather than what the hashing path chooses. Modified: head/sys/netinet6/in6_pcbgroup.c Modified: head/sys/netinet6/in6_pcbgroup.c ============================================================================== --- head/sys/netinet6/in6_pcbgroup.c Sat Jul 12 05:44:16 2014 (r268560) +++ head/sys/netinet6/in6_pcbgroup.c Sat Jul 12 05:45:53 2014 (r268561) @@ -128,6 +128,19 @@ struct inpcbgroup * in6_pcbgroup_byinpcb(struct inpcb *inp) { +#ifdef RSS + /* + * Listen sockets with INP_RSS_BUCKET_SET set have a pre-determined + * RSS bucket and thus we should use this pcbgroup, rather than + * using a tuple or hash. + * + * XXX should verify that there's actually pcbgroups and inp_rss_listen_bucket + * fits in that! + */ + if (inp->inp_flags2 & INP_RSS_BUCKET_SET) + return (&inp->inp_pcbinfo->ipi_pcbgroups[inp->inp_rss_listen_bucket]); +#endif + return (in6_pcbgroup_bytuple(inp->inp_pcbinfo, &inp->in6p_laddr, inp->inp_lport, &inp->in6p_faddr, inp->inp_fport)); }