From owner-cvs-all@FreeBSD.ORG Thu Jun 24 01:37:08 2004 Return-Path: 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 E744D16A4CE; Thu, 24 Jun 2004 01:37:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFC8543D49; Thu, 24 Jun 2004 01:37:08 +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 i5O1b4WO011749; Thu, 24 Jun 2004 01:37:04 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O1b4Y6011748; Thu, 24 Jun 2004 01:37:04 GMT (envelope-from rwatson) Message-Id: <200406240137.i5O1b4Y6011748@repoman.freebsd.org> From: Robert Watson Date: Thu, 24 Jun 2004 01:37:04 +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/kern uipc_socket2.c src/sys/netinet tcp_input.c src/sys/sys socketvar.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 01:37:09 -0000 rwatson 2004-06-24 01:37:04 UTC FreeBSD src repository Modified files: sys/kern uipc_socket2.c sys/netinet tcp_input.c sys/sys socketvar.h Log: Introduce sbreserve_locked(), which asserts the socket buffer lock on the socket buffer having its limits adjusted. sbreserve() now acquires the lock before calling sbreserve_locked(). In soreserve(), acquire socket buffer locks across read-modify-writes of socket buffer fields, and calls into sbreserve/sbrelease; make sure to acquire in keeping with the socket buffer lock order. In tcp_mss(), acquire the socket buffer lock in the calling context so that we have atomic read-modify -write on buffer sizes. Revision Changes Path 1.135 +26 -7 src/sys/kern/uipc_socket2.c 1.244 +6 -2 src/sys/netinet/tcp_input.c 1.127 +2 -0 src/sys/sys/socketvar.h