From owner-svn-src-user@FreeBSD.ORG Wed Mar 4 22:59:59 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1AAC106564A; Wed, 4 Mar 2009 22:59:59 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id A20728FC0A; Wed, 4 Mar 2009 22:59:59 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (pool-98-109-39-197.nwrknj.fios.verizon.net [98.109.39.197]) by cyrus.watson.org (Postfix) with ESMTPSA id 1A50646B3C; Wed, 4 Mar 2009 17:59:59 -0500 (EST) Received: from localhost (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.14.3/8.14.3) with ESMTP id n24Mxfsm098592; Wed, 4 Mar 2009 17:59:53 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Kip Macy Date: Wed, 4 Mar 2009 17:59:31 -0500 User-Agent: KMail/1.9.7 References: <200903042122.n24LMdO3053650@svn.freebsd.org> In-Reply-To: <200903042122.n24LMdO3053650@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200903041759.31535.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Wed, 04 Mar 2009 17:59:53 -0500 (EST) X-Virus-Scanned: ClamAV 0.94.2/9068/Wed Mar 4 16:56:13 2009 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r189374 - user/kmacy/HEAD_fast_net_merge/sys/netinet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 23:00:00 -0000 On Wednesday 04 March 2009 4:22:39 pm Kip Macy wrote: > Author: kmacy > Date: Wed Mar 4 21:22:39 2009 > New Revision: 189374 > URL: http://svn.freebsd.org/changeset/base/189374 > > Log: > Use per-cpu callouts for tcp_timer > 186694, 187660 > > 186694: > - convert tcp_timer_activate over to using > per-cpu callouts > - don't acquire the tcbinfo lock exclusively > in tcp_timer_rexmt unless needed for tcp_drop > > 187660: > - mp_maxid may not be valid ensure that we > re-schedule on cpuid less than or equal to > the current one for tcp callouts > > Modified: > user/kmacy/HEAD_fast_net_merge/sys/netinet/tcp_timer.c > > Modified: user/kmacy/HEAD_fast_net_merge/sys/netinet/tcp_timer.c > ============================================================================== > --- user/kmacy/HEAD_fast_net_merge/sys/netinet/tcp_timer.c Wed Mar 4 21:04:52 2009 (r189373) > +++ user/kmacy/HEAD_fast_net_merge/sys/netinet/tcp_timer.c Wed Mar 4 21:22:39 2009 (r189374) > @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include > @@ -118,6 +119,8 @@ int tcp_maxpersistidle; > /* max idle time in persist */ > int tcp_maxidle; > > +#define INP_CPU(inp) min(curcpu, ((inp)->inp_flowid % mp_maxid)) This is not really safe. CPU ID's may be sparse. The only guarantees you have are that 0 is the boot CPU, and that all valid CPU IDs are in the range [0 .. mp_maxid] (inclusive). Thus, you could have a system that only has CPUs 0 and 3 and if you are on CPU 3 and flowid is 5, then this will choose min(3, 5 % 3) == min(3, 2) == 2 which is an invalid CPU. -- John Baldwin