Date: Mon, 1 May 2006 09:14:13 GMT From: "George V. Neville-Neil" <gnn@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 96479 for review Message-ID: <200605010914.k419EDLG016605@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=96479 Change 96479 by gnn@gnn_devbox_fast_ipsec on 2006/05/01 09:13:21 Integrate my own view from HEAD Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/conf/GENERIC#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/lib.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/lib.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/main.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/xmodem.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0/xmodem.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/inc/AT91RM9200.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/cam.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/NOTES#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.alpha#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.amd64#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.i386#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.ia64#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.pc98#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.alpha#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.amd64#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.i386#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.ia64#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.pc98#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc_acpi.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc_isa.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc_pci.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_ebus.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_sbus.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/pucvar.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/README#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/array.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/him.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/list.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sab/sab.c#3 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sab/sab82532reg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_puc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/minidump_machdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/minidump.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_clock.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sig.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/serdev_if.m#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_hash.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/Makefile#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/puc/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/rr232x/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/sio/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/sk/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/netflow/netflow.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/frag6.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netnatm/natm.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/ppc.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/ppcreg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/include/minidump.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_sk.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_skreg.h#3 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/xmaciireg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/yukonreg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/bus.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/eventhandler.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/lock.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mac_policy.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/module.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/param.h#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/rman.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/turnstile.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/vnode.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/conf/DEFAULTS#2 (text+ko) ==== @@ -1,11 +1,9 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/alpha # -# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.3 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.4 2006/04/28 21:21:50 marcel Exp $ machine alpha # Pseudo devices. device mem # Memory and kernel memory devices - -options PUC_FASTINTR ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/conf/GENERIC#4 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.193 2006/04/24 08:44:33 delphij Exp $ cpu EV4 cpu EV5 @@ -70,8 +70,6 @@ options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. # Debugging for use in -current @@ -106,6 +104,8 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device isp # Qlogic family device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/isa/isa.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.38 2005/10/25 19:48:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.39 2006/04/20 04:16:02 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -231,6 +231,7 @@ res = rman_reserve_resource(&isa_drq_rman, start, start, 1, 0, child); + rman_set_rid(res, *rid); if (res && !passthrough) { rle = resource_list_find(rl, type, *rid); rle->start = rman_get_start(res); ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/apecs_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.16 2006/04/20 04:16:02 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,12 +79,17 @@ apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if ((hwrpb->rpb_type == ST_DEC_2100_A50) && (type == SYS_RES_IRQ)) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/lca_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.18 2006/04/20 04:16:02 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -78,11 +78,16 @@ lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if (type == SYS_RES_IRQ) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/pci/pcibus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.37 2005/09/25 20:12:29 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.39 2006/04/22 19:04:21 marcel Exp $"); #include "opt_isa.h" @@ -96,7 +96,7 @@ alpha_platform_alloc_ide_intr(int chan) { int irqs[2] = { 14, 15 }; - return isa_alloc_intr(0, 0, irqs[chan]); + return (isa_alloc_intr(0, 0, irqs[chan])); } int @@ -230,9 +230,11 @@ #ifdef DEV_ISA if((start >= ISA_IRQ_OFFSET) && (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) { - return isa_alloc_intrs(bus, child, - start - ISA_IRQ_OFFSET, - end - ISA_IRQ_OFFSET); + rv = isa_alloc_intrs(bus, child, + start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } else #endif @@ -252,6 +254,7 @@ if (rv == 0) return 0; + rman_set_rid(rv, *rid); rstart = rman_get_start(rv); rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type)); rman_set_bushandle(rv, rstart); ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -25,12 +25,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.11 2005/07/02 19:57:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12 2006/04/21 04:24:50 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> #include <sys/cons.h> +#include <sys/sysctl.h> #include <sys/kernel.h> #include <sys/kerneldump.h> #include <vm/vm.h> @@ -40,6 +41,11 @@ CTASSERT(sizeof(struct kerneldumpheader) == 512); +int do_minidump = 1; +TUNABLE_INT("debug.minidump", &do_minidump); +SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0, + "Enable mini crash dumps"); + /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This * is to protect us from metadata and to protect metadata from us. @@ -272,6 +278,10 @@ size_t hdrsz; int error; + if (do_minidump) { + minidumpsys(di); + return; + } bzero(&ehdr, sizeof(ehdr)); ehdr.e_ident[EI_MAG0] = ELFMAG0; ehdr.e_ident[EI_MAG1] = ELFMAG1; ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/fpu.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,6 +96,8 @@ typedef u_char bool_t; +static void fpu_clean_state(void); + int hw_float = 1; SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, &hw_float, 0, @@ -407,6 +409,8 @@ PCPU_SET(fpcurthread, curthread); pcb = PCPU_GET(curpcb); + fpu_clean_state(); + if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { /* * This is the first time this thread has used the FPU, @@ -474,6 +478,7 @@ s = intr_disable(); if (td == PCPU_GET(fpcurthread)) { + fpu_clean_state(); fxrstor(addr); intr_restore(s); } else { @@ -484,6 +489,37 @@ } /* + * On AuthenticAMD processors, the fxrstor instruction does not restore + * the x87's stored last instruction pointer, last data pointer, and last + * opcode values, except in the rare case in which the exception summary + * (ES) bit in the x87 status word is set to 1. + * + * In order to avoid leaking this information across processes, we clean + * these values by performing a dummy load before executing fxrstor(). + */ +static double dummy_variable = 0.0; +static void +fpu_clean_state(void) +{ + u_short status; + + /* + * Clear the ES bit in the x87 status word if it is currently + * set, in order to avoid causing a fault in the upcoming load. + */ + fnstsw(&status); + if (status & 0x80) + fnclex(); + + /* + * Load the dummy variable into the x87 stack. This mangles + * the x87 stack, but we don't care since we're about to call + * fxrstor() anyway. + */ + __asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable)); +} + +/* * This really sucks. We want the acpi version only, but it requires * the isa_if.h file in order to get the definitions. */ ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.144 2006/02/15 14:48:59 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); #include "opt_cpu.h" @@ -233,7 +233,7 @@ "\014<b11>" "\015<b12>" "\016CX16" /* CMPXCHG16B Instruction */ - "\017<b14>" + "\017XTPR" /* Send Task Priority Messages*/ "\020<b15>" "\021<b16>" "\022<b17>" @@ -360,7 +360,8 @@ else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && (cpu_high >= 4)) { cpuid_count(4, 0, regs); - cmp = ((regs[0] & 0xfc000000) >> 26) + 1; + if ((regs[0] & 0x1f) != 0) + cmp = ((regs[0] >> 26) & 0x3f) + 1; } if (cmp > 1) printf("\n Cores per package: %d", cmp); ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.271 2006/03/18 19:32:46 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.273 2006/04/25 00:06:37 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -183,6 +183,7 @@ mp_topology(void) { struct cpu_group *group; + u_int regs[4]; int logical_cpus; int apic_id; int groups; @@ -195,6 +196,13 @@ logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16; if (logical_cpus <= 1) return; + /* Nothing to do if reported cores are physical cores. */ + if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) { + cpuid_count(4, 0, regs); + if ((regs[0] & 0x1f) != 0 && + logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1) + return; + } group = &mp_groups[0]; groups = 1; for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { @@ -385,8 +393,8 @@ * are available, use them. */ if (cpu_high >= 4) { - /* Ask the processor about up to 32 caches. */ - for (i = 0; i < 32; i++) { + /* Ask the processor about the L1 cache. */ + for (i = 0; i < 1; i++) { cpuid_count(4, i, p); threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1; if (hyperthreading_cpus < threads_per_cache) ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.67 2005/09/25 20:03:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -340,7 +340,7 @@ rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == 0) return 0; - + rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { rman_set_bustag(rv, AMD64_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.545 2006/04/13 03:31:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.552 2006/04/29 00:59:15 alc Exp $"); /* * Manages physical address maps. @@ -181,7 +181,7 @@ static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ -static u_int64_t KPDPphys; /* phys addr of kernel level 3 */ +u_int64_t KPDPphys; /* phys addr of kernel level 3 */ u_int64_t KPML4phys; /* phys addr of kernel level 4 */ static u_int64_t DMPDphys; /* phys addr of direct mapped level 2 */ @@ -1449,6 +1449,9 @@ static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, + "Current number of pv entries"); + #ifdef PV_STATS static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; @@ -1464,8 +1467,6 @@ static long pv_entry_frees, pv_entry_allocs; static int pv_entry_spare; -SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, - "Current number of pv entries"); SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, "Current number of pv entry frees"); SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, @@ -1545,9 +1546,10 @@ struct pv_chunk *pc; int idx, field, bit; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc = pv_to_chunk(pv); idx = pv - &pc->pc_pventry[0]; field = idx / 64; @@ -1565,9 +1567,8 @@ /* entire chunk is free, return it */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); - vm_page_lock_queues(); + dump_drop_page(m->phys_addr); vm_page_free(m); - vm_page_unlock_queues(); } /* @@ -1588,7 +1589,7 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); PV_STAT(pv_entry_allocs++); - PV_STAT(pv_entry_count++); + pv_entry_count++; if (pv_entry_count > pv_entry_high_water) pagedaemon_wakeup(); pc = TAILQ_FIRST(&pmap->pm_pvchunk); @@ -1616,6 +1617,7 @@ m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { + pv_entry_count--; PV_STAT(pc_chunk_tryfail++); return (NULL); } @@ -1644,6 +1646,7 @@ PV_STAT(pc_chunk_count++); PV_STAT(pc_chunk_allocs++); colour++; + dump_add_page(m->phys_addr); pc = (void *)PHYS_TO_DMAP(m->phys_addr); pc->pc_pmap = pmap; pc->pc_map[0] = PC_FREE0 & ~1ul; /* preallocated bit 0 */ @@ -2057,6 +2060,7 @@ boolean_t wired) { vm_paddr_t pa; + pd_entry_t *pde; register pt_entry_t *pte; vm_paddr_t opa; pt_entry_t origpte, newpte; @@ -2094,7 +2098,13 @@ } #endif - pte = pmap_pte(pmap, va); + pde = pmap_pde(pmap, va); + if (pde != NULL) { + if ((*pde & PG_PS) != 0) + panic("pmap_enter: attempted pmap_enter on 2MB page"); + pte = pmap_pde_to_pte(pde, va); + } else + pte = NULL; /* * Page Directory table entry not valid, we need a new PT page @@ -2107,9 +2117,6 @@ origpte = *pte; opa = origpte & PG_FRAME; - if (origpte & PG_PS) - panic("pmap_enter: attempted pmap_enter on 2MB page"); - /* * Mapping has not changed, must be protection or wiring change. */ @@ -2777,7 +2784,7 @@ /* Mark free */ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); - PV_STAT(pv_entry_count--); + pv_entry_count--; pc->pc_map[field] |= bitmask; m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -2793,14 +2800,13 @@ PV_STAT(pc_chunk_frees++); TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); - vm_page_lock_queues(); + dump_drop_page(m->phys_addr); vm_page_free(m); - vm_page_unlock_queues(); } } + vm_page_unlock_queues(); pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); - vm_page_unlock_queues(); } /* ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/uma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.1 2003/10/14 05:51:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.2 2006/04/21 04:24:50 peter Exp $"); #include <sys/param.h> #include <sys/lock.h> @@ -44,6 +44,7 @@ { static vm_pindex_t colour; vm_page_t m; + vm_paddr_t pa; void *va; int pflags; @@ -64,7 +65,9 @@ } else break; } - va = (void *)PHYS_TO_DMAP(m->phys_addr); + pa = m->phys_addr; + dump_add_page(pa); + va = (void *)PHYS_TO_DMAP(pa); if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) pagezero(va); return (va); @@ -74,8 +77,11 @@ uma_small_free(void *mem, int size, u_int8_t flags) { vm_page_t m; + vm_paddr_t pa; - m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)mem)); + pa = DMAP_TO_PHYS((vm_offset_t)mem); + dump_drop_page(pa); + m = PHYS_TO_VM_PAGE(pa); vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.4 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.5 2006/04/28 21:21:51 marcel Exp $ machine amd64 @@ -11,5 +11,3 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device - -options PUC_FASTINTR ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.452 2006/04/10 20:04:22 ps Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.454 2006/04/28 05:23:10 scottl Exp $ cpu HAMMER ident GENERIC @@ -57,10 +57,6 @@ options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -98,7 +94,11 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. device ahd # AHA39320/29320 and onboard AIC79xx devices +options AHD_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~215k to driver. device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family #device ispfw # Firmware for QLogic HBAs- normally a module @@ -128,6 +128,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.52 2006/03/06 15:29:28 yar Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.53 2006/04/28 05:23:10 scottl Exp $ # # @@ -281,6 +281,11 @@ device hptmv # +# Highpoint RocketRAID 232x. This is software RAID but with hardware +# acceleration assistance for RAID_5. +device rr232x + +# # IBM (now Adaptec) ServeRAID controllers device ips ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/md_var.h#2 (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/amd64/include/md_var.h,v 1.76 2005/10/14 22:52:00 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.77 2006/04/21 04:24:50 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -53,6 +53,8 @@ extern char kstack[]; extern char sigcode[]; extern int szsigcode; +extern uint64_t *vm_page_dump; +extern int vm_page_dump_size; extern struct pcpu __pcpu[]; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605010914.k419EDLG016605>