From owner-cvs-all@FreeBSD.ORG  Tue Nov 23 17:21:30 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 BA23816A4CE; Tue, 23 Nov 2004 17:21:30 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id ACE9143D3F; Tue, 23 Nov 2004 17:21:30 +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 iANHLU2p059820;
	Tue, 23 Nov 2004 17:21:30 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iANHLUBP059819;
	Tue, 23 Nov 2004 17:21:30 GMT
	(envelope-from rwatson)
Message-Id: <200411231721.iANHLUBP059819@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 23 Nov 2004 17:21:30 +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/netinet tcp_input.c tcp_subr.c tcp_timer.c
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: Tue, 23 Nov 2004 17:21:30 -0000

rwatson     2004-11-23 17:21:30 UTC

  FreeBSD src repository

  Modified files:
    sys/netinet          tcp_input.c tcp_subr.c tcp_timer.c 
  Log:
  tcp_timewait() performs multiple non-atomic reads on the tcptw
  structure, so assert the inpcb lock associated with the tcptw.
  Also assert the tcbinfo lock, as tcp_timewait() may call
  tcp_twclose() or tcp_2msl_rest(), which require it.  Since
  tcp_timewait() is already called with that lock from tcp_input(),
  this doesn't change current locking, merely documents reasons for
  it.
  
  In tcp_twstart(), assert the tcbinfo lock, as tcp_timer_2msl_rest()
  is called, which requires that lock.
  
  In tcp_twclose(), assert the tcbinfo lock, as tcp_timer_2msl_stop()
  is called, which requires that lock.
  
  Document the locking strategy for the time wait queues in tcp_timer.c,
  which consists of protecting the time wait queues in the same manner
  as the tcbinfo structure (using the tcbinfo lock).
  
  In tcp_timer_2msl_reset(), assert the tcbinfo lock, as the time wait
  queues are modified.
  
  In tcp_timer_2msl_stop(), assert the tcbinfo lock, as the time wait
  queues may be modified.
  
  In tcp_timer_2msl_tw(), assert the tcbinfo lock, as the time wait
  queues may be modified.
  
  MFC after:      2 weeks
  
  Revision  Changes    Path
  1.257     +4 -0      src/sys/netinet/tcp_input.c
  1.211     +2 -0      src/sys/netinet/tcp_subr.c
  1.69      +9 -0      src/sys/netinet/tcp_timer.c