From owner-svn-src-user@FreeBSD.ORG  Thu Nov 13 05:31:37 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 E3A3D106567E;
	Thu, 13 Nov 2008 05:31:37 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CBF688FC19;
	Thu, 13 Nov 2008 05:31:37 +0000 (UTC)
	(envelope-from kmacy@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 mAD5VbPw050283;
	Thu, 13 Nov 2008 05:31:37 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAD5VbmE050282;
	Thu, 13 Nov 2008 05:31:37 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811130531.mAD5VbmE050282@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 13 Nov 2008 05:31:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184911 - user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Nov 2008 05:31:38 -0000

Author: kmacy
Date: Thu Nov 13 05:31:37 2008
New Revision: 184911
URL: http://svn.freebsd.org/changeset/base/184911

Log:
  lock buf ring on dequeue

Modified:
  user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_osdep.h

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_osdep.h
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_osdep.h	Thu Nov 13 05:28:42 2008	(r184910)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/cxgb_osdep.h	Thu Nov 13 05:31:37 2008	(r184911)
@@ -228,7 +228,7 @@ buf_ring_full(struct buf_ring *mr)
  *
  */
 static __inline void *
-buf_ring_dequeue(struct buf_ring *mr)
+__buf_ring_dequeue(struct buf_ring *mr)
 {
 	uint32_t prod, cons, mask;
 	caddr_t *ring, m;
@@ -236,19 +236,28 @@ buf_ring_dequeue(struct buf_ring *mr)
 	ring = (caddr_t *)mr->br_ring;
 	mask = mr->br_size - 1;
 	cons = mr->br_cons;
-	mb();
 	prod = mr->br_prod;
 	m = NULL;
 	if (cons != prod) {
 		m = ring[cons];
 		ring[cons] = NULL;
 		mr->br_cons = (cons + 1) & mask;
-		mb();
 	}
 	return (m);
 }
 
-#ifdef DEBUG_BUFRING
+static __inline void *
+buf_ring_dequeue(struct buf_ring *mr)
+{
+	void *buf;
+	
+	mtx_lock(&mr->br_lock);
+	buf = __buf_ring_dequeue(mr);
+	mtx_unlock(&mr->br_lock);
+	return (buf);
+}
+	
+#ifdef INVARIANT_SUPPORT
 static __inline void
 __buf_ring_scan(struct buf_ring *mr, void *m, char *file, int line)
 {