From owner-p4-projects@FreeBSD.ORG Thu Jun 23 05:28:30 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37A6F1065672; Thu, 23 Jun 2011 05:28:30 +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 E18CF106564A for ; Thu, 23 Jun 2011 05:28:29 +0000 (UTC) (envelope-from goda@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7DDB28FC0A for ; Thu, 23 Jun 2011 05:28:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5N5STm2090216 for ; Thu, 23 Jun 2011 05:28:29 GMT (envelope-from goda@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5N5STFu090213 for perforce@freebsd.org; Thu, 23 Jun 2011 05:28:29 GMT (envelope-from goda@FreeBSD.org) Date: Thu, 23 Jun 2011 05:28:29 GMT Message-Id: <201106230528.p5N5STFu090213@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to goda@FreeBSD.org using -f From: Kazuya Goda To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2011 05:28:30 -0000 http://p4web.freebsd.org/@@195190?ac=10 Change 195190 by goda@hassaku on 2011/06/23 05:27:37 Support UDP. Netisr policy on IP is changed "hybride". Affected files ... .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/if_ethersubr.c#3 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/netisr.c#2 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/ip_input.c#2 edit Differences ... ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/if_ethersubr.c#3 (text+ko) ==== @@ -78,6 +78,7 @@ #include #include #include +#include #include #endif @@ -912,19 +913,32 @@ { struct ip *ip = NULL; struct tcphdr *th = NULL; + struct udphdr *uh = NULL; + uint16_t sport, dport; - if ( m->m_flags & M_FLOWID ) + if (m->m_flags & M_FLOWID) goto not_rps; ip = mtod(m, struct ip *); - if( ip->ip_p != IPPROTO_TCP ) + + switch (ip->ip_p){ + case IPPROTO_TCP: + th = (struct tcphdr *)((caddr_t)ip + (ip->ip_hl << 2)); + sport = th->th_sport; + dport = th->th_dport; + break; + case IPPROTO_UDP: + uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2)); + sport = uh->uh_sport; + dport = uh->uh_dport; + break; + default: goto not_rps; + } - th = (struct tcphdr *)((caddr_t)ip + ( ip->ip_hl << 2 ) ); - m->m_flags |= M_FLOWID; - m->m_pkthdr.flowid = rss_hash_ip4_4tuple(ip->ip_src, th->th_sport, ip->ip_dst, th->th_dport); - + m->m_pkthdr.flowid = rss_hash_ip4_4tuple(ip->ip_src, sport, ip->ip_dst, dport); + M_HASHTYPE_SET(m, M_HASHTYPE_RSS_4TUPLE); } not_rps: ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/netisr.c#2 (text+ko) ==== @@ -1073,6 +1073,7 @@ sched_pin(); m = netisr_select_cpuid(&netisr_proto[proto], NETISR_DISPATCH_HYBRID, source, m, &cpuid); + if (m == NULL) { error = ENOBUFS; goto out_unpin; ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/ip_input.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include "opt_ipstealth.h" #include "opt_ipsec.h" #include "opt_route.h" +#include "opt_rps.h" #include #include @@ -144,6 +145,9 @@ .nh_handler = ip_input, .nh_proto = NETISR_IP, .nh_policy = NETISR_POLICY_FLOW, +#ifdef RPS + .nh_dispatch = NETISR_DISPATCH_HYBRID, +#endif }; extern struct domain inetdomain;