From owner-cvs-src@FreeBSD.ORG Sun Jan 9 05:31:16 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B22316A4CE; Sun, 9 Jan 2005 05:31:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 870AE43D3F; Sun, 9 Jan 2005 05:31:16 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j095VGFG042905; Sun, 9 Jan 2005 05:31:16 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j095VGkg042904; Sun, 9 Jan 2005 05:31:16 GMT (envelope-from rwatson) Message-Id: <200501090531.j095VGkg042904@repoman.freebsd.org> From: Robert Watson Date: Sun, 9 Jan 2005 05:31:16 +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/netipx ipx_input.c spx_usrreq.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jan 2005 05:31:16 -0000 rwatson 2005-01-09 05:31:16 UTC FreeBSD src repository Modified files: sys/netipx ipx_input.c spx_usrreq.c Log: Use the IPX PCB list mutex and IPX PCB mutexes to lock down the SPX portion of IPX/SPX: - Protect IPX PCB lists with the IPX PCB list mutex, in particular when calling PCB and PCB list manipulation routines in ipx_pcb.c. - Protect both IPX PCB state and SPX PCB state using the IPX PCB mutex. - Generally annotate locking, as well as adding liberal use of lock assertions to document locking requirements. - Where possible, use unlocked reads when reading integer or smaller sized socket options on SPX sockets. - De-spl throughout. Notes: - spx_input() expects both the list mutex and PCB mutex to be held on entry, but will release both on return. Because sonewconn() is called from spx_input(), it may actually drop one PCB lock and acquire another during generation of a new connection, meaning the caller is not in a position to unlock the PCB mutex. MFC after: 3 weeks Revision Changes Path 1.48 +2 -1 src/sys/netipx/ipx_input.c 1.61 +108 -38 src/sys/netipx/spx_usrreq.c