From owner-svn-src-all@FreeBSD.ORG Sun Oct 6 15:16:11 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D6DD96D2; Sun, 6 Oct 2013 15:16:10 +0000 (UTC) (envelope-from mr.kodiak@gmail.com) Received: from mail-ie0-x22a.google.com (mail-ie0-x22a.google.com [IPv6:2607:f8b0:4001:c03::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7E0F62F6D; Sun, 6 Oct 2013 15:16:10 +0000 (UTC) Received: by mail-ie0-f170.google.com with SMTP id x13so13661409ief.1 for ; Sun, 06 Oct 2013 08:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=DyodcM8vIVxsZX+82fWaLPrgDke5LRkBzLQlWkxjUkU=; b=YjkyXTqF8GVh2qLvKM1hBIkOVv+T2o4xPGxuE5bnUz/4qrugJjS7BnE1voT7QToc8W y5Q3DCRXH18QV2AGYGOVI2E7wnHeQOBA35ocVZRug9/IhBsQR4HjyrFwMBaRRuPIsOMF 5WeaA2p/BGHe0jwbFfZahMhPLZ0gxL068GPyg1tdy3fGi6o0gLd5Xqve1H+3//hHVHRS rjURZLeqGiDxPaIi5Nv9ed9g04JGodzkODu3DII85FMDpjyJ4j880O9cdOD5dqP/Z8T6 5AdvWHJK7NreaHvcMDLtdJj/wuBpdyEZw6zabYLtAoEt+rvNzLncPJVPdmUZZOgJuF1X laZA== X-Received: by 10.50.62.211 with SMTP id a19mr13793424igs.18.1381072569926; Sun, 06 Oct 2013 08:16:09 -0700 (PDT) MIME-Version: 1.0 Sender: mr.kodiak@gmail.com Received: by 10.64.6.134 with HTTP; Sun, 6 Oct 2013 08:15:39 -0700 (PDT) In-Reply-To: <52515651.6050809@FreeBSD.org> References: <201310051807.r95I7P0M048589@svn.freebsd.org> <52515651.6050809@FreeBSD.org> From: Bryan Venteicher Date: Sun, 6 Oct 2013 10:15:39 -0500 X-Google-Sender-Auth: 5Oq-hQD3Uz5um_N3SsihmtZ7CIM Message-ID: Subject: Re: svn commit: r256066 - head/sys/dev/virtio/network To: koobs@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-src-head@freebsd.org, Bryan Venteicher , svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 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: Sun, 06 Oct 2013 15:16:11 -0000 On Sun, Oct 6, 2013 at 7:23 AM, Kubilay Kocak wrote: > On 6/10/2013 5:07 AM, Bryan Venteicher wrote: > > Author: bryanv > > Date: Sat Oct 5 18:07:24 2013 > > New Revision: 256066 > > URL: http://svnweb.freebsd.org/changeset/base/256066 > > > > Log: > > Do not hold the vtnet Rx queue lock when calling up into the stack > > > > This matches other similar drivers and avoids various LOR warnings. > > > > Approved by: re (marius) > > > > Modified: > > head/sys/dev/virtio/network/if_vtnet.c > > > > Modified: head/sys/dev/virtio/network/if_vtnet.c > > > ============================================================================== > > --- head/sys/dev/virtio/network/if_vtnet.c Sat Oct 5 16:22:33 2013 > (r256065) > > +++ head/sys/dev/virtio/network/if_vtnet.c Sat Oct 5 18:07:24 2013 > (r256066) > > @@ -1700,9 +1700,9 @@ vtnet_rxq_input(struct vtnet_rxq *rxq, s > > rxq->vtnrx_stats.vrxs_ipackets++; > > rxq->vtnrx_stats.vrxs_ibytes += m->m_pkthdr.len; > > > > - /* VTNET_RXQ_UNLOCK(rxq); */ > > + VTNET_RXQ_UNLOCK(rxq); > > (*ifp->if_input)(ifp, m); > > - /* VTNET_RXQ_LOCK(rxq); */ > > + VTNET_RXQ_LOCK(rxq); > > } > > > > static int > > @@ -1782,6 +1782,10 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) > > m_adj(m, adjsz); > > > > vtnet_rxq_input(rxq, m, hdr); > > + > > + /* Must recheck after dropping the Rx lock. */ > > + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) > > + break; > > } > > > > if (deq > 0) > > _______________________________________________ > > svn-src-head@freebsd.org mailing list > > http://lists.freebsd.org/mailman/listinfo/svn-src-head > > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" > > > > Thanks Bryan, confirming no more LOR apparent after this commit :) > > Is this a good MFC candidate? The driver in -CURRENT is very different than what is in -STABLE. I'll bundle this change (and any applicable subsequent ones) when I MFC in a month or so. > >