From owner-p4-projects@FreeBSD.ORG Mon Oct 6 15:17:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13C8916A4C0; Mon, 6 Oct 2003 15:17:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E03B116A4B3 for ; Mon, 6 Oct 2003 15:17:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6854F43F3F for ; Mon, 6 Oct 2003 15:17:05 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h96MH5XJ071608 for ; Mon, 6 Oct 2003 15:17:05 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h96MH4JY071605 for perforce@freebsd.org; Mon, 6 Oct 2003 15:17:04 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Mon, 6 Oct 2003 15:17:04 -0700 (PDT) Message-Id: <200310062217.h96MH4JY071605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 39275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Oct 2003 22:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=39275 Change 39275 by sam@sam_ebb on 2003/10/06 15:16:29 can't assert Giant is not owned--with net.isr.enable set to 1 there are paths that bring us in to ip_input with Giant held (e.g. through the loopback interface) Affected files ... .. //depot/projects/netperf/sys/netinet/ip_divert.c#5 edit .. //depot/projects/netperf/sys/netinet/ip_input.c#9 edit .. //depot/projects/netperf/sys/netinet/ip_mroute.c#12 edit Differences ... ==== //depot/projects/netperf/sys/netinet/ip_divert.c#5 (text+ko) ==== @@ -158,8 +158,6 @@ u_int16_t nport; struct sockaddr_in divsrc; - mtx_assert(&Giant, MA_NOTOWNED); - /* Sanity check */ KASSERT(port != 0, ("%s: port=0", __func__)); ==== //depot/projects/netperf/sys/netinet/ip_input.c#9 (text+ko) ==== @@ -367,8 +367,6 @@ int s, error; #endif /* FAST_IPSEC */ - mtx_assert(&Giant, MA_NOTOWNED); - args.eh = NULL; args.oif = NULL; args.rule = NULL; ==== //depot/projects/netperf/sys/netinet/ip_mroute.c#12 (text+ko) ==== @@ -1312,8 +1312,6 @@ int error; vifi_t vifi; - mtx_assert(&Giant, MA_NOTOWNED); - if (mrtdebug & DEBUG_FORWARD) log(LOG_DEBUG, "ip_mforward: src %lx, dst %lx, ifp %p\n", (u_long)ntohl(ip->ip_src.s_addr), (u_long)ntohl(ip->ip_dst.s_addr),