From owner-svn-src-stable-7@FreeBSD.ORG  Sun Jan 11 11:51:18 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E67B210659CF;
	Sun, 11 Jan 2009 11:51:18 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D31DD8FC14;
	Sun, 11 Jan 2009 11:51:18 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BBpI5r027597;
	Sun, 11 Jan 2009 11:51:18 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0BBpIcA027596;
	Sun, 11 Jan 2009 11:51:18 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200901111151.n0BBpIcA027596@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 11 Jan 2009 11:51:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187051 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb netgraph
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2009 11:51:19 -0000

Author: mav
Date: Sun Jan 11 11:51:18 2009
New Revision: 187051
URL: http://svn.freebsd.org/changeset/base/187051

Log:
  MFC rev. 186907:
  
  Mark ng_vjc node as FORCE_WRITER to protect slcompress state.
  I think it can be the reason of livelock in netgraph reported by some
  mpd users.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netgraph/ng_vjc.c

Modified: stable/7/sys/netgraph/ng_vjc.c
==============================================================================
--- stable/7/sys/netgraph/ng_vjc.c	Sun Jan 11 11:36:00 2009	(r187050)
+++ stable/7/sys/netgraph/ng_vjc.c	Sun Jan 11 11:51:18 2009	(r187051)
@@ -249,6 +249,9 @@ ng_vjc_constructor(node_p node)
 
 	NG_NODE_SET_PRIVATE(node, priv);
 
+	/* slcompress is not thread-safe. Protect it's state here. */
+	NG_NODE_FORCE_WRITER(node);
+
 	/* Done */
 	return (0);
 }