Date: Tue, 22 Jun 2004 23:50:09 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 55562 for review Message-ID: <200406222350.i5MNo9Dp023000@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=55562 Change 55562 by rwatson@rwatson_tislabs on 2004/06/22 23:50:05 Integrate netperf_socket. Affected files ... .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/netperf_socket/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#22 integrate .. //depot/projects/netperf_socket/sys/conf/files#28 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#8 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#8 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#7 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#11 integrate .. //depot/projects/netperf_socket/sys/net/if.c#12 integrate .. //depot/projects/netperf_socket/sys/net/if.h#5 integrate .. //depot/projects/netperf_socket/sys/net/if_clone.c#1 branch .. //depot/projects/netperf_socket/sys/net/if_clone.h#1 branch .. //depot/projects/netperf_socket/sys/net/if_disc.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_faith.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_gif.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_loop.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_ppp.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_stf.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#15 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/netperf_socket/sys/netipsec/key.c#5 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx.h#2 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#11 integrate .. //depot/projects/netperf_socket/sys/sys/imgact_aout.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#14 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#7 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/ttycom.h#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/boot/forth/loader.conf#6 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.78 2004/06/20 15:58:24 josef Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $ ############################################################## ### Basic configuration options ############################ @@ -172,8 +172,6 @@ if_tun_load="NO" # Tunnel driver (user process ppp) if_vlan_load="NO" # IEEE 802.1Q VLAN network interface ipfw_load="NO" # Firewall -pfsync_load="NO" # pfsync pseudo interface -pflog_load="NO" # pflog pseudo interface pf_load="NO" # packet filter ==== //depot/projects/netperf_socket/sys/boot/i386/cdboot/cdboot.s#2 (text+ko) ==== @@ -1,19 +1,33 @@ # -# Copyright (c) 2001 John Baldwin +# Copyright (c) 2001 John Baldwin <jhb@FreeBSD.org> # All rights reserved. # -# Redistribution and use in source and binary forms are freely -# permitted provided that the above copyright notice and this -# paragraph and the following disclaimer are duplicated in all -# such forms. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the author nor the names of any co-contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. # -# This software is provided "AS IS" and without any express or -# implied warranties, including, without limitation, the implied -# warranties of merchantability and fitness for a particular -# purpose. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.11 2004/01/12 20:34:42 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.13 2004/06/22 21:55:22 jhb Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -151,7 +165,6 @@ mov $0xffff,%cx # path name by repnz # scanning for scasb # nul char - inc %di # Skip nul mov %di,%si # Point %si at next path mov (%si),%al # Get first char of next path or %al,%al # Is it double nul? ==== //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.24 2004/01/14 22:38:03 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.25 2004/06/22 04:22:34 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -101,6 +101,8 @@ char *ptr, *buf, *cp; size_t len, sz; + GIANT_REQUIRED; + buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); *pbuf = buf; ==== //depot/projects/netperf_socket/sys/conf/NOTES#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1232 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1233 2004/06/22 22:02:57 bms Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -372,9 +372,8 @@ # The default is that packets coming from a tunnel are _not_ processed; # they are assumed trusted. # -# Note that enabling this can be problematic as there are no mechanisms -# in place for distinguishing packets coming out of a tunnel (e.g. no -# encX devices as found on openbsd). +# IPSEC history is preserved for such packets, and can be filtered +# using ipfw(8)'s 'ipsec' keyword, when this option is enabled. # #options IPSEC_FILTERGIF #filter ipsec packets from a tunnel ==== //depot/projects/netperf_socket/sys/conf/files#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.906 2004/06/16 23:23:59 mlaier Exp $ +# $FreeBSD: src/sys/conf/files,v 1.907 2004/06/22 20:13:24 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1222,6 +1222,7 @@ net/if.c standard net/if_arcsubr.c optional arcnet net/if_atmsubr.c optional atm +net/if_clone.c standard net/if_disc.c optional disc net/if_ef.c optional ef net/if_ethersubr.c optional ether ==== //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_auth.c#3 (text+ko) ==== @@ -105,7 +105,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.34 2004/06/21 22:46:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.36 2004/06/22 05:20:30 darrenr Exp $"; #endif @@ -320,9 +320,10 @@ #endif { mb_t *m; -#if defined(_KERNEL) && !SOLARIS && \ - (!defined(__FreeBSD_version) || (__FreeBSD_version < 501000)) +#if defined(_KERNEL) && !SOLARIS +# if !defined(__FreeBSD_version) || (__FreeBSD_version < 501104) struct ifqueue *ifq; +# endif int s; #endif frauth_t auth, *au = &auth, *fra; @@ -444,22 +445,8 @@ # if SOLARIS error = (fr_qin(fra->fra_q, m) == 0) ? EINVAL : 0; # else /* SOLARIS */ -# if __FreeBSD_version >= 501104 - if (! netisr_dispatch(NETISR_IP, m)) + if (! netisr_queue(NETISR_IP, m)) error = ENOBUFS; -# else - ifq = &ipintrq; - if (IF_QFULL(ifq)) { - IF_DROP(ifq); - m_freem(m); - error = ENOBUFS; - } else { - IF_ENQUEUE(ifq, m); -# if IRIX < 605 - schednetisr(NETISR_IP); -# endif - } -# endif # endif /* SOLARIS */ if (error) fr_authstats.fas_quefail++; ==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.8 2004/06/16 23:24:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.9 2004/06/22 20:13:24 brooks Exp $ */ /* $OpenBSD: if_pflog.c,v 1.11 2003/12/31 11:18:25 cedric Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -63,6 +63,9 @@ #endif #include <net/if.h> +#if defined(__FreeBSD__) +#include <net/if_clone.h> +#endif #include <net/if_types.h> #include <net/route.h> #include <net/bpf.h> @@ -123,8 +126,7 @@ #ifdef __FreeBSD__ static MALLOC_DEFINE(M_PFLOG, PFLOGNAME, "Packet Filter Logging Interface"); static LIST_HEAD(pflog_list, pflog_softc) pflog_list; -struct if_clone pflog_cloner = IF_CLONE_INITIALIZER(PFLOGNAME, - pflog_clone_create, pflog_clone_destroy, 1, IF_MAXUNIT); +IFC_SIMPLE_DECLARE(pflog, 1); static void pflog_clone_destroy(struct ifnet *ifp) ==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.8 2004/06/16 23:24:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.9 2004/06/22 20:13:24 brooks Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */ /* @@ -62,6 +62,9 @@ #endif #include <net/if.h> +#if defined(__FreeBSD__) +#include <net/if_clone.h> +#endif #include <net/if_types.h> #include <net/route.h> #include <net/bpf.h> @@ -148,8 +151,7 @@ #ifdef __FreeBSD__ static MALLOC_DEFINE(M_PFSYNC, PFSYNCNAME, "Packet Filter State Sync. Interface"); static LIST_HEAD(pfsync_list, pfsync_softc) pfsync_list; -struct if_clone pfsync_cloner = IF_CLONE_INITIALIZER(PFSYNCNAME, - pfsync_clone_create, pfsync_clone_destroy, 1, IF_MAXUNIT); +IFC_SIMPLE_DECLARE(pfsync, 1); static void pfsync_clone_destroy(struct ifnet *ifp) ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.6 2004/06/16 23:24:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.7 2004/06/22 20:13:25 brooks Exp $ */ /* $OpenBSD: pfvar.h,v 1.187 2004/03/22 04:54:18 mcbride Exp $ */ /* @@ -40,6 +40,7 @@ #include <net/radix.h> #ifdef __FreeBSD__ +#include <net/if_clone.h> #include <vm/uma.h> #else #include <netinet/ip_ipsp.h> ==== //depot/projects/netperf_socket/sys/dev/acpica/acpiio.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.9 2003/09/13 20:13:01 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.10 2004/06/22 08:23:26 brueffer Exp $ */ /* @@ -44,7 +44,7 @@ struct acpi_battinfo { int cap; /* percent */ - int min; /* remianing time */ + int min; /* remaining time */ int state; /* battery state */ }; @@ -57,8 +57,8 @@ u_int32_t dvol; /* Design voltage (mV) */ u_int32_t wcap; /* WARN capacity */ u_int32_t lcap; /* Low capacity */ - u_int32_t gra1; /* Granulity 1(Warn to Low) */ - u_int32_t gra2; /* Granulity 2(Full to Warn) */ + u_int32_t gra1; /* Granularity 1 (Warn to Low) */ + u_int32_t gra2; /* Granularity 2 (Full to Warn) */ char model[ACPI_CMBAT_MAXSTRLEN]; /* model identifier */ char serial[ACPI_CMBAT_MAXSTRLEN]; /* Serial number */ char type[ACPI_CMBAT_MAXSTRLEN]; /* Type */ ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.213 2004/06/16 09:46:37 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.214 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -156,7 +156,7 @@ /* initialize queue and associated lock */ bzero(&ch->queue_mtx, sizeof(struct mtx)); - mtx_init(&ch->queue_mtx, "ATA queue lock", MTX_DEF, 0); + mtx_init(&ch->queue_mtx, "ATA queue lock", NULL, MTX_DEF); TAILQ_INIT(&ch->ata_queue); /* do not attach devices if we are in early boot */ ==== //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.74 2004/06/17 21:36:10 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.75 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -1324,7 +1324,7 @@ ctlr->driver = malloc(sizeof(struct ata_promise_sx4), M_TEMP, M_NOWAIT | M_ZERO); hpkt = ctlr->driver; - mtx_init(&hpkt->mtx, "ATA promise HPKT lock", MTX_DEF, 0); + mtx_init(&hpkt->mtx, "ATA promise HPKT lock", NULL, MTX_DEF); hpkt->busy = hpkt->head = hpkt->tail = 0; if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS, ==== //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.172 2004/04/13 09:44:20 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.173 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -97,7 +97,7 @@ adp->sectors = 17; adp->heads = 8; } - mtx_init(&adp->queue_mtx, "ATA disk bioqueue lock", MTX_DEF, 0); + mtx_init(&adp->queue_mtx, "ATA disk bioqueue lock", NULL, MTX_DEF); bioq_init(&adp->queue); lbasize = (u_int32_t)atadev->param->lba_size_1 | ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.167 2004/06/21 20:42:03 green Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.168 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -230,7 +230,7 @@ if (!(cdp = malloc(sizeof(struct acd_softc), M_ACD, M_NOWAIT | M_ZERO))) return NULL; bioq_init(&cdp->queue); - mtx_init(&cdp->queue_mtx, "ATAPI CD bioqueue lock", MTX_DEF, 0); + mtx_init(&cdp->queue_mtx, "ATAPI CD bioqueue lock", NULL, MTX_DEF); cdp->device = atadev; cdp->lun = ata_get_lun(&acd_lun_map); cdp->block_size = 2048; ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.95 2004/03/01 13:17:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.96 2004/06/22 11:18:25 sos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,7 +82,7 @@ fdp->lun = ata_get_lun(&afd_lun_map); ata_set_name(atadev, "afd", fdp->lun); bioq_init(&fdp->queue); - mtx_init(&fdp->queue_mtx, "ATAPI FD bioqueue lock", MTX_DEF, 0); + mtx_init(&fdp->queue_mtx, "ATAPI FD bioqueue lock", NULL, MTX_DEF); if (afd_sense(fdp)) { free(fdp, M_AFD); ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.91 2004/06/16 09:46:37 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.92 2004/06/22 11:18:25 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -106,7 +106,7 @@ stp->lun = ata_get_lun(&ast_lun_map); ata_set_name(atadev, "ast", stp->lun); bioq_init(&stp->queue); - mtx_init(&stp->queue_mtx, "ATAPI TAPE bioqueue lock", MTX_DEF, 0); + mtx_init(&stp->queue_mtx, "ATAPI TAPE bioqueue lock", NULL, MTX_DEF); if (ast_sense(stp)) { free(stp, M_AST); ==== //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.52 2004/06/21 22:57:10 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.54 2004/06/22 23:05:06 ps Exp $ */ /* @@ -2493,7 +2493,7 @@ for (i = 0; i < sc->ciss_max_logical_bus; i++) ciss_cam_rescan_target(sc, i, CAM_TARGET_WILDCARD); /* Rescan the physical buses */ - for (i = CISS_PHYSICAL_BASE; i < sc->ciss_max_logical_bus + + for (i = CISS_PHYSICAL_BASE; i < sc->ciss_max_physical_bus + CISS_PHYSICAL_BASE; i++) ciss_cam_rescan_target(sc, i, CAM_TARGET_WILDCARD); } @@ -3414,6 +3414,7 @@ if (ld->cl_update == 0) continue; + ld->cl_update = 0; ld->cl_address = cll->lun[i]; ld->cl_controller = &sc->ciss_controllers[bus]; if (ciss_identify_logical(sc, ld) == 0) { ==== //depot/projects/netperf_socket/sys/dev/cy/cy.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.154 2004/06/21 22:57:10 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.155 2004/06/22 20:32:16 phk Exp $"); #include "opt_compat.h" @@ -299,9 +299,7 @@ struct termios lt_out; bool_t do_timestamp; - bool_t do_dcd_timestamp; struct timeval timestamp; - struct timeval dcd_timestamp; u_long bytes_in; /* statistics */ u_long bytes_out; @@ -1283,11 +1281,6 @@ ++com->mdm; modem_status = cd_inb(iobase, CD1400_MSVR2, cy_align); if (modem_status != com->last_modem_status) { - if (com->do_dcd_timestamp - && !(com->last_modem_status & MSR_DCD) - && modem_status & MSR_DCD) - microtime(&com->dcd_timestamp); - /* * Schedule high level to handle DCD changes. Note * that we don't use the delta bits anywhere. Some @@ -1673,10 +1666,6 @@ com->do_timestamp = TRUE; *(struct timeval *)data = com->timestamp; break; - case TIOCDCDTIMESTAMP: - com->do_dcd_timestamp = TRUE; - *(struct timeval *)data = com->dcd_timestamp; - break; default: splx(s); return (ENOTTY); ==== //depot/projects/netperf_socket/sys/dev/digi/digi.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.h,v 1.15 2004/06/16 09:46:42 phk Exp $ + * $FreeBSD: src/sys/dev/digi/digi.h,v 1.16 2004/06/22 20:32:16 phk Exp $ */ #define W(p) (*(u_int16_t *)(p)) @@ -107,10 +107,6 @@ struct termios lt_in; /* should be in struct tty */ struct termios lt_out; - u_int do_timestamp; - u_int do_dcd_timestamp; - struct timeval dcd_timestamp; - u_long bytes_in, bytes_out; u_int delta_error_counts[CE_NTYPES]; u_long error_counts; ==== //depot/projects/netperf_socket/sys/dev/sio/sio.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.440 2004/06/21 22:57:13 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.441 2004/06/22 20:32:16 phk Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -251,9 +251,7 @@ struct termios lt_out; bool_t do_timestamp; - bool_t do_dcd_timestamp; struct timeval timestamp; - struct timeval dcd_timestamp; struct pps_state pps; int pps_bit; #ifdef ALT_BREAK_TO_DEBUGGER @@ -1449,7 +1447,6 @@ com->poll = FALSE; com->poll_output = FALSE; com->do_timestamp = FALSE; - com->do_dcd_timestamp = FALSE; com->pps.ppsparam.mode = 0; sio_setreg(com, com_cfcr, com->cfcr_image &= ~CFCR_SBREAK); tp = com->tp; @@ -1914,11 +1911,6 @@ /* modem status change? (always check before doing output) */ modem_status = inb(com->modem_status_port); if (modem_status != com->last_modem_status) { - if (com->do_dcd_timestamp - && !(com->last_modem_status & MSR_DCD) - && modem_status & MSR_DCD) - microtime(&com->dcd_timestamp); - /* * Schedule high level to handle DCD changes. Note * that we don't use the delta bits anywhere. Some @@ -2160,10 +2152,6 @@ com->do_timestamp = TRUE; *(struct timeval *)data = com->timestamp; break; - case TIOCDCDTIMESTAMP: - com->do_dcd_timestamp = TRUE; - *(struct timeval *)data = com->dcd_timestamp; - break; default: splx(s); error = pps_ioctl(cmd, data, &com->pps); ==== //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ * advised of the possibility of such damage. * * $Id: vinumio.c,v 1.39 2003/05/23 00:59:53 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.99 2004/06/17 17:16:47 phk Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.100 2004/06/22 06:38:01 le Exp $ */ #include <dev/vinum/vinumhdr.h> @@ -68,7 +68,7 @@ drive->lasterror = ENOTBLK; else { DROP_GIANT(); - drive->lasterror = (dsw->d_open) (drive->dev, FWRITE | FREAD, 0, NULL); + drive->lasterror = (dsw->d_open) (drive->dev, FWRITE | FREAD, 0, td); PICKUP_GIANT(); } ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.4 2004/06/18 19:53:33 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.5 2004/06/22 18:13:43 le Exp $"); #include <sys/param.h> #include <sys/bio.h> @@ -421,7 +421,6 @@ g_detach(cp); g_destroy_consumer(cp); - g_free(gp->softc); g_destroy_geom(gp); return (NULL); } ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.2 2004/06/14 17:06:55 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.3 2004/06/22 14:54:31 le Exp $"); #include <sys/param.h> #include <sys/bio.h> @@ -357,7 +357,9 @@ * the desired data. */ if (wp->type == DEGRADED) { - wp->buf = g_malloc(wp->length, M_WAITOK | M_ZERO); + wp->buf = g_malloc(wp->length, M_NOWAIT | M_ZERO); + if (wp->buf == NULL) + return (ENOMEM); wp->bufmalloc = 1; LIST_FOREACH(s, &p->subdisks, in_plex) { /* Skip the broken subdisk. */ @@ -369,7 +371,9 @@ if (rbp->bio == NULL) return (ENOMEM); rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; rbp->bio->bio_cmd = BIO_READ; rbp->bio->bio_offset = wp->offset; @@ -414,7 +418,9 @@ * write the parity stripe back out. */ if (wp->type == DEGRADED) { - wp->buf = g_malloc(wp->length, M_WAITOK | M_ZERO); + wp->buf = g_malloc(wp->length, M_NOWAIT | M_ZERO); + if (wp->buf == NULL) + return (ENOMEM); wp->bufmalloc = 1; /* Copy the original data. */ @@ -432,7 +438,9 @@ if (rbp->bio == NULL) return (ENOMEM); rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; rbp->bio->bio_cmd = BIO_READ; rbp->bio->bio_data = rbp->buf; @@ -476,7 +484,9 @@ * recalculate the parity again. */ } else if (wp->type == COMBINED) { - wp->buf = g_malloc(wp->length, M_WAITOK | M_ZERO); + wp->buf = g_malloc(wp->length, M_NOWAIT | M_ZERO); + if (wp->buf == NULL) + return (ENOMEM); wp->bufmalloc = 1; /* Get the data from all subdisks. */ @@ -492,7 +502,9 @@ return (ENOMEM); rbp->bio->bio_cmd = BIO_READ; rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; rbp->bio->bio_data = rbp->buf; rbp->bio->bio_offset = wp->offset; @@ -544,7 +556,9 @@ return (ENOMEM); rbp->bio->bio_cmd = BIO_READ; rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; rbp->bio->bio_data = rbp->buf; rbp->bio->bio_offset = wp->offset; @@ -568,7 +582,9 @@ * out the parity again. */ } else { - wp->buf = g_malloc(wp->length, M_WAITOK | M_ZERO); + wp->buf = g_malloc(wp->length, M_NOWAIT | M_ZERO); + if (wp->buf == NULL) + return (ENOMEM); wp->bufmalloc = 1; LIST_FOREACH(s, &p->subdisks, in_plex) { /* Skip the parity stripe. */ @@ -591,7 +607,9 @@ } else { rbp->bio->bio_cmd = BIO_READ; rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; } rbp->bio->bio_data = rbp->buf; ==== //depot/projects/netperf_socket/sys/i386/i386/pmap.c#13 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.476 2004/06/20 20:57:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.477 2004/06/22 19:35:43 alc Exp $"); /* * Manages physical address maps. @@ -860,18 +860,34 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - vm_paddr_t pa; + pd_entry_t pde; + pt_entry_t pte; vm_page_t m; m = NULL; - mtx_lock(&Giant); - if ((pa = pmap_extract(pmap, va)) != 0) { - m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); - vm_page_hold(m); - vm_page_unlock_queues(); + if (pmap == NULL) + return (m); + vm_page_lock_queues(); + PMAP_LOCK(pmap); + pde = *pmap_pde(pmap, va); + if (pde != 0) { + if (pde & PG_PS) { + if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { + m = PHYS_TO_VM_PAGE((pde & ~PDRMASK) | + (va & PDRMASK)); + vm_page_hold(m); + } + } else { + pte = *pmap_pte_quick(pmap, va); + if (pte != 0 && + ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { + m = PHYS_TO_VM_PAGE(pte & PG_FRAME); + vm_page_hold(m); + } + } } - mtx_unlock(&Giant); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); return (m); } ==== //depot/projects/netperf_socket/sys/kern/init_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.170 2004/04/05 10:16:38 dfr Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.172 2004/06/22 04:36:24 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ #include "opt_compat.h" @@ -37,8 +37,8 @@ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ { SYF_MPSAFE | AS(wait_args), (sy_call_t *)wait4 }, /* 7 = wait4 */ { compat(SYF_MPSAFE | AS(ocreat_args),creat) }, /* 8 = old creat */ - { AS(link_args), (sy_call_t *)link }, /* 9 = link */ - { AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */ + { SYF_MPSAFE | AS(link_args), (sy_call_t *)link }, /* 9 = link */ + { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */ { 0, (sy_call_t *)nosys }, /* 11 = obsolete execv */ { AS(chdir_args), (sy_call_t *)chdir }, /* 12 = chdir */ { AS(fchdir_args), (sy_call_t *)fchdir }, /* 13 = fchdir */ ==== //depot/projects/netperf_socket/sys/kern/kern_conf.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.152 2004/06/17 17:16:48 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.153 2004/06/22 20:22:24 le Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -50,7 +50,7 @@ extern unsigned char reserved_majors[256]; /* - * This is the number of hash-buckets. Experiements with 'real-life' + * This is the number of hash-buckets. Experiments with 'real-life' * dev_t's show that a prime halfway between two powers of two works * best. */ @@ -241,7 +241,7 @@ } /* - * struct cdev *and u_dev_t primitives + * struct cdev * and u_dev_t primitives */ int @@ -675,8 +675,8 @@ * we do "on-demand" devices, using rman or other "private" methods * will be very tricky to lock down properly once we lock down this file. * - * Instead we give the drivers these routines which puts the struct cdev *'s that - * are to be managed on their own list, and gives the driver the ability + * Instead we give the drivers these routines which puts the struct cdev *'s + * that are to be managed on their own list, and gives the driver the ability * to ask for the first free unit number or a given specified unit number. * * In addition these routines support paired devices (pty, nmdm and similar) @@ -781,7 +781,7 @@ } /* - * Helper sysctl for devname(3). We're given a {u}struct cdev *and return + * Helper sysctl for devname(3). We're given a struct cdev * and return * the name, if any, registered by the device driver. */ static int ==== //depot/projects/netperf_socket/sys/kern/syscalls.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.156 2004/04/05 10:16:38 dfr Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.158 2004/06/22 04:36:25 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ const char *syscallnames[] = { ==== //depot/projects/netperf_socket/sys/kern/syscalls.master#7 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -58,8 +58,8 @@ 7 MSTD { int wait4(int pid, int *status, int options, \ struct rusage *rusage); } wait4 wait_args int 8 MCOMPAT { int creat(char *path, int mode); } -9 STD { int link(char *path, char *link); } -10 STD { int unlink(char *path); } +9 MSTD { int link(char *path, char *link); } +10 MSTD { int unlink(char *path); } 11 OBSOL execv 12 STD { int chdir(char *path); } 13 STD { int fchdir(int fd); } ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#22 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.186 2004/06/21 00:20:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.187 2004/06/22 03:49:22 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -221,12 +221,8 @@ struct sockaddr *nam; struct thread *td; { - int s = splnet(); - int error; - error = (*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td); - splx(s); - return (error); + return ((*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td)); } void @@ -263,24 +259,19 @@ int backlog; struct thread *td; { - int s, error; + int error; /* * XXXRW: Ordering issue here -- perhaps we need to set * SO_ACCEPTCONN before the call to pru_listen()? * XXXRW: General atomic test-and-set concerns here also. */ - s = splnet(); if (so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | - SS_ISDISCONNECTING)) { - splx(s); + SS_ISDISCONNECTING)) return (EINVAL); - } error = (*so->so_proto->pr_usrreqs->pru_listen)(so, td); - if (error) { - splx(s); + if (error) return (error); - } ACCEPT_LOCK(); if (TAILQ_EMPTY(&so->so_comp)) { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406222350.i5MNo9Dp023000>