From owner-p4-projects@FreeBSD.ORG Thu Jul 16 08:16:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF4331065673; Thu, 16 Jul 2009 08:16:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E6D5106566C for ; Thu, 16 Jul 2009 08:16:48 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6ADC38FC0C for ; Thu, 16 Jul 2009 08:16:48 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6G8GmNC029946 for ; Thu, 16 Jul 2009 08:16:48 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6G8Glw3029944 for perforce@freebsd.org; Thu, 16 Jul 2009 08:16:47 GMT (envelope-from andre@freebsd.org) Date: Thu, 16 Jul 2009 08:16:47 GMT Message-Id: <200907160816.n6G8Glw3029944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 166155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jul 2009 08:16:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=166155 Change 166155 by andre@andre_flirtbox on 2009/07/16 08:16:14 IFC. Have to sort out a few conflicts manually. Affected files ... .. //depot/projects/tcp_reass/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/tcp_reass/amd64/amd64/exception.S#4 integrate .. //depot/projects/tcp_reass/amd64/amd64/genassym.c#6 integrate .. //depot/projects/tcp_reass/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/tcp_reass/amd64/amd64/machdep.c#8 integrate .. //depot/projects/tcp_reass/amd64/amd64/msi.c#6 integrate .. //depot/projects/tcp_reass/amd64/amd64/pmap.c#8 integrate .. //depot/projects/tcp_reass/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/tcp_reass/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/tcp_reass/amd64/conf/GENERIC#7 integrate .. //depot/projects/tcp_reass/amd64/ia32/ia32_exception.S#4 integrate .. //depot/projects/tcp_reass/amd64/ia32/ia32_reg.c#4 integrate .. //depot/projects/tcp_reass/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/tcp_reass/amd64/include/param.h#6 integrate .. //depot/projects/tcp_reass/amd64/include/pcb.h#5 integrate .. //depot/projects/tcp_reass/amd64/include/pmap.h#6 integrate .. //depot/projects/tcp_reass/amd64/include/vm.h#3 integrate .. //depot/projects/tcp_reass/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/tcp_reass/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/tcp_reass/arm/include/param.h#5 integrate .. //depot/projects/tcp_reass/arm/include/pmap.h#6 integrate .. //depot/projects/tcp_reass/arm/include/vm.h#3 integrate .. //depot/projects/tcp_reass/bsm/audit_kevents.h#4 integrate .. //depot/projects/tcp_reass/cam/ata/ata_all.c#1 branch .. //depot/projects/tcp_reass/cam/ata/ata_all.h#1 branch .. //depot/projects/tcp_reass/cam/ata/ata_da.c#1 branch .. //depot/projects/tcp_reass/cam/ata/ata_xpt.c#1 branch .. //depot/projects/tcp_reass/cam/cam.c#4 integrate .. //depot/projects/tcp_reass/cam/cam.h#4 integrate .. //depot/projects/tcp_reass/cam/cam_ccb.h#3 integrate .. //depot/projects/tcp_reass/cam/cam_periph.c#7 integrate .. //depot/projects/tcp_reass/cam/cam_xpt.c#5 integrate .. //depot/projects/tcp_reass/cam/cam_xpt.h#3 integrate .. //depot/projects/tcp_reass/cam/cam_xpt_internal.h#1 branch .. //depot/projects/tcp_reass/cam/cam_xpt_periph.h#3 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/tcp_reass/cam/scsi/scsi_xpt.c#1 branch .. //depot/projects/tcp_reass/cddl/compat/opensolaris/sys/sig.h#3 integrate .. //depot/projects/tcp_reass/cddl/contrib/opensolaris/common/nvpair/nvpair.c#4 integrate .. //depot/projects/tcp_reass/cddl/dev/dtrace/amd64/dtrace_subr.c#4 integrate .. //depot/projects/tcp_reass/cddl/dev/dtrace/i386/dtrace_subr.c#3 integrate .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/tcp_reass/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/tcp_reass/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/tcp_reass/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/tcp_reass/compat/linux/linux_socket.c#5 integrate .. //depot/projects/tcp_reass/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/tcp_reass/compat/svr4/svr4_stat.c#5 integrate .. //depot/projects/tcp_reass/conf/NOTES#8 integrate .. //depot/projects/tcp_reass/conf/files#9 integrate .. //depot/projects/tcp_reass/conf/newvers.sh#4 integrate .. //depot/projects/tcp_reass/conf/options#8 integrate .. //depot/projects/tcp_reass/contrib/altq/altq/altq_subr.c#6 integrate .. //depot/projects/tcp_reass/contrib/dev/acpica/compiler/aslcompile.c#4 integrate .. //depot/projects/tcp_reass/contrib/dev/acpica/compiler/aslutils.c#4 integrate .. //depot/projects/tcp_reass/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 integrate .. //depot/projects/tcp_reass/contrib/pf/net/pf.c#6 integrate .. //depot/projects/tcp_reass/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/tcp_reass/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/tcp_reass/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/tcp_reass/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/tcp_reass/contrib/rdma/rdma_cma.c#4 integrate .. //depot/projects/tcp_reass/ddb/db_expr.c#4 integrate .. //depot/projects/tcp_reass/ddb/db_sym.c#3 integrate .. //depot/projects/tcp_reass/ddb/db_variables.c#3 integrate .. //depot/projects/tcp_reass/ddb/db_variables.h#3 integrate .. //depot/projects/tcp_reass/ddb/ddb.h#5 integrate .. //depot/projects/tcp_reass/dev/aac/aac_disk.c#4 integrate .. //depot/projects/tcp_reass/dev/acpi_support/acpi_hp.c#3 integrate .. //depot/projects/tcp_reass/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/tcp_reass/dev/advansys/advansys.c#3 integrate .. //depot/projects/tcp_reass/dev/advansys/advlib.h#3 integrate .. //depot/projects/tcp_reass/dev/ahci/ahci.c#1 branch .. //depot/projects/tcp_reass/dev/ahci/ahci.h#1 branch .. //depot/projects/tcp_reass/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/tcp_reass/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/tcp_reass/dev/amd/amd.h#3 integrate .. //depot/projects/tcp_reass/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/tcp_reass/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/tcp_reass/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/tcp_reass/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/tcp_reass/dev/ata/chipsets/ata-nvidia.c#5 integrate .. //depot/projects/tcp_reass/dev/ath/ah_osdep.c#5 integrate .. //depot/projects/tcp_reass/dev/ath/ah_osdep.h#5 integrate .. //depot/projects/tcp_reass/dev/ath/ath_hal/ar5416/ar5416_reset.c#4 integrate .. //depot/projects/tcp_reass/dev/ath/if_ath.c#8 integrate .. //depot/projects/tcp_reass/dev/ath/if_athvar.h#7 integrate .. //depot/projects/tcp_reass/dev/ciss/ciss.c#6 integrate .. //depot/projects/tcp_reass/dev/ciss/cissvar.h#4 integrate .. //depot/projects/tcp_reass/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/tcp_reass/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#5 integrate .. //depot/projects/tcp_reass/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate .. //depot/projects/tcp_reass/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/tcp_reass/dev/drm/r600_cp.c#3 integrate .. //depot/projects/tcp_reass/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/tcp_reass/dev/e1000/e1000_82542.c#3 integrate .. //depot/projects/tcp_reass/dev/e1000/if_igb.c#5 integrate .. //depot/projects/tcp_reass/dev/hptrr/hptrr_config.c#4 integrate .. //depot/projects/tcp_reass/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/tcp_reass/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/tcp_reass/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/tcp_reass/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/tcp_reass/dev/mfi/mfi.c#8 integrate .. //depot/projects/tcp_reass/dev/mfi/mfivar.h#4 integrate .. //depot/projects/tcp_reass/dev/mlx/mlx.c#4 integrate .. //depot/projects/tcp_reass/dev/mlx/mlxvar.h#3 integrate .. //depot/projects/tcp_reass/dev/mpt/mpt.h#5 integrate .. //depot/projects/tcp_reass/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/tcp_reass/dev/mwl/if_mwl.c#4 integrate .. //depot/projects/tcp_reass/dev/mwl/if_mwlvar.h#4 integrate .. //depot/projects/tcp_reass/dev/ral/rt2560.c#7 integrate .. //depot/projects/tcp_reass/dev/ral/rt2661.c#6 integrate .. //depot/projects/tcp_reass/dev/re/if_re.c#9 integrate .. //depot/projects/tcp_reass/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/tcp_reass/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/tcp_reass/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/tcp_reass/dev/trm/trm.h#3 integrate .. //depot/projects/tcp_reass/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/tcp_reass/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/tcp_reass/dev/xl/if_xl.c#5 integrate .. //depot/projects/tcp_reass/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/tcp_reass/fs/nfs/nfs_commonkrpc.c#4 integrate .. //depot/projects/tcp_reass/fs/nfs/nfs_var.h#4 integrate .. //depot/projects/tcp_reass/fs/nfs/nfsport.h#4 integrate .. //depot/projects/tcp_reass/fs/nfsclient/nfs_clrpcops.c#4 integrate .. //depot/projects/tcp_reass/fs/nfsclient/nfs_clstate.c#4 integrate .. //depot/projects/tcp_reass/fs/nfsclient/nfs_clvnops.c#5 integrate .. //depot/projects/tcp_reass/fs/nfsserver/nfs_nfsdport.c#5 integrate .. //depot/projects/tcp_reass/geom/geom_dev.c#4 integrate .. //depot/projects/tcp_reass/geom/part/g_part.c#5 integrate .. //depot/projects/tcp_reass/geom/part/g_part_if.m#5 integrate .. //depot/projects/tcp_reass/i386/conf/GENERIC#7 integrate .. //depot/projects/tcp_reass/i386/i386/io_apic.c#5 integrate .. //depot/projects/tcp_reass/i386/i386/msi.c#6 integrate .. //depot/projects/tcp_reass/i386/i386/pmap.c#7 integrate .. //depot/projects/tcp_reass/i386/ibcs2/ibcs2_misc.c#7 integrate .. //depot/projects/tcp_reass/i386/include/param.h#6 integrate .. //depot/projects/tcp_reass/i386/include/pmap.h#8 integrate .. //depot/projects/tcp_reass/i386/include/vm.h#3 integrate .. //depot/projects/tcp_reass/i386/pci/pci_bus.c#4 integrate .. //depot/projects/tcp_reass/i386/xen/pmap.c#4 integrate .. //depot/projects/tcp_reass/ia64/ia64/pmap.c#7 integrate .. //depot/projects/tcp_reass/ia64/include/param.h#5 integrate .. //depot/projects/tcp_reass/ia64/include/pmap.h#3 integrate .. //depot/projects/tcp_reass/ia64/include/vm.h#3 integrate .. //depot/projects/tcp_reass/kern/init_sysent.c#8 integrate .. //depot/projects/tcp_reass/kern/kern_exit.c#9 integrate .. //depot/projects/tcp_reass/kern/kern_linker.c#9 integrate .. //depot/projects/tcp_reass/kern/kern_mbuf.c#8 integrate .. //depot/projects/tcp_reass/kern/kern_poll.c#7 integrate .. //depot/projects/tcp_reass/kern/kern_prot.c#6 integrate .. //depot/projects/tcp_reass/kern/kern_sig.c#7 integrate .. //depot/projects/tcp_reass/kern/kern_synch.c#6 integrate .. //depot/projects/tcp_reass/kern/kern_sysctl.c#5 integrate .. //depot/projects/tcp_reass/kern/kern_thread.c#6 integrate .. //depot/projects/tcp_reass/kern/kern_uuid.c#6 integrate .. //depot/projects/tcp_reass/kern/kern_vimage.c#5 integrate .. //depot/projects/tcp_reass/kern/link_elf.c#8 integrate .. //depot/projects/tcp_reass/kern/link_elf_obj.c#8 integrate .. //depot/projects/tcp_reass/kern/subr_param.c#4 integrate .. //depot/projects/tcp_reass/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/tcp_reass/kern/subr_trap.c#7 integrate .. //depot/projects/tcp_reass/kern/sys_pipe.c#5 integrate .. //depot/projects/tcp_reass/kern/syscalls.c#8 integrate .. //depot/projects/tcp_reass/kern/syscalls.master#8 integrate .. //depot/projects/tcp_reass/kern/systrace_args.c#8 integrate .. //depot/projects/tcp_reass/kern/tty.c#8 integrate .. //depot/projects/tcp_reass/kern/tty_pts.c#6 integrate .. //depot/projects/tcp_reass/kern/uipc_domain.c#6 integrate .. //depot/projects/tcp_reass/kern/uipc_socket.c#8 integrate .. //depot/projects/tcp_reass/kern/vfs_syscalls.c#9 integrate .. //depot/projects/tcp_reass/mips/include/param.h#4 integrate .. //depot/projects/tcp_reass/mips/include/pmap.h#4 integrate .. //depot/projects/tcp_reass/mips/include/vm.h#3 integrate .. //depot/projects/tcp_reass/modules/Makefile#7 integrate .. //depot/projects/tcp_reass/modules/ahci/Makefile#1 branch .. //depot/projects/tcp_reass/modules/cam/Makefile#3 integrate .. //depot/projects/tcp_reass/modules/geom/geom_label/Makefile#3 integrate .. //depot/projects/tcp_reass/modules/wlan/Makefile#6 integrate .. //depot/projects/tcp_reass/net/bridgestp.c#6 integrate .. //depot/projects/tcp_reass/net/flowtable.c#5 integrate .. //depot/projects/tcp_reass/net/flowtable.h#5 integrate .. //depot/projects/tcp_reass/net/if.c#8 integrate .. //depot/projects/tcp_reass/net/if_bridge.c#7 integrate .. //depot/projects/tcp_reass/net/if_clone.c#5 integrate .. //depot/projects/tcp_reass/net/if_ef.c#7 integrate .. //depot/projects/tcp_reass/net/if_enc.c#6 integrate .. //depot/projects/tcp_reass/net/if_ethersubr.c#8 integrate .. //depot/projects/tcp_reass/net/if_faith.c#4 integrate .. //depot/projects/tcp_reass/net/if_gif.c#6 integrate .. //depot/projects/tcp_reass/net/if_gif.h#5 integrate .. //depot/projects/tcp_reass/net/if_gre.c#6 integrate .. //depot/projects/tcp_reass/net/if_loop.c#6 integrate .. //depot/projects/tcp_reass/net/if_media.h#6 integrate .. //depot/projects/tcp_reass/net/if_mib.c#6 integrate .. //depot/projects/tcp_reass/net/if_spppsubr.c#5 integrate .. //depot/projects/tcp_reass/net/if_stf.c#6 integrate .. //depot/projects/tcp_reass/net/if_var.h#7 integrate .. //depot/projects/tcp_reass/net/if_vlan.c#6 integrate .. //depot/projects/tcp_reass/net/raw_cb.c#7 integrate .. //depot/projects/tcp_reass/net/raw_cb.h#4 integrate .. //depot/projects/tcp_reass/net/raw_usrreq.c#6 integrate .. //depot/projects/tcp_reass/net/route.c#8 integrate .. //depot/projects/tcp_reass/net/rtsock.c#8 integrate .. //depot/projects/tcp_reass/net/vnet.c#1 branch .. //depot/projects/tcp_reass/net/vnet.h#5 integrate .. //depot/projects/tcp_reass/net80211/_ieee80211.h#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211.c#7 integrate .. //depot/projects/tcp_reass/net80211/ieee80211.h#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_action.c#1 branch .. //depot/projects/tcp_reass/net80211/ieee80211_action.h#1 branch .. //depot/projects/tcp_reass/net80211/ieee80211_adhoc.c#5 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_ageq.c#1 branch .. //depot/projects/tcp_reass/net80211/ieee80211_ageq.h#1 branch .. //depot/projects/tcp_reass/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_hostap.c#5 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_ht.c#7 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_ht.h#7 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_hwmp.c#1 branch .. //depot/projects/tcp_reass/net80211/ieee80211_input.c#7 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_mesh.c#1 branch .. //depot/projects/tcp_reass/net80211/ieee80211_mesh.h#1 branch .. //depot/projects/tcp_reass/net80211/ieee80211_node.c#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_node.h#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_output.c#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_proto.h#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_scan.c#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_scan.h#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_sta.c#5 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_var.h#6 integrate .. //depot/projects/tcp_reass/net80211/ieee80211_wds.c#5 integrate .. //depot/projects/tcp_reass/netgraph/atm/ng_atm.c#6 integrate .. //depot/projects/tcp_reass/netgraph/netgraph.h#7 integrate .. //depot/projects/tcp_reass/netgraph/ng_base.c#7 integrate .. //depot/projects/tcp_reass/netgraph/ng_eiface.c#6 integrate .. //depot/projects/tcp_reass/netgraph/ng_ether.c#6 integrate .. //depot/projects/tcp_reass/netgraph/ng_gif.c#5 integrate .. //depot/projects/tcp_reass/netgraph/ng_iface.c#7 integrate .. //depot/projects/tcp_reass/netinet/icmp6.h#4 integrate .. //depot/projects/tcp_reass/netinet/icmp_var.h#4 integrate .. //depot/projects/tcp_reass/netinet/if_ether.c#6 integrate .. //depot/projects/tcp_reass/netinet/igmp.c#6 integrate .. //depot/projects/tcp_reass/netinet/in.c#7 integrate .. //depot/projects/tcp_reass/netinet/in_gif.c#6 integrate .. //depot/projects/tcp_reass/netinet/in_mcast.c#7 integrate .. //depot/projects/tcp_reass/netinet/in_pcb.c#8 integrate .. //depot/projects/tcp_reass/netinet/in_pcb.h#7 integrate .. //depot/projects/tcp_reass/netinet/in_rmx.c#7 integrate .. //depot/projects/tcp_reass/netinet/in_var.h#5 integrate .. //depot/projects/tcp_reass/netinet/ip_carp.c#6 integrate .. //depot/projects/tcp_reass/netinet/ip_divert.c#7 integrate .. //depot/projects/tcp_reass/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/tcp_reass/netinet/ip_fw.h#8 integrate .. //depot/projects/tcp_reass/netinet/ip_icmp.c#7 integrate .. //depot/projects/tcp_reass/netinet/ip_input.c#7 integrate .. //depot/projects/tcp_reass/netinet/ip_ipsec.c#7 integrate .. //depot/projects/tcp_reass/netinet/ip_mroute.c#6 integrate .. //depot/projects/tcp_reass/netinet/ip_options.c#8 integrate .. //depot/projects/tcp_reass/netinet/ip_output.c#8 integrate .. //depot/projects/tcp_reass/netinet/ip_var.h#5 integrate .. //depot/projects/tcp_reass/netinet/ipfw/ip_fw2.c#4 integrate .. //depot/projects/tcp_reass/netinet/ipfw/ip_fw_nat.c#4 integrate .. //depot/projects/tcp_reass/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/tcp_reass/netinet/raw_ip.c#7 integrate .. //depot/projects/tcp_reass/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/tcp_reass/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/tcp_reass/netinet/tcp_input.c#11 integrate .. //depot/projects/tcp_reass/netinet/tcp_offload.c#5 integrate .. //depot/projects/tcp_reass/netinet/tcp_offload.h#5 integrate .. //depot/projects/tcp_reass/netinet/tcp_output.c#13 integrate .. //depot/projects/tcp_reass/netinet/tcp_reass.c#29 integrate .. //depot/projects/tcp_reass/netinet/tcp_sack.c#7 integrate .. //depot/projects/tcp_reass/netinet/tcp_subr.c#9 integrate .. //depot/projects/tcp_reass/netinet/tcp_syncache.c#6 integrate .. //depot/projects/tcp_reass/netinet/tcp_syncache.h#5 integrate .. //depot/projects/tcp_reass/netinet/tcp_timer.c#8 integrate .. //depot/projects/tcp_reass/netinet/tcp_timewait.c#6 integrate .. //depot/projects/tcp_reass/netinet/tcp_usrreq.c#11 integrate .. //depot/projects/tcp_reass/netinet/tcp_var.h#15 integrate .. //depot/projects/tcp_reass/netinet/udp_usrreq.c#6 integrate .. //depot/projects/tcp_reass/netinet/udp_var.h#5 integrate .. //depot/projects/tcp_reass/netinet/vinet.h#5 delete .. //depot/projects/tcp_reass/netinet6/dest6.c#4 integrate .. //depot/projects/tcp_reass/netinet6/frag6.c#6 integrate .. //depot/projects/tcp_reass/netinet6/icmp6.c#7 integrate .. //depot/projects/tcp_reass/netinet6/in6.c#7 integrate .. //depot/projects/tcp_reass/netinet6/in6_gif.c#5 integrate .. //depot/projects/tcp_reass/netinet6/in6_ifattach.c#6 integrate .. //depot/projects/tcp_reass/netinet6/in6_mcast.c#4 integrate .. //depot/projects/tcp_reass/netinet6/in6_pcb.c#7 integrate .. //depot/projects/tcp_reass/netinet6/in6_proto.c#6 integrate .. //depot/projects/tcp_reass/netinet6/in6_rmx.c#6 integrate .. //depot/projects/tcp_reass/netinet6/in6_src.c#7 integrate .. //depot/projects/tcp_reass/netinet6/in6_var.h#5 integrate .. //depot/projects/tcp_reass/netinet6/ip6_forward.c#4 integrate .. //depot/projects/tcp_reass/netinet6/ip6_input.c#6 integrate .. //depot/projects/tcp_reass/netinet6/ip6_ipsec.c#6 integrate .. //depot/projects/tcp_reass/netinet6/ip6_mroute.c#6 integrate .. //depot/projects/tcp_reass/netinet6/ip6_output.c#8 integrate .. //depot/projects/tcp_reass/netinet6/ip6_var.h#7 integrate .. //depot/projects/tcp_reass/netinet6/mld6.c#6 integrate .. //depot/projects/tcp_reass/netinet6/nd6.c#6 integrate .. //depot/projects/tcp_reass/netinet6/nd6.h#5 integrate .. //depot/projects/tcp_reass/netinet6/nd6_nbr.c#6 integrate .. //depot/projects/tcp_reass/netinet6/nd6_rtr.c#6 integrate .. //depot/projects/tcp_reass/netinet6/raw_ip6.c#8 integrate .. //depot/projects/tcp_reass/netinet6/raw_ip6.h#4 integrate .. //depot/projects/tcp_reass/netinet6/route6.c#4 integrate .. //depot/projects/tcp_reass/netinet6/scope6.c#6 integrate .. //depot/projects/tcp_reass/netinet6/tcp6_var.h#4 integrate .. //depot/projects/tcp_reass/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/tcp_reass/netinet6/vinet6.h#5 delete .. //depot/projects/tcp_reass/netipsec/ah_var.h#3 integrate .. //depot/projects/tcp_reass/netipsec/esp_var.h#3 integrate .. //depot/projects/tcp_reass/netipsec/ipcomp_var.h#3 integrate .. //depot/projects/tcp_reass/netipsec/ipip_var.h#4 integrate .. //depot/projects/tcp_reass/netipsec/ipsec.c#6 integrate .. //depot/projects/tcp_reass/netipsec/ipsec.h#6 integrate .. //depot/projects/tcp_reass/netipsec/ipsec6.h#6 integrate .. //depot/projects/tcp_reass/netipsec/ipsec_input.c#5 integrate .. //depot/projects/tcp_reass/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/tcp_reass/netipsec/ipsec_output.c#6 integrate .. //depot/projects/tcp_reass/netipsec/key.c#8 integrate .. //depot/projects/tcp_reass/netipsec/key_debug.c#5 integrate .. //depot/projects/tcp_reass/netipsec/key_debug.h#4 integrate .. //depot/projects/tcp_reass/netipsec/keysock.c#5 integrate .. //depot/projects/tcp_reass/netipsec/keysock.h#4 integrate .. //depot/projects/tcp_reass/netipsec/vipsec.h#4 delete .. //depot/projects/tcp_reass/netipsec/xform_ah.c#4 integrate .. //depot/projects/tcp_reass/netipsec/xform_esp.c#4 integrate .. //depot/projects/tcp_reass/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/tcp_reass/netipsec/xform_ipip.c#5 integrate .. //depot/projects/tcp_reass/netipsec/xform_tcp.c#6 integrate .. //depot/projects/tcp_reass/nfs/nfs_common.c#6 integrate .. //depot/projects/tcp_reass/nfsclient/bootp_subr.c#6 integrate .. //depot/projects/tcp_reass/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/tcp_reass/nfsclient/nfs_diskless.c#7 integrate .. //depot/projects/tcp_reass/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/tcp_reass/nfsclient/nfsmount.h#6 integrate .. //depot/projects/tcp_reass/pc98/conf/GENERIC#7 integrate .. //depot/projects/tcp_reass/pci/if_rlreg.h#7 integrate .. //depot/projects/tcp_reass/powerpc/aim/mmu_oea64.c#5 integrate .. //depot/projects/tcp_reass/powerpc/include/param.h#5 integrate .. //depot/projects/tcp_reass/powerpc/include/pmap.h#6 integrate .. //depot/projects/tcp_reass/powerpc/include/vm.h#3 integrate .. //depot/projects/tcp_reass/rpc/clnt_rc.c#6 integrate .. //depot/projects/tcp_reass/rpc/clnt_vc.c#5 integrate .. //depot/projects/tcp_reass/sparc64/conf/GENERIC#8 integrate .. //depot/projects/tcp_reass/sparc64/include/param.h#5 integrate .. //depot/projects/tcp_reass/sparc64/include/pmap.h#4 integrate .. //depot/projects/tcp_reass/sparc64/include/vm.h#3 integrate .. //depot/projects/tcp_reass/sun4v/conf/GENERIC#7 integrate .. //depot/projects/tcp_reass/sun4v/include/param.h#5 integrate .. //depot/projects/tcp_reass/sun4v/include/pmap.h#3 integrate .. //depot/projects/tcp_reass/sun4v/include/vm.h#3 integrate .. //depot/projects/tcp_reass/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/tcp_reass/sys/disk.h#4 integrate .. //depot/projects/tcp_reass/sys/namei.h#6 integrate .. //depot/projects/tcp_reass/sys/param.h#9 integrate .. //depot/projects/tcp_reass/sys/pcpu.h#7 integrate .. //depot/projects/tcp_reass/sys/proc.h#7 integrate .. //depot/projects/tcp_reass/sys/signalvar.h#3 integrate .. //depot/projects/tcp_reass/sys/sleepqueue.h#6 integrate .. //depot/projects/tcp_reass/sys/socketvar.h#7 integrate .. //depot/projects/tcp_reass/sys/syscall.h#8 integrate .. //depot/projects/tcp_reass/sys/syscall.mk#8 integrate .. //depot/projects/tcp_reass/sys/syscallsubr.h#7 integrate .. //depot/projects/tcp_reass/sys/sysctl.h#8 integrate .. //depot/projects/tcp_reass/sys/sysproto.h#8 integrate .. //depot/projects/tcp_reass/sys/vimage.h#5 integrate .. //depot/projects/tcp_reass/tools/sound/feeder_rate_mkfilter.awk#4 integrate .. //depot/projects/tcp_reass/vm/device_pager.c#5 integrate .. //depot/projects/tcp_reass/vm/pmap.h#4 integrate .. //depot/projects/tcp_reass/vm/vm.h#4 integrate .. //depot/projects/tcp_reass/vm/vm_contig.c#6 integrate .. //depot/projects/tcp_reass/vm/vm_extern.h#5 integrate .. //depot/projects/tcp_reass/vm/vm_fault.c#7 integrate .. //depot/projects/tcp_reass/vm/vm_map.c#8 integrate .. //depot/projects/tcp_reass/vm/vm_mmap.c#8 integrate .. //depot/projects/tcp_reass/vm/vm_object.c#9 integrate .. //depot/projects/tcp_reass/vm/vm_object.h#6 integrate .. //depot/projects/tcp_reass/vm/vm_page.c#8 integrate .. //depot/projects/tcp_reass/vm/vm_phys.c#5 integrate .. //depot/projects/tcp_reass/vm/vm_phys.h#4 integrate Differences ... ==== //depot/projects/tcp_reass/amd64/amd64/cpu_switch.S#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.168 2009/04/01 13:09:26 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.169 2009/07/09 09:34:11 kib Exp $ */ #include @@ -97,6 +97,7 @@ ENTRY(cpu_switch) /* Switch to new thread. First, save context. */ movq TD_PCB(%rdi),%r8 + movb $1,PCB_FULL_IRET(%r8) movq (%rsp),%rax /* Hardware registers */ movq %r15,PCB_R15(%r8) ==== //depot/projects/tcp_reass/amd64/amd64/exception.S#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.138 2009/04/01 13:09:26 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.140 2009/07/10 10:29:16 kib Exp $ */ #include "opt_atpic.h" @@ -162,19 +162,20 @@ .globl alltraps .type alltraps,@function alltraps: + movq %rdi,TF_RDI(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz alltraps_testi /* already running with kernel GS.base */ swapgs + movq PCPU(CURPCB),%rdi + movb $0,PCB_FULL_IRET(%rdi) movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) alltraps_testi: testl $PSL_I,TF_RFLAGS(%rsp) - jz alltraps_pushregs + jz alltraps_pushregs_no_rdi sti -alltraps_pushregs: - movq %rdi,TF_RDI(%rsp) alltraps_pushregs_no_rdi: movq %rsi,TF_RSI(%rsp) movq %rdx,TF_RDX(%rsp) @@ -233,14 +234,17 @@ .globl alltraps_noen .type alltraps_noen,@function alltraps_noen: + movq %rdi,TF_RDI(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs + movq PCPU(CURPCB),%rdi + movb $0,PCB_FULL_IRET(%rdi) 1: movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) - jmp alltraps_pushregs + jmp alltraps_pushregs_no_rdi IDTVEC(dblfault) subq $TF_ERR,%rsp @@ -278,12 +282,13 @@ IDTVEC(page) subq $TF_ERR,%rsp movl $T_PAGEFLT,TF_TRAPNO(%rsp) + movq %rdi,TF_RDI(%rsp) /* free up a GP register */ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs -1: - movq %rdi,TF_RDI(%rsp) /* free up a GP register */ - movq %cr2,%rdi /* preserve %cr2 before .. */ + movq PCPU(CURPCB),%rdi + movb $0,PCB_FULL_IRET(%rdi) +1: movq %cr2,%rdi /* preserve %cr2 before .. */ movq %rdi,TF_ADDR(%rsp) /* enabling interrupts. */ movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) @@ -311,7 +316,9 @@ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 2f /* already running with kernel GS.base */ 1: swapgs -2: movw %fs,TF_FS(%rsp) +2: movq PCPU(CURPCB),%rdi + movb $1,PCB_FULL_IRET(%rdi) /* always full iret from GPF */ + movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) @@ -341,6 +348,8 @@ movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) + movq PCPU(CURPCB),%r11 + movb $0,PCB_FULL_IRET(%r11) sti movq $KUDSEL,TF_SS(%rsp) movq $KUCSEL,TF_CS(%rsp) @@ -644,7 +653,8 @@ */ testb $SEL_RPL_MASK,TF_CS(%rsp) jz ld_regs - + cmpb $0,PCB_FULL_IRET(%r8) + je ld_regs testl $TF_HASSEGS,TF_FLAGS(%rsp) je set_segs @@ -756,38 +766,38 @@ .globl ds_load_fault ds_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movzwl TF_DS(%rsp),%edx - movl %edx,TF_ERR(%rsp) + movq %rsp, %rdi + call trap movw $KUDSEL,TF_DS(%rsp) - jmp calltrap + jmp doreti ALIGN_TEXT .globl es_load_fault es_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movzwl TF_ES(%rsp),%edx - movl %edx,TF_ERR(%rsp) + movq %rsp, %rdi + call trap movw $KUDSEL,TF_ES(%rsp) - jmp calltrap + jmp doreti ALIGN_TEXT .globl fs_load_fault fs_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movzwl TF_FS(%rsp),%edx - movl %edx,TF_ERR(%rsp) + movq %rsp, %rdi + call trap movw $KUF32SEL,TF_FS(%rsp) - jmp calltrap + jmp doreti ALIGN_TEXT .globl gs_load_fault gs_load_fault: popfq movl $T_PROTFLT,TF_TRAPNO(%rsp) - movzwl TF_GS(%rsp),%edx - movl %edx,TF_ERR(%rsp) + movq %rsp, %rdi + call trap movw $KUG32SEL,TF_GS(%rsp) - jmp calltrap + jmp doreti #ifdef HWPMC_HOOKS ENTRY(end_exceptions) #endif ==== //depot/projects/tcp_reass/amd64/amd64/genassym.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.176 2009/07/01 07:34:28 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.177 2009/07/09 09:34:11 kib Exp $"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" @@ -141,6 +141,7 @@ ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6)); ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); ASSYM(PCB_TSSP, offsetof(struct pcb, pcb_tssp)); +ASSYM(PCB_FULL_IRET, offsetof(struct pcb, pcb_full_iret)); ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_32BIT, PCB_32BIT); ASSYM(PCB_GS32BIT, PCB_GS32BIT); ==== //depot/projects/tcp_reass/amd64/amd64/io_apic.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.34 2009/07/01 17:20:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.35 2009/07/06 18:23:00 jhb Exp $"); #include "opt_isa.h" @@ -327,7 +327,7 @@ { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; - u_int old_vector; + u_int old_vector, new_vector; u_int old_id; /* @@ -348,11 +348,14 @@ * Allocate an APIC vector for this interrupt pin. Once * we have a vector we program the interrupt pin. */ - intpin->io_cpu = apic_id; - intpin->io_vector = apic_alloc_vector(apic_id, intpin->io_irq); - if (intpin->io_vector == 0) + new_vector = apic_alloc_vector(apic_id, intpin->io_irq); + if (new_vector == 0) return (ENOSPC); + intpin->io_cpu = apic_id; + intpin->io_vector = new_vector; + if (isrc->is_handlers > 0) + apic_enable_vector(intpin->io_cpu, intpin->io_vector); if (bootverbose) { printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); @@ -365,8 +368,11 @@ * Free the old vector after the new one is established. This is done * to prevent races where we could miss an interrupt. */ - if (old_vector) + if (old_vector) { + if (isrc->is_handlers > 0) + apic_disable_vector(old_id, old_vector); apic_free_vector(old_id, old_vector, intpin->io_irq); + } return (0); } ==== //depot/projects/tcp_reass/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.703 2009/06/23 22:42:39 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.705 2009/07/09 09:34:11 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -100,8 +100,9 @@ #ifndef KDB #error KDB must be enabled in order for DDB to work! #endif +#include +#include #endif -#include #include @@ -381,6 +382,7 @@ regs->tf_fs = _ufssel; regs->tf_gs = _ugssel; regs->tf_flags = TF_HASSEGS; + td->td_pcb->pcb_full_iret = 1; PROC_LOCK(p); mtx_lock(&psp->ps_mtx); } @@ -482,6 +484,7 @@ signotify(td); PROC_UNLOCK(p); td->td_pcb->pcb_flags |= PCB_FULLCTX; + td->td_pcb->pcb_full_iret = 1; return (EJUSTRETURN); } @@ -852,6 +855,7 @@ pcb->pcb_gsbase = 0; pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT); pcb->pcb_initial_fpucw = __INITIAL_FPUCW__; + pcb->pcb_full_iret = 1; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; @@ -1083,6 +1087,30 @@ IDTVEC(xmm), IDTVEC(dblfault), IDTVEC(fast_syscall), IDTVEC(fast_syscall32); +#ifdef DDB +/* + * Display the index and function name of any IDT entries that don't use + * the default 'rsvd' entry point. + */ +DB_SHOW_COMMAND(idt, db_show_idt) +{ + struct gate_descriptor *ip; + int idx; + uintptr_t func; + + ip = idt; + for (idx = 0; idx < NIDT && !db_pager_quit; idx++) { + func = ((long)ip->gd_hioffset << 16 | ip->gd_looffset); + if (func != (uintptr_t)&IDTVEC(rsvd)) { + db_printf("%3d\t", idx); + db_printsym(func, DB_STGY_PROC); + db_printf("\n"); + } + ip++; + } +} +#endif + void sdtossd(sd, ssd) struct user_segment_descriptor *sd; @@ -2006,6 +2034,7 @@ td->td_pcb->pcb_gsbase = mcp->mc_gsbase; } td->td_pcb->pcb_flags |= PCB_FULLCTX; + td->td_pcb->pcb_full_iret = 1; return (0); } ==== //depot/projects/tcp_reass/amd64/amd64/msi.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.13 2009/07/01 17:20:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.14 2009/07/06 18:23:00 jhb Exp $"); #include #include @@ -230,6 +230,8 @@ msi->msi_cpu = apic_id; msi->msi_vector = vector; + if (msi->msi_intsrc.is_handlers > 0) + apic_enable_vector(msi->msi_cpu, msi->msi_vector); if (bootverbose) printf("msi: Assigning %s IRQ %d to local APIC %u vector %u\n", msi->msi_msix ? "MSI-X" : "MSI", msi->msi_irq, @@ -238,6 +240,8 @@ sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); sib->msi_cpu = apic_id; sib->msi_vector = vector + i; + if (sib->msi_intsrc.is_handlers > 0) + apic_enable_vector(sib->msi_cpu, sib->msi_vector); if (bootverbose) printf( "msi: Assigning MSI IRQ %d to local APIC %u vector %u\n", @@ -249,9 +253,15 @@ * Free the old vector after the new one is established. This is done * to prevent races where we could miss an interrupt. */ + if (msi->msi_intsrc.is_handlers > 0) + apic_disable_vector(old_id, old_vector); apic_free_vector(old_id, old_vector, msi->msi_irq); - for (i = 1; i < msi->msi_count; i++) + for (i = 1; i < msi->msi_count; i++) { + sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); + if (sib->msi_intsrc.is_handlers > 0) + apic_disable_vector(old_id, old_vector + i); apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); + } return (0); } ==== //depot/projects/tcp_reass/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.661 2009/06/14 19:51:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.663 2009/07/12 23:31:20 alc Exp $"); /* * Manages physical address maps. @@ -614,6 +614,7 @@ { TAILQ_INIT(&m->md.pv_list); + m->md.pat_mode = PAT_WRITE_BACK; } /* @@ -1120,7 +1121,8 @@ endpte = pte + count; while (pte < endpte) { oldpte |= *pte; - pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | PG_RW | PG_V); + pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | + pmap_cache_bits((*ma)->md.pat_mode, 0) | PG_RW | PG_V); pte++; ma++; } @@ -2218,11 +2220,19 @@ /* * Invalidate the 2MB page mapping and return "failure" if the * mapping was never accessed or the allocation of the new - * page table page fails. + * page table page fails. If the 2MB page mapping belongs to + * the direct map region of the kernel's address space, then + * the page allocation request specifies the highest possible + * priority (VM_ALLOC_INTERRUPT). Otherwise, the priority is + * normal. Page table pages are preallocated for every other + * part of the kernel address space, so the direct map region + * is the only part of the kernel address space that must be + * handled here. */ if ((oldpde & PG_A) == 0 || (mpte = vm_page_alloc(NULL, - pmap_pde_pindex(va), VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL | - VM_ALLOC_WIRED)) == NULL) { + pmap_pde_pindex(va), (va >= DMAP_MIN_ADDRESS && va < + DMAP_MAX_ADDRESS ? VM_ALLOC_INTERRUPT : VM_ALLOC_NORMAL) | + VM_ALLOC_NOOBJ | VM_ALLOC_WIRED)) == NULL) { free = NULL; pmap_remove_pde(pmap, pde, trunc_2mpage(va), &free); pmap_invalidate_page(pmap, trunc_2mpage(va)); @@ -3017,7 +3027,7 @@ /* * Now validate mapping with desired protection/wiring. */ - newpte = (pt_entry_t)(pa | PG_V); + newpte = (pt_entry_t)(pa | pmap_cache_bits(m->md.pat_mode, 0) | PG_V); if ((prot & VM_PROT_WRITE) != 0) { newpte |= PG_RW; vm_page_flag_set(m, PG_WRITEABLE); @@ -3102,7 +3112,8 @@ " in pmap %p", va, pmap); return (FALSE); } - newpde = VM_PAGE_TO_PHYS(m) | PG_PS | PG_V; + newpde = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 1) | + PG_PS | PG_V; if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { newpde |= PG_MANAGED; @@ -3284,7 +3295,7 @@ */ pmap->pm_stats.resident_count++; - pa = VM_PAGE_TO_PHYS(m); + pa = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 0); if ((prot & VM_PROT_EXECUTE) == 0) pa |= pg_nx; @@ -3325,6 +3336,7 @@ pd_entry_t *pde; vm_paddr_t pa, ptepa; vm_page_t p, pdpg; + int pat_mode; VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); KASSERT(object->type == OBJT_DEVICE, @@ -3335,6 +3347,7 @@ p = vm_page_lookup(object, pindex); KASSERT(p->valid == VM_PAGE_BITS_ALL, ("pmap_object_init_pt: invalid page %p", p)); + pat_mode = p->md.pat_mode; /* * Abort the mapping if the first page is not physically @@ -3346,21 +3359,28 @@ /* * Skip the first page. Abort the mapping if the rest of - * the pages are not physically contiguous. + * the pages are not physically contiguous or have differing + * memory attributes. */ p = TAILQ_NEXT(p, listq); for (pa = ptepa + PAGE_SIZE; pa < ptepa + size; pa += PAGE_SIZE) { KASSERT(p->valid == VM_PAGE_BITS_ALL, ("pmap_object_init_pt: invalid page %p", p)); - if (pa != VM_PAGE_TO_PHYS(p)) + if (pa != VM_PAGE_TO_PHYS(p) || + pat_mode != p->md.pat_mode) return; p = TAILQ_NEXT(p, listq); } - /* Map using 2MB pages. */ + /* + * Map using 2MB pages. Since "ptepa" is 2M aligned and + * "size" is a multiple of 2M, adding the PAT setting to "pa" + * will not affect the termination of this loop. + */ PMAP_LOCK(pmap); - for (pa = ptepa; pa < ptepa + size; pa += NBPDR) { + for (pa = ptepa | pmap_cache_bits(pat_mode, 1); pa < ptepa + + size; pa += NBPDR) { pdpg = pmap_allocpde(pmap, addr, M_NOWAIT); if (pdpg == NULL) { /* @@ -4365,6 +4385,23 @@ } /* + * Sets the memory attribute for the specified page. + */ +void +pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma) +{ + + m->md.pat_mode = ma; + + /* + * Update the direct mapping and flush the cache. + */ + if (pmap_change_attr(PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)), PAGE_SIZE, + m->md.pat_mode)) + panic("memory attribute change on the direct map failed"); +} + +/* * Changes the specified virtual address range's memory type to that given by * the parameter "mode". The specified virtual address range must be * completely contained within either the direct map or the kernel map. If ==== //depot/projects/tcp_reass/amd64/amd64/sys_machdep.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.93 2009/06/27 15:03:50 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.94 2009/07/09 09:34:11 kib Exp $"); #include #include @@ -103,6 +103,7 @@ error = amd64_get_ldt(td, largs); break; case I386_SET_LDT: + td->td_pcb->pcb_full_iret = 1; if (largs->descs != NULL) { lp = (struct user_segment_descriptor *) kmem_alloc(kernel_map, largs->num * @@ -132,6 +133,7 @@ if (td != curthread) return; + td->td_pcb->pcb_full_iret = 1; critical_enter(); sd = PCPU_GET(gs32p); sd->sd_lobase = base & 0xffffff; @@ -146,6 +148,7 @@ if (td != curthread) return; + td->td_pcb->pcb_full_iret = 1; critical_enter(); sd = PCPU_GET(fs32p); sd->sd_lobase = base & 0xffffff; @@ -201,6 +204,7 @@ if (!error) { pcb->pcb_fsbase = i386base; td->td_frame->tf_fs = _ufssel; + pcb->pcb_full_iret = 1; update_gdt_fsbase(td, i386base); } break; @@ -212,6 +216,7 @@ error = copyin(uap->parms, &i386base, sizeof(i386base)); if (!error) { pcb->pcb_gsbase = i386base; + pcb->pcb_full_iret = 1; td->td_frame->tf_gs = _ugssel; update_gdt_gsbase(td, i386base); } @@ -225,6 +230,7 @@ if (!error) { if (a64base < VM_MAXUSER_ADDRESS) { pcb->pcb_fsbase = a64base; + pcb->pcb_full_iret = 1; td->td_frame->tf_fs = _ufssel; } else error = EINVAL; >>> TRUNCATED FOR MAIL (1000 lines) <<<