Date: Tue, 22 Oct 2013 10:10:36 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256883 - in user/dchagin/lemul: . bin/ps bin/sh cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/lib/libdtrace/powerpc cddl/lib/libdtrace contrib/binutils/gas con... Message-ID: <201310221010.r9MAAa75090343@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Tue Oct 22 10:10:34 2013 New Revision: 256883 URL: http://svnweb.freebsd.org/changeset/base/256883 Log: Sync with HEAD. Added: user/dchagin/lemul/share/man/man4/altera_atse.4 - copied unchanged from r256882, head/share/man/man4/altera_atse.4 user/dchagin/lemul/sys/arm/conf/IMX53-QSB - copied unchanged from r256882, head/sys/arm/conf/IMX53-QSB user/dchagin/lemul/sys/boot/fdt/dts/imx53-qsb.dts - copied unchanged from r256882, head/sys/boot/fdt/dts/imx53-qsb.dts user/dchagin/lemul/sys/dev/altera/atse/ - copied from r256882, head/sys/dev/altera/atse/ user/dchagin/lemul/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu - copied unchanged from r256882, head/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu user/dchagin/lemul/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu - copied unchanged from r256882, head/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu user/dchagin/lemul/sys/dev/cxgbe/iw_cxgbe/ - copied from r256882, head/sys/dev/cxgbe/iw_cxgbe/ user/dchagin/lemul/sys/dev/etherswitch/arswitch/arswitch_9340.c - copied unchanged from r256882, head/sys/dev/etherswitch/arswitch/arswitch_9340.c user/dchagin/lemul/sys/dev/etherswitch/arswitch/arswitch_9340.h - copied unchanged from r256882, head/sys/dev/etherswitch/arswitch/arswitch_9340.h - copied unchanged from r256882, head/sys/dev/fdt/fdt_ic_if.m user/dchagin/lemul/sys/dev/ffec/ - copied from r256882, head/sys/dev/ffec/ user/dchagin/lemul/sys/dev/random/dummy_rng.c - copied unchanged from r256882, head/sys/dev/random/dummy_rng.c user/dchagin/lemul/sys/dev/random/live_entropy_sources.c - copied unchanged from r256882, head/sys/dev/random/live_entropy_sources.c user/dchagin/lemul/sys/dev/random/live_entropy_sources.h - copied unchanged from r256882, head/sys/dev/random/live_entropy_sources.h user/dchagin/lemul/sys/dev/random/rwfile.c - copied unchanged from r256882, head/sys/dev/random/rwfile.c user/dchagin/lemul/sys/dev/random/rwfile.h - copied unchanged from r256882, head/sys/dev/random/rwfile.h user/dchagin/lemul/sys/dev/usb/controller/dwc_otg_fdt.c - copied unchanged from r256882, head/sys/dev/usb/controller/dwc_otg_fdt.c user/dchagin/lemul/sys/modules/cxgbe/iw_cxgbe/ - copied from r256882, head/sys/modules/cxgbe/iw_cxgbe/ user/dchagin/lemul/sys/powerpc/powerpc/clock.c - copied unchanged from r256882, head/sys/powerpc/powerpc/clock.c user/dchagin/lemul/sys/powerpc/powerpc/nexus.c - copied unchanged from r256882, head/sys/powerpc/powerpc/nexus.c user/dchagin/lemul/sys/powerpc/powerpc/vm_machdep.c - copied unchanged from r256882, head/sys/powerpc/powerpc/vm_machdep.c user/dchagin/lemul/sys/powerpc/pseries/phyp_llan.c - copied unchanged from r256882, head/sys/powerpc/pseries/phyp_llan.c Directory Properties: user/dchagin/lemul/sys/dev/fdt/fdt_ic_if.m (props changed) Deleted: user/dchagin/lemul/lib/libyaml/libbsdyml.3 user/dchagin/lemul/share/man/man4/isf.4 user/dchagin/lemul/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c user/dchagin/lemul/sys/contrib/rdma/core_priv.h user/dchagin/lemul/sys/contrib/rdma/ib_addr.h user/dchagin/lemul/sys/contrib/rdma/ib_cache.h user/dchagin/lemul/sys/contrib/rdma/ib_cm.h user/dchagin/lemul/sys/contrib/rdma/ib_fmr_pool.h user/dchagin/lemul/sys/contrib/rdma/ib_mad.h user/dchagin/lemul/sys/contrib/rdma/ib_marshall.h user/dchagin/lemul/sys/contrib/rdma/ib_pack.h user/dchagin/lemul/sys/contrib/rdma/ib_sa.h user/dchagin/lemul/sys/contrib/rdma/ib_smi.h user/dchagin/lemul/sys/contrib/rdma/ib_umem.h user/dchagin/lemul/sys/contrib/rdma/ib_user_cm.h user/dchagin/lemul/sys/contrib/rdma/ib_user_mad.h user/dchagin/lemul/sys/contrib/rdma/ib_user_sa.h user/dchagin/lemul/sys/contrib/rdma/ib_user_verbs.h user/dchagin/lemul/sys/contrib/rdma/ib_verbs.h user/dchagin/lemul/sys/contrib/rdma/iw_cm.h user/dchagin/lemul/sys/contrib/rdma/rdma_addr.c user/dchagin/lemul/sys/contrib/rdma/rdma_cache.c user/dchagin/lemul/sys/contrib/rdma/rdma_cm.h user/dchagin/lemul/sys/contrib/rdma/rdma_cm_ib.h user/dchagin/lemul/sys/contrib/rdma/rdma_cma.c user/dchagin/lemul/sys/contrib/rdma/rdma_device.c user/dchagin/lemul/sys/contrib/rdma/rdma_iwcm.c user/dchagin/lemul/sys/contrib/rdma/rdma_user_cm.h user/dchagin/lemul/sys/contrib/rdma/rdma_verbs.c user/dchagin/lemul/sys/contrib/rdma/types.h user/dchagin/lemul/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu user/dchagin/lemul/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu user/dchagin/lemul/sys/dev/isf/ user/dchagin/lemul/sys/dev/random/pseudo_rng.c user/dchagin/lemul/sys/modules/rdma/addr/ user/dchagin/lemul/sys/modules/rdma/cma/ user/dchagin/lemul/sys/modules/rdma/core/ user/dchagin/lemul/sys/modules/rdma/iwcm/ user/dchagin/lemul/sys/powerpc/aim/clock.c user/dchagin/lemul/sys/powerpc/aim/nexus.c user/dchagin/lemul/sys/powerpc/aim/vm_machdep.c user/dchagin/lemul/sys/powerpc/booke/clock.c user/dchagin/lemul/sys/powerpc/booke/vm_machdep.c user/dchagin/lemul/sys/powerpc/mpc85xx/nexus.c user/dchagin/lemul/usr.sbin/isfctl/ Modified: user/dchagin/lemul/Makefile.inc1 user/dchagin/lemul/ObsoleteFiles.inc user/dchagin/lemul/UPDATING user/dchagin/lemul/bin/ps/print.c user/dchagin/lemul/bin/sh/jobs.c user/dchagin/lemul/bin/sh/miscbltin.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c user/dchagin/lemul/cddl/lib/libdtrace/psinfo.d user/dchagin/lemul/contrib/binutils/gas/config/tc-arm.c user/dchagin/lemul/contrib/binutils/gas/config/tc-mips.c user/dchagin/lemul/contrib/binutils/gas/config/tc-mips.h user/dchagin/lemul/contrib/binutils/gas/dwarf2dbg.c user/dchagin/lemul/contrib/bsnmp/lib/snmp.c user/dchagin/lemul/contrib/bsnmp/lib/snmp.h user/dchagin/lemul/contrib/bsnmp/lib/snmpagent.c user/dchagin/lemul/contrib/gcclibs/libssp/ssp.c user/dchagin/lemul/contrib/ipfilter/ipf.h user/dchagin/lemul/contrib/jemalloc/ChangeLog user/dchagin/lemul/contrib/jemalloc/FREEBSD-diffs user/dchagin/lemul/contrib/jemalloc/FREEBSD-upgrade user/dchagin/lemul/contrib/jemalloc/VERSION user/dchagin/lemul/contrib/jemalloc/doc/jemalloc.3 user/dchagin/lemul/contrib/jemalloc/include/jemalloc/internal/arena.h user/dchagin/lemul/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h user/dchagin/lemul/contrib/jemalloc/include/jemalloc/internal/private_namespace.h user/dchagin/lemul/contrib/jemalloc/include/jemalloc/internal/tcache.h user/dchagin/lemul/contrib/jemalloc/include/jemalloc/jemalloc.h user/dchagin/lemul/contrib/jemalloc/src/arena.c user/dchagin/lemul/contrib/jemalloc/src/chunk.c user/dchagin/lemul/contrib/jemalloc/src/ctl.c user/dchagin/lemul/contrib/jemalloc/src/jemalloc.c user/dchagin/lemul/contrib/libcxxrt/typeinfo.cc user/dchagin/lemul/contrib/mtree/compare.c user/dchagin/lemul/contrib/mtree/create.c user/dchagin/lemul/contrib/mtree/getid.c user/dchagin/lemul/contrib/mtree/spec.c user/dchagin/lemul/etc/defaults/rc.conf user/dchagin/lemul/etc/login.conf user/dchagin/lemul/etc/mtree/BSD.usr.dist user/dchagin/lemul/etc/netstart user/dchagin/lemul/etc/rc user/dchagin/lemul/etc/rc.d/initrandom user/dchagin/lemul/etc/rc.d/jail user/dchagin/lemul/etc/rc.d/rtadvd user/dchagin/lemul/etc/rc.d/sendmail user/dchagin/lemul/etc/sendmail/freebsd.mc user/dchagin/lemul/lib/libc/gen/getutxent.c user/dchagin/lemul/lib/libc/gen/popen.c user/dchagin/lemul/lib/libc/gen/syslog.c user/dchagin/lemul/lib/libc/iconv/citrus_mapper.c user/dchagin/lemul/lib/libc/sys/getrlimit.2 user/dchagin/lemul/lib/libcrypt/tests/Makefile user/dchagin/lemul/lib/libproc/_libproc.h user/dchagin/lemul/lib/libutil/login_class.3 user/dchagin/lemul/lib/libutil/login_class.c user/dchagin/lemul/lib/libvmmapi/vmmapi.c user/dchagin/lemul/lib/libyaml/Makefile user/dchagin/lemul/lib/libz/zopen.c user/dchagin/lemul/release/Makefile user/dchagin/lemul/release/picobsd/build/picobsd user/dchagin/lemul/release/picobsd/floppy.tree/etc/rc1 user/dchagin/lemul/release/picobsd/floppy.tree/etc/ssh/sshd_config user/dchagin/lemul/sbin/gvinum/gvinum.c user/dchagin/lemul/sbin/ifconfig/ifconfig.8 user/dchagin/lemul/sbin/ifconfig/ifgroup.c user/dchagin/lemul/sbin/iscontrol/fsm.c user/dchagin/lemul/sbin/nos-tun/nos-tun.c user/dchagin/lemul/sbin/route/keywords user/dchagin/lemul/sbin/route/route.8 user/dchagin/lemul/sbin/route/route.c user/dchagin/lemul/share/examples/bhyve/vmrun.sh user/dchagin/lemul/share/examples/kld/random_adaptor/random_adaptor_example.c user/dchagin/lemul/share/man/man4/Makefile user/dchagin/lemul/share/man/man4/random.4 user/dchagin/lemul/share/man/man5/rc.conf.5 user/dchagin/lemul/share/man/man8/rc.8 user/dchagin/lemul/share/man/man8/rc.sendmail.8 user/dchagin/lemul/share/man/man9/rtentry.9 user/dchagin/lemul/share/mk/atf.test.mk user/dchagin/lemul/share/mk/bsd.libnames.mk user/dchagin/lemul/share/mk/bsd.test.mk user/dchagin/lemul/sys/amd64/amd64/pmap.c user/dchagin/lemul/sys/amd64/include/vmm.h (contents, props changed) user/dchagin/lemul/sys/amd64/vmm/intel/vmx.c user/dchagin/lemul/sys/amd64/vmm/intel/vmx.h user/dchagin/lemul/sys/amd64/vmm/intel/vmx_controls.h user/dchagin/lemul/sys/amd64/vmm/vmm_dev.c user/dchagin/lemul/sys/amd64/vmm/x86.c user/dchagin/lemul/sys/arm/allwinner/a10_wdog.c user/dchagin/lemul/sys/arm/arm/busdma_machdep-v6.c user/dchagin/lemul/sys/arm/arm/cpufunc.c user/dchagin/lemul/sys/arm/arm/cpufunc_asm_armv7.S user/dchagin/lemul/sys/arm/arm/fusu.S user/dchagin/lemul/sys/arm/arm/identcpu.c user/dchagin/lemul/sys/arm/arm/locore.S user/dchagin/lemul/sys/arm/arm/machdep.c user/dchagin/lemul/sys/arm/arm/pl310.c user/dchagin/lemul/sys/arm/arm/pmap-v6.c user/dchagin/lemul/sys/arm/broadcom/bcm2835/bcm2835_wdog.c user/dchagin/lemul/sys/arm/broadcom/bcm2835/files.bcm2835 user/dchagin/lemul/sys/arm/freescale/imx/files.imx53 user/dchagin/lemul/sys/arm/freescale/imx/imx51_ccm.c user/dchagin/lemul/sys/arm/include/armreg.h user/dchagin/lemul/sys/arm/include/pmap.h user/dchagin/lemul/sys/arm/mv/common.c user/dchagin/lemul/sys/arm/mv/mv_localbus.c user/dchagin/lemul/sys/arm/mv/mvreg.h user/dchagin/lemul/sys/arm/xscale/i80321/ep80219_machdep.c user/dchagin/lemul/sys/arm/xscale/i80321/iq31244_machdep.c user/dchagin/lemul/sys/arm/xscale/i8134x/crb_machdep.c user/dchagin/lemul/sys/arm/xscale/ixp425/avila_machdep.c user/dchagin/lemul/sys/arm/xscale/pxa/pxa_machdep.c user/dchagin/lemul/sys/boot/fdt/dts/digi-ccwmx53.dts user/dchagin/lemul/sys/boot/forth/loader.conf user/dchagin/lemul/sys/cam/ata/ata_all.c user/dchagin/lemul/sys/cam/ata/ata_all.h user/dchagin/lemul/sys/cam/ata/ata_da.c user/dchagin/lemul/sys/cam/ata/ata_pmp.c user/dchagin/lemul/sys/cam/ata/ata_xpt.c user/dchagin/lemul/sys/cam/cam_ccb.h user/dchagin/lemul/sys/cam/cam_periph.c user/dchagin/lemul/sys/cam/cam_periph.h user/dchagin/lemul/sys/cam/cam_queue.c user/dchagin/lemul/sys/cam/cam_queue.h user/dchagin/lemul/sys/cam/cam_sim.c user/dchagin/lemul/sys/cam/cam_sim.h user/dchagin/lemul/sys/cam/cam_xpt.c user/dchagin/lemul/sys/cam/cam_xpt.h user/dchagin/lemul/sys/cam/cam_xpt_internal.h user/dchagin/lemul/sys/cam/cam_xpt_periph.h user/dchagin/lemul/sys/cam/cam_xpt_sim.h user/dchagin/lemul/sys/cam/ctl/ctl_frontend_cam_sim.c user/dchagin/lemul/sys/cam/ctl/scsi_ctl.c user/dchagin/lemul/sys/cam/scsi/scsi_all.c user/dchagin/lemul/sys/cam/scsi/scsi_all.h user/dchagin/lemul/sys/cam/scsi/scsi_cd.c user/dchagin/lemul/sys/cam/scsi/scsi_ch.c user/dchagin/lemul/sys/cam/scsi/scsi_da.c user/dchagin/lemul/sys/cam/scsi/scsi_enc.c user/dchagin/lemul/sys/cam/scsi/scsi_enc_internal.h user/dchagin/lemul/sys/cam/scsi/scsi_enc_safte.c user/dchagin/lemul/sys/cam/scsi/scsi_enc_ses.c user/dchagin/lemul/sys/cam/scsi/scsi_pass.c user/dchagin/lemul/sys/cam/scsi/scsi_pt.c user/dchagin/lemul/sys/cam/scsi/scsi_sa.c user/dchagin/lemul/sys/cam/scsi/scsi_sg.c user/dchagin/lemul/sys/cam/scsi/scsi_targ_bh.c user/dchagin/lemul/sys/cam/scsi/scsi_target.c user/dchagin/lemul/sys/cam/scsi/scsi_xpt.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c user/dchagin/lemul/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h user/dchagin/lemul/sys/cddl/dev/dtrace/amd64/dtrace_isa.c user/dchagin/lemul/sys/cddl/dev/dtrace/dtrace_sysctl.c user/dchagin/lemul/sys/conf/NOTES user/dchagin/lemul/sys/conf/files user/dchagin/lemul/sys/conf/files.amd64 user/dchagin/lemul/sys/conf/files.i386 user/dchagin/lemul/sys/conf/files.powerpc user/dchagin/lemul/sys/conf/kmod.mk user/dchagin/lemul/sys/conf/newvers.sh user/dchagin/lemul/sys/conf/options user/dchagin/lemul/sys/contrib/dev/run/rt2870.fw.uu user/dchagin/lemul/sys/contrib/rdma/krping/getopt.c user/dchagin/lemul/sys/contrib/rdma/krping/krping.c user/dchagin/lemul/sys/contrib/rdma/krping/krping.h user/dchagin/lemul/sys/contrib/rdma/krping/krping_dev.c user/dchagin/lemul/sys/dev/ahci/ahci.c user/dchagin/lemul/sys/dev/ahci/ahci.h user/dchagin/lemul/sys/dev/aic7xxx/aic79xx.c user/dchagin/lemul/sys/dev/aic7xxx/aic7xxx.c user/dchagin/lemul/sys/dev/altera/sdcard/altera_sdcard.c user/dchagin/lemul/sys/dev/altera/sdcard/altera_sdcard_io.c user/dchagin/lemul/sys/dev/ata/ata-all.c user/dchagin/lemul/sys/dev/ath/if_ath.c user/dchagin/lemul/sys/dev/ath/if_ath_tx.c user/dchagin/lemul/sys/dev/cfi/cfi_core.c user/dchagin/lemul/sys/dev/cxgbe/adapter.h user/dchagin/lemul/sys/dev/cxgbe/common/common.h user/dchagin/lemul/sys/dev/cxgbe/firmware/t4fw_cfg.txt user/dchagin/lemul/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt user/dchagin/lemul/sys/dev/cxgbe/firmware/t4fw_interface.h user/dchagin/lemul/sys/dev/cxgbe/firmware/t5fw_cfg.txt user/dchagin/lemul/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt user/dchagin/lemul/sys/dev/cxgbe/t4_main.c user/dchagin/lemul/sys/dev/cxgbe/t4_sge.c user/dchagin/lemul/sys/dev/cxgbe/tom/t4_cpl_io.c user/dchagin/lemul/sys/dev/drm2/i915/i915_drv.c user/dchagin/lemul/sys/dev/drm2/radeon/radeon_drv.c user/dchagin/lemul/sys/dev/etherswitch/arswitch/arswitch.c user/dchagin/lemul/sys/dev/etherswitch/arswitch/arswitch_vlans.c user/dchagin/lemul/sys/dev/etherswitch/arswitch/arswitchreg.h user/dchagin/lemul/sys/dev/etherswitch/arswitch/arswitchvar.h user/dchagin/lemul/sys/dev/fdt/fdt_common.c user/dchagin/lemul/sys/dev/fdt/fdt_common.h user/dchagin/lemul/sys/dev/fdt/fdtbus.c user/dchagin/lemul/sys/dev/fdt/simplebus.c user/dchagin/lemul/sys/dev/firewire/sbp_targ.c user/dchagin/lemul/sys/dev/glxsb/glxsb.c user/dchagin/lemul/sys/dev/hifn/hifn7751.c user/dchagin/lemul/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c user/dchagin/lemul/sys/dev/hyperv/vmbus/hv_hv.c user/dchagin/lemul/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c user/dchagin/lemul/sys/dev/isp/isp.c user/dchagin/lemul/sys/dev/isp/isp_freebsd.c user/dchagin/lemul/sys/dev/isp/isp_freebsd.h user/dchagin/lemul/sys/dev/isp/ispvar.h user/dchagin/lemul/sys/dev/md/md.c user/dchagin/lemul/sys/dev/mpt/mpt_cam.c user/dchagin/lemul/sys/dev/mvs/mvs.c user/dchagin/lemul/sys/dev/ofw/ofw_bus_subr.c user/dchagin/lemul/sys/dev/ofw/ofw_fdt.c user/dchagin/lemul/sys/dev/random/harvest.c user/dchagin/lemul/sys/dev/random/hash.h user/dchagin/lemul/sys/dev/random/ivy.c user/dchagin/lemul/sys/dev/random/nehemiah.c user/dchagin/lemul/sys/dev/random/random_adaptors.c user/dchagin/lemul/sys/dev/random/random_adaptors.h user/dchagin/lemul/sys/dev/random/random_harvestq.c user/dchagin/lemul/sys/dev/random/random_harvestq.h user/dchagin/lemul/sys/dev/random/randomdev.c user/dchagin/lemul/sys/dev/random/randomdev.h user/dchagin/lemul/sys/dev/random/randomdev_soft.c user/dchagin/lemul/sys/dev/random/randomdev_soft.h user/dchagin/lemul/sys/dev/random/yarrow.c user/dchagin/lemul/sys/dev/random/yarrow.h user/dchagin/lemul/sys/dev/re/if_re.c user/dchagin/lemul/sys/dev/rndtest/rndtest.c user/dchagin/lemul/sys/dev/safe/safe.c user/dchagin/lemul/sys/dev/siis/siis.c user/dchagin/lemul/sys/dev/syscons/scmouse.c user/dchagin/lemul/sys/dev/syscons/syscons.c user/dchagin/lemul/sys/dev/uart/uart_dev_pl011.c user/dchagin/lemul/sys/dev/ubsec/ubsec.c user/dchagin/lemul/sys/dev/usb/controller/musb_otg.c user/dchagin/lemul/sys/dev/usb/controller/musb_otg.h user/dchagin/lemul/sys/dev/usb/controller/xhci.c user/dchagin/lemul/sys/dev/usb/serial/uslcom.c user/dchagin/lemul/sys/dev/usb/usbdevs user/dchagin/lemul/sys/dev/usb/wlan/if_run.c user/dchagin/lemul/sys/dev/usb/wlan/if_runreg.h user/dchagin/lemul/sys/dev/xen/blkfront/blkfront.c user/dchagin/lemul/sys/dev/xen/netback/netback.c user/dchagin/lemul/sys/fs/devfs/devfs_vnops.c user/dchagin/lemul/sys/geom/concat/g_concat.c user/dchagin/lemul/sys/geom/concat/g_concat.h user/dchagin/lemul/sys/geom/gate/g_gate.c user/dchagin/lemul/sys/geom/geom.h user/dchagin/lemul/sys/geom/geom_dev.c user/dchagin/lemul/sys/geom/geom_disk.c user/dchagin/lemul/sys/geom/geom_disk.h user/dchagin/lemul/sys/geom/geom_int.h user/dchagin/lemul/sys/geom/geom_io.c user/dchagin/lemul/sys/geom/geom_kern.c user/dchagin/lemul/sys/geom/geom_slice.c user/dchagin/lemul/sys/geom/geom_vfs.c user/dchagin/lemul/sys/geom/label/g_label.c user/dchagin/lemul/sys/geom/mirror/g_mirror.c user/dchagin/lemul/sys/geom/mirror/g_mirror.h user/dchagin/lemul/sys/geom/multipath/g_multipath.c user/dchagin/lemul/sys/geom/nop/g_nop.c user/dchagin/lemul/sys/geom/nop/g_nop.h user/dchagin/lemul/sys/geom/part/g_part.c user/dchagin/lemul/sys/geom/part/g_part_apm.c user/dchagin/lemul/sys/geom/part/g_part_bsd.c user/dchagin/lemul/sys/geom/part/g_part_ebr.c user/dchagin/lemul/sys/geom/part/g_part_gpt.c user/dchagin/lemul/sys/geom/part/g_part_mbr.c user/dchagin/lemul/sys/geom/part/g_part_pc98.c user/dchagin/lemul/sys/geom/part/g_part_vtoc8.c user/dchagin/lemul/sys/geom/raid/g_raid.c user/dchagin/lemul/sys/geom/raid/g_raid.h user/dchagin/lemul/sys/geom/raid/md_ddf.c user/dchagin/lemul/sys/geom/raid/md_intel.c user/dchagin/lemul/sys/geom/raid/md_jmicron.c user/dchagin/lemul/sys/geom/raid/md_nvidia.c user/dchagin/lemul/sys/geom/raid/md_promise.c user/dchagin/lemul/sys/geom/raid/md_sii.c user/dchagin/lemul/sys/geom/raid/tr_concat.c user/dchagin/lemul/sys/geom/raid/tr_raid0.c user/dchagin/lemul/sys/geom/raid/tr_raid1.c user/dchagin/lemul/sys/geom/raid/tr_raid1e.c user/dchagin/lemul/sys/geom/raid/tr_raid5.c user/dchagin/lemul/sys/geom/stripe/g_stripe.c user/dchagin/lemul/sys/geom/stripe/g_stripe.h user/dchagin/lemul/sys/geom/zero/g_zero.c user/dchagin/lemul/sys/kern/kern_event.c user/dchagin/lemul/sys/kern/kern_exec.c user/dchagin/lemul/sys/kern/kern_intr.c user/dchagin/lemul/sys/kern/kern_resource.c user/dchagin/lemul/sys/kern/makesyscalls.sh user/dchagin/lemul/sys/kern/subr_bus.c user/dchagin/lemul/sys/kern/subr_devstat.c user/dchagin/lemul/sys/kern/subr_taskqueue.c user/dchagin/lemul/sys/kern/sys_generic.c user/dchagin/lemul/sys/kern/uipc_syscalls.c user/dchagin/lemul/sys/kern/vfs_bio.c user/dchagin/lemul/sys/mips/atheros/ar71xx_chip.c user/dchagin/lemul/sys/mips/atheros/ar71xx_cpudef.h user/dchagin/lemul/sys/mips/atheros/ar71xx_machdep.c user/dchagin/lemul/sys/mips/atheros/ar71xx_spi.c user/dchagin/lemul/sys/mips/atheros/ar724x_chip.c user/dchagin/lemul/sys/mips/atheros/ar91xx_chip.c user/dchagin/lemul/sys/mips/atheros/ar933x_chip.c user/dchagin/lemul/sys/mips/atheros/ar933xreg.h user/dchagin/lemul/sys/mips/atheros/ar934x_chip.c user/dchagin/lemul/sys/mips/atheros/ar934xreg.h user/dchagin/lemul/sys/mips/atheros/if_arge.c user/dchagin/lemul/sys/mips/atheros/if_argevar.h user/dchagin/lemul/sys/mips/beri/beri_machdep.c user/dchagin/lemul/sys/mips/beri/files.beri user/dchagin/lemul/sys/mips/cavium/octeon_rnd.c user/dchagin/lemul/sys/mips/conf/BERI_DE4.hints user/dchagin/lemul/sys/mips/conf/BERI_DE4_MDROOT user/dchagin/lemul/sys/mips/conf/BERI_DE4_SDROOT user/dchagin/lemul/sys/mips/conf/DB120 user/dchagin/lemul/sys/mips/conf/DB120.hints user/dchagin/lemul/sys/mips/include/asm.h user/dchagin/lemul/sys/mips/include/pcb.h user/dchagin/lemul/sys/mips/mips/bcopy.S user/dchagin/lemul/sys/mips/mips/exception.S user/dchagin/lemul/sys/mips/mips/fp.S user/dchagin/lemul/sys/mips/mips/support.S user/dchagin/lemul/sys/mips/mips/swtch.S user/dchagin/lemul/sys/modules/Makefile user/dchagin/lemul/sys/modules/cxgb/Makefile user/dchagin/lemul/sys/modules/cxgbe/Makefile user/dchagin/lemul/sys/modules/cxgbe/t4_firmware/Makefile user/dchagin/lemul/sys/modules/cxgbe/t5_firmware/Makefile user/dchagin/lemul/sys/modules/dtrace/Makefile user/dchagin/lemul/sys/modules/dtrace/fasttrap/Makefile user/dchagin/lemul/sys/modules/random/Makefile user/dchagin/lemul/sys/modules/rdma/Makefile user/dchagin/lemul/sys/net/flowtable.c user/dchagin/lemul/sys/net/ieee8023ad_lacp.c user/dchagin/lemul/sys/net/if.c user/dchagin/lemul/sys/net/if_ethersubr.c user/dchagin/lemul/sys/net/if_media.h user/dchagin/lemul/sys/net/if_tun.c user/dchagin/lemul/sys/net/if_var.h user/dchagin/lemul/sys/net/radix.c user/dchagin/lemul/sys/net/radix.h user/dchagin/lemul/sys/net/route.c user/dchagin/lemul/sys/net/rtsock.c user/dchagin/lemul/sys/netatalk/at_control.c user/dchagin/lemul/sys/netgraph/ng_base.c user/dchagin/lemul/sys/netgraph/ng_iface.c user/dchagin/lemul/sys/netinet/in.c user/dchagin/lemul/sys/netinet/in.h user/dchagin/lemul/sys/netinet/in_var.h user/dchagin/lemul/sys/netinet/ip_input.c user/dchagin/lemul/sys/netinet/ip_output.c user/dchagin/lemul/sys/netinet/sctp_constants.h user/dchagin/lemul/sys/netinet/sctp_usrreq.c user/dchagin/lemul/sys/netinet6/in6.c user/dchagin/lemul/sys/netinet6/in6_var.h user/dchagin/lemul/sys/netinet6/ip6_input.c user/dchagin/lemul/sys/netinet6/ip6_output.c user/dchagin/lemul/sys/netipx/ipx.c user/dchagin/lemul/sys/netipx/ipx_if.h user/dchagin/lemul/sys/ofed/drivers/net/mlx4/en_netdev.c user/dchagin/lemul/sys/ofed/include/linux/gfp.h user/dchagin/lemul/sys/pci/if_rlreg.h user/dchagin/lemul/sys/powerpc/aim/interrupt.c user/dchagin/lemul/sys/powerpc/aim/machdep.c user/dchagin/lemul/sys/powerpc/aim/trap.c user/dchagin/lemul/sys/powerpc/booke/machdep.c user/dchagin/lemul/sys/powerpc/booke/pmap.c user/dchagin/lemul/sys/powerpc/conf/GENERIC64 user/dchagin/lemul/sys/powerpc/ofw/ofw_pci.c user/dchagin/lemul/sys/powerpc/ofw/ofw_pci.h user/dchagin/lemul/sys/powerpc/ofw/ofw_pcib_pci.c user/dchagin/lemul/sys/powerpc/ofw/ofw_pcibus.c user/dchagin/lemul/sys/powerpc/powermac/ata_kauai.c user/dchagin/lemul/sys/powerpc/powermac/ata_macio.c user/dchagin/lemul/sys/powerpc/pseries/phyp-hvcall.S user/dchagin/lemul/sys/sys/counter.h user/dchagin/lemul/sys/sys/devicestat.h user/dchagin/lemul/sys/sys/eventvar.h user/dchagin/lemul/sys/sys/param.h user/dchagin/lemul/sys/sys/proc.h user/dchagin/lemul/sys/sys/random.h user/dchagin/lemul/sys/sys/resource.h user/dchagin/lemul/sys/sys/resourcevar.h user/dchagin/lemul/sys/sys/systm.h user/dchagin/lemul/sys/ufs/ffs/ffs_extern.h user/dchagin/lemul/sys/ufs/ffs/ffs_softdep.c user/dchagin/lemul/sys/ufs/ffs/ffs_vfsops.c user/dchagin/lemul/sys/ufs/ffs/softdep.h user/dchagin/lemul/sys/ufs/ufs/dinode.h user/dchagin/lemul/sys/ufs/ufs/ufs_extern.h user/dchagin/lemul/sys/ufs/ufs/ufsmount.h user/dchagin/lemul/sys/xen/xen-os.h user/dchagin/lemul/tools/build/mk/OptionalObsoleteFiles.inc user/dchagin/lemul/tools/make_libdeps.sh user/dchagin/lemul/usr.bin/limits/limits.c user/dchagin/lemul/usr.bin/netstat/if.c user/dchagin/lemul/usr.bin/netstat/main.c user/dchagin/lemul/usr.bin/netstat/mbuf.c user/dchagin/lemul/usr.bin/netstat/netstat.h user/dchagin/lemul/usr.bin/netstat/route.c user/dchagin/lemul/usr.bin/pathchk/pathchk.c user/dchagin/lemul/usr.bin/procstat/procstat_rlimit.c user/dchagin/lemul/usr.bin/rpcinfo/rpcinfo.c user/dchagin/lemul/usr.bin/systat/netcmds.c user/dchagin/lemul/usr.bin/uname/uname.1 user/dchagin/lemul/usr.bin/uname/uname.c user/dchagin/lemul/usr.sbin/Makefile user/dchagin/lemul/usr.sbin/bhyve/bhyverun.c user/dchagin/lemul/usr.sbin/bhyve/bhyverun.h user/dchagin/lemul/usr.sbin/bhyve/mptbl.c user/dchagin/lemul/usr.sbin/bhyve/pci_ahci.c user/dchagin/lemul/usr.sbin/bhyve/pci_hostbridge.c user/dchagin/lemul/usr.sbin/bhyve/pci_virtio_block.c user/dchagin/lemul/usr.sbin/bhyve/pci_virtio_net.c user/dchagin/lemul/usr.sbin/bhyve/rtc.c user/dchagin/lemul/usr.sbin/bhyve/spinup_ap.c user/dchagin/lemul/usr.sbin/bhyvectl/bhyvectl.c user/dchagin/lemul/usr.sbin/bhyveload/bhyveload.8 user/dchagin/lemul/usr.sbin/bhyveload/bhyveload.c user/dchagin/lemul/usr.sbin/bootparamd/bootparamd/main.c user/dchagin/lemul/usr.sbin/bootparamd/callbootd/callbootd.c user/dchagin/lemul/usr.sbin/bsdconfig/share/strings.subr user/dchagin/lemul/usr.sbin/bsdinstall/bsdinstall.8 user/dchagin/lemul/usr.sbin/bsdinstall/scripts/zfsboot user/dchagin/lemul/usr.sbin/freebsd-update/freebsd-update.sh user/dchagin/lemul/usr.sbin/ifmcstat/ifmcstat.c user/dchagin/lemul/usr.sbin/jail/command.c user/dchagin/lemul/usr.sbin/jail/config.c user/dchagin/lemul/usr.sbin/jail/jail.8 user/dchagin/lemul/usr.sbin/jail/jail.c user/dchagin/lemul/usr.sbin/jail/jailp.h user/dchagin/lemul/usr.sbin/kldxref/kldxref.c user/dchagin/lemul/usr.sbin/pkg/Makefile user/dchagin/lemul/usr.sbin/pkg/config.c user/dchagin/lemul/usr.sbin/pkg/pkg.c user/dchagin/lemul/usr.sbin/ppp/mppe.c user/dchagin/lemul/usr.sbin/ypset/ypset.c Directory Properties: user/dchagin/lemul/ (props changed) user/dchagin/lemul/cddl/ (props changed) user/dchagin/lemul/cddl/contrib/opensolaris/ (props changed) user/dchagin/lemul/contrib/binutils/ (props changed) user/dchagin/lemul/contrib/ipfilter/ (props changed) user/dchagin/lemul/contrib/libcxxrt/ (props changed) user/dchagin/lemul/contrib/mtree/ (props changed) user/dchagin/lemul/lib/libc/ (props changed) user/dchagin/lemul/lib/libutil/ (props changed) user/dchagin/lemul/lib/libvmmapi/ (props changed) user/dchagin/lemul/lib/libz/ (props changed) user/dchagin/lemul/sbin/ (props changed) user/dchagin/lemul/share/man/man4/ (props changed) user/dchagin/lemul/sys/ (props changed) user/dchagin/lemul/sys/amd64/vmm/ (props changed) user/dchagin/lemul/sys/boot/ (props changed) user/dchagin/lemul/sys/cddl/contrib/opensolaris/ (props changed) user/dchagin/lemul/sys/conf/ (props changed) user/dchagin/lemul/sys/dev/hyperv/ (props changed) user/dchagin/lemul/usr.bin/procstat/ (props changed) user/dchagin/lemul/usr.sbin/bhyve/ (props changed) user/dchagin/lemul/usr.sbin/bhyvectl/ (props changed) user/dchagin/lemul/usr.sbin/bhyveload/ (props changed) user/dchagin/lemul/usr.sbin/bsdinstall/scripts/docsinstall (props changed) user/dchagin/lemul/usr.sbin/bsdinstall/scripts/entropy (props changed) user/dchagin/lemul/usr.sbin/jail/ (props changed) Modified: user/dchagin/lemul/Makefile.inc1 ============================================================================== --- user/dchagin/lemul/Makefile.inc1 Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/Makefile.inc1 Tue Oct 22 10:10:34 2013 (r256883) @@ -1722,6 +1722,13 @@ delete-old-libs: chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ rm ${RM_I} "${DESTDIR}/$${file}" <&3; \ fi; \ + for ext in debug symbols; do \ + if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \ + "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \ + <&3; \ + fi; \ + done; \ done @echo ">>> Old libraries removed" @@ -1733,6 +1740,11 @@ check-old-libs: if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ + for ext in debug symbols; do \ + if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \ + fi; \ + done; \ done delete-old-dirs: @@ -1830,7 +1842,7 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU CPUTYPE=${XDEV_CPUTYPE} XDDIR=${XDEV_ARCH}-freebsd -XDTP=/usr/${XDDIR} +XDTP=usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ @@ -1843,8 +1855,8 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -XDDESTDIR=${DESTDIR}${XDTP} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}/${XDTP} .if !defined(OSREL) OSREL!= uname -r | sed -e 's/[-(].*//' .endif @@ -1924,6 +1936,7 @@ _xi-libraries: _xi-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ Modified: user/dchagin/lemul/ObsoleteFiles.inc ============================================================================== --- user/dchagin/lemul/ObsoleteFiles.inc Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/ObsoleteFiles.inc Tue Oct 22 10:10:34 2013 (r256883) @@ -38,6 +38,17 @@ # xargs -n1 | sort | uniq -d; # done +# 20131014: libbsdyml becomes private +OLD_FILES+=usr/lib/libbsdyml.a +OLD_FILES+=usr/lib/libbsdyml.so +OLD_LIBS+=usr/lib/libbsdyml.so.0 +OLD_FILES+=usr/lib/libbsdyml_p.a +OLD_FILES+=usr/lib32/libbsdyml.a +OLD_FILES+=usr/lib32/libbsdyml.so +OLD_LIBS+=usr/lib32/libbsdyml.so.0 +OLD_FILES+=usr/lib32/libbsdyml_p.a +OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz +OLD_FILES+=usr/include/bsdyml.h # 20131013: Removal of the ATF tools OLD_FILES+=etc/atf/FreeBSD.conf OLD_FILES+=etc/atf/atf-run.hooks @@ -86,7 +97,7 @@ OLD_FILES+=usr/include/lwres/result.h OLD_FILES+=usr/include/lwres/version.h OLD_FILES+=usr/lib/liblwres.a OLD_FILES+=usr/lib/liblwres.so -OLD_LIBS+=usr/lib/liblwres.so.50 +OLD_LIBS+=usr/lib/liblwres.so.90 OLD_FILES+=usr/lib/liblwres_p.a OLD_FILES+=usr/sbin/arpaname OLD_FILES+=usr/sbin/ddns-confgen @@ -96,6 +107,7 @@ OLD_FILES+=usr/sbin/dnssec-keygen OLD_FILES+=usr/sbin/dnssec-revoke OLD_FILES+=usr/sbin/dnssec-settime OLD_FILES+=usr/sbin/dnssec-signzone +OLD_FILES+=usr/sbin/dnssec-verify OLD_FILES+=usr/sbin/genrandom OLD_FILES+=usr/sbin/isc-hmac-fixup OLD_FILES+=usr/sbin/lwresd @@ -259,6 +271,7 @@ OLD_FILES+=usr/share/man/man8/dnssec-key OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz OLD_FILES+=usr/share/man/man8/genrandom.8.gz OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz OLD_FILES+=usr/share/man/man8/lwresd.8.gz @@ -293,6 +306,8 @@ OLD_DIRS+=var/named/var/run OLD_DIRS+=var/named/var/run/named OLD_DIRS+=var/named/var/stats OLD_DIRS+=var/run/named +# 20130923: example moved +OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh # 20130908: libssh becomes private OLD_FILES+=usr/lib/libssh.a OLD_FILES+=usr/lib/libssh.so Modified: user/dchagin/lemul/UPDATING ============================================================================== --- user/dchagin/lemul/UPDATING Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/UPDATING Tue Oct 22 10:10:34 2013 (r256883) @@ -31,6 +31,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131014: + libbsdyml has been renamed to libyaml and moved to /usr/lib/private. + This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg + 1.1.4_8 and verify bsdyml not linked in, before running "make + delete-old-libs": + # make -C /usr/ports/ports-mgmt/pkg build deinstall install clean + or + # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml + 20131010: The rc.d/jail script has been updated to support jail(8) configuration file. The "jail_<jname>_*" rc.conf(5) variables Modified: user/dchagin/lemul/bin/ps/print.c ============================================================================== --- user/dchagin/lemul/bin/ps/print.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/bin/ps/print.c Tue Oct 22 10:10:34 2013 (r256883) @@ -797,8 +797,6 @@ char * emulname(KINFO *k, VARENT *ve __unused) { - if (k->ki_p->ki_emul == NULL) - return (NULL); return (strdup(k->ki_p->ki_emul)); } @@ -827,7 +825,6 @@ out: char * loginclass(KINFO *k, VARENT *ve __unused) { - char *s; /* * Don't display login class for system processes; @@ -837,8 +834,5 @@ loginclass(KINFO *k, VARENT *ve __unused if (k->ki_p->ki_flag & P_SYSTEM) { return (strdup("-")); } - s = k->ki_p->ki_loginclass; - if (s == NULL) - return (NULL); - return (strdup(s)); + return (strdup(k->ki_p->ki_loginclass)); } Modified: user/dchagin/lemul/bin/sh/jobs.c ============================================================================== --- user/dchagin/lemul/bin/sh/jobs.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/bin/sh/jobs.c Tue Oct 22 10:10:34 2013 (r256883) @@ -978,7 +978,6 @@ int waitforjob(struct job *jp, int *origstatus) { #if JOBS - pid_t mypgrp = getpgrp(); int propagate_int = jp->jobctl && jp->foreground; #endif int status; @@ -992,7 +991,7 @@ waitforjob(struct job *jp, int *origstat dotrap(); #if JOBS if (jp->jobctl) { - if (tcsetpgrp(ttyfd, mypgrp) < 0) + if (tcsetpgrp(ttyfd, rootpid) < 0) error("tcsetpgrp failed, errno=%d\n", errno); } if (jp->state == JOBSTOPPED) Modified: user/dchagin/lemul/bin/sh/miscbltin.c ============================================================================== --- user/dchagin/lemul/bin/sh/miscbltin.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/bin/sh/miscbltin.c Tue Oct 22 10:10:34 2013 (r256883) @@ -405,6 +405,9 @@ static const struct limits limits[] = { #ifdef RLIMIT_NPTS { "pseudo-terminals", (char *)0, RLIMIT_NPTS, 1, 'p' }, #endif +#ifdef RLIMIT_KQUEUES + { "kqueues", (char *)0, RLIMIT_KQUEUES, 1, 'k' }, +#endif { (char *) 0, (char *)0, 0, 0, '\0' } }; @@ -421,7 +424,7 @@ ulimitcmd(int argc __unused, char **argv struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpw")) != '\0') + while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0') switch (optc) { case 'H': how = HARD; Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Oct 22 10:10:34 2013 (r256883) @@ -242,8 +242,14 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ /* XXX */ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #elif defined(__powerpc__) -/* XXX */ -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + /* + * Add 4 bytes to hit the low half of this 64-bit + * big-endian address. + */ + rel->r_offset = s->dofs_offset + + dofr[j].dofr_offset + 4; + rel->r_info = ELF32_R_INFO(count + dep->de_global, + R_PPC_REL32); #elif defined(__sparc) /* * Add 4 bytes to hit the low half of this 64-bit @@ -423,7 +429,10 @@ prepare_elf64(dtrace_hdl_t *dtp, const d #elif defined(__mips__) /* XXX */ #elif defined(__powerpc__) -/* XXX */ + rel->r_offset = s->dofs_offset + + dofr[j].dofr_offset; + rel->r_info = ELF64_R_INFO(count + dep->de_global, + R_PPC64_REL64); #elif defined(__i386) || defined(__amd64) rel->r_offset = s->dofs_offset + dofr[j].dofr_offset; @@ -824,12 +833,84 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ return (0); } #elif defined(__powerpc__) +/* The sentinel is 'xor r3,r3,r3'. */ +#define DT_OP_XOR_R3 0x7c631a78 + +#define DT_OP_NOP 0x60000000 +#define DT_OP_BLR 0x4e800020 + +/* This captures all forms of branching to address. */ +#define DT_IS_BRANCH(inst) ((inst & 0xfc000000) == 0x48000000) +#define DT_IS_BL(inst) (DT_IS_BRANCH(inst) && (inst & 0x01)) + /* XXX */ static int dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela, uint32_t *off) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); + uint32_t *ip; + + if ((rela->r_offset & (sizeof (uint32_t) - 1)) != 0) + return (-1); + + /*LINTED*/ + ip = (uint32_t *)(p + rela->r_offset); + + /* + * We only know about some specific relocation types. + */ + if (GELF_R_TYPE(rela->r_info) != R_PPC_REL24 && + GELF_R_TYPE(rela->r_info) != R_PPC_PLTREL24) + return (-1); + + /* + * We may have already processed this object file in an earlier linker + * invocation. Check to see if the present instruction sequence matches + * the one we would install below. + */ + if (isenabled) { + if (ip[0] == DT_OP_XOR_R3) { + (*off) += sizeof (ip[0]); + return (0); + } + } else { + if (ip[0] == DT_OP_NOP) { + (*off) += sizeof (ip[0]); + return (0); + } + } + + /* + * We only expect branch to address instructions. + */ + if (!DT_IS_BRANCH(ip[0])) { + dt_dprintf("found %x instead of a branch instruction at %llx\n", + ip[0], (u_longlong_t)rela->r_offset); + return (-1); + } + + if (isenabled) { + /* + * It would necessarily indicate incorrect usage if an is- + * enabled probe were tail-called so flag that as an error. + * It's also potentially (very) tricky to handle gracefully, + * but could be done if this were a desired use scenario. + */ + if (!DT_IS_BL(ip[0])) { + dt_dprintf("tail call to is-enabled probe at %llx\n", + (u_longlong_t)rela->r_offset); + return (-1); + } + + ip[0] = DT_OP_XOR_R3; + (*off) += sizeof (ip[0]); + } else { + if (DT_IS_BL(ip[0])) + ip[0] = DT_OP_NOP; + else + ip[0] = DT_OP_BLR; + } + return (0); } Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Tue Oct 22 10:10:34 2013 (r256883) @@ -311,6 +311,10 @@ static const dt_ident_t _dtrace_globals[ &dt_idops_func, "void(@)" }, { "memref", DT_IDENT_FUNC, 0, DIF_SUBR_MEMREF, DT_ATTR_STABCMN, DT_VERS_1_1, &dt_idops_func, "uintptr_t *(void *, size_t)" }, +#if !defined(sun) +{ "memstr", DT_IDENT_FUNC, 0, DIF_SUBR_MEMSTR, DT_ATTR_STABCMN, DT_VERS_1_0, + &dt_idops_func, "string(void *, char, size_t)" }, +#endif { "min", DT_IDENT_AGGFUNC, 0, DTRACEAGG_MIN, DT_ATTR_STABCMN, DT_VERS_1_0, &dt_idops_func, "void(@)" }, { "mod", DT_IDENT_ACTFUNC, 0, DT_ACT_MOD, DT_ATTR_STABCMN, Modified: user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c ============================================================================== --- user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c Tue Oct 22 10:10:34 2013 (r256883) @@ -35,14 +35,26 @@ #include <dt_impl.h> #include <dt_pid.h> +#include <libproc_compat.h> + /*ARGSUSED*/ int dt_pid_create_entry_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp, fasttrap_probe_spec_t *ftp, const GElf_Sym *symp) { + ftp->ftps_type = DTFTP_ENTRY; + ftp->ftps_pc = (uintptr_t)symp->st_value; + ftp->ftps_size = (size_t)symp->st_size; + ftp->ftps_noffs = 1; + ftp->ftps_offs[0] = 0; + + if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { + dt_dprintf("fasttrap probe creation ioctl failed: %s\n", + strerror(errno)); + return (dt_set_errno(dtp, errno)); + } - dt_dprintf("%s: unimplemented\n", __func__); - return (DT_PROC_ERR); + return (1); } int @@ -50,8 +62,74 @@ dt_pid_create_return_probe(struct ps_pro fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, uint64_t *stret) { - dt_dprintf("%s: unimplemented\n", __func__); - return (DT_PROC_ERR); + uintptr_t temp; + uint32_t *text; + int i; + int srdepth = 0; + + if ((text = malloc(symp->st_size + 4)) == NULL) { + dt_dprintf("mr sparkle: malloc() failed\n"); + return (DT_PROC_ERR); + } + + if (Pread(P, text, symp->st_size, symp->st_value) != symp->st_size) { + dt_dprintf("mr sparkle: Pread() failed\n"); + free(text); + return (DT_PROC_ERR); + } + + /* + * Leave a dummy instruction in the last slot to simplify edge + * conditions. + */ + text[symp->st_size / 4] = 0; + + ftp->ftps_type = DTFTP_RETURN; + ftp->ftps_pc = symp->st_value; + ftp->ftps_size = symp->st_size; + ftp->ftps_noffs = 0; + + for (i = 0; i < symp->st_size / 4; i++) { + + if ((text[i] & 0xfc000001) != 0x48000000 && + text[i] != 0x4e800020) + continue; + + /* + * Check for a jump within this function. If it's outside this + * function then it's a tail-call, so a return point. + */ + if ((text[i] & 0xfc000000) == 0x48000000) { + temp = (text[i] & 0x03fffffc); + /* Bit 30 denotes an absolute address. */ + if (!(text[i] & 0x02)) { + temp += symp->st_value + i * 4; + } + else { + /* Sign extend the absolute address. */ + if (temp & 0x02000000) { + temp |= (UINTPTR_MAX - 0x03ffffff); + } + } + if (temp >= symp->st_value && + temp <= (symp->st_value + symp->st_size)) + continue; + } + dt_dprintf("return at offset %x\n", i * 4); + ftp->ftps_offs[ftp->ftps_noffs++] = i * 4; + } + + free(text); + if (ftp->ftps_noffs > 0) { + if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { + dt_dprintf("fasttrap probe creation ioctl failed: %s\n", + strerror(errno)); + return (dt_set_errno(dtp, errno)); + } + } + + + return (ftp->ftps_noffs); } /*ARGSUSED*/ @@ -59,9 +137,22 @@ int dt_pid_create_offset_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp, fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, ulong_t off) { + if (off & 0x3) + return (DT_PROC_ALIGN); - dt_dprintf("%s: unimplemented\n", __func__); - return (DT_PROC_ERR); + ftp->ftps_type = DTFTP_OFFSETS; + ftp->ftps_pc = (uintptr_t)symp->st_value; + ftp->ftps_size = (size_t)symp->st_size; + ftp->ftps_noffs = 1; + ftp->ftps_offs[0] = off; + + if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { + dt_dprintf("fasttrap probe creation ioctl failed: %s\n", + strerror(errno)); + return (dt_set_errno(dtp, errno)); + } + + return (1); } /*ARGSUSED*/ @@ -69,7 +160,38 @@ int dt_pid_create_glob_offset_probes(struct ps_prochandle *P, dtrace_hdl_t *dtp, fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, const char *pattern) { + ulong_t i; + + ftp->ftps_type = DTFTP_OFFSETS; + ftp->ftps_pc = (uintptr_t)symp->st_value; + ftp->ftps_size = (size_t)symp->st_size; + ftp->ftps_noffs = 0; + + /* + * If we're matching against everything, just iterate through each + * instruction in the function, otherwise look for matching offset + * names by constructing the string and comparing it against the + * pattern. + */ + if (strcmp("*", pattern) == 0) { + for (i = 0; i < symp->st_size; i += 4) { + ftp->ftps_offs[ftp->ftps_noffs++] = i; + } + } else { + char name[sizeof (i) * 2 + 1]; + + for (i = 0; i < symp->st_size; i += 4) { + (void) sprintf(name, "%lx", i); + if (gmatch(name, pattern)) + ftp->ftps_offs[ftp->ftps_noffs++] = i; + } + } + + if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { + dt_dprintf("fasttrap probe creation ioctl failed: %s\n", + strerror(errno)); + return (dt_set_errno(dtp, errno)); + } - dt_dprintf("%s: unimplemented\n", __func__); - return (DT_PROC_ERR); + return (ftp->ftps_noffs); } Modified: user/dchagin/lemul/cddl/lib/libdtrace/psinfo.d ============================================================================== --- user/dchagin/lemul/cddl/lib/libdtrace/psinfo.d Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/cddl/lib/libdtrace/psinfo.d Tue Oct 22 10:10:34 2013 (r256883) @@ -57,7 +57,8 @@ translator psinfo_t < struct proc *T > { pr_gid = T->p_ucred->cr_rgid; pr_egid = T->p_ucred->cr_groups[0]; pr_addr = 0; - pr_psargs = stringof(T->p_args->ar_args); + pr_psargs = (T->p_args->ar_args == 0) ? "" : + memstr(T->p_args->ar_args, ' ', T->p_args->ar_length); pr_arglen = T->p_args->ar_length; pr_jailid = T->p_ucred->cr_prison->pr_id; }; Modified: user/dchagin/lemul/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- user/dchagin/lemul/contrib/binutils/gas/config/tc-arm.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/binutils/gas/config/tc-arm.c Tue Oct 22 10:10:34 2013 (r256883) @@ -12660,14 +12660,14 @@ do_vfp_nsyn_cvt (enum neon_shape rs, int /* Conversions without bitshift. */ const char *enc[] = { - "ftosis", - "ftouis", + "ftosizs", + "ftouizs", "fsitos", "fuitos", "fcvtsd", "fcvtds", - "ftosid", - "ftouid", + "ftosizd", + "ftouizd", "fsitod", "fuitod" }; Modified: user/dchagin/lemul/contrib/binutils/gas/config/tc-mips.c ============================================================================== --- user/dchagin/lemul/contrib/binutils/gas/config/tc-mips.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/binutils/gas/config/tc-mips.c Tue Oct 22 10:10:34 2013 (r256883) @@ -15420,21 +15420,6 @@ MIPS options:\n\ -mno-octeon-useun generate MIPS unaligned load/store instructions\n")); } -enum dwarf2_format -mips_dwarf2_format (void) -{ - if (HAVE_64BIT_SYMBOLS) - { -#ifdef TE_IRIX - return dwarf2_format_64bit_irix; -#else - return dwarf2_format_64bit; -#endif - } - else - return dwarf2_format_32bit; -} - int mips_dwarf2_addr_size (void) { Modified: user/dchagin/lemul/contrib/binutils/gas/config/tc-mips.h ============================================================================== --- user/dchagin/lemul/contrib/binutils/gas/config/tc-mips.h Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/binutils/gas/config/tc-mips.h Tue Oct 22 10:10:34 2013 (r256883) @@ -155,10 +155,6 @@ extern void mips_emit_delays (void); extern void mips_enable_auto_align (void); #define md_elf_section_change_hook() mips_enable_auto_align() -enum dwarf2_format; -extern enum dwarf2_format mips_dwarf2_format (void); -#define DWARF2_FORMAT() mips_dwarf2_format () - extern int mips_dwarf2_addr_size (void); #define DWARF2_ADDR_SIZE(bfd) mips_dwarf2_addr_size () Modified: user/dchagin/lemul/contrib/binutils/gas/dwarf2dbg.c ============================================================================== --- user/dchagin/lemul/contrib/binutils/gas/dwarf2dbg.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/binutils/gas/dwarf2dbg.c Tue Oct 22 10:10:34 2013 (r256883) @@ -1271,6 +1271,7 @@ out_debug_line (segT line_seg) symbolS *line_end; struct line_seg *s; enum dwarf2_format d2f; + int sizeof_initial_length; int sizeof_offset; subseg_set (line_seg, 0); @@ -1287,27 +1288,24 @@ out_debug_line (segT line_seg) d2f = DWARF2_FORMAT (); if (d2f == dwarf2_format_32bit) { - expr.X_add_number = -4; - emit_expr (&expr, 4); - sizeof_offset = 4; + sizeof_initial_length = sizeof_offset = 4; } else if (d2f == dwarf2_format_64bit) { - expr.X_add_number = -12; - out_four (-1); - emit_expr (&expr, 8); + sizeof_initial_length = 12; sizeof_offset = 8; + out_four (-1); } else if (d2f == dwarf2_format_64bit_irix) { - expr.X_add_number = -8; - emit_expr (&expr, 8); - sizeof_offset = 8; + sizeof_initial_length = sizeof_offset = 8; } else { as_fatal (_("internal error: unknown dwarf2 format")); } + expr.X_add_number = -sizeof_initial_length; + emit_expr (&expr, sizeof_offset); /* Version. */ out_two (2); @@ -1316,7 +1314,7 @@ out_debug_line (segT line_seg) expr.X_op = O_subtract; expr.X_add_symbol = prologue_end; expr.X_op_symbol = line_start; - expr.X_add_number = - (4 + 2 + 4); + expr.X_add_number = - (sizeof_initial_length + 2 + sizeof_offset); emit_expr (&expr, sizeof_offset); /* Parameters of the state machine. */ Modified: user/dchagin/lemul/contrib/bsnmp/lib/snmp.c ============================================================================== --- user/dchagin/lemul/contrib/bsnmp/lib/snmp.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/bsnmp/lib/snmp.c Tue Oct 22 10:10:34 2013 (r256883) @@ -288,11 +288,13 @@ parse_secparams(struct asn_buf *b, struc memset(buf, 0, 256); tb.asn_ptr = buf; tb.asn_len = 256; + u_int len; - if (asn_get_octetstring(b, buf, &tb.asn_len) != ASN_ERR_OK) { + if (asn_get_octetstring(b, buf, &len) != ASN_ERR_OK) { snmp_error("cannot parse usm header"); return (ASN_ERR_FAILED); } + tb.asn_len = len; if (asn_get_sequence(&tb, &octs_len) != ASN_ERR_OK) { snmp_error("cannot decode usm header"); @@ -864,7 +866,7 @@ snmp_fix_encoding(struct asn_buf *b, str return (SNMP_CODE_FAILED); pdu->scoped_len = b->asn_ptr - pdu->scoped_ptr; - if ((code = snmp_pdu_fix_padd(b, pdu))!= ASN_ERR_OK) + if (snmp_pdu_fix_padd(b, pdu) != ASN_ERR_OK) return (SNMP_CODE_FAILED); if (pdu->security_model != SNMP_SECMODEL_USM) @@ -997,7 +999,7 @@ snmp_pdu_encode(struct snmp_pdu *pdu, st if ((err = snmp_pdu_encode_header(resp_b, pdu)) != SNMP_CODE_OK) return (err); for (idx = 0; idx < pdu->nbindings; idx++) - if ((err = snmp_binding_encode(resp_b, &pdu->bindings[idx])) + if (snmp_binding_encode(resp_b, &pdu->bindings[idx]) != ASN_ERR_OK) return (SNMP_CODE_FAILED); Modified: user/dchagin/lemul/contrib/bsnmp/lib/snmp.h ============================================================================== --- user/dchagin/lemul/contrib/bsnmp/lib/snmp.h Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/bsnmp/lib/snmp.h Tue Oct 22 10:10:34 2013 (r256883) @@ -182,7 +182,7 @@ struct snmp_pdu { /* fixes for encoding */ size_t outer_len; - size_t scoped_len; + asn_len_t scoped_len; u_char *outer_ptr; u_char *digest_ptr; u_char *encrypted_ptr; Modified: user/dchagin/lemul/contrib/bsnmp/lib/snmpagent.c ============================================================================== --- user/dchagin/lemul/contrib/bsnmp/lib/snmpagent.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/bsnmp/lib/snmpagent.c Tue Oct 22 10:10:34 2013 (r256883) @@ -166,7 +166,7 @@ find_subnode(const struct snmp_value *va } static void -snmp_pdu_create_response(struct snmp_pdu *pdu, struct snmp_pdu *resp) +snmp_pdu_create_response(const struct snmp_pdu *pdu, struct snmp_pdu *resp) { memset(resp, 0, sizeof(*resp)); strcpy(resp->community, pdu->community); @@ -276,7 +276,12 @@ snmp_get(struct snmp_pdu *pdu, struct as } } - return (snmp_fix_encoding(resp_b, resp)); + if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) { + snmp_debug("get: failed to encode PDU"); + return (SNMP_RET_ERR); + } + + return (SNMP_RET_OK); } static struct snmp_node * @@ -438,7 +443,13 @@ snmp_getnext(struct snmp_pdu *pdu, struc return (SNMP_RET_ERR); } } - return (snmp_fix_encoding(resp_b, resp)); + + if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) { + snmp_debug("getnext: failed to encode PDU"); + return (SNMP_RET_ERR); + } + + return (SNMP_RET_OK); } enum snmp_ret @@ -537,7 +548,12 @@ snmp_getbulk(struct snmp_pdu *pdu, struc } done: - return (snmp_fix_encoding(resp_b, resp)); + if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) { + snmp_debug("getnext: failed to encode PDU"); + return (SNMP_RET_ERR); + } + + return (SNMP_RET_OK); } /* @@ -952,18 +968,57 @@ enum snmp_ret snmp_make_errresp(const struct snmp_pdu *pdu, struct asn_buf *pdu_b, struct asn_buf *resp_b) { + u_char type; asn_len_t len; struct snmp_pdu resp; enum asn_err err; enum snmp_code code; - memset(&resp, 0, sizeof(resp)); + snmp_pdu_create_response(pdu, &resp); + if ((code = snmp_pdu_decode_header(pdu_b, &resp)) != SNMP_CODE_OK) return (SNMP_RET_IGN); - if (pdu_b->asn_len < len) + if (pdu->version == SNMP_V3) { + if (resp.user.priv_proto != SNMP_PRIV_NOPRIV && + (asn_get_header(pdu_b, &type, &resp.scoped_len) != ASN_ERR_OK + || type != ASN_TYPE_OCTETSTRING)) { + snmp_error("cannot decode encrypted pdu"); + return (SNMP_RET_IGN); + } + + if (asn_get_sequence(pdu_b, &len) != ASN_ERR_OK) { + snmp_error("cannot decode scoped pdu header"); + return (SNMP_RET_IGN); + } + + len = SNMP_ENGINE_ID_SIZ; + if (asn_get_octetstring(pdu_b, (u_char *)resp.context_engine, + &len) != ASN_ERR_OK) { + snmp_error("cannot decode msg context engine"); + return (SNMP_RET_IGN); + } + resp.context_engine_len = len; + len = SNMP_CONTEXT_NAME_SIZ; + if (asn_get_octetstring(pdu_b, (u_char *)resp.context_name, + &len) != ASN_ERR_OK) { + snmp_error("cannot decode msg context name"); + return (SNMP_RET_IGN); + } + resp.context_name[len] = '\0'; + } + + + if (asn_get_header(pdu_b, &type, &len) != ASN_ERR_OK) { + snmp_error("cannot get pdu header"); return (SNMP_RET_IGN); - pdu_b->asn_len = len; + } + + if ((type & ~ASN_TYPE_MASK) != + (ASN_TYPE_CONSTRUCTED | ASN_CLASS_CONTEXT)) { + snmp_error("bad pdu header tag"); + return (SNMP_RET_IGN); + } err = snmp_parse_pdus_hdr(pdu_b, &resp, &len); if (ASN_ERR_STOPPED(err)) Modified: user/dchagin/lemul/contrib/gcclibs/libssp/ssp.c ============================================================================== --- user/dchagin/lemul/contrib/gcclibs/libssp/ssp.c Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/gcclibs/libssp/ssp.c Tue Oct 22 10:10:34 2013 (r256883) @@ -128,7 +128,7 @@ fail (const char *msg1, size_t msg1len, #ifdef HAVE_SYSLOG_H /* Only send the error to syslog if there was no tty available. */ else - syslog (LOG_CRIT, msg3); + syslog (LOG_CRIT, "%s", msg3); #endif /* HAVE_SYSLOG_H */ /* Try very hard to exit. Note that signals may be blocked preventing Modified: user/dchagin/lemul/contrib/ipfilter/ipf.h ============================================================================== --- user/dchagin/lemul/contrib/ipfilter/ipf.h Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/ipfilter/ipf.h Tue Oct 22 10:10:34 2013 (r256883) @@ -42,9 +42,10 @@ struct file; #include <sys/time.h> #include <sys/socket.h> #include <net/if.h> -#if __FreeBSD_version >= 300000 -# include <net/if_var.h> -#endif + +#define _WANT_IFADDR +#include <net/if_var.h> + #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> Modified: user/dchagin/lemul/contrib/jemalloc/ChangeLog ============================================================================== --- user/dchagin/lemul/contrib/jemalloc/ChangeLog Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/jemalloc/ChangeLog Tue Oct 22 10:10:34 2013 (r256883) @@ -6,6 +6,21 @@ found in the git revision history: http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git git://canonware.com/jemalloc.git +* 3.4.1 (October 20, 2013) + + Bug fixes: + - Fix a race in the "arenas.extend" mallctl that could cause memory corruption + of internal data structures and subsequent crashes. + - Fix Valgrind integration flaws that caused Valgrind warnings about reads of + uninitialized memory in: + + arena chunk headers + + internal zero-initialized data structures (relevant to tcache and prof + code) + - Preserve errno during the first allocation. A readlink(2) call during + initialization fails unless /etc/malloc.conf exists, so errno was typically + set during the first allocation prior to this fix. + - Fix compilation warnings reported by gcc 4.8.1. + * 3.4.0 (June 2, 2013) This version is essentially a small bugfix release, but the addition of @@ -60,7 +75,7 @@ found in the git revision history: Bug fixes: - Fix "arenas.extend" mallctl to output the number of arenas. - - Fix chunk_recycyle() to unconditionally inform Valgrind that returned memory + - Fix chunk_recycle() to unconditionally inform Valgrind that returned memory is undefined. - Fix build break on FreeBSD related to alloca.h. Modified: user/dchagin/lemul/contrib/jemalloc/FREEBSD-diffs ============================================================================== --- user/dchagin/lemul/contrib/jemalloc/FREEBSD-diffs Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/jemalloc/FREEBSD-diffs Tue Oct 22 10:10:34 2013 (r256883) @@ -45,7 +45,7 @@ index abd5e6f..1d7491a 100644 + </refsect1> </refentry> diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in -index e46ac54..527449d 100644 +index 53c135c..c547339 100644 --- a/include/jemalloc/internal/jemalloc_internal.h.in +++ b/include/jemalloc/internal/jemalloc_internal.h.in @@ -1,5 +1,8 @@ @@ -97,10 +97,10 @@ index de44e14..564d604 100644 bool malloc_mutex_init(malloc_mutex_t *mutex); diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h -index 65de316..366676b 100644 +index cdb0b0e..2a98d1f 100644 --- a/include/jemalloc/internal/private_namespace.h +++ b/include/jemalloc/internal/private_namespace.h -@@ -216,7 +216,6 @@ +@@ -218,7 +218,6 @@ #define iralloc JEMALLOC_N(iralloc) #define irallocx JEMALLOC_N(irallocx) #define isalloc JEMALLOC_N(isalloc) @@ -244,7 +244,7 @@ index 0000000..e6c8407 +#endif + diff --git a/src/jemalloc.c b/src/jemalloc.c -index bc350ed..352c98e 100644 +index ae56db6..1412a5e 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL) Modified: user/dchagin/lemul/contrib/jemalloc/FREEBSD-upgrade ============================================================================== --- user/dchagin/lemul/contrib/jemalloc/FREEBSD-upgrade Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/jemalloc/FREEBSD-upgrade Tue Oct 22 10:10:34 2013 (r256883) @@ -60,7 +60,7 @@ do_extract() { local rev=$1 # Clone. rm -rf ${work} - git clone git://canonware.com/jemalloc.git ${work} + git clone https://github.com/jemalloc/jemalloc.git ${work} ( cd ${work} if [ "x${rev}" != "x" ] ; then Modified: user/dchagin/lemul/contrib/jemalloc/VERSION ============================================================================== --- user/dchagin/lemul/contrib/jemalloc/VERSION Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/jemalloc/VERSION Tue Oct 22 10:10:34 2013 (r256883) @@ -1 +1 @@ -3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775 +3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0 Modified: user/dchagin/lemul/contrib/jemalloc/doc/jemalloc.3 ============================================================================== --- user/dchagin/lemul/contrib/jemalloc/doc/jemalloc.3 Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/jemalloc/doc/jemalloc.3 Tue Oct 22 10:10:34 2013 (r256883) @@ -2,12 +2,12 @@ .\" Title: JEMALLOC .\" Author: Jason Evans .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>; -.\" Date: 06/02/2013 +.\" Date: 10/20/2013 .\" Manual: User Manual -.\" Source: jemalloc 3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775 +.\" Source: jemalloc 3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0 .\" Language: English .\" -.TH "JEMALLOC" "3" "06/02/2013" "jemalloc 3.4.0-0-g0ed518e5dab7" "User Manual" +.TH "JEMALLOC" "3" "10/20/2013" "jemalloc 3.4.1-0-g0135fb806e41" "User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ jemalloc \- general purpose memory allocation functions .SH "LIBRARY" .PP -This manual describes jemalloc 3\&.4\&.0\-0\-g0ed518e5dab789ad2171bb38977a8927e2a26775\&. More information can be found at the +This manual describes jemalloc 3\&.4\&.1\-0\-g0135fb806e4137dc9cdf152541926a2bc95e33f0\&. More information can be found at the \m[blue]\fBjemalloc website\fR\m[]\&\s-2\u[1]\d\s+2\&. .PP The following configuration options are enabled in libc\*(Aqs built\-in jemalloc: Modified: user/dchagin/lemul/contrib/jemalloc/include/jemalloc/internal/arena.h ============================================================================== --- user/dchagin/lemul/contrib/jemalloc/include/jemalloc/internal/arena.h Tue Oct 22 09:58:31 2013 (r256882) +++ user/dchagin/lemul/contrib/jemalloc/include/jemalloc/internal/arena.h Tue Oct 22 10:10:34 2013 (r256883) @@ -441,6 +441,7 @@ void arena_postfork_child(arena_t *arena #ifndef JEMALLOC_ENABLE_INLINE arena_chunk_map_t *arena_mapp_get(arena_chunk_t *chunk, size_t pageind); size_t *arena_mapbitsp_get(arena_chunk_t *chunk, size_t pageind); +size_t arena_mapbitsp_read(size_t *mapbitsp); size_t arena_mapbits_get(arena_chunk_t *chunk, size_t pageind); size_t arena_mapbits_unallocated_size_get(arena_chunk_t *chunk, size_t pageind); @@ -451,6 +452,7 @@ size_t arena_mapbits_dirty_get(arena_chu size_t arena_mapbits_unzeroed_get(arena_chunk_t *chunk, size_t pageind); size_t arena_mapbits_large_get(arena_chunk_t *chunk, size_t pageind); size_t arena_mapbits_allocated_get(arena_chunk_t *chunk, size_t pageind); +void arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits); void arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind, size_t size, size_t flags); void arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind, @@ -498,10 +500,17 @@ arena_mapbitsp_get(arena_chunk_t *chunk, } JEMALLOC_ALWAYS_INLINE size_t +arena_mapbitsp_read(size_t *mapbitsp) +{ + + return (*mapbitsp); +} + +JEMALLOC_ALWAYS_INLINE size_t arena_mapbits_get(arena_chunk_t *chunk, size_t pageind) { - return (*arena_mapbitsp_get(chunk, pageind)); + return (arena_mapbitsp_read(arena_mapbitsp_get(chunk, pageind))); } JEMALLOC_ALWAYS_INLINE size_t @@ -585,82 +594,89 @@ arena_mapbits_allocated_get(arena_chunk_ } JEMALLOC_ALWAYS_INLINE void +arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits) +{ + + *mapbitsp = mapbits; +} + +JEMALLOC_ALWAYS_INLINE void arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind, size_t size, size_t flags) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert((size & PAGE_MASK) == 0); assert((flags & ~CHUNK_MAP_FLAGS_MASK) == 0); assert((flags & (CHUNK_MAP_DIRTY|CHUNK_MAP_UNZEROED)) == flags); - *mapbitsp = size | CHUNK_MAP_BININD_INVALID | flags; + arena_mapbitsp_write(mapbitsp, size | CHUNK_MAP_BININD_INVALID | flags); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind, size_t size) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert((size & PAGE_MASK) == 0); - assert((*mapbitsp & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0); - *mapbitsp = size | (*mapbitsp & PAGE_MASK); + assert((mapbits & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0); + arena_mapbitsp_write(mapbitsp, size | (mapbits & PAGE_MASK)); } JEMALLOC_ALWAYS_INLINE void *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310221010.r9MAAa75090343>