From owner-svn-src-projects@FreeBSD.ORG Mon Jun 1 17:16:06 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECB501065674 for ; Mon, 1 Jun 2009 17:16:06 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outO.internet-mail-service.net (outo.internet-mail-service.net [216.240.47.238]) by mx1.freebsd.org (Postfix) with ESMTP id D07B28FC13 for ; Mon, 1 Jun 2009 17:16:06 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 791BAB647; Mon, 1 Jun 2009 10:01:18 -0700 (PDT) X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38]) by idiom.com (Postfix) with ESMTP id 272BC2D6017; Mon, 1 Jun 2009 10:01:18 -0700 (PDT) Message-ID: <4A24095D.1020209@elischer.org> Date: Mon, 01 Jun 2009 10:01:17 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.21 (Macintosh/20090302) MIME-Version: 1.0 To: Robert Watson References: <200906010903.n5193tai070679@svn.freebsd.org> In-Reply-To: <200906010903.n5193tai070679@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r193212 - projects/pnet/sys/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 17:16:07 -0000 Robert Watson wrote: > Author: rwatson > Date: Mon Jun 1 09:03:55 2009 > New Revision: 193212 > URL: http://svn.freebsd.org/changeset/base/193212 > > Log: > Add missing VNET setup in the deferred dispatch case. "oooh" goody > > Lock around stats updates in forced direct dispatch mode. > > Modified: > projects/pnet/sys/net/netisr.c > > Modified: projects/pnet/sys/net/netisr.c > ============================================================================== > --- projects/pnet/sys/net/netisr.c Mon Jun 1 08:50:56 2009 (r193211) > +++ projects/pnet/sys/net/netisr.c Mon Jun 1 09:03:55 2009 (r193212) > @@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > > #ifdef DDB > #include > @@ -697,7 +698,10 @@ netisr_process_workstream_proto(struct n > if (local_npw.nw_head == NULL) > local_npw.nw_tail = NULL; > local_npw.nw_len--; > + VNET_ASSERT(m->m_pkthdr.rcvif != NULL); > + CURVNET_SET(m->m_pkthdr.rcvif->if_vnet); > np[proto].np_handler(m); > + CURVNET_RESTORE(); > } > KASSERT(local_npw.nw_len == 0, > ("%s(%u): len %u", __func__, proto, local_npw.nw_len)); > @@ -882,13 +886,17 @@ netisr_dispatch_src(u_int proto, uintptr > /* > * If direct dispatch is forced, then unconditionally dispatch > * without a formal CPU selection. Borrow the current CPU's stats, > - * even if there's no worker on it. > + * even if there's no worker on it. In this case we don't update > + * nws_flags because all netisr processing will be source ordered due > + * to always being forced to directly dispatch. > */ > if (netisr_direct_force) { > nwsp = &nws[curcpu]; > npwp = &nwsp->nws_work[proto]; > + NWS_LOCK(nwsp); > npwp->nw_dispatched++; > npwp->nw_handled++; > + NWS_UNLOCK(nwsp); > np[proto].np_handler(m); > error = 0; > goto out_unlock;