From owner-svn-soc-all@FreeBSD.ORG Sun Jun 14 02:41:55 2015 Return-Path: Delivered-To: svn-soc-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB02E473 for ; Sun, 14 Jun 2015 02:41:54 +0000 (UTC) (envelope-from btw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 CCD37EE3 for ; Sun, 14 Jun 2015 02:41:54 +0000 (UTC) (envelope-from btw@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5E2fssj068171 for ; Sun, 14 Jun 2015 02:41:54 GMT (envelope-from btw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5E2frU2068164 for svn-soc-all@FreeBSD.org; Sun, 14 Jun 2015 02:41:53 GMT (envelope-from btw@FreeBSD.org) Date: Sun, 14 Jun 2015 02:41:53 GMT Message-Id: <201506140241.t5E2frU2068164@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to btw@FreeBSD.org using -f From: btw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287061 - soc2015/btw/head/sys/netinet6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2015 02:41:55 -0000 Author: btw Date: Sun Jun 14 02:41:53 2015 New Revision: 287061 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287061 Log: Implement the IPv6 RSS software hash function: * rss_proto_software_hash_v6 - hash the given source/destination IPv6 address, port and direction. Modified: soc2015/btw/head/sys/netinet6/in6_rss.c soc2015/btw/head/sys/netinet6/in6_rss.h Modified: soc2015/btw/head/sys/netinet6/in6_rss.c ============================================================================== --- soc2015/btw/head/sys/netinet6/in6_rss.c Sun Jun 14 00:31:22 2015 (r287060) +++ soc2015/btw/head/sys/netinet6/in6_rss.c Sun Jun 14 02:41:53 2015 (r287061) @@ -101,3 +101,52 @@ datalen += sizeof(dstport); return (rss_hash(datalen, data)); } + +/* + * Calculate an appropriate ipv6 2-tuple or 4-tuple given the given + * IPv6 source/destination address, UDP or TCP source/destination ports + * and the protocol type. + * + * The protocol code may wish to do a software hash of the given + * tuple. This depends upon the currently configured RSS hash types. + * + * This assumes that the packet in question isn't a fragment. + * + * It also assumes the packet source/destination address + * are in "incoming" packet order (ie, source is "far" address.) + */ +int +rss_proto_software_hash_v6(const struct in6_addr *s, const struct in6_addr *d, + u_short sp, u_short dp, int proto, + uint32_t *hashval, uint32_t *hashtype) +{ + uint32_t hash; + + /* + * Next, choose the hash type depending upon the protocol + * identifier. + */ + if ((proto == IPPROTO_TCP) && + (rss_gethashconfig() & RSS_HASHTYPE_RSS_TCP_IPV6)) { + hash = rss_hash_ip6_4tuple(s, sp, d, dp); + *hashval = hash; + *hashtype = M_HASHTYPE_RSS_TCP_IPV6; + return (0); + } else if ((proto == IPPROTO_UDP) && + (rss_gethashconfig() & RSS_HASHTYPE_RSS_UDP_IPV6)) { + hash = rss_hash_ip6_4tuple(s, sp, d, dp); + *hashval = hash; + *hashtype = M_HASHTYPE_RSS_UDP_IPV6; + return (0); + } else if (rss_gethashconfig() & RSS_HASHTYPE_RSS_IPV6) { + /* RSS doesn't hash on other protocols like SCTP; so 2-tuple */ + hash = rss_hash_ip6_2tuple(s, d); + *hashval = hash; + *hashtype = M_HASHTYPE_RSS_IPV6; + return (0); + } + + /* No configured available hashtypes! */ + printf("%s: no available hashtypes!\n", __func__); + return (-1); +} Modified: soc2015/btw/head/sys/netinet6/in6_rss.h ============================================================================== --- soc2015/btw/head/sys/netinet6/in6_rss.h Sun Jun 14 00:31:22 2015 (r287060) +++ soc2015/btw/head/sys/netinet6/in6_rss.h Sun Jun 14 02:41:53 2015 (r287061) @@ -42,4 +42,13 @@ uint32_t rss_hash_ip6_2tuple(const struct in6_addr *src, const struct in6_addr *dst); +/* + * Functions to calculate a software RSS hash for a given mbuf or + * packet detail. + */ +int rss_proto_software_hash_v6(const struct in6_addr *src, + const struct in6_addr *dst, u_short src_port, + u_short dst_port, int proto, uint32_t *hashval, + uint32_t *hashtype); + #endif /* !_NETINET6_IN6_RSS_H_ */