From owner-cvs-src@FreeBSD.ORG Fri Jul 4 00:24:03 2008 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B37E1065672; Fri, 4 Jul 2008 00:24:03 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 881938FC18; Fri, 4 Jul 2008 00:24:03 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m640O32f050782; Fri, 4 Jul 2008 00:24:03 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m640O3xh050781; Fri, 4 Jul 2008 00:24:03 GMT (envelope-from rwatson@repoman.freebsd.org) Message-Id: <200807040024.m640O3xh050781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rwatson@repoman.freebsd.org using -f From: Robert Watson Date: Fri, 4 Jul 2008 00:21:38 +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/dev/usb usb_ethersubr.c src/sys/kern kern_poll.c src/sys/net if_ppp.c netisr.c netisr.h rtsock.c src/sys/netatalk ddp_usrreq.c src/sys/netgraph ng_base.c src/sys/netinet if_ether.c ip_input.c src/sys/netinet6 ip6_input.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: Fri, 04 Jul 2008 00:24:03 -0000 rwatson 2008-07-04 00:21:38 UTC FreeBSD src repository Modified files: sys/dev/usb usb_ethersubr.c sys/kern kern_poll.c sys/net if_ppp.c netisr.c netisr.h rtsock.c sys/netatalk ddp_usrreq.c sys/netgraph ng_base.c sys/netinet if_ether.c ip_input.c sys/netinet6 ip6_input.c sys/netipx ipx_input.c sys/netnatm natm_proto.c Log: SVN rev 180239 on 2008-07-04 00:21:38Z by rwatson Remove NETISR_MPSAFE, which allows specific netisr handlers to be directly dispatched without Giant, and add NETISR_FORCEQUEUE, which allows specific netisr handlers to always be dispatched via a queue (deferred). Mark the usb and if_ppp netisr handlers as NETISR_FORCEQUEUE, and explicitly acquire Giant in those handlers. Previously, any netisr handler not marked NETISR_MPSAFE would necessarily run deferred and with Giant acquired. This change removes Giant scaffolding from the netisr infrastructure, but NETISR_FORCEQUEUE allows non-MPSAFE handlers to continue to force deferred dispatch so as to avoid lock order reversals between their acqusition of Giant and any calling context. It is likely we will be able to remove NETISR_FORCEQUEUE once IFF_NEEDSGIANT is removed, as non-MPSAFE usb and if_ppp drivers will no longer be supported. Reviewed by: bz MFC after: 1 month X-MFC note: We can't remove NETISR_MPSAFE from stable/7 for KPI reasons, but the rest can go back. Revision Changes Path 1.24 +6 -1 src/sys/dev/usb/usb_ethersubr.c 1.33 +2 -4 src/sys/kern/kern_poll.c 1.123 +4 -3 src/sys/net/if_ppp.c 1.22 +15 -31 src/sys/net/netisr.c 1.35 +1 -1 src/sys/net/netisr.h 1.147 +1 -1 src/sys/net/rtsock.c 1.56 +3 -3 src/sys/netatalk/ddp_usrreq.c 1.160 +1 -2 src/sys/netgraph/ng_base.c 1.172 +1 -1 src/sys/netinet/if_ether.c 1.338 +1 -1 src/sys/netinet/ip_input.c 1.101 +1 -1 src/sys/netinet6/ip6_input.c 1.58 +1 -1 src/sys/netipx/ipx_input.c 1.21 +1 -1 src/sys/netnatm/natm_proto.c