Date: Wed, 5 Nov 2003 20:29:36 -0800 (PST) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 41557 for review Message-ID: <200311060429.hA64TakY083244@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=41557 Change 41557 by sam@sam_ebb on 2003/11/05 20:29:33 IFC @ 41555 Affected files ... .. //depot/projects/netperf/sys/coda/coda_subr.c#5 integrate .. //depot/projects/netperf/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/netperf/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/netperf/sys/conf/NOTES#17 integrate .. //depot/projects/netperf/sys/conf/files#21 integrate .. //depot/projects/netperf/sys/conf/kern.mk#2 integrate .. //depot/projects/netperf/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/netperf/sys/conf/kmod.mk#7 integrate .. //depot/projects/netperf/sys/conf/options#17 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/netperf/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/netperf/sys/dev/firewire/if_fwe.c#7 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#10 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_intr.c#7 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_tx.c#7 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#8 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi.c#13 integrate .. //depot/projects/netperf/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/netperf/sys/dev/xe/if_xe_pccard.c#7 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/netperf/sys/fs/udf/osta.c#2 integrate .. //depot/projects/netperf/sys/fs/udf/osta.h#2 integrate .. //depot/projects/netperf/sys/fs/udf/udf.h#2 integrate .. //depot/projects/netperf/sys/fs/udf/udf_iconv.c#1 branch .. //depot/projects/netperf/sys/fs/udf/udf_mount.h#1 branch .. //depot/projects/netperf/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/netperf/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/netperf/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/netperf/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/nexus.c#4 integrate .. //depot/projects/netperf/sys/i386/include/bus_dma.h#3 integrate .. //depot/projects/netperf/sys/kern/kern_mac.c#7 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#16 integrate .. //depot/projects/netperf/sys/kern/subr_bus.c#11 integrate .. //depot/projects/netperf/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/netperf/sys/kern/vfs_default.c#5 integrate .. //depot/projects/netperf/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/netperf/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/netperf/sys/modules/udf/Makefile#2 integrate .. //depot/projects/netperf/sys/net/netisr.c#7 edit .. //depot/projects/netperf/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/netperf/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/netperf/sys/netinet6/in6.c#15 integrate .. //depot/projects/netperf/sys/netinet6/in6.h#6 integrate .. //depot/projects/netperf/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/netperf/sys/netinet6/in6_proto.c#7 integrate .. //depot/projects/netperf/sys/netinet6/in6_src.c#18 integrate .. //depot/projects/netperf/sys/netinet6/ip6_var.h#9 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/netperf/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/netperf/sys/pc98/i386/busio.s#2 integrate .. //depot/projects/netperf/sys/pci/if_xl.c#9 integrate .. //depot/projects/netperf/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/netperf/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/netperf/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/netperf/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/netperf/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/netperf/sys/sys/iconv.h#3 integrate .. //depot/projects/netperf/sys/sys/mount.h#2 integrate .. //depot/projects/netperf/sys/sys/mutex.h#6 integrate .. //depot/projects/netperf/sys/sys/proc.h#9 integrate .. //depot/projects/netperf/sys/sys/sched.h#4 integrate .. //depot/projects/netperf/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/netperf/sys/sys/vnode.h#5 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/netperf/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/netperf/sys/vm/vm_map.c#12 integrate Differences ... ==== //depot/projects/netperf/sys/coda/coda_subr.c#5 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/coda/coda_subr.c,v 1.27 2003/10/05 07:44:45 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_subr.c,v 1.28 2003/11/05 04:30:06 kan Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -307,12 +307,12 @@ void coda_checkunmounting(mp) struct mount *mp; -{ +{ register struct vnode *vp, *nvp; struct cnode *cp; int count = 0, bad = 0; - mtx_lock(&mntvnode_mtx); + MNT_ILOCK(mp); for (vp = TAILQ_FIRST(&mp->mnt_nvnodelist); vp; vp = nvp) { nvp = TAILQ_NEXT(vp, v_nmntvnodes); if (vp->v_mount != mp) @@ -331,7 +331,7 @@ } VI_UNLOCK(vp); } - mtx_unlock(&mntvnode_mtx); + MNT_IUNLOCK(mp); } void ==== //depot/projects/netperf/sys/compat/linux/linux_ipc.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.37 2003/06/10 21:27:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.38 2003/11/05 01:53:10 fjoe Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -716,7 +716,7 @@ /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_INFO, - (void *)&bsd_shminfo, &bufsz, 1); + (void *)&bsd_shminfo, &bufsz); if (error) return error; @@ -731,7 +731,7 @@ /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, SHM_INFO, - (void *)&bsd_shm_info, &bufsz, 1); + (void *)&bsd_shm_info, &bufsz); if (error) return error; @@ -744,7 +744,7 @@ case LINUX_IPC_STAT: /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_STAT, - (void *)&bsd_shmid, &bufsz, 1); + (void *)&bsd_shmid, &bufsz); if (error) return error; @@ -756,7 +756,7 @@ case LINUX_SHM_STAT: /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_STAT, - (void *)&bsd_shmid, &bufsz, 1); + (void *)&bsd_shmid, &bufsz); if (error) return error; @@ -775,7 +775,7 @@ /* Perform shmctl wanting removed segments lookup */ return kern_shmctl(td, args->shmid, IPC_SET, - (void *)&bsd_shmid, &bufsz, 1); + (void *)&bsd_shmid, &bufsz); case LINUX_IPC_RMID: { void *buf; @@ -790,7 +790,7 @@ linux_to_bsd_shmid_ds(&linux_shmid, &bsd_shmid); buf = (void *)&bsd_shmid; } - return kern_shmctl(td, args->shmid, IPC_RMID, buf, &bufsz, 1); + return kern_shmctl(td, args->shmid, IPC_RMID, buf, &bufsz); } case LINUX_SHM_LOCK: ==== //depot/projects/netperf/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.55 2003/06/22 08:41:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.56 2003/11/05 23:52:54 anholt Exp $"); #include "opt_mac.h" @@ -268,8 +268,13 @@ linux_statfs.f_bavail = bsd_statfs->f_bavail; linux_statfs.f_ffree = bsd_statfs->f_ffree; linux_statfs.f_files = bsd_statfs->f_files; - linux_statfs.f_fsid.val[0] = bsd_statfs->f_fsid.val[0]; - linux_statfs.f_fsid.val[1] = bsd_statfs->f_fsid.val[1]; + if (suser(td)) { + linux_statfs.f_fsid.val[0] = 0; + linux_statfs.f_fsid.val[1] = 0; + } else { + linux_statfs.f_fsid.val[0] = bsd_statfs->f_fsid.val[0]; + linux_statfs.f_fsid.val[1] = bsd_statfs->f_fsid.val[1]; + } linux_statfs.f_namelen = MAXNAMLEN; return copyout(&linux_statfs, args->buf, sizeof(linux_statfs)); } @@ -312,8 +317,13 @@ linux_statfs.f_bavail = bsd_statfs->f_bavail; linux_statfs.f_ffree = bsd_statfs->f_ffree; linux_statfs.f_files = bsd_statfs->f_files; - linux_statfs.f_fsid.val[0] = bsd_statfs->f_fsid.val[0]; - linux_statfs.f_fsid.val[1] = bsd_statfs->f_fsid.val[1]; + if (suser(td)) { + linux_statfs.f_fsid.val[0] = 0; + linux_statfs.f_fsid.val[1] = 0; + } else { + linux_statfs.f_fsid.val[0] = bsd_statfs->f_fsid.val[0]; + linux_statfs.f_fsid.val[1] = bsd_statfs->f_fsid.val[1]; + } linux_statfs.f_namelen = MAXNAMLEN; error = copyout(&linux_statfs, args->buf, sizeof(linux_statfs)); fdrop(fp, td); ==== //depot/projects/netperf/sys/conf/NOTES#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1183 2003/10/28 05:47:39 sam Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1186 2003/11/05 14:32:27 bde Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -151,7 +151,7 @@ # but will work just fine on UP too. Users of this scheduler should expect # some hicups and be prepaired to provide feedback. # -options SCHED_4BSD +options SCHED_4BSD #options SCHED_ULE ##################################################################### @@ -449,7 +449,7 @@ options NETGRAPH_TTY options NETGRAPH_UI options NETGRAPH_VJC -options NETGRAPH_ATM_ATMPIF +options NETGRAPH_ATM_ATMPIF # NgATM - Netgraph ATM options NGATM_ATM @@ -582,7 +582,6 @@ options PIM # Protocol Independent Multicast options IPFIREWALL #firewall options IPFIREWALL_VERBOSE #enable logging to syslogd(8) -options IPFIREWALL_FORWARD #enable transparent proxy support options IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity options IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default options IPV6FIREWALL #firewall for IPv6 @@ -601,7 +600,7 @@ # various random failures / extreme cases related to mbuf # functions. See the mbuf(9) manpage for a list of available # test cases. -options MBUF_STRESS_TEST +options MBUF_STRESS_TEST # RANDOM_IP_ID causes the ID field in IP packets to be randomized # instead of incremented by 1 with each packet generated. This @@ -793,9 +792,10 @@ # Optional character code conversion support with LIBICONV. # Each option requires their base file system and LIBICONV. -options CD9660_ICONV -options MSDOSFS_ICONV -options NTFS_ICONV +options CD9660_ICONV +options MSDOSFS_ICONV +options NTFS_ICONV +options UDF_ICONV ##################################################################### @@ -807,7 +807,7 @@ options _KPOSIX_PRIORITY_SCHEDULING # p1003_1b_semaphores are very experimental, # user should be ready to assist in debugging if problems arise. -options P1003_1B_SEMAPHORES +options P1003_1B_SEMAPHORES ##################################################################### @@ -843,14 +843,6 @@ options HZ=100 -# If you see the "calcru: negative time of %ld usec for pid %d (%s)\n" -# message you probably have some broken sw/hw which disables interrupts -# for too long. You can make the system more resistant to this by -# choosing a high value for NTIMECOUNTER. The default is 5, there -# is no upper limit but more than a couple of hundred are not productive. - -options NTIMECOUNTER=20 - # Enable support for the kernel PLL to use an external PPS signal, # under supervision of [x]ntpd(8) # More info in ntpd documentation: http://www.eecis.udel.edu/~ntp @@ -983,7 +975,7 @@ # DA_OLD_QUIRKS: Restore old USB and firewire quirks that have been # deprecated. Please also email scsi@freebsd.org if you # have a device that needs this option. -options DA_OLD_QUIRKS +options DA_OLD_QUIRKS # Options for the CAM CDROM driver: # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN @@ -1055,7 +1047,7 @@ # disk devices in the system looking for components that it recognizes (already # configured once before) and auto-configured them into arrays. device raidframe -options RAID_AUTOCONFIG +options RAID_AUTOCONFIG # Kernel side iconv library options LIBICONV @@ -1353,7 +1345,6 @@ options DPT_TIMEOUT_FACTOR=4 options DPT_LOST_IRQ options DPT_RESET_HBA -options DPT_ALLOW_MEMIO # # Compaq "CISS" RAID controllers (SmartRAID 5* series) @@ -1757,7 +1748,7 @@ device utopia #ATM PHY driver options NATM #native ATM -options LIBMBPOOL #needed by patm, iatm +options LIBMBPOOL #needed by patm, iatm # # Audio drivers: `pcm', `sbc', `gusc' @@ -2131,7 +2122,7 @@ # can be used in combination with an external daemon to create a # software-based watchdog solution. # -options WATCHDOG +options WATCHDOG # # Disable swapping of upages and stack pages. This option removes all @@ -2241,7 +2232,7 @@ makeoptions UKBD_DFLT_KEYMAP=it.iso # options for uvscom: -options UVSCOM_DEFAULT_OPKTSIZE=8 # default output packet size +options UVSCOM_DEFAULT_OPKTSIZE=8 # default output packet size ##################################################################### # FireWire support @@ -2255,10 +2246,10 @@ device dcons # dumb console driver device dcons_crom # FireWire attachment -options DCONS_BUF_SIZE=16384 # buffer size -options DCONS_POLL_HZ=100 # polling rate -options DCONS_FORCE_CONSOLE=0 # force to be the primary console -options DCONS_FORCE_GDB=1 # force to be the gdb device +options DCONS_BUF_SIZE=16384 # buffer size +options DCONS_POLL_HZ=100 # polling rate +options DCONS_FORCE_CONSOLE=0 # force to be the primary console +options DCONS_FORCE_GDB=1 # force to be the gdb device ##################################################################### # crypto subsystem @@ -2276,12 +2267,12 @@ device rndtest # FIPS 140-2 entropy tester device hifn # Hifn 7951, 7781, etc. -options HIFN_DEBUG # enable debugging support: hw.hifn.debug -options HIFN_RNDTEST # enable rndtest support +options HIFN_DEBUG # enable debugging support: hw.hifn.debug +options HIFN_RNDTEST # enable rndtest support device ubsec # Broadcom 5501, 5601, 58xx -options UBSEC_DEBUG # enable debugging support: hw.ubsec.debug -options UBSEC_RNDTEST # enable rndtest support +options UBSEC_DEBUG # enable debugging support: hw.ubsec.debug +options UBSEC_RNDTEST # enable rndtest support ##################################################################### @@ -2295,7 +2286,7 @@ # Debug options options BUS_DEBUG # enable newbus debugging options DEBUG_VFS_LOCKS # enable vfs lock debugging -options SOCKBUF_DEBUG # enable sockbuf last record/mb tail checking +options SOCKBUF_DEBUG # enable sockbuf last record/mb tail checking ##################################################################### # SYSV IPC KERNEL PARAMETERS @@ -2354,13 +2345,13 @@ # file. Both offset and length of the read operation must be # multiples of the physical media sector size. # -#options DIRECTIO +#options DIRECTIO # Specify a lower limit for the number of swap I/O buffers. They are # (among other things) used when bypassing the buffer cache due to # DIRECTIO kernel option enabled and O_DIRECT flag set on file. # -#options NSWBUF_MIN=120 +#options NSWBUF_MIN=120 ##################################################################### @@ -2403,7 +2394,7 @@ options SLIP_IFF_OPTS options VFS_BIO_DEBUG # VFS buffer I/O debugging -options KSTACK_MAX_PAGES=32 # Maximum pages to give the kernel stack +options KSTACK_MAX_PAGES=32 # Maximum pages to give the kernel stack # Yet more undocumented options for linting. options AAC_DEBUG ==== //depot/projects/netperf/sys/conf/files#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.843 2003/11/03 12:05:58 harti Exp $ +# $FreeBSD: src/sys/conf/files,v 1.844 2003/11/05 06:38:14 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -940,6 +940,7 @@ fs/smbfs/smbfs_vfsops.c optional smbfs fs/smbfs/smbfs_vnops.c optional smbfs fs/specfs/spec_vnops.c standard +fs/udf/udf_iconv.c optional udf_iconv fs/udf/udf_vfsops.c optional udf fs/udf/udf_vnops.c optional udf fs/udf/osta.c optional udf ==== //depot/projects/netperf/sys/conf/kern.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.36 2003/05/30 01:06:58 peter Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.37 2003/11/04 23:29:17 peter Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -24,6 +24,7 @@ # .if ${MACHINE_ARCH} == "i386" CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 +INLINE_LIMIT?= 15000 .endif # @@ -33,6 +34,7 @@ # .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -mno-fp-regs -ffixed-8 -Wa,-mev6 +INLINE_LIMIT?= 15000 .endif # @@ -41,6 +43,7 @@ # .if ${MACHINE_ARCH} == "ia64" CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata +INLINE_LIMIT?= 15000 .endif # @@ -50,6 +53,7 @@ # .if ${MACHINE_ARCH} == "sparc64" CFLAGS+= -mcmodel=medlow -msoft-float +INLINE_LIMIT?= 15000 .endif # @@ -60,6 +64,7 @@ CFLAGS+= -mcmodel=kernel -mno-red-zone \ -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow \ -msoft-float -fno-asynchronous-unwind-tables +INLINE_LIMIT?= 20000 .endif # ==== //depot/projects/netperf/sys/conf/kern.pre.mk#6 (text+ko) ==== @@ -1,10 +1,7 @@ -# kern.pre.mk -# -# Unified Makefile for building kernels. This includes all the definitions -# that need to be included before %BEFORE_DEPEND -# -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.35 2003/10/27 11:19:08 harti Exp $ -# +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.37 2003/11/05 12:20:16 bde Exp $ + +# Part of a unified Makefile for building kernels. This part contains all +# of the definitions that need to be before %BEFORE_DEPEND. # Can be overridden by makeoptions or /etc/make.conf KERNEL_KO?= kernel @@ -39,7 +36,9 @@ INCLUDES+= -I$S/contrib/ngatm COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h -CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common +CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} +CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} -fno-strict-aliasing +WERROR?= -Werror # XXX LOCORE means "don't declare C stuff" not "for locore.s". ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} @@ -55,10 +54,6 @@ .endif .endif DEFINED_PROF= ${PROF} -WERROR?= -Werror -INLINE_LIMIT?= 15000 -CFLAGS+= -finline-limit=${INLINE_LIMIT} -fno-strict-aliasing - # Put configuration-specific C flags last (except for ${PROF}) so that they # can override the others. ==== //depot/projects/netperf/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.143 2003/10/03 22:00:06 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.144 2003/11/04 23:29:17 peter Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -99,7 +99,6 @@ CFLAGS+= -I@/../include -I${DESTDIR}/usr/include .endif # @ -INLINE_LIMIT?= 15000 CFLAGS+= -finline-limit=${INLINE_LIMIT} # Disallow common variables, and if we end up with commons from ==== //depot/projects/netperf/sys/conf/options#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.422 2003/11/01 00:18:29 njl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.424 2003/11/05 14:37:48 bde Exp $ # # On the handling of kernel options # @@ -122,7 +122,6 @@ MD_ROOT_SIZE opt_md.h NDGBPORTS opt_dgb.h NSWBUF_MIN opt_swap.h -NTIMECOUNTER opt_ntp.h PANIC_REBOOT_WAIT_TIME opt_panic.h PPS_SYNC opt_ntp.h PUC_FASTINTR opt_puc.h @@ -202,6 +201,7 @@ CD9660_ICONV opt_dontuse.h MSDOSFS_ICONV opt_dontuse.h NTFS_ICONV opt_dontuse.h +UDF_ICONV opt_dontuse.h # If you are following the conditions in the copyright, # you can enable soft-updates which will speed up a lot of thigs @@ -344,7 +344,6 @@ IPFIREWALL_VERBOSE opt_ipfw.h IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h -IPFIREWALL_FORWARD opt_ipfw.h IPV6FIREWALL opt_ip6fw.h IPV6FIREWALL_VERBOSE opt_ip6fw.h IPV6FIREWALL_VERBOSE_LIMIT opt_ip6fw.h @@ -426,8 +425,6 @@ # This makes "atm.h" unusable. NATM -DPT_ALLOW_MEMIO opt_dpt.h # Allow PCI devices to use memory - # mapped I/O # DPT driver debug flags DPT_MEASURE_PERFORMANCE opt_dpt.h DPT_HANDLE_TIMEOUTS opt_dpt.h @@ -552,23 +549,12 @@ BUS_DEBUG opt_bus.h # options for USB support -UHCI_DEBUG opt_usb.h -OHCI_DEBUG opt_usb.h USB_DEBUG opt_usb.h -UGEN_DEBUG opt_usb.h -UHID_DEBUG opt_usb.h -UHUB_DEBUG opt_usb.h -UKBD_DEBUG opt_usb.h -ULPT_DEBUG opt_usb.h -UMASS_DEBUG opt_usb.h -UMS_DEBUG opt_usb.h -URIO_DEBUG opt_usb.h UKBD_DFLT_KEYMAP opt_ukbd.h UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h # Vinum options VINUMDEBUG opt_vinum.h -VINUM_AUTOSTART opt_vinum.h # Embedded system options INIT_PATH opt_init_path.h @@ -632,7 +618,6 @@ # options for hifn driver HIFN_DEBUG opt_hifn.h HIFN_RNDTEST opt_hifn.h -HIFN_NO_RNG opt_hifn.h # options for safenet driver SAFE_DEBUG opt_safe.h ==== //depot/projects/netperf/sys/contrib/dev/acpica/dmresrc.c#2 (text+ko) ==== @@ -435,7 +435,7 @@ /* The list must have a valid END_TAG */ - if (ByteData[ByteCount-2] != (ACPI_RDESC_TYPE_END_TAG | 1)) + if (ByteData[ByteCount-1] != (ACPI_RDESC_TYPE_END_TAG | 1)) { return FALSE; } ==== //depot/projects/netperf/sys/dev/ata/ata-raid.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.69 2003/09/08 13:36:26 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.70 2003/11/05 15:41:20 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -184,7 +184,7 @@ rdp->disk.d_fwheads = rdp->heads; rdp->disk.d_maxsize = 128 * DEV_BSIZE; rdp->disk.d_drv1 = rdp; - disk_create(rdp->lun, &rdp->disk, 0, NULL, NULL); + disk_create(rdp->lun, &rdp->disk, DISKFLAG_NOGIANT, NULL, NULL); printf("ar%d: %lluMB <ATA ", rdp->lun, (unsigned long long) (rdp->total_sectors / ((1024L * 1024L) / DEV_BSIZE))); @@ -715,7 +715,7 @@ buf1->bp.bio_pblkno = lba; if ((buf1->drive = drv) > 0) buf1->bp.bio_pblkno += rdp->offset; - buf1->bp.bio_caller1 = (void *)rdp; + buf1->bp.bio_driver1 = (void *)rdp; buf1->bp.bio_bcount = chunk * DEV_BSIZE; buf1->bp.bio_data = data; buf1->bp.bio_cmd = bp->bio_cmd; @@ -841,7 +841,7 @@ static void ar_done(struct bio *bp) { - struct ar_softc *rdp = (struct ar_softc *)bp->bio_caller1; + struct ar_softc *rdp = (struct ar_softc *)bp->bio_driver1; struct ar_buf *buf = (struct ar_buf *)bp; switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { ==== //depot/projects/netperf/sys/dev/firewire/if_fwe.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.22 2003/11/03 13:01:23 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.23 2003/11/06 04:19:15 simokawa Exp $ */ #include "opt_inet.h" @@ -58,7 +58,7 @@ #include <dev/firewire/firewirereg.h> #include <dev/firewire/if_fwevar.h> -#define FWEDEBUG if (fwedebug) printf +#define FWEDEBUG if (fwedebug) if_printf #define TX_MAX_QUEUE (FWMAXQUEUE - 1) #define RX_MAX_QUEUE FWMAXQUEUE @@ -210,7 +210,7 @@ #endif - FWEDEBUG("interface %s created.\n", ifp->if_xname); + FWEDEBUG(ifp, "interface created\n"); return 0; } @@ -286,7 +286,7 @@ struct mbuf *m; int i; - FWEDEBUG("initializing %s\n", ifp->if_xname); + FWEDEBUG(ifp, "initializing\n"); /* XXX keep promiscoud mode */ ifp->if_flags |= IFF_PROMISC; @@ -441,7 +441,7 @@ fwe = (struct fwe_softc *)xfer->sc; ifp = &fwe->fwe_if; /* XXX error check */ - FWEDEBUG("resp = %d\n", xfer->resp); + FWEDEBUG(ifp, "resp = %d\n", xfer->resp); if (xfer->resp != 0) ifp->if_oerrors ++; @@ -463,12 +463,12 @@ struct fwe_softc *fwe = ((struct fwe_eth_softc *)ifp->if_softc)->fwe; int s; - FWEDEBUG("%s starting\n", ifp->if_xname); + FWEDEBUG(ifp, "starting\n"); if (fwe->dma_ch < 0) { struct mbuf *m = NULL; - FWEDEBUG("%s not ready.\n", ifp->if_xname); + FWEDEBUG(ifp, "not ready\n"); s = splimp(); do { @@ -602,7 +602,7 @@ fp->mode.stream.len - ETHER_ALIGN; m->m_pkthdr.rcvif = ifp; #if 0 - FWEDEBUG("%02x %02x %02x %02x %02x %02x\n" + FWEDEBUG(ifp, "%02x %02x %02x %02x %02x %02x\n" "%02x %02x %02x %02x %02x %02x\n" "%02x %02x %02x %02x\n" "%02x %02x %02x %02x\n" ==== //depot/projects/netperf/sys/dev/hatm/if_hatm.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.17 2003/10/31 18:32:01 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.18 2003/11/05 11:47:31 harti Exp $"); #include "opt_inet.h" #include "opt_natm.h" @@ -1399,6 +1399,11 @@ kenv_getuint(sc, "max_mbuf_pages", &sc->mbuf_max_pages, HE_CONFIG_MAX_MBUF_PAGES, 0); + /* mpsafe */ + kenv_getuint(sc, "mpsafe", &sc->mpsafe, 0, 0); + if (sc->mpsafe != 0) + sc->mpsafe = INTR_MPSAFE; + return (0); } @@ -1936,8 +1941,8 @@ bpfattach(ifp, DLT_ATM_RFC1483, sizeof(struct atmllc)); #endif - error = bus_setup_intr(dev, sc->irqres, INTR_TYPE_NET, hatm_intr, - &sc->irq_0, &sc->ih); + error = bus_setup_intr(dev, sc->irqres, sc->mpsafe | INTR_TYPE_NET, + hatm_intr, &sc->irq_0, &sc->ih); if (error != 0) { device_printf(dev, "could not setup interrupt\n"); hatm_detach(dev); ==== //depot/projects/netperf/sys/dev/hatm/if_hatm_intr.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_intr.c,v 1.14 2003/10/30 16:19:50 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_intr.c,v 1.15 2003/11/05 11:15:47 harti Exp $"); /* * ForeHE driver. @@ -231,7 +231,7 @@ for (i = 0; i < MBUF0_PER_PAGE; i++, c++) { c->hdr.pageno = sc->mbuf_npages; c->hdr.chunkno = i; - c->hdr.flags = MBUF_USED; + c->hdr.flags = 0; hatm_ext_free(&sc->mbuf_list[0], (struct mbufx_free *)c); } @@ -246,7 +246,7 @@ for (i = 0; i < MBUF1_PER_PAGE; i++, c++) { c->hdr.pageno = sc->mbuf_npages; c->hdr.chunkno = i; - c->hdr.flags = MBUF_USED; + c->hdr.flags = 0; hatm_ext_free(&sc->mbuf_list[1], (struct mbufx_free *)c); } ==== //depot/projects/netperf/sys/dev/hatm/if_hatm_tx.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_tx.c,v 1.8 2003/10/29 15:15:19 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_tx.c,v 1.9 2003/11/05 11:43:06 harti Exp $"); #include "opt_inet.h" #include "opt_natm.h" @@ -78,7 +78,32 @@ #include <dev/hatm/if_hatmreg.h> #include <dev/hatm/if_hatmvar.h> + /* + * These macros are used to trace the flow of transmit mbufs and to + * detect transmit mbuf leaks in the driver. + */ +#ifdef HATM_DEBUG +#define hatm_free_txmbuf(SC) \ + do { \ + if (--sc->txmbuf < 0) \ + DBG(sc, TX, ("txmbuf below 0!")); \ + else if (sc->txmbuf == 0) \ + DBG(sc, TX, ("txmbuf now 0")); \ + } while (0) +#define hatm_get_txmbuf(SC) \ + do { \ + if (++sc->txmbuf > 20000) \ + DBG(sc, TX ("txmbuf %u", sc->txmbuf)); \ + else if (sc->txmbuf == 1) \ + DBG(sc, TX, ("txmbuf leaves 0")); \ + } while (0) +#else +#define hatm_free_txmbuf(SC) do { } while (0) +#define hatm_get_txmbuf(SC) do { } while (0) +#endif + +/* * Allocate a new TPD, zero the TPD part. Cannot return NULL if * flag is 0. The TPD is removed from the free list and its used * bit is set. @@ -124,6 +149,7 @@ { if (tpd->mbuf != NULL) { bus_dmamap_unload(sc->tx_tag, tpd->map); + hatm_free_txmbuf(sc); m_freem(tpd->mbuf); tpd->mbuf = NULL; } @@ -344,9 +370,13 @@ if (m == NULL) break; + hatm_get_txmbuf(sc); + if (m->m_len < sizeof(*aph)) - if ((m = m_pullup(m, sizeof(*aph))) == NULL) + if ((m = m_pullup(m, sizeof(*aph))) == NULL) { + hatm_free_txmbuf(sc); continue; + } aph = mtod(m, struct atm_pseudohdr *); arg.vci = ATM_PH_VCI(aph); @@ -354,12 +384,14 @@ m_adj(m, sizeof(*aph)); if ((len = m->m_pkthdr.len) == 0) { + hatm_free_txmbuf(sc); m_freem(m); continue; } if ((arg.vpi & ~HE_VPI_MASK) || (arg.vci & ~HE_VCI_MASK) || (arg.vci == 0)) { + hatm_free_txmbuf(sc); m_freem(m); continue; } @@ -367,10 +399,12 @@ arg.vcc = sc->vccs[cid]; if (arg.vcc == NULL || !(arg.vcc->vflags & HE_VCC_OPEN)) { + hatm_free_txmbuf(sc); m_freem(m); continue; } if (arg.vcc->vflags & HE_VCC_FLOW_CTRL) { + hatm_free_txmbuf(sc); m_freem(m); sc->istats.flow_drop++; continue; @@ -380,6 +414,7 @@ if (arg.vcc->param.aal == ATMIO_AAL_RAW) { if (len < 52) { /* too short */ + hatm_free_txmbuf(sc); m_freem(m); continue; } @@ -388,8 +423,10 @@ * Get the header and ignore except * payload type and CLP. */ - if (m->m_len < 4 && (m = m_pullup(m, 4)) == NULL) + if (m->m_len < 4 && (m = m_pullup(m, 4)) == NULL) { + hatm_free_txmbuf(sc); continue; + } arg.pti = mtod(m, u_char *)[3] & 0xf; arg.pti = ((arg.pti & 0xe) << 2) | ((arg.pti & 1) << 1); m_adj(m, 4); @@ -412,6 +449,7 @@ * TPD to get a map. Additional TPDs may be allocated by the * callback. */ if ((tpd = hatm_alloc_tpd(sc, M_NOWAIT)) == NULL) { + hatm_free_txmbuf(sc); m_freem(m); sc->ifatm.ifnet.if_oerrors++; continue; @@ -430,6 +468,9 @@ sc->istats.defrag++; m = m_defrag(m, M_DONTWAIT); if (m == NULL) { + tpd->mbuf = NULL; + hatm_free_txmbuf(sc); + hatm_free_tpd(sc, tpd); sc->ifatm.ifnet.if_oerrors++; continue; } ==== //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#8 (text+ko) ==== @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt <harti@freebsd.org> * - * $FreeBSD: src/sys/dev/hatm/if_hatmvar.h,v 1.13 2003/10/31 13:35:22 harti Exp $ + * $FreeBSD: src/sys/dev/hatm/if_hatmvar.h,v 1.15 2003/11/05 11:47:31 harti Exp $ * * Fore HE driver for NATM */ @@ -458,9 +458,14 @@ /* internal statistics */ struct istats istats; + u_int mpsafe; + #ifdef HATM_DEBUG /* debugging */ u_int debug; + + /* transmit mbuf count */ + int txmbuf; #endif }; ==== //depot/projects/netperf/sys/dev/wi/if_wi.c#13 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.155 2003/11/04 00:31:58 green Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.157 2003/11/04 23:47:19 green Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -655,9 +655,15 @@ wi_write_val(sc, WI_RID_PORTTYPE, WI_PORTTYPE_ADHOC); break; case IEEE80211_M_HOSTAP: - /* The card can lock up if we don't toggle it first. */ - wi_cmd(sc, WI_CMD_DISABLE | WI_PORT0, 0, 0, 0); - wi_cmd(sc, WI_CMD_ENABLE | WI_PORT0, 0, 0, 0); + /* + * For PRISM cards, override the empty SSID, because in + * HostAP mode the controller will lock up otherwise. + */ + if (sc->sc_firmware_type == WI_INTERSIL && + ic->ic_des_esslen == 0) { + ic->ic_des_essid[0] = ' '; >>> TRUNCATED FOR MAIL (1000 lines) <<<home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311060429.hA64TakY083244>