Date: Fri, 26 Sep 2003 10:28:40 -0700 (PDT) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 38661 for review Message-ID: <200309261728.h8QHSedj033984@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=38661 Change 38661 by sam@sam_ebb on 2003/09/26 10:28:08 IFC @ 38660 Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/elf_machdep.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/promcons.c#3 integrate .. //depot/projects/netperf/sys/alpha/include/elf.h#2 integrate .. //depot/projects/netperf/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_sysvec.c#3 integrate .. //depot/projects/netperf/sys/alpha/tlsb/zs_tlsb.c#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/netperf/sys/amd64/include/elf.h#2 integrate .. //depot/projects/netperf/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/netperf/sys/arm/include/elf.h#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/netperf/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/netperf/sys/compat/ia32/ia32_util.h#2 integrate .. //depot/projects/netperf/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/netperf/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/netperf/sys/conf/NOTES#10 integrate .. //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_fil.c#5 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_acad.c#5 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cmbat.c#5 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/asr/asr.c#5 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/netperf/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/netperf/sys/dev/digi/digi.c#3 integrate .. //depot/projects/netperf/sys/dev/exca/exca.c#4 integrate .. //depot/projects/netperf/sys/dev/fb/fb.c#3 integrate .. //depot/projects/netperf/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/netperf/sys/dev/firewire/fwphyreg.h#1 branch .. //depot/projects/netperf/sys/dev/gfb/gfb_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/iir/iir.c#3 integrate .. //depot/projects/netperf/sys/dev/iir/iir.h#2 integrate .. //depot/projects/netperf/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/netperf/sys/dev/iir/iir_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/netperf/sys/dev/puc/puc.c#5 integrate .. //depot/projects/netperf/sys/dev/puc/pucvar.h#3 integrate .. //depot/projects/netperf/sys/dev/sio/sio.c#7 integrate .. //depot/projects/netperf/sys/dev/uart/uart.h#3 integrate .. //depot/projects/netperf/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/netperf/sys/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/netperf/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/netperf/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/netperf/sys/dev/uart/uart_bus_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/uart/uart_bus_puc.c#2 integrate .. //depot/projects/netperf/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/netperf/sys/dev/uart/uart_cpu_alpha.c#3 integrate .. //depot/projects/netperf/sys/dev/uart/uart_cpu_amd64.c#3 integrate .. //depot/projects/netperf/sys/dev/uart/uart_cpu_i386.c#3 integrate .. //depot/projects/netperf/sys/dev/uart/uart_cpu_ia64.c#3 integrate .. //depot/projects/netperf/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/netperf/sys/dev/uart/uart_cpu_sparc64.c#3 integrate .. //depot/projects/netperf/sys/dev/uart/uart_dev_sab82532.c#4 integrate .. //depot/projects/netperf/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs.h#4 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#4 integrate .. //depot/projects/netperf/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/netperf/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/netperf/sys/i386/include/clock.h#4 integrate .. //depot/projects/netperf/sys/i386/include/elf.h#2 integrate .. //depot/projects/netperf/sys/i386/include/pmap.h#2 integrate .. //depot/projects/netperf/sys/i386/isa/clock.c#5 integrate .. //depot/projects/netperf/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/netperf/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/netperf/sys/ia64/include/elf.h#2 integrate .. //depot/projects/netperf/sys/isa/vga_isa.c#2 integrate .. //depot/projects/netperf/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/netperf/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/netperf/sys/kern/init_main.c#4 integrate .. //depot/projects/netperf/sys/kern/kern_exec.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_sig.c#5 integrate .. //depot/projects/netperf/sys/kern/tty_cons.c#3 integrate .. //depot/projects/netperf/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/netperf/sys/modules/bridge/Makefile#3 integrate .. //depot/projects/netperf/sys/modules/ipfilter/Makefile#3 integrate .. //depot/projects/netperf/sys/net/bridge.c#10 integrate .. //depot/projects/netperf/sys/net/pfil.c#4 integrate .. //depot/projects/netperf/sys/net/pfil.h#4 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_node.h#7 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/netperf/sys/netinet/icmp6.h#2 integrate .. //depot/projects/netperf/sys/netinet/ip6.h#2 integrate .. //depot/projects/netperf/sys/netinet/ip_input.c#7 integrate .. //depot/projects/netperf/sys/netinet/ip_output.c#7 integrate .. //depot/projects/netperf/sys/netinet/ip_var.h#5 integrate .. //depot/projects/netperf/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/netperf/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/netperf/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/netperf/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/netperf/sys/netinet6/ip6protosw.h#3 integrate .. //depot/projects/netperf/sys/netkey/key.c#2 integrate .. //depot/projects/netperf/sys/netkey/key_debug.c#2 integrate .. //depot/projects/netperf/sys/netkey/key_debug.h#2 integrate .. //depot/projects/netperf/sys/netkey/keysock.c#2 integrate .. //depot/projects/netperf/sys/pc98/pc98/pc98gdc.c#2 integrate .. //depot/projects/netperf/sys/powerpc/include/cpu.h#3 integrate .. //depot/projects/netperf/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/netperf/sys/powerpc/include/param.h#3 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/netperf/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/netperf/sys/sys/cons.h#2 integrate .. //depot/projects/netperf/sys/sys/param.h#7 integrate .. //depot/projects/netperf/sys/sys/protosw.h#3 integrate .. //depot/projects/netperf/sys/sys/signalvar.h#2 integrate .. //depot/projects/netperf/sys/sys/sysent.h#2 integrate .. //depot/projects/netperf/sys/vm/vm_map.c#6 integrate .. //depot/projects/netperf/sys/vm/vm_mmap.c#4 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.15 2003/08/17 08:08:38 gordon Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.16 2003/09/25 01:10:22 peter Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -73,7 +73,8 @@ PS_STRINGS, VM_PROT_ALL, exec_copyout_strings, - exec_setregs + exec_setregs, + NULL }; static Elf64_Brandinfo freebsd_brand_info = { ==== //depot/projects/netperf/sys/alpha/alpha/promcons.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.30 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.31 2003/09/26 10:52:16 phk Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -250,7 +250,7 @@ promcnattach(int alpha_console) { prom_consdev.cn_pri = CN_NORMAL; - prom_consdev.cn_dev = makedev(CDEV_MAJOR, 0); + sprintf(prom_consdev.cn_name, "promcons"); make_dev(&prom_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "promcons"); cnadd(&prom_consdev); promcn_attached = 1; ==== //depot/projects/netperf/sys/alpha/include/elf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/elf.h,v 1.13 2002/05/30 08:32:18 dfr Exp $ + * $FreeBSD: src/sys/alpha/include/elf.h,v 1.14 2003/09/25 01:10:22 peter Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -135,16 +135,4 @@ #define ELF_TARG_MACH EM_ALPHA #define ELF_TARG_VER 1 -#ifdef _KERNEL - -/* - * On the Alpha we load the dynamic linker where a userland call - * to mmap(0, ...) would put it. The rationale behind this - * calculation is that it leaves room for the heap to grow to - * its maximum allowed size. - */ -#define ELF_RTLD_ADDR(vmspace) \ - (round_page((vm_offset_t)(vmspace)->vm_daddr + maxdsiz)) - -#endif #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/netperf/sys/alpha/linux/linux_sysvec.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.90 2003/08/22 07:20:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.91 2003/09/25 01:10:22 peter Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -200,7 +200,8 @@ PS_STRINGS, VM_PROT_ALL, exec_copyout_strings, - exec_setregs + exec_setregs, + NULL }; static Elf64_Brandinfo linux_brand = { ==== //depot/projects/netperf/sys/alpha/osf1/osf1_sysvec.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.10 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.11 2003/09/25 01:10:22 peter Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -87,7 +87,8 @@ PS_STRINGS, VM_PROT_ALL, exec_copyout_strings, - exec_setregs + exec_setregs, + NULL }; /* ==== //depot/projects/netperf/sys/alpha/tlsb/zs_tlsb.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.37 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.38 2003/09/26 10:53:29 phk Exp $"); #include "opt_ddb.h" @@ -227,7 +227,7 @@ /* should really bet part of ivars */ zs_console_addr = (caddr_t) ALPHA_PHYS_TO_K0SEG(base + offset); - zs_consdev.cn_dev = makedev(CDEV_MAJOR, 0); + sprintf(zs_consdev.cn_name, "zs0"); zs_consdev.cn_pri = CN_NORMAL; make_dev(&zs_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "zs0"); cnadd(&zs_consdev); ==== //depot/projects/netperf/sys/amd64/amd64/elf_machdep.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.17 2003/08/17 08:08:38 gordon Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.18 2003/09/25 01:10:23 peter Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -70,7 +70,8 @@ PS_STRINGS, VM_PROT_ALL, exec_copyout_strings, - exec_setregs + exec_setregs, + NULL }; static Elf64_Brandinfo freebsd_brand_info = { ==== //depot/projects/netperf/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.437 2003/09/13 21:57:38 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.439 2003/09/26 04:12:41 alc Exp $"); /* * Manages physical address maps. @@ -1012,6 +1012,7 @@ register struct pmap *pmap; { vm_page_t pml4pg; + static vm_pindex_t color; /* * allocate object for the ptes @@ -1022,14 +1023,13 @@ /* * allocate the page directory page */ - VM_OBJECT_LOCK(pmap->pm_pteobj); - pml4pg = vm_page_grab(pmap->pm_pteobj, NUPDE + NUPDPE + NUPML4E, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); + while ((pml4pg = vm_page_alloc(NULL, color++, VM_ALLOC_NOOBJ | + VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) + VM_WAIT; vm_page_lock_queues(); vm_page_flag_clear(pml4pg, PG_BUSY); pml4pg->valid = VM_PAGE_BITS_ALL; vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(pmap->pm_pteobj); pmap->pm_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pml4pg)); @@ -1241,14 +1241,8 @@ void pmap_release(pmap_t pmap) { - vm_object_t object; vm_page_t m; - object = pmap->pm_pteobj; - - KASSERT(object->ref_count == 1, - ("pmap_release: pteobj reference count %d != 1", - object->ref_count)); KASSERT(pmap->pm_stats.resident_count == 0, ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); @@ -1258,15 +1252,14 @@ mtx_unlock_spin(&allpmaps_lock); vm_page_lock_queues(); - while ((m = TAILQ_FIRST(&object->memq)) != NULL) { - m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_busy(m); - vm_page_free(m); - } - KASSERT(TAILQ_EMPTY(&object->memq), + m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I]); + m->wire_count--; + atomic_subtract_int(&cnt.v_wire_count, 1); + vm_page_busy(m); + vm_page_free(m); + vm_page_unlock_queues(); + KASSERT(TAILQ_EMPTY(&pmap->pm_pteobj->memq), ("pmap_release: leaking page table pages")); - vm_page_unlock_queues(); } static int ==== //depot/projects/netperf/sys/amd64/include/elf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/elf.h,v 1.15 2003/05/14 04:10:49 peter Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.16 2003/09/25 01:10:23 peter Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -137,16 +137,4 @@ #define ELF_TARG_MACH EM_X86_64 #define ELF_TARG_VER 1 -#ifdef _KERNEL - -/* - * On the i386 we load the dynamic linker where a userland call - * to mmap(0, ...) would put it. The rationale behind this - * calculation is that it leaves room for the heap to grow to - * its maximum allowed size. - */ -#define ELF_RTLD_ADDR(vmspace) \ - (round_page((vm_offset_t)(vmspace)->vm_daddr + maxdsiz)) - -#endif /* _KERNEL */ #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/netperf/sys/amd64/include/vmparam.h#3 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.41 2003/09/23 03:20:34 peter Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.42 2003/09/25 01:11:17 peter Exp $ */ @@ -55,13 +55,13 @@ #define DFLDSIZ (128UL*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (512UL*1024*1024) /* max data size */ +#define MAXDSIZ (8192UL*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (8UL*1024*1024) /* initial stack size limit */ #endif #ifndef MAXSSIZ -#define MAXSSIZ (64UL*1024*1024) /* max stack size */ +#define MAXSSIZ (512UL*1024*1024) /* max stack size */ #endif #ifndef SGROWSIZ #define SGROWSIZ (128UL*1024) /* amount to grow stack */ ==== //depot/projects/netperf/sys/arm/include/elf.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.3 2001/10/10 23:06:51 ps Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.4 2003/09/25 01:10:23 peter Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -91,16 +91,4 @@ #define ELF_TARG_MACH EM_ARM #define ELF_TARG_VER 1 -#ifdef _KERNEL - -/* - * On the StrongARM we load the dynamic linker where a userland call - * to mmap(0, ...) would put it. The rationale behind this - * calculation is that it leaves room for the heap to grow to - * its maximum allowed size. - */ -#define ELF_RTLD_ADDR(vmspace) \ - (round_page((vm_offset_t)(vmspace)->vm_daddr + maxdsiz)) - -#endif /* _KERNEL */ #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/netperf/sys/cam/scsi/scsi_targ_bh.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.18 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.19 2003/09/25 05:02:19 simokawa Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -167,7 +167,7 @@ xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_PATH_REGISTERED; + csa.event_enable = AC_PATH_REGISTERED | AC_PATH_DEREGISTERED; csa.callback = targbhasync; csa.callback_arg = NULL; xpt_action((union ccb *)&csa); @@ -185,15 +185,26 @@ targbhasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg) { - struct cam_periph *periph; + struct cam_path *new_path; + cam_status status; + + /* + * Allocate a peripheral instance for + * this target instance. + */ + status = xpt_create_path(&new_path, NULL, + xpt_path_path_id(path), + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); + if (status != CAM_REQ_CMP) { + printf("targbhasync: Unable to create path " + "due to status 0x%x\n", status); + return; + } - periph = (struct cam_periph *)callback_arg; switch (code) { case AC_PATH_REGISTERED: { struct ccb_pathinq *cpi; - struct cam_path *new_path; - cam_status status; cpi = (struct ccb_pathinq *)arg; @@ -201,35 +212,23 @@ if ((cpi->target_sprt & PIT_PROCESSOR) == 0) break; - /* - * Allocate a peripheral instance for - * this target instance. - */ - status = xpt_create_path(&new_path, NULL, - xpt_path_path_id(path), - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - if (status != CAM_REQ_CMP) { - printf("targbhasync: Unable to create path " - "due to status 0x%x\n", status); - break; - } status = cam_periph_alloc(targbhctor, NULL, targbhdtor, targbhstart, "targbh", CAM_PERIPH_BIO, new_path, targbhasync, AC_PATH_REGISTERED, cpi); - xpt_free_path(new_path); break; } case AC_PATH_DEREGISTERED: { - targbhdislun(periph); + cam_periph_invalidate(cam_periph_find(new_path, "targbh")); break; } default: break; } + xpt_free_path(new_path); } /* Attempt to enable our lun */ @@ -439,6 +438,8 @@ case 1: /* FALLTHROUGH */ default: + /* XXX Wait for callback of targbhdislun() */ + tsleep(softc, PRIBIO, "targbh", hz/2); free(softc, M_DEVBUF); break; } ==== //depot/projects/netperf/sys/compat/ia32/ia32_sysvec.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.8 2003/08/23 00:04:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.9 2003/09/25 01:10:23 peter Exp $"); #include "opt_compat.h" @@ -78,9 +78,12 @@ static register_t *ia32_copyout_strings(struct image_params *imgp); static void ia32_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); +static void ia32_fixlimits(struct image_params *imgp); extern struct sysent freebsd32_sysent[]; +SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode"); + struct sysentvec ia32_freebsd_sysvec = { SYS_MAXSYSCALL, freebsd32_sysent, @@ -106,7 +109,8 @@ FREEBSD32_PS_STRINGS, VM_PROT_ALL, ia32_copyout_strings, - ia32_setregs + ia32_setregs, + ia32_fixlimits }; @@ -283,3 +287,62 @@ pcb->pcb_flags |= PCB_FULLCTX; td->td_retval[1] = 0; } + +static u_long ia32_maxdsiz = IA32_MAXDSIZ; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, ""); +static u_long ia32_maxssiz = IA32_MAXSSIZ; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, ""); +static u_long ia32_maxvmem = IA32_MAXVMEM; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); + +static void +ia32_fixlimits(struct image_params *imgp) +{ + struct proc *p = imgp->proc; + + if (ia32_maxdsiz != 0) { + if (p->p_rlimit[RLIMIT_DATA].rlim_cur > ia32_maxdsiz || + p->p_rlimit[RLIMIT_DATA].rlim_max > ia32_maxdsiz) { + if (p->p_limit->p_refcnt > 1) { + p->p_limit->p_refcnt--; + p->p_limit = limcopy(p->p_limit); + } + if (p->p_rlimit[RLIMIT_DATA].rlim_cur > ia32_maxdsiz) + p->p_rlimit[RLIMIT_DATA].rlim_cur = + ia32_maxdsiz; + if (p->p_rlimit[RLIMIT_DATA].rlim_max > ia32_maxdsiz) + p->p_rlimit[RLIMIT_DATA].rlim_max = + ia32_maxdsiz; + } + } + if (ia32_maxssiz != 0) { + if (p->p_rlimit[RLIMIT_STACK].rlim_cur > ia32_maxssiz || + p->p_rlimit[RLIMIT_STACK].rlim_max > ia32_maxssiz) { + if (p->p_limit->p_refcnt > 1) { + p->p_limit->p_refcnt--; + p->p_limit = limcopy(p->p_limit); + } + if (p->p_rlimit[RLIMIT_STACK].rlim_cur > ia32_maxssiz) + p->p_rlimit[RLIMIT_STACK].rlim_cur = + ia32_maxssiz; + if (p->p_rlimit[RLIMIT_STACK].rlim_max > ia32_maxssiz) + p->p_rlimit[RLIMIT_STACK].rlim_max = + ia32_maxssiz; + } + } + if (ia32_maxvmem != 0) { + if (p->p_rlimit[RLIMIT_VMEM].rlim_cur > ia32_maxvmem || + p->p_rlimit[RLIMIT_VMEM].rlim_max > ia32_maxvmem) { + if (p->p_limit->p_refcnt > 1) { + p->p_limit->p_refcnt--; + p->p_limit = limcopy(p->p_limit); + } + if (p->p_rlimit[RLIMIT_VMEM].rlim_cur > ia32_maxvmem) + p->p_rlimit[RLIMIT_VMEM].rlim_cur = + ia32_maxvmem; + if (p->p_rlimit[RLIMIT_VMEM].rlim_max > ia32_maxvmem) + p->p_rlimit[RLIMIT_VMEM].rlim_max = + ia32_maxvmem; + } + } +} ==== //depot/projects/netperf/sys/compat/ia32/ia32_util.h#2 (text+ko) ==== @@ -25,7 +25,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/compat/ia32/ia32_util.h,v 1.7 2003/08/22 23:19:02 peter Exp $ + * $FreeBSD: src/sys/compat/ia32/ia32_util.h,v 1.8 2003/09/25 01:10:23 peter Exp $ */ #include <vm/vm.h> @@ -38,3 +38,7 @@ #include <sys/cdefs.h> #define FREEBSD32_USRSTACK ((1ul << 32) - PAGE_SIZE) + +#define IA32_MAXDSIZ (512*1024*1024) /* 512MB */ +#define IA32_MAXSSIZ (64*1024*1024) /* 64MB */ +#define IA32_MAXVMEM 0 /* Unlimited */ ==== //depot/projects/netperf/sys/compat/pecoff/imgact_pecoff.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.31 2003/06/10 21:29:12 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.32 2003/09/25 01:10:23 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -114,7 +114,8 @@ PS_STRINGS, VM_PROT_ALL, exec_copyout_strings, - exec_setregs + exec_setregs, + NULL }; ==== //depot/projects/netperf/sys/compat/svr4/svr4_sysvec.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.33 2003/06/15 00:31:22 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.34 2003/09/25 01:10:23 peter Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -189,7 +189,8 @@ PS_STRINGS, VM_PROT_ALL, exec_copyout_strings, - exec_setregs + exec_setregs, + NULL }; Elf32_Brandinfo svr4_brand = { ==== //depot/projects/netperf/sys/conf/NOTES#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1176 2003/09/19 19:04:30 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1177 2003/09/25 16:06:17 sam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -569,7 +569,7 @@ # # PFIL_HOOKS enables an abtraction layer which is meant to be used in # network code where filtering is required. See the pfil(9) man page. -# This option is a subset of the IPFILTER option. +# This option is required by the IPFILTER option. # # TCPDEBUG enables code which keeps traces of the TCP state machine # for sockets with the SO_DEBUG option set, which can then be examined @@ -591,7 +591,7 @@ options IPFILTER_LOG #ipfilter logging options IPFILTER_DEFAULT_BLOCK #block all packets by default options IPSTEALTH #support for stealth forwarding -options PFIL_HOOKS +options PFIL_HOOKS #required by IPFILTER options TCPDEBUG # The MBUF_STRESS_TEST option enables options which create ==== //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_fil.c#5 (text+ko) ==== @@ -131,7 +131,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.42.2.34 2001/07/23 13:49:57 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.38 2003/02/19 05:47:00 imp Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.40 2003/09/24 05:08:58 sam Exp $"; #endif extern struct protosw inetsw[]; @@ -310,8 +310,7 @@ } # endif #endif /* __NetBSD_Version >= 105110000 && _KERNEL */ -#if (__FreeBSD_version >= 501108) -# include <net/pfil.h> +#if (__FreeBSD_version >= 501108) && defined(_KERNEL) static int fr_check_wrapper(void *arg, struct mbuf **mp, struct ifnet *ifp, int dir) ==== //depot/projects/netperf/sys/dev/acpica/acpi.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.102 2003/09/18 05:12:45 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.103 2003/09/26 04:32:40 njl Exp $ */ #include "opt_acpi.h" @@ -2081,6 +2081,7 @@ {"ACPI_CA_DEBUGGER", ACPI_CA_DEBUGGER}, {"ACPI_OS_SERVICES", ACPI_OS_SERVICES}, {"ACPI_CA_DISASSEMBLER", ACPI_CA_DISASSEMBLER}, + {"ACPI_ALL_COMPONENTS", ACPI_ALL_COMPONENTS}, {"ACPI_BUS", ACPI_BUS}, {"ACPI_SYSTEM", ACPI_SYSTEM}, @@ -2092,9 +2093,7 @@ {"ACPI_PROCESSOR", ACPI_PROCESSOR}, {"ACPI_THERMAL", ACPI_THERMAL}, {"ACPI_FAN", ACPI_FAN}, - {"ACPI_ALL_DRIVERS", ACPI_ALL_DRIVERS}, - {"ACPI_ALL_COMPONENTS", ACPI_ALL_COMPONENTS}, {NULL, 0} }; @@ -2107,6 +2106,7 @@ {"ACPI_LV_ALL_EXCEPTIONS", ACPI_LV_ALL_EXCEPTIONS}, /* Trace verbosity level 1 [Standard Trace Level] */ + {"ACPI_LV_INIT_NAMES", ACPI_LV_INIT_NAMES}, {"ACPI_LV_PARSE", ACPI_LV_PARSE}, {"ACPI_LV_LOAD", ACPI_LV_LOAD}, {"ACPI_LV_DISPATCH", ACPI_LV_DISPATCH}, @@ -2120,7 +2120,6 @@ {"ACPI_LV_RESOURCES", ACPI_LV_RESOURCES}, {"ACPI_LV_USER_REQUESTS", ACPI_LV_USER_REQUESTS}, {"ACPI_LV_PACKAGE", ACPI_LV_PACKAGE}, - {"ACPI_LV_INIT_NAMES", ACPI_LV_INIT_NAMES}, {"ACPI_LV_VERBOSITY1", ACPI_LV_VERBOSITY1}, /* Trace verbosity level 2 [Function tracing and memory allocation] */ ==== //depot/projects/netperf/sys/dev/acpica/acpi_acad.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.18 2003/09/14 17:47:44 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.19 2003/09/26 05:24:55 njl Exp $ */ #include "opt_acpi.h" @@ -137,7 +137,7 @@ if (acpi_get_type(dev) == ACPI_TYPE_DEVICE && acpi_MatchHid(dev, "ACPI0003")) { - device_set_desc(dev, "AC adapter"); + device_set_desc(dev, "AC Adapter"); return (0); } return (ENXIO); ==== //depot/projects/netperf/sys/dev/acpica/acpi_cmbat.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.24 2003/09/13 20:13:01 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.25 2003/09/26 05:24:55 njl Exp $ */ #include "opt_acpi.h" @@ -316,7 +316,7 @@ if (acpi_get_type(dev) == ACPI_TYPE_DEVICE && !acpi_disabled("cmbat") && acpi_MatchHid(dev, "PNP0C0A")) { - device_set_desc(dev, "Control method Battery"); + device_set_desc(dev, "Control Method Battery"); return (0); } return (ENXIO); ==== //depot/projects/netperf/sys/dev/acpica/acpi_ec.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.40 2003/09/15 21:20:55 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.41 2003/09/26 05:24:55 njl Exp $ */ /****************************************************************************** * @@ -137,7 +137,7 @@ *****************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.40 2003/09/15 21:20:55 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.41 2003/09/26 05:24:55 njl Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -437,7 +437,7 @@ */ magic = acpi_get_magic(dev); if (DEV_ECDT(dev)) { - snprintf(desc, sizeof(desc), "embedded controller: ECDT, GPE %#x, GLK", + snprintf(desc, sizeof(desc), "Embedded Controller: ECDT, GPE %#x, GLK", DEV_GET_GPEBIT(magic)); device_set_desc_copy(dev, desc); ret = 0; @@ -482,7 +482,7 @@ */ peer = devclass_get_device(acpi_ec_devclass, uid); if (peer == NULL || !device_is_alive(peer)) { - snprintf(desc, sizeof(desc), "embedded controller: GPE %#x%s", + snprintf(desc, sizeof(desc), "Embedded Controller: GPE %#x%s", gpebit, glk != 0 ? ", GLK" : ""); device_set_desc_copy(dev, desc); ret = 0; ==== //depot/projects/netperf/sys/dev/acpica/acpi_resource.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.19 2003/09/10 22:06:41 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.20 2003/09/26 05:24:55 njl Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -571,7 +571,7 @@ acpi_sysresource_probe(device_t dev) { if (!acpi_disabled("sysresource") && acpi_MatchHid(dev, "PNP0C02")) - device_set_desc(dev, "system resource"); + device_set_desc(dev, "System Resource"); else return (ENXIO); ==== //depot/projects/netperf/sys/dev/acpica/acpi_thermal.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.31 2003/08/28 16:06:30 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.32 2003/09/26 05:24:55 njl Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -155,7 +155,7 @@ /* No FUNCTION_TRACE - too noisy */ if (acpi_get_type(dev) == ACPI_TYPE_THERMAL && !acpi_disabled("thermal")) { - device_set_desc(dev, "thermal zone"); + device_set_desc(dev, "Thermal Zone"); result = -10; } else { result = ENXIO; ==== //depot/projects/netperf/sys/dev/aic7xxx/aic79xx_pci.c#3 (text+ko) ==== @@ -38,11 +38,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#76 $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#80 $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.15 2003/08/24 17:48:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.16 2003/09/25 23:36:41 scottl Exp $"); #ifdef __linux__ #include "aic79xx_osm.h" @@ -453,8 +453,10 @@ * or read prefetching could be initiated by the * CPU or host bridge. Our device does not support * either, so look for data corruption and/or flaged - * PCI errors. + * PCI errors. First pause without causing another + * chip reset. */ + hcntrl &= ~CHIPRST; ahd_outb(ahd, HCNTRL, hcntrl|PAUSE); while (ahd_is_paused(ahd) == 0) ; ==== //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_pci.c#4 (text+ko) ==== @@ -39,11 +39,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#69 $ + * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#72 $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.30 2003/09/02 17:30:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.31 2003/09/25 23:36:41 scottl Exp $"); #ifdef __linux__ #include "aic7xxx_osm.h" @@ -1285,8 +1285,10 @@ * or read prefetching could be initiated by the * CPU or host bridge. Our device does not support * either, so look for data corruption and/or flagged - * PCI errors. + * PCI errors. First pause without causing another + * chip reset. */ + hcntrl &= ~CHIPRST; ahc_outb(ahc, HCNTRL, hcntrl|PAUSE); while (ahc_is_paused(ahc) == 0) ; ==== //depot/projects/netperf/sys/dev/asr/asr.c#5 (text+ko) ==== @@ -105,7 +105,7 @@ */ #include <sys/cdefs.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309261728.h8QHSedj033984>