From owner-cvs-src@FreeBSD.ORG Wed Sep 29 04:54:34 2004 Return-Path: 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 2A8C216A4CE; Wed, 29 Sep 2004 04:54:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02F1243D2D; Wed, 29 Sep 2004 04:54:34 +0000 (GMT) (envelope-from mlaier@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 i8T4sX7N043174; Wed, 29 Sep 2004 04:54:33 GMT (envelope-from mlaier@repoman.freebsd.org) Received: (from mlaier@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8T4sXsl043173; Wed, 29 Sep 2004 04:54:33 GMT (envelope-from mlaier) Message-Id: <200409290454.i8T4sXsl043173@repoman.freebsd.org> From: Max Laier Date: Wed, 29 Sep 2004 04:54:33 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src UPDATING src/share/man/man9 pfil.9 src/sys/contrib/ipfilter/netinet ip_fil.c src/sys/contrib/pf/net pf.c pf_ioctl.c pfvar.h src/sys/net bridge.c pfil.c pfil.h src/sys/netinet ip_fastfwd.c ip_fw.h ip_fw2.c ip_fw_pfil.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 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: Wed, 29 Sep 2004 04:54:34 -0000 mlaier 2004-09-29 04:54:33 UTC FreeBSD src repository Modified files: . UPDATING share/man/man9 pfil.9 sys/contrib/ipfilter/netinet ip_fil.c sys/contrib/pf/net pf.c pf_ioctl.c pfvar.h sys/net bridge.c pfil.c pfil.h sys/netinet ip_fastfwd.c ip_fw.h ip_fw2.c ip_fw_pfil.c ip_input.c ip_output.c sys/netinet6 ip6_forward.c ip6_input.c ip6_output.c sys/sys param.h Log: Add an additional struct inpcb * argument to pfil(9) in order to enable passing along socket information. This is required to work around a LOR with the socket code which results in an easy reproducible hard lockup with debug.mpsafenet=1. This commit does *not* fix the LOR, but enables us to do so later. The missing piece is to turn the filter locking into a leaf lock and will follow in a seperate (later) commit. This will hopefully be MT5'ed in order to fix the problem for RELENG_5 in forseeable future. Suggested by: rwatson A lot of work by: csjp (he'd be even more helpful w/o mentor-reviews ;) Reviewed by: rwatson, csjp Tested by: -pf, -ipfw, LINT, csjp and myself MFC after: 3 days LOR IDs: 14 - 17 (not fixed yet) Revision Changes Path 1.366 +5 -0 src/UPDATING 1.16 +3 -3 src/share/man/man9/pfil.9 1.49 +25 -2 src/sys/contrib/ipfilter/netinet/ip_fil.c 1.20 +85 -2 src/sys/contrib/pf/net/pf.c 1.16 +16 -12 src/sys/contrib/pf/net/pf_ioctl.c 1.10 +11 -0 src/sys/contrib/pf/net/pfvar.h 1.84 +1 -1 src/sys/net/bridge.c 1.10 +6 -6 src/sys/net/pfil.c 1.12 +5 -4 src/sys/net/pfil.h 1.21 +2 -2 src/sys/netinet/ip_fastfwd.c 1.91 +3 -2 src/sys/netinet/ip_fw.h 1.77 +32 -11 src/sys/netinet/ip_fw2.c 1.10 +6 -2 src/sys/netinet/ip_fw_pfil.c 1.291 +1 -1 src/sys/netinet/ip_input.c 1.232 +1 -1 src/sys/netinet/ip_output.c 1.27 +1 -1 src/sys/netinet6/ip6_forward.c 1.78 +1 -1 src/sys/netinet6/ip6_input.c 1.84 +1 -1 src/sys/netinet6/ip6_output.c 1.216 +1 -1 src/sys/sys/param.h