Date: Thu, 17 Jun 2004 23:56:33 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 55197 for review Message-ID: <200406172356.i5HNuX7R038421@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=55197 Change 55197 by rwatson@rwatson_paprika on 2004/06/17 23:56:18 Integrate netperf_socket to loop back in additional socket and socket buffer locking, raw_cb locking, conversions to conditional giant assertions in a number of places in the network stack, locking annotations for socket and socket buffer, . Also included are udev_t/dev_t changes, better clock_gettime(), nice moves to process from kseseg, a UFS deadlock fix, pf import, ATA stability fixes, etc. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#9 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/include/cpu.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cpu.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/nexus_io.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/dinode.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/inode.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/netperf_socket/sys/coda/cnode.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#4 integrate .. //depot/projects/netperf_socket/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_psdev.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_venus.c#3 integrate .. //depot/projects/netperf_socket/sys/coda/coda_venus.h#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_types.h#3 integrate .. //depot/projects/netperf_socket/sys/conf/files#27 integrate .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/fla/fla.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#7 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#7 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_if.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#8 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_osfp.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_subr.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/netinet/in4_cksum.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#15 integrate .. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_core.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_core.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_drv.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_fops.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_vm.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/fb/gfb.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/vga.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwmem.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/gfb/gfb_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ida/idavar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/iicbus/iic.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/joy/joy.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/joy/joyvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/led/led.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/led/led.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/matcd/matcd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/matcd/matcd_data.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/mcd/mcd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mcd/mcdvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlxvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/mly/mly.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/mly/mlyvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/null/null.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openpromio.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pcfclock.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pps.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scdvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/smbus/smb.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/streams/streams.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/sysmouse.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_vars.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe_compat.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe_freebsd.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ums.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/urio.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinum.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumconfig.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumext.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumobj.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumutil.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/zs/z8530var.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_rule.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_hash.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_ihash.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_ihash.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_inode.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf.h#2 integrate .. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom.h#4 integrate .. //depot/projects/netperf_socket/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_dev.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_extern.h#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_ihash.c#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_mount.h#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/inode.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_toshiba.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/bios/apm.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/bios/apm.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/bios/smapi.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/bios.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/i386/geode.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mem.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/perfmon.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/cpu.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/pmap.h#7 integrate .. //depot/projects/netperf_socket/sys/i386/isa/mse.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_ext.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_hdr.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_kbd.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_sup.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spic.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spkr.c#3 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_ctl.c#3 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_rbch.c#3 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_tel.c#3 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_trace.c#3 integrate .. //depot/projects/netperf_socket/sys/i4b/layer4/i4b_i4bdrv.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/mem.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/cpu.h#3 integrate .. //depot/projects/netperf_socket/sys/isa/psm.c#6 integrate .. //depot/projects/netperf_socket/sys/isa/vga_isa.c#4 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/iso.h#3 integrate .. //depot/projects/netperf_socket/sys/kern/init_main.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_acct.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_clock.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_physio.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_resource.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_time.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/subr_devstat.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/subr_log.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/sys_socket.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/tty_conf.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/tty_cons.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/tty_tty.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#10 integrate .. //depot/projects/netperf_socket/sys/modules/pf/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/pflog/Makefile#3 delete .. //depot/projects/netperf_socket/sys/modules/pfsync/Makefile#3 delete .. //depot/projects/netperf_socket/sys/net/bpf.c#7 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if.c#11 integrate .. //depot/projects/netperf_socket/sys/net/if_arcsubr.c#8 integrate .. //depot/projects/netperf_socket/sys/net/if_ef.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/netperf_socket/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_iso88025subr.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_sl.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#8 integrate .. //depot/projects/netperf_socket/sys/net/if_tapvar.h#5 integrate .. //depot/projects/netperf_socket/sys/net/if_tun.c#8 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#14 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#6 integrate .. //depot/projects/netperf_socket/sys/net/ppp_tty.c#2 integrate .. //depot/projects/netperf_socket/sys/net/raw_cb.c#6 integrate .. //depot/projects/netperf_socket/sys/net/raw_cb.h#3 integrate .. //depot/projects/netperf_socket/sys/net/raw_usrreq.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#8 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#8 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tty.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/in.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/in_proto.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/netperf_socket/sys/netncp/ncp_mod.c#4 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_trantcp.c#5 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_dev.c#3 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/nfsclient/krpc_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#7 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_syscalls.c#9 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#12 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#8 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/mse.c#5 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/olpt.c#5 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/pc98gdc.c#5 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#10 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/wd_cd.c#3 integrate .. //depot/projects/netperf_socket/sys/pccard/pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/pccard/slot.h#2 integrate .. //depot/projects/netperf_socket/sys/pci/agp.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/agppriv.h#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_ti.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/if_tireg.h#2 integrate .. //depot/projects/netperf_socket/sys/pci/xrpu.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_syscons.h#2 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/netperf_socket/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/netperf_socket/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/netperf_socket/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/netperf_socket/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/creator/creator.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/creator/creator_upa.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/cpu.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/mem.c#5 integrate .. //depot/projects/netperf_socket/sys/sys/_lock.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/_types.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/acct.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/bio.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/linedisc.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mac.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/mac_policy.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#13 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#13 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#11 integrate .. //depot/projects/netperf_socket/sys/sys/sched.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/snoop.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/stat.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/sysctl.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/systm.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/types.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/user.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#6 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/dinode.h#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extern.h#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_ihash.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/device_pager.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_param.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.49 2004/06/03 05:58:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.50 2004/06/16 09:46:26 phk Exp $"); /* * Memory special file @@ -67,9 +67,9 @@ #include <vm/pmap.h> #include <vm/vm_extern.h> -static dev_t memdev, kmemdev; +static struct cdev *memdev, *kmemdev; #ifdef PERFMON -static dev_t perfdev; +static struct cdev *perfdev; #endif /* PERFMON */ static d_open_t mmopen; @@ -95,7 +95,7 @@ struct mem_range_softc mem_range_softc; static int -mmclose(dev_t dev, int flags, int fmt, struct thread *td) +mmclose(struct cdev *dev, int flags, int fmt, struct thread *td) { switch (minor(dev)) { #ifdef PERFMON @@ -109,7 +109,7 @@ } static int -mmopen(dev_t dev, int flags, int fmt, struct thread *td) +mmopen(struct cdev *dev, int flags, int fmt, struct thread *td) { int error; @@ -136,7 +136,7 @@ /*ARGSUSED*/ static int -mmrw(dev_t dev, struct uio *uio, int flags) +mmrw(struct cdev *dev, struct uio *uio, int flags) { vm_offset_t o, v; int c = 0; @@ -219,7 +219,7 @@ * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) +memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { /* * /dev/mem is the only one that makes sense through this @@ -240,7 +240,7 @@ } static int -mmioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td) +mmioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td) { switch(minor(dev)) { #ifdef PERFMON ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#9 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.149 2004/06/12 06:03:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.150 2004/06/15 19:28:39 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1425,12 +1425,6 @@ return uma_zalloc(pvzone, M_NOWAIT); } -/* - * If it is the first entry on the list, it is actually - * in the header and we must copy the following entry up - * to the header. Otherwise we must search the list for - * the entry. In either case we free the now unused entry. - */ static int pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) ==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.38 2004/06/04 16:02:48 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.39 2004/06/16 09:46:26 phk Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -86,7 +86,7 @@ int promopen(dev, flag, mode, td) - dev_t dev; + struct cdev *dev; int flag, mode; struct thread *td; { @@ -137,7 +137,7 @@ int promclose(dev, flag, mode, td) - dev_t dev; + struct cdev *dev; int flag, mode; struct thread *td; { ==== //depot/projects/netperf_socket/sys/alpha/include/cpu.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.37 2004/04/05 21:00:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.38 2004/06/16 09:46:26 phk Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -66,7 +66,7 @@ /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ +#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ #define CPU_ROOT_DEVICE 2 /* string: root device name */ #define CPU_UNALIGNED_PRINT 3 /* int: print unaligned accesses */ #define CPU_UNALIGNED_FIX 4 /* int: fix unaligned accesses */ ==== //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.44 2004/06/04 16:02:48 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.45 2004/06/16 09:46:27 phk Exp $"); #include "opt_ddb.h" @@ -258,7 +258,7 @@ static int -zsopen(dev_t dev, int flag, int mode, struct thread *td) +zsopen(struct cdev *dev, int flag, int mode, struct thread *td) { struct zs_softc *sc = ZS_SOFTC(minor(dev)); struct tty *tp; @@ -305,7 +305,7 @@ } static int -zsclose(dev_t dev, int flag, int mode, struct thread *td) +zsclose(struct cdev *dev, int flag, int mode, struct thread *td) { struct zs_softc *sc = ZS_SOFTC(minor(dev)); struct tty *tp; ==== //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.115 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.116 2004/06/16 09:46:27 phk Exp $"); /* * Memory special file @@ -68,7 +68,7 @@ #include <vm/pmap.h> #include <vm/vm_extern.h> -static dev_t memdev, kmemdev, iodev; +static struct cdev *memdev, *kmemdev, *iodev; static d_open_t mmopen; static d_close_t mmclose; @@ -95,7 +95,7 @@ struct mem_range_softc mem_range_softc; static int -mmclose(dev_t dev, int flags, int fmt, struct thread *td) +mmclose(struct cdev *dev, int flags, int fmt, struct thread *td) { switch (minor(dev)) { case 14: @@ -105,7 +105,7 @@ } static int -mmopen(dev_t dev, int flags, int fmt, struct thread *td) +mmopen(struct cdev *dev, int flags, int fmt, struct thread *td) { int error; @@ -133,7 +133,7 @@ /*ARGSUSED*/ static int -mmrw(dev_t dev, struct uio *uio, int flags) +mmrw(struct cdev *dev, struct uio *uio, int flags) { int o; u_long c = 0, v; @@ -214,7 +214,7 @@ * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) +memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { switch (minor(dev)) { @@ -242,7 +242,7 @@ * and mem_range_attr_set. */ static int -mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td) +mmioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) { int nd, error = 0; struct mem_range_op *mo = (struct mem_range_op *)data; ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#14 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.470 2004/06/14 01:17:50 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.475 2004/06/17 06:16:57 alc Exp $"); /* * Manages physical address maps. @@ -774,19 +774,23 @@ if (pmap == 0) return 0; + PMAP_LOCK(pmap); pdep = pmap_pde(pmap, va); if (pdep) { pde = *pdep; if (pde) { if ((pde & PG_PS) != 0) { rtval = (pde & ~PDRMASK) | (va & PDRMASK); + PMAP_UNLOCK(pmap); return rtval; } pte = pmap_pte(pmap, va); rtval = ((*pte & PG_FRAME) | (va & PAGE_MASK)); + PMAP_UNLOCK(pmap); return rtval; } } + PMAP_UNLOCK(pmap); return 0; } @@ -1223,10 +1227,6 @@ *pd = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } - vm_page_lock_queues(); - vm_page_wakeup(m); - vm_page_unlock_queues(); - return m; } @@ -1427,12 +1427,6 @@ return uma_zalloc(pvzone, M_NOWAIT); } -/* - * If it is the first entry on the list, it is actually - * in the header and we must copy the following entry up - * to the header. Otherwise we must search the list for - * the entry. In either case we free the now unused entry. - */ static int pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) @@ -1440,6 +1434,7 @@ pv_entry_t pv; int rtval; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->md.pv_list_count < pmap->pm_stats.resident_count) { TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -1500,6 +1495,7 @@ pt_entry_t oldpte; vm_page_t m, mpte; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); oldpte = pte_load_clear(ptq); if (oldpte & PG_W) pmap->pm_stats.wired_count -= 1; @@ -1540,6 +1536,7 @@ { pt_entry_t *pte; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); pte = pmap_pte(pmap, va); if (pte == NULL || (*pte & PG_V) == 0) return; @@ -1566,8 +1563,12 @@ if (pmap == NULL) return; + /* + * Perform an unsynchronized read. This is, however, safe. + */ if (pmap->pm_stats.resident_count == 0) return; + PMAP_LOCK(pmap); /* * special handling of removing one page. a very @@ -1578,6 +1579,7 @@ pde = pmap_pde(pmap, sva); if (pde && (*pde & PG_PS) == 0) { pmap_remove_page(pmap, sva); + PMAP_UNLOCK(pmap); return; } } @@ -1648,6 +1650,7 @@ if (anyvalid) pmap_invalidate_all(pmap); + PMAP_UNLOCK(pmap); } /* @@ -1938,7 +1941,9 @@ if (opa) { int err; vm_page_lock_queues(); + PMAP_LOCK(pmap); err = pmap_remove_pte(pmap, pte, va); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); @@ -2570,7 +2575,7 @@ if (pde == NULL || (*pde & PG_V) == 0) return (FALSE); pte = vtopte(addr); - if ((*pte & PG_V) == 0) + if (*pte & PG_V) return (FALSE); return (TRUE); } @@ -2791,12 +2796,12 @@ vm_page_t m; int val = 0; + PMAP_LOCK(pmap); ptep = pmap_pte(pmap, addr); - if (ptep == 0) { - return 0; - } + pte = (ptep != NULL) ? *ptep : 0; + PMAP_UNLOCK(pmap); - if ((pte = *ptep) != 0) { + if (pte != 0) { vm_paddr_t pa; val = MINCORE_INCORE; ==== //depot/projects/netperf_socket/sys/amd64/include/cpu.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.71 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.72 2004/06/16 09:46:28 phk Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -65,7 +65,7 @@ /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ +#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ #define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ #define CPU_DISRTCSET 3 /* int: disable resettodr() call */ #define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */ ==== //depot/projects/netperf_socket/sys/arm/arm/nexus_io.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.3 2004/06/17 17:51:47 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -75,8 +75,6 @@ /* get kernel virtual address */ 0, /* there is no linear mapping */ - NULL, - /* barrier */ nexus_bs_barrier, @@ -190,7 +188,7 @@ } int -nexus_bs_mmap(dev_t dev, vm_offset_t off, vm_paddr_t *addr, int prot) +nexus_bs_mmap(struct cdev *dev, vm_offset_t off, vm_paddr_t *addr, int prot) { *addr = off; return (0); ==== //depot/projects/netperf_socket/sys/arm/include/bus.h#2 (text+ko) ==== @@ -67,7 +67,7 @@ * (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/arm/include/bus.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/bus.h,v 1.3 2004/06/17 17:51:47 cognet Exp $ */ #ifndef _MACHINE_BUS_H_ @@ -117,9 +117,6 @@ /* get kernel virtual address */ void * (*bs_vaddr) (void *, bus_space_handle_t); - /* mmap bus space for user */ - int (*bs_mmap) (dev_t, vm_offset_t, vm_paddr_t *, int); - /* barrier */ void (*bs_barrier) (void *, bus_space_handle_t, bus_size_t, bus_size_t, int); @@ -258,12 +255,6 @@ (*(t)->bs_vaddr)((t)->bs_cookie, (h)) /* - * MMap bus space for a user application. - */ -#define bus_space_mmap(t, a, o, p, f) \ - (*(t)->bs_mmap)((t)->bs_cookie, (a), (o), (p), (f)) - -/* * Bus barrier operations. */ #define bus_space_barrier(t, h, o, l, f) \ @@ -411,7 +402,7 @@ void * __bs_c(f,_bs_vaddr) (void *t, bus_space_handle_t bsh); #define bs_mmap_proto(f) \ -int __bs_c(f,_bs_mmap) (dev_t, vm_offset_t, vm_paddr_t *, int); +int __bs_c(f,_bs_mmap) (struct cdev *, vm_offset_t, vm_paddr_t *, int); #define bs_barrier_proto(f) \ void __bs_c(f,_bs_barrier) (void *t, bus_space_handle_t bsh, \ ==== //depot/projects/netperf_socket/sys/arm/sa11x0/assabet_machdep.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.1 2004/05/14 11:46:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.2 2004/06/17 17:52:12 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -257,16 +257,6 @@ valloc_pages(kernelstack, KSTACK_PAGES); -#ifdef VERBOSE_INIT_ARM - printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa, - irqstack.pv_va); - printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa, - abtstack.pv_va); - printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa, - undstack.pv_va); - printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa, - kernelstack.pv_va); -#endif /* * Allocate memory for the l1 and l2 page tables. The scheme to avoid * wasting memory by allocating the l1pt on the first 16k memory was @@ -285,10 +275,6 @@ l1pagetable = kernel_l1pt.pv_pa; - /* XXX bla **/ -#if 0 - bcopy((void*)0xd0300000, &mfs_root, MD_ROOT_SIZE*1024); -#endif /* Map the L2 pages tables in the L1 page table */ pmap_link_l2pt(l1pagetable, 0x00000000, &kernel_pt_table[KERNEL_PT_SYS]); @@ -349,7 +335,7 @@ cpu_tlb_flushID(); cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)); - /* + /* * Pages were allocated during the secondary bootstrap for the * stacks for different CPU modes. * We must now set the r13 registers in the different CPU modes to @@ -358,7 +344,6 @@ * of the stack memory. */ printf("init subsystems: stacks\n"); - set_stackptr(PSR_IRQ32_MODE, irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE); set_stackptr(PSR_ABT32_MODE, @@ -383,56 +368,8 @@ bootverbose = 1; -#if 0 - set_cpufuncs(); -#endif /* Set stack for exception handlers */ -#if 0 - printf("arm_init: physical_pages = %08x\n", physical_pages); - printf("arm_init: kernel_l1pt: pa = %08x, va = %08x\n", - kernel_l1pt.pv_pa, kernel_l1pt.pv_va); - printf("arm_init: proc0_uarea: pa = %08x, va = %08x\n", - proc0_uarea.pv_pa, proc0_uarea.pv_va); - printf("arm_init: proc0_kstack: pa = %08x, va = %08x\n", - proc0_kstack.pv_pa, proc0_kstack.pv_va); -#endif - -/* printf("arm_init: physfree = %08x\n", physical_freestart); - printf("arm_init: first = %08x\n", first); - printf("arm_init: end = %08x\n", (uint32_t) &end); - - printf("arm_init: params = %08x\n", params); - printf("arm_init: params: page_size = %08x\n", params->u1.s.page_size); - printf("arm_init: params: nrpages = %08x\n", params->u1.s.nr_pages); - printf("arm_init: params: ramdisk_size = %08x\n", params->u1.s.ramdisk_size); - printf("arm_init: params: flags = %08x\n", params->u1.s.flags); - printf("arm_init: params: rootdev = %08x\n", params->u1.s.rootdev); - printf("arm_init: params: video_num_cols = %08x\n", params->u1.s.video_num_cols); - printf("arm_init: params: video_num_rows = %08x\n", params->u1.s.video_num_rows); - printf("arm_init: params: video_x = %08x\n", params->u1.s.video_x); - printf("arm_init: params: video_y = %08x\n", params->u1.s.video_y); - printf("arm_init: params: memc_control_reg = %08x\n", params->u1.s.memc_control_reg); - printf("arm_init: params: sounddefault = %02x\n", params->u1.s.sounddefault); - printf("arm_init: params: adfsdrives = %02x\n", params->u1.s.adfsdrives); - printf("arm_init: params: bytes_per_char_h = %02x\n", params->u1.s.bytes_per_char_h); - printf("arm_init: params: bytes_per_char_v = %02x\n", params->u1.s.bytes_per_char_v); - for(i = 0; i < 4; i++) { - printf("arm_init: params: pages_in_bank[%d] = %08x\n", i, params->u1.s.pages_in_bank[i]); - } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406172356.i5HNuX7R038421>