From owner-cvs-all@FreeBSD.ORG  Thu Jun 17 22:48:27 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 607BF16A4D0; Thu, 17 Jun 2004 22:48:27 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5803543D5A; Thu, 17 Jun 2004 22:48:27 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5HMmCZC023295;
	Thu, 17 Jun 2004 22:48:12 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5HMmCLt023294;
	Thu, 17 Jun 2004 22:48:12 GMT
	(envelope-from rwatson)
Message-Id: <200406172248.i5HMmCLt023294@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 17 Jun 2004 22:48:12 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/fs/fifofs fifo_vnops.c src/sys/fs/portalfs
 portal_vnops.c src/sys/kern sys_socket.c uipc_socket.c
 uipc_socket2.c vfs_aio.c src/sys/netgraph ng_ksocket.csrc/sys/netsmb ...
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jun 2004 22:48:27 -0000

rwatson     2004-06-17 22:48:11 UTC

  FreeBSD src repository

  Modified files:
    sys/fs/fifofs        fifo_vnops.c 
    sys/fs/portalfs      portal_vnops.c 
    sys/kern             sys_socket.c uipc_socket.c uipc_socket2.c 
                         vfs_aio.c 
    sys/netgraph         ng_ksocket.c 
    sys/netgraph/bluetooth/socket ng_btsocket_rfcomm.c 
    sys/netsmb           smb_trantcp.c 
    sys/nfsserver        nfs_syscalls.c 
  Log:
  Merge additional socket buffer locking from rwatson_netperf:
  
  - Lock down low hanging fruit use of sb_flags with socket buffer
    lock.
  
  - Lock down low hanging fruit use of so_state with socket lock.
  
  - Lock down low hanging fruit use of so_options.
  
  - Lock down low-hanging fruit use of sb_lowwat and sb_hiwat with
    socket buffer lock.
  
  - Annotate situations in which we unlock the socket lock and then
    grab the receive socket buffer lock, which are currently actually
    the same lock.  Depending on how we want to play our cards, we
    may want to coallesce these lock uses to reduce overhead.
  
  - Convert a if()->panic() into a KASSERT relating to so_state in
    soaccept().
  
  - Remove a number of splnet()/splx() references.
  
  More complex merging of socket and socket buffer locking to
  follow.
  
  Revision  Changes    Path
  1.98      +2 -0      src/sys/fs/fifofs/fifo_vnops.c
  1.63      +4 -0      src/sys/fs/portalfs/portal_vnops.c
  1.60      +20 -0     src/sys/kern/sys_socket.c
  1.179     +25 -14    src/sys/kern/uipc_socket.c
  1.132     +24 -0     src/sys/kern/uipc_socket2.c
  1.171     +15 -2     src/sys/kern/vfs_aio.c
  1.11      +12 -0     src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  1.45      +14 -0     src/sys/netgraph/ng_ksocket.c
  1.21      +6 -0      src/sys/netsmb/smb_trantcp.c
  1.101     +8 -0      src/sys/nfsserver/nfs_syscalls.c