From owner-cvs-src@FreeBSD.ORG Mon Jul 18 16:55:47 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org 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 7660D16A41C; Mon, 18 Jul 2005 16:55:47 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A41743D5D; Mon, 18 Jul 2005 16:55:47 +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 j6IGtl04064183; Mon, 18 Jul 2005 16:55:47 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6IGtloC064182; Mon, 18 Jul 2005 16:55:47 GMT (envelope-from rwatson) Message-Id: <200507181655.j6IGtloC064182@repoman.freebsd.org> From: Robert Watson Date: Mon, 18 Jul 2005 16:55:47 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/net if_atmsubr.c src/sys/netnatm natm.c natm.h natm_pcb.c natm_proto.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 18 Jul 2005 16:55:47 -0000 rwatson 2005-07-18 16:55:47 UTC FreeBSD src repository Modified files: sys/net if_atmsubr.c sys/netnatm natm.c natm.h natm_pcb.c natm_proto.c Log: Lock down netnatm and mark as MPSAFE: - Introduce a subsystem mutex, natm_mtx, manipulated with accessor macros NATM_LOCK_INIT(), NATM_LOCK(), NATM_UNLOCK(), NATM_LOCK_ASSERT(). It protects the consistency of pcb-related data structures. Finer grained locking is possible, but should be done in the context of specific measurements (as very little work is done in netnatm -- most is in the ATM device driver or socket layer, so there's probably not much contention). - Remove GIANT_REQUIRED, mark as NETISR_MPSAFE, remove NET_NEEDS_GIANT("netnatm"). - Conditionally acquire Giant when entering network interfaces for ifp->if_ioctl() using IFF_LOCKGIANT(ifp)/IFF_UNLOCKGIANT(ifp) in order to coexist with non-MPSAFE atm ifnet drivers.. - De-spl. MFC after: 2 weeks Reviewed by: harti, bms (various versions) Revision Changes Path 1.38 +9 -6 src/sys/net/if_atmsubr.c 1.38 +56 -51 src/sys/netnatm/natm.c 1.11 +7 -0 src/sys/netnatm/natm.h 1.16 +3 -5 src/sys/netnatm/natm_pcb.c 1.16 +2 -3 src/sys/netnatm/natm_proto.c