Re: svn commit: r278473 - in head/sys: amd64/amd64 amd64/include amd64/vmm contrib/dev/acpica/include i386/i386 i386/include x86/acpica x86/include x86/x86 x86/xen
On Wednesday, February 11, 2015 10:32:00 AM Konstantin Belousov wrote: On Wed, Feb 11, 2015 at 12:43:39AM +, Rui Paulo wrote: On Feb 09, 2015, at 01:01 PM, Konstantin Belousov k...@freebsd.org wrote: Author: kib Date: Mon Feb 9 21:00:56 2015 New Revision: 278473 URL: https://svnweb.freebsd.org/changeset/base/278473 Log: Add x2APIC support. Enable it by default if CPU is capable. The hw.x2apic_enable tunable allows disabling it from the loader prompt. This breaks VMware Fusion when the host CPU has x2APIC support. In my case, mpt(4) was unable to receive interrupts and USB was similarly broken. It's possible that this is a VMware bug, but you might want to avoid turning this on when running under the VMware hypervisor. Neel pointed this out to me when the patch was reviewed. He told me that x2APIC does not work in Fusion 5.x, while it seems to be fixed in 7.x. https://communities.vmware.com/message/2173695?tstart=0 Upon further discussion with Neel and Peter, it was suggested that we enable enable x2APIC unconditionally, which seems what is done for Linux benchmarks. Is vmware 5.x is used while there is already at least version 7.x ? I have no idea about vmware product nomenclature and lifecycle. I believe we can ask vmware what version it is when we notice we are running under it (which we already detect for TSC purposes). We could quirk for that case, or even just disable for VM_GUEST_VMWARE for now. -- John Baldwin ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r278473 - in head/sys: amd64/amd64 amd64/include amd64/vmm contrib/dev/acpica/include i386/i386 i386/include x86/acpica x86/include x86/x86 x86/xen
On Wed, Feb 11, 2015 at 10:20:03AM -0500, John Baldwin wrote: On Wednesday, February 11, 2015 10:32:00 AM Konstantin Belousov wrote: On Wed, Feb 11, 2015 at 12:43:39AM +, Rui Paulo wrote: On Feb 09, 2015, at 01:01 PM, Konstantin Belousov k...@freebsd.org wrote: Author: kib Date: Mon Feb 9 21:00:56 2015 New Revision: 278473 URL: https://svnweb.freebsd.org/changeset/base/278473 Log: Add x2APIC support. Enable it by default if CPU is capable. The hw.x2apic_enable tunable allows disabling it from the loader prompt. This breaks VMware Fusion when the host CPU has x2APIC support. In my case, mpt(4) was unable to receive interrupts and USB was similarly broken. It's possible that this is a VMware bug, but you might want to avoid turning this on when running under the VMware hypervisor. Neel pointed this out to me when the patch was reviewed. He told me that x2APIC does not work in Fusion 5.x, while it seems to be fixed in 7.x. https://communities.vmware.com/message/2173695?tstart=0 Upon further discussion with Neel and Peter, it was suggested that we enable enable x2APIC unconditionally, which seems what is done for Linux benchmarks. Is vmware 5.x is used while there is already at least version 7.x ? I have no idea about vmware product nomenclature and lifecycle. I believe we can ask vmware what version it is when we notice we are running under it (which we already detect for TSC purposes). We could quirk for that case, or even just disable for VM_GUEST_VMWARE for now. Ok, https://lkml.org/lkml/2013/1/17/552 Patch is below. Please, users of VMWare, test it. diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index f20b735..c3df686 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -31,6 +31,7 @@ __FBSDID($FreeBSD$); #include sys/systm.h #include sys/bus.h #include sys/kernel.h +#include sys/limits.h #include sys/malloc.h #include sys/smp.h #include vm/vm.h @@ -40,6 +41,7 @@ __FBSDID($FreeBSD$); #include machine/intr_machdep.h #include x86/apicvar.h #include machine/md_var.h +#include x86/vmware.h #include contrib/dev/acpica/include/acpi.h #include contrib/dev/acpica/include/actables.h @@ -130,6 +132,7 @@ madt_setup_local(void) { ACPI_TABLE_DMAR *dmartbl; vm_paddr_t dmartbl_physaddr; + u_int p[4]; madt = pmap_mapbios(madt_physaddr, madt_length); if ((cpu_feature2 CPUID2_X2APIC) != 0) { @@ -146,6 +149,16 @@ madt_setup_local(void) } acpi_unmap_table(dmartbl); } + if (vm_guest == VM_GUEST_VMWARE) { + vmware_hvcall(VMW_HVCMD_GETVCPU_INFO, p); + if ((p[0] VMW_VCPUINFO_VCPU_RESERVED) != 0 || + (p[0] VMW_VCPUINFO_LEGACY_X2APIC) == 0) { + x2apic_mode = 0; + if (bootverbose) + printf( + x2APIC available but disabled inside VMWare without intr redirection\n); + } + } TUNABLE_INT_FETCH(hw.x2apic_enable, x2apic_mode); } diff --git a/sys/x86/include/vmware.h b/sys/x86/include/vmware.h index c72f48d..d3d7e2d 100644 --- a/sys/x86/include/vmware.h +++ b/sys/x86/include/vmware.h @@ -31,8 +31,13 @@ #defineVMW_HVMAGIC 0x564d5868 #defineVMW_HVPORT 0x5658 + #defineVMW_HVCMD_GETVERSION10 #defineVMW_HVCMD_GETHZ 45 +#defineVMW_HVCMD_GETVCPU_INFO 68 + +#defineVMW_VCPUINFO_LEGACY_X2APIC (1 3) +#defineVMW_VCPUINFO_VCPU_RESERVED (1 31) static __inline void vmware_hvcall(u_int cmd, u_int *p) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278586 - head/contrib/binutils/ld/scripttempl
Author: tijl Date: Wed Feb 11 17:25:23 2015 New Revision: 278586 URL: https://svnweb.freebsd.org/changeset/base/278586 Log: Fix ldscripts such that ld(1) collects the .fini_array section in the same order as the .init_array section. Finalisation routines need to be called in the opposite order as their corresponding initialisation routines but rtld(1) handles that by calling the function pointers in .fini_array in reverse order. Reviewed by: kib MFC after:2 weeks Modified: head/contrib/binutils/ld/scripttempl/elf.sc Modified: head/contrib/binutils/ld/scripttempl/elf.sc == --- head/contrib/binutils/ld/scripttempl/elf.sc Wed Feb 11 17:00:32 2015 (r278585) +++ head/contrib/binutils/ld/scripttempl/elf.sc Wed Feb 11 17:25:23 2015 (r278586) @@ -402,8 +402,8 @@ cat EOF .fini_array ${RELOCATING-0} : { ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}} -KEEP (*(.fini_array)) KEEP (*(SORT(.fini_array.*))) +KEEP (*(.fini_array)) ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}} } ${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}} ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278582 - head/sys/boot/pc98/boot2
Author: jhb Date: Wed Feb 11 15:49:14 2015 New Revision: 278582 URL: https://svnweb.freebsd.org/changeset/base/278582 Log: MFi386: When building some of the boot loaders with clang, and DEBUG_FLAGS or CFLAGS having '-g' in it, clang outputs several assembly directives that are too new for our version of binutils. Therefore, assemble the resulting .s files with clang instead. A more general solution can be implemented when a GNU as-compatible driver for clang's integrated assembler appears. Tested by:gjb Modified: head/sys/boot/pc98/boot2/Makefile Modified: head/sys/boot/pc98/boot2/Makefile == --- head/sys/boot/pc98/boot2/Makefile Wed Feb 11 15:21:25 2015 (r278581) +++ head/sys/boot/pc98/boot2/Makefile Wed Feb 11 15:49:14 2015 (r278582) @@ -92,6 +92,7 @@ boot2.out: ${BTXCRT} boot2.o sio.o ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s + ${CC} ${ACFLAGS} -c boot2.s SRCS= boot2.c boot2.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278584 - in head/sys/cam: ctl scsi
Author: mav Date: Wed Feb 11 16:10:31 2015 New Revision: 278584 URL: https://svnweb.freebsd.org/changeset/base/278584 Log: Add support for General Statistics and Performance log page. CTL already collects most of statistics reported there, so why not. MFC after:2 weeks Modified: head/sys/cam/ctl/ctl.c head/sys/cam/ctl/ctl.h head/sys/cam/ctl/ctl_private.h head/sys/cam/scsi/scsi_all.h Modified: head/sys/cam/ctl/ctl.c == --- head/sys/cam/ctl/ctl.c Wed Feb 11 16:07:28 2015(r278583) +++ head/sys/cam/ctl/ctl.c Wed Feb 11 16:10:31 2015(r278584) @@ -4483,6 +4483,8 @@ ctl_init_log_page_index(struct ctl_lun * lun-log_pages.index[1].page_len = k * 2; lun-log_pages.index[2].page_data = lun-log_pages.lbp_page[0]; lun-log_pages.index[2].page_len = 12*CTL_NUM_LBP_PARAMS; + lun-log_pages.index[3].page_data = (uint8_t *)lun-log_pages.stat_page; + lun-log_pages.index[3].page_len = sizeof(lun-log_pages.stat_page); return (CTL_RETVAL_COMPLETE); } @@ -4720,6 +4722,9 @@ ctl_alloc_lun(struct ctl_softc *ctl_soft lun-serseq = CTL_LUN_SERSEQ_OFF; lun-ctl_softc = ctl_softc; +#ifdef CTL_TIME_IO + lun-last_busy = getsbinuptime(); +#endif TAILQ_INIT(lun-ooa_queue); TAILQ_INIT(lun-blocked_queue); STAILQ_INIT(lun-error_list); @@ -7085,6 +7090,67 @@ ctl_lbp_log_sense_handler(struct ctl_scs } int +ctl_sap_log_sense_handler(struct ctl_scsiio *ctsio, + struct ctl_page_index *page_index, + int pc) +{ + struct ctl_lun *lun; + struct stat_page *data; + uint64_t rn, wn, rb, wb; + struct bintime rt, wt; + int i; + + lun = (struct ctl_lun *)ctsio-io_hdr.ctl_private[CTL_PRIV_LUN].ptr; + data = (struct stat_page *)page_index-page_data; + + scsi_ulto2b(SLP_SAP, data-sap.hdr.param_code); + data-sap.hdr.param_control = SLP_LBIN; + data-sap.hdr.param_len = sizeof(struct scsi_log_stat_and_perf) - + sizeof(struct scsi_log_param_header); + rn = wn = rb = wb = 0; + bintime_clear(rt); + bintime_clear(wt); + for (i = 0; i CTL_MAX_PORTS; i++) { + rn += lun-stats.ports[i].operations[CTL_STATS_READ]; + wn += lun-stats.ports[i].operations[CTL_STATS_WRITE]; + rb += lun-stats.ports[i].bytes[CTL_STATS_READ]; + wb += lun-stats.ports[i].bytes[CTL_STATS_WRITE]; + bintime_add(rt, lun-stats.ports[i].time[CTL_STATS_READ]); + bintime_add(wt, lun-stats.ports[i].time[CTL_STATS_WRITE]); + } + scsi_u64to8b(rn, data-sap.read_num); + scsi_u64to8b(wn, data-sap.write_num); + if (lun-stats.blocksize 0) { + scsi_u64to8b(wb / lun-stats.blocksize, + data-sap.recvieved_lba); + scsi_u64to8b(rb / lun-stats.blocksize, + data-sap.transmitted_lba); + } + scsi_u64to8b((uint64_t)rt.sec * 1000 + rt.frac / (UINT64_MAX / 1000), + data-sap.read_int); + scsi_u64to8b((uint64_t)wt.sec * 1000 + wt.frac / (UINT64_MAX / 1000), + data-sap.write_int); + scsi_u64to8b(0, data-sap.weighted_num); + scsi_u64to8b(0, data-sap.weighted_int); + scsi_ulto2b(SLP_IT, data-it.hdr.param_code); + data-it.hdr.param_control = SLP_LBIN; + data-it.hdr.param_len = sizeof(struct scsi_log_idle_time) - + sizeof(struct scsi_log_param_header); +#ifdef CTL_TIME_IO + scsi_u64to8b(lun-idle_time / SBT_1MS, data-it.idle_int); +#endif + scsi_ulto2b(SLP_TI, data-ti.hdr.param_code); + data-it.hdr.param_control = SLP_LBIN; + data-ti.hdr.param_len = sizeof(struct scsi_log_time_interval) - + sizeof(struct scsi_log_param_header); + scsi_ulto4b(3, data-ti.exponent); + scsi_ulto4b(1, data-ti.integer); + + page_index-page_len = sizeof(*data); + return (0); +} + +int ctl_log_sense(struct ctl_scsiio *ctsio) { struct ctl_lun *lun; @@ -11689,6 +11755,12 @@ ctl_scsiio_precheck(struct ctl_softc *so * Every I/O goes into the OOA queue for a * particular LUN, and stays there until completion. */ +#ifdef CTL_TIME_IO + if (TAILQ_EMPTY(lun-ooa_queue)) { + lun-idle_time += getsbinuptime() - + lun-last_busy; + } +#endif TAILQ_INSERT_TAIL(lun-ooa_queue, ctsio-io_hdr, ooa_links); } @@ -13735,6 +13807,10 @@ ctl_process_done(union ctl_io *io) * Remove this from the OOA queue. */ TAILQ_REMOVE(lun-ooa_queue, io-io_hdr, ooa_links); +#ifdef CTL_TIME_IO + if (TAILQ_EMPTY(lun-ooa_queue)) +
svn commit: r278585 - head/usr.sbin/ctld
Author: trasz Date: Wed Feb 11 17:00:32 2015 New Revision: 278585 URL: https://svnweb.freebsd.org/changeset/base/278585 Log: Fix formatting. MFC after:1 month Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/ctld/ctl.conf.5 Modified: head/usr.sbin/ctld/ctl.conf.5 == --- head/usr.sbin/ctld/ctl.conf.5 Wed Feb 11 16:10:31 2015 (r278584) +++ head/usr.sbin/ctld/ctl.conf.5 Wed Feb 11 17:00:32 2015 (r278585) @@ -27,7 +27,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 7, 2015 +.Dd February 11, 2015 .Dt CTL.CONF 5 .Os .Sh NAME @@ -228,7 +228,7 @@ An IPv4 or IPv6 address and port to list .\.It Ic listen-iser Ar address .\An IPv4 or IPv6 address and port to listen on for incoming connections .\using iSER (iSCSI over RDMA) protocol. -.It Ic redirect Aq Ar address +.It Ic redirect Ar address IPv4 or IPv6 address to redirect initiators to. When configured, all initiators attempting to connect to portal belonging to this @@ -326,7 +326,7 @@ If second argument is not specified, tar Assign specified CTL port (such as isp0) to the target. On startup ctld configures LUN mapping and enables all assigned ports. Each port can be assigned to only one target. -.It Ic redirect Aq Ar address +.It Ic redirect Ar address IPv4 or IPv6 address to redirect initiators to. When configured, all initiators attempting to connect to this target will get redirected using Target moved temporarily login response. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r278473 - in head/sys: amd64/amd64 amd64/include amd64/vmm contrib/dev/acpica/include i386/i386 i386/include x86/acpica x86/include x86/x86 x86/xen
On Wed, Feb 11, 2015 at 9:20 AM, John Baldwin j...@freebsd.org wrote: On Wednesday, February 11, 2015 10:32:00 AM Konstantin Belousov wrote: On Wed, Feb 11, 2015 at 12:43:39AM +, Rui Paulo wrote: On Feb 09, 2015, at 01:01 PM, Konstantin Belousov k...@freebsd.org wrote: Author: kib Date: Mon Feb 9 21:00:56 2015 New Revision: 278473 URL: https://svnweb.freebsd.org/changeset/base/278473 Log: Add x2APIC support. Enable it by default if CPU is capable. The hw.x2apic_enable tunable allows disabling it from the loader prompt. This breaks VMware Fusion when the host CPU has x2APIC support. In my case, mpt(4) was unable to receive interrupts and USB was similarly broken. It's possible that this is a VMware bug, but you might want to avoid turning this on when running under the VMware hypervisor. Neel pointed this out to me when the patch was reviewed. He told me that x2APIC does not work in Fusion 5.x, while it seems to be fixed in 7.x. https://communities.vmware.com/message/2173695?tstart=0 Upon further discussion with Neel and Peter, it was suggested that we enable enable x2APIC unconditionally, which seems what is done for Linux benchmarks. Is vmware 5.x is used while there is already at least version 7.x ? I have no idea about vmware product nomenclature and lifecycle. I believe we can ask vmware what version it is when we notice we are running under it (which we already detect for TSC purposes). We could quirk for that case, or even just disable for VM_GUEST_VMWARE for now. I'm not too familiar with this stuff, but is this Linux commit [1] relevant? If so, it might be something nice to wrap into my projects/paravirt branch (I've been extremely busy recently, but I hope to get the review comments addressed and merge it into HEAD soon). [1] - https://lkml.org/lkml/2013/1/17/552 -- John Baldwin ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278587 - head/sys/cddl/dev/fbt/arm
Author: gnn Date: Wed Feb 11 17:27:37 2015 New Revision: 278587 URL: https://svnweb.freebsd.org/changeset/base/278587 Log: Clean up machine dependent code for DTrace on ARM. Submitted by: markj Modified: head/sys/cddl/dev/fbt/arm/fbt_isa.c Modified: head/sys/cddl/dev/fbt/arm/fbt_isa.c == --- head/sys/cddl/dev/fbt/arm/fbt_isa.c Wed Feb 11 17:25:23 2015 (r278586) +++ head/sys/cddl/dev/fbt/arm/fbt_isa.c Wed Feb 11 17:27:37 2015 (r278587) @@ -33,114 +33,21 @@ #include sys/cdefs.h #include sys/param.h -#include sys/systm.h -#include sys/conf.h -#include sys/cpuvar.h -#include sys/fcntl.h -#include sys/filio.h -#include sys/kdb.h -#include sys/kernel.h -#include sys/kmem.h -#include sys/kthread.h -#include sys/limits.h -#include sys/linker.h -#include sys/lock.h -#include sys/malloc.h -#include sys/module.h -#include sys/mutex.h -#include sys/pcpu.h -#include sys/poll.h -#include sys/proc.h -#include sys/selinfo.h -#include sys/smp.h -#include sys/syscall.h -#include sys/sysent.h -#include sys/sysproto.h -#include sys/uio.h -#include sys/unistd.h -#include machine/frame.h -#include machine/md_var.h -#include machine/stdarg.h #include sys/dtrace.h -#include sys/dtrace_bsd.h -static MALLOC_DEFINE(M_FBT, fbt, Function Boundary Tracing); +#include fbt.h -#define FBT_PATCHVAL 0xe06a0cfe // illegal instruction +#defineFBT_PATCHVAL0xe06a0cfe /* illegal instruction */ -#define FBT_PUSHM 0xe92d -#define FBT_POPM 0xe8bd -#define FBT_JUMP 0xea00 - -static d_open_tfbt_open; -static int fbt_unload(void); -static voidfbt_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); -static voidfbt_provide_module(void *, modctl_t *); -static voidfbt_destroy(void *, dtrace_id_t, void *); -static voidfbt_enable(void *, dtrace_id_t, void *); -static voidfbt_disable(void *, dtrace_id_t, void *); -static voidfbt_load(void *); -static voidfbt_suspend(void *, dtrace_id_t, void *); -static voidfbt_resume(void *, dtrace_id_t, void *); +#defineFBT_PUSHM 0xe92d +#defineFBT_POPM0xe8bd +#defineFBT_JUMP0xea00 #defineFBT_ENTRY entry #defineFBT_RETURN return -#defineFBT_ADDR2NDX(addr) uintptr_t)(addr)) 4) fbt_probetab_mask) -#defineFBT_PROBETAB_SIZE 0x8000 /* 32k entries -- 128K total */ -static struct cdevsw fbt_cdevsw = { - .d_version = D_VERSION, - .d_open = fbt_open, - .d_name = fbt, -}; - -static dtrace_pattr_t fbt_attr = { -{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON }, -{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN }, -{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA }, -{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON }, -{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA }, -}; - -static dtrace_pops_t fbt_pops = { - NULL, - fbt_provide_module, - fbt_enable, - fbt_disable, - fbt_suspend, - fbt_resume, - fbt_getargdesc, - NULL, - NULL, - fbt_destroy -}; - -typedef struct fbt_probe { - struct fbt_probe *fbtp_hashnext; - uint32_t*fbtp_patchpoint; - int8_t fbtp_rval; - uint32_tfbtp_patchval; - uint32_tfbtp_savedval; - uintptr_t fbtp_roffset; - dtrace_id_t fbtp_id; - const char *fbtp_name; - modctl_t*fbtp_ctl; - int fbtp_loadcnt; - int fbtp_primary; - int fbtp_invop_cnt; - int fbtp_symindx; - struct fbt_probe *fbtp_next; -} fbt_probe_t; - -static struct cdev *fbt_cdev; -static dtrace_provider_id_tfbt_id; -static fbt_probe_t **fbt_probetab; -static int fbt_probetab_size; -static int fbt_probetab_mask; -static int fbt_verbose = 0; - -static int +int fbt_invop(uintptr_t addr, uintptr_t *stack, uintptr_t rval) { struct trapframe *frame = (struct trapframe *)stack; @@ -152,9 +59,10 @@ fbt_invop(uintptr_t addr, uintptr_t *sta fbt-fbtp_invop_cnt++; cpu-cpu_dtrace_caller = addr; + /* TODO: Need 5th parameter from stack */ dtrace_probe(fbt-fbtp_id, frame-tf_r0, frame-tf_r1, frame-tf_r2, - frame-tf_r3, 0); // TODO: Need 5th parameter from stack + frame-tf_r3, 0); cpu-cpu_dtrace_caller = 0; @@ -165,15 +73,23 @@ fbt_invop(uintptr_t addr, uintptr_t
Re: svn commit: r278012 - head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt
On Jan 31, 2015, at 03:12 PM, Mark Johnston ma...@freebsd.org wrote: Author: markj Date: Sat Jan 31 23:12:29 2015 New Revision: 278012 URL: https://svnweb.freebsd.org/changeset/base/278012 Log: Fix mktemp(1) usage. MFC after: 1 week Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh == --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Sat Jan 31 23:11:57 2015 (r278011) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Sat Jan 31 23:12:29 2015 (r278012) @@ -48,7 +48,7 @@ fi dtrace=$1 startdir=$PWD -dir=$(mktemp -td drtiXX) +dir=$(mktemp -d -t drtiXX) if (( $? != 0 )); then print -u2 'Could not create safe temporary directory' exit 2 I hit this exact same problem in xz-utils when running the test suite. I think this is a bug in our mktemp and perhaps it's time we move to a version of mktemp that everyone else uses: mktemp.org. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278589 - head/usr.sbin/flowctl
Author: pfg Date: Wed Feb 11 17:46:35 2015 New Revision: 278589 URL: https://svnweb.freebsd.org/changeset/base/278589 Log: flowctl: Replace alloca() with an array. Reviewed by: glebius Modified: head/usr.sbin/flowctl/flowctl.c Modified: head/usr.sbin/flowctl/flowctl.c == --- head/usr.sbin/flowctl/flowctl.c Wed Feb 11 17:41:23 2015 (r278588) +++ head/usr.sbin/flowctl/flowctl.c Wed Feb 11 17:46:35 2015 (r278589) @@ -222,12 +222,10 @@ ctl_show(int argc, char **argv) static void do_show(int version, void (*func)(struct ngnf_show_header *)) { - struct ng_mesg *ng_mesg; + struct ng_mesg ng_mesg[SORCVBUF_SIZE]; struct ngnf_show_header req, *resp; int token, nread; - ng_mesg = alloca(SORCVBUF_SIZE); - req.version = version; req.hash_id = req.list_id = 0; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r278473 - in head/sys: amd64/amd64 amd64/include amd64/vmm contrib/dev/acpica/include i386/i386 i386/include x86/acpica x86/include x86/x86 x86/xen
On Feb 11, 2015, at 08:55 AM, Konstantin Belousov kostik...@gmail.com wrote: Ok, https://lkml.org/lkml/2013/1/17/552 Patch is below. Please, users of VMWare, test it. Fixed the problem for me on VMware Fusion 6.0.5. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278592 - head/sys/kern
Author: rpaulo Date: Wed Feb 11 19:07:05 2015 New Revision: 278592 URL: https://svnweb.freebsd.org/changeset/base/278592 Log: Remove check against NULL after M_WAITOK. Submitted by: Oliver Pinter Modified: head/sys/kern/kern_sig.c Modified: head/sys/kern/kern_sig.c == --- head/sys/kern/kern_sig.cWed Feb 11 18:59:46 2015(r278591) +++ head/sys/kern/kern_sig.cWed Feb 11 19:07:05 2015(r278592) @@ -3362,8 +3362,6 @@ close: len = MAXPATHLEN * 2 + sizeof(comm_name) - 1 + sizeof(' ') + sizeof(core_name) - 1; data = malloc(len, M_TEMP, M_WAITOK); - if (data == NULL) - goto out; if (vn_fullpath_global(td, p-p_textvp, fullpath, freepath) != 0) goto out; if (!coredump_sanitise_path(fullpath)) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278590 - head/usr.bin/wc
Author: marcel Date: Wed Feb 11 17:56:24 2015 New Revision: 278590 URL: https://svnweb.freebsd.org/changeset/base/278590 Log: Close the file list before opening the container that holds the totals, otherwise we end up emitting invalid JSON -- provided libxo does not prevent us from doing that. PR: 197499 Submitted by: allanjude@ Modified: head/usr.bin/wc/wc.c Modified: head/usr.bin/wc/wc.c == --- head/usr.bin/wc/wc.cWed Feb 11 17:46:35 2015(r278589) +++ head/usr.bin/wc/wc.cWed Feb 11 17:56:24 2015(r278590) @@ -140,12 +140,14 @@ main(int argc, char *argv[]) } while(*++argv); } + xo_close_list(file); + if (total 1) { xo_open_container(total); show_cnt(total, tlinect, twordct, tcharct, tlongline); xo_close_container(total); } - xo_close_list(file); + xo_close_container(wc); xo_finish(); exit(errors == 0 ? 0 : 1); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278580 - head/contrib/elftoolchain/libdwarf
Author: emaste Date: Wed Feb 11 14:59:35 2015 New Revision: 278580 URL: https://svnweb.freebsd.org/changeset/base/278580 Log: libdwarf: Add aarch64 relocation support Reviewed by: andrew, rpaulo Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D1817 Modified: head/contrib/elftoolchain/libdwarf/libdwarf.h head/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Modified: head/contrib/elftoolchain/libdwarf/libdwarf.h == --- head/contrib/elftoolchain/libdwarf/libdwarf.h Wed Feb 11 12:08:40 2015(r278579) +++ head/contrib/elftoolchain/libdwarf/libdwarf.h Wed Feb 11 14:59:35 2015(r278580) @@ -439,6 +439,7 @@ enum Dwarf_ISA { DW_ISA_SPARC, DW_ISA_X86, DW_ISA_X86_64, + DW_ISA_AARCH64, DW_ISA_MAX }; Modified: head/contrib/elftoolchain/libdwarf/libdwarf_reloc.c == --- head/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Wed Feb 11 12:08:40 2015(r278579) +++ head/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Wed Feb 11 14:59:35 2015(r278580) @@ -35,6 +35,8 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg, assert(dbg != NULL); switch (dbg-dbgp_isa) { + case DW_ISA_AARCH64: + return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32); case DW_ISA_X86: return (R_386_32); case DW_ISA_X86_64: @@ -62,6 +64,12 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D switch (dbg-dbg_machine) { case EM_NONE: break; + case EM_AARCH64: + if (rel_type == R_AARCH64_ABS32) + return (4); + else if (rel_type == R_AARCH64_ABS64) + return (8); + break; case EM_ARM: if (rel_type == R_ARM_ABS32) return (4); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278593 - head/contrib/elftoolchain/libdwarf
Author: emaste Date: Wed Feb 11 19:53:44 2015 New Revision: 278593 URL: https://svnweb.freebsd.org/changeset/base/278593 Log: libdwarf: Add symbol value when processing .rela relocations Reviewed by: kib, rpaulo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D1826 Modified: head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Modified: head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c == --- head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Wed Feb 11 19:07:05 2015(r278592) +++ head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Wed Feb 11 19:53:44 2015(r278593) @@ -70,11 +70,15 @@ _dwarf_elf_apply_reloc(Dwarf_Debug dbg, offset = rela.r_offset; size = _dwarf_get_reloc_size(dbg, type); + if (size == 0) + continue; /* Unknown or non-absolute relocation. */ if (endian == ELFDATA2MSB) - _dwarf_write_msb(buf, offset, rela.r_addend, size); + _dwarf_write_msb(buf, offset, + sym.st_value + rela.r_addend, size); else - _dwarf_write_lsb(buf, offset, rela.r_addend, size); + _dwarf_write_lsb(buf, offset, + sym.st_value + rela.r_addend, size); } } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278594 - head/usr.sbin/ctld
Author: mav Date: Wed Feb 11 19:57:38 2015 New Revision: 278594 URL: https://svnweb.freebsd.org/changeset/base/278594 Log: Add missing asprintf() status checks. MFC after:2 weeks Modified: head/usr.sbin/ctld/ctld.c Modified: head/usr.sbin/ctld/ctld.c == --- head/usr.sbin/ctld/ctld.c Wed Feb 11 19:53:44 2015(r278593) +++ head/usr.sbin/ctld/ctld.c Wed Feb 11 19:57:38 2015(r278594) @@ -1191,8 +1191,11 @@ port_new(struct conf *conf, struct targe { struct port *port; char *name; + int ret; - asprintf(name, %s-%s, pg-pg_name, target-t_name); + ret = asprintf(name, %s-%s, pg-pg_name, target-t_name); + if (ret = 0) + log_err(1, asprintf); if (port_find(conf, name) != NULL) { log_warnx(duplicate port \%s\, name); free(name); @@ -1216,8 +1219,11 @@ port_new_pp(struct conf *conf, struct ta { struct port *port; char *name; + int ret; - asprintf(name, %s-%s, pp-pp_name, target-t_name); + ret = asprintf(name, %s-%s, pp-pp_name, target-t_name); + if (ret = 0) + log_err(1, asprintf); if (port_find(conf, name) != NULL) { log_warnx(duplicate port \%s\, name); free(name); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278598 - head/sys/cam/ctl
Author: mav Date: Wed Feb 11 22:03:23 2015 New Revision: 278598 URL: https://svnweb.freebsd.org/changeset/base/278598 Log: Do not dereference NULL clearing UA that was not set in r277917. MFC after:3 days Modified: head/sys/cam/ctl/ctl.c Modified: head/sys/cam/ctl/ctl.c == --- head/sys/cam/ctl/ctl.c Wed Feb 11 20:51:58 2015(r278597) +++ head/sys/cam/ctl/ctl.c Wed Feb 11 22:03:23 2015(r278598) @@ -11712,7 +11712,8 @@ ctl_clear_ua(struct ctl_softc *ctl_softc STAILQ_FOREACH(lun, ctl_softc-lun_list, links) { mtx_lock(lun-lun_lock); pu = lun-pending_ua[initidx / CTL_MAX_INIT_PER_PORT]; - pu[initidx % CTL_MAX_INIT_PER_PORT] = ~ua_type; + if (pu != NULL) + pu[initidx % CTL_MAX_INIT_PER_PORT] = ~ua_type; mtx_unlock(lun-lun_lock); } } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278605 - head/sys/x86/iommu
Author: kib Date: Wed Feb 11 23:28:28 2015 New Revision: 278605 URL: https://svnweb.freebsd.org/changeset/base/278605 Log: vm_page_lookup() accepts read-locked object. Sponsored by: The FreeBSD Foundation MFC after:1 week Modified: head/sys/x86/iommu/intel_utils.c Modified: head/sys/x86/iommu/intel_utils.c == --- head/sys/x86/iommu/intel_utils.cWed Feb 11 23:05:58 2015 (r278604) +++ head/sys/x86/iommu/intel_utils.cWed Feb 11 23:28:28 2015 (r278605) @@ -411,11 +411,9 @@ dmar_load_root_entry_ptr(struct dmar_uni */ DMAR_ASSERT_LOCKED(unit); - /* VM_OBJECT_RLOCK(unit-ctx_obj); */ - VM_OBJECT_WLOCK(unit-ctx_obj); + VM_OBJECT_RLOCK(unit-ctx_obj); root_entry = vm_page_lookup(unit-ctx_obj, 0); - /* VM_OBJECT_RUNLOCK(unit-ctx_obj); */ - VM_OBJECT_WUNLOCK(unit-ctx_obj); + VM_OBJECT_RUNLOCK(unit-ctx_obj); dmar_write8(unit, DMAR_RTADDR_REG, VM_PAGE_TO_PHYS(root_entry)); dmar_write4(unit, DMAR_GCMD_REG, unit-hw_gcmd | DMAR_GCMD_SRTP); /* XXXKIB should have a timeout */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278600 - head/include
Author: bdrewery Date: Wed Feb 11 22:39:13 2015 New Revision: 278600 URL: https://svnweb.freebsd.org/changeset/base/278600 Log: Correct and clarify comment for __SMBF. MFC after:2 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/include/stdio.h Modified: head/include/stdio.h == --- head/include/stdio.hWed Feb 11 22:35:32 2015(r278599) +++ head/include/stdio.hWed Feb 11 22:39:13 2015(r278600) @@ -166,7 +166,7 @@ __END_DECLS #define__SRW 0x0010 /* open for reading writing */ #define__SEOF 0x0020 /* found EOF */ #define__SERR 0x0040 /* found error */ -#define__SMBF 0x0080 /* _buf is from malloc */ +#define__SMBF 0x0080 /* _bf._base is from malloc */ #define__SAPP 0x0100 /* fdopen()ed in append mode */ #define__SSTR 0x0200 /* this is an sprintf/snprintf string */ #define__SOPT 0x0400 /* do fseek() optimization */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278603 - head/usr.bin/svn/svn
Author: gjb Date: Wed Feb 11 22:59:24 2015 New Revision: 278603 URL: https://svnweb.freebsd.org/changeset/base/278603 Log: Ensure ORGANIZATION_NAME is quoted when ORGANIZATION could contain strings of two or more words. Reviewed by: peter Reported by: k...@denninger.net PR: 197540 MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/usr.bin/svn/svn/Makefile Modified: head/usr.bin/svn/svn/Makefile == --- head/usr.bin/svn/svn/Makefile Wed Feb 11 22:55:24 2015 (r278602) +++ head/usr.bin/svn/svn/Makefile Wed Feb 11 22:59:24 2015 (r278603) @@ -54,8 +54,13 @@ DPSRCS+= freebsd-organization.h CLEANFILES+= freebsd-organization.h CFLAGS+= -I. -DHAS_ORGANIZATION_NAME freebsd-organization.h: - @echo '#define ORGANIZATION_NAME ${ORGANIZATION}' \ + @echo '#define ORGANIZATION_NAME${ORGANIZATION}' \ freebsd-organization.h + @# Remove quotes from ORGANIZATION_NAME if they exist. + @sed -i '' -e 's,,,g' freebsd-organization.h + @# Quote ORGANIZATION_NAME, in case it is two or more words. + @sed -i '' -E 's, , ,' freebsd-organization.h + @sed -i '' -E 's,$$,,' freebsd-organization.h .endif svnlite.1: svn.1 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278607 - head/usr.bin/svn/svn
Author: gjb Date: Thu Feb 12 00:17:14 2015 New Revision: 278607 URL: https://svnweb.freebsd.org/changeset/base/278607 Log: Reduce number of lines to set ORGANIZATION_NAME in freebsd-organization.h. Patched by: ian PR: 197540 MFC after:3 days X-MFC-with: r278603 Sponsored by: The FreeBSD Foundation Modified: head/usr.bin/svn/svn/Makefile Modified: head/usr.bin/svn/svn/Makefile == --- head/usr.bin/svn/svn/Makefile Wed Feb 11 23:30:46 2015 (r278606) +++ head/usr.bin/svn/svn/Makefile Thu Feb 12 00:17:14 2015 (r278607) @@ -54,13 +54,8 @@ DPSRCS+= freebsd-organization.h CLEANFILES+= freebsd-organization.h CFLAGS+= -I. -DHAS_ORGANIZATION_NAME freebsd-organization.h: - @echo '#define ORGANIZATION_NAME${ORGANIZATION}' \ + @echo #define ORGANIZATION_NAME\$$(eval echo ${ORGANIZATION})\ \ freebsd-organization.h - @# Remove quotes from ORGANIZATION_NAME if they exist. - @sed -i '' -e 's,,,g' freebsd-organization.h - @# Quote ORGANIZATION_NAME, in case it is two or more words. - @sed -i '' -E 's, , ,' freebsd-organization.h - @sed -i '' -E 's,$$,,' freebsd-organization.h .endif svnlite.1: svn.1 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278606 - head/sys/x86/iommu
Author: kib Date: Wed Feb 11 23:30:46 2015 New Revision: 278606 URL: https://svnweb.freebsd.org/changeset/base/278606 Log: Registers definitions for the new capabilities from the version 2.4 of VT-d specification. Also add definitions for the interrupt remapping table and IEC. Print new capabilities on boot. although there is no hardware which support it. Sponsored by: The FreeBSD Foundation MFC after:1 week Modified: head/sys/x86/iommu/intel_drv.c head/sys/x86/iommu/intel_reg.h Modified: head/sys/x86/iommu/intel_drv.c == --- head/sys/x86/iommu/intel_drv.c Wed Feb 11 23:28:28 2015 (r278605) +++ head/sys/x86/iommu/intel_drv.c Wed Feb 11 23:30:46 2015 (r278606) @@ -375,7 +375,7 @@ dmar_print_caps(device_t dev, struct dma caphi = unit-hw_cap 32; device_printf(dev, cap=%b,, (u_int)unit-hw_cap, \020\004AFL\005WBF\006PLMR\007PHMR\010CM\027ZLR\030ISOCH); - printf(%b, , caphi, \020\010PSI\027DWD\030DRD); + printf(%b, , caphi, \020\010PSI\027DWD\030DRD\031FL1GP\034PSI); printf(ndoms=%d, sagaw=%d, mgaw=%d, fro=%d, nfr=%d, superp=%d, DMAR_CAP_ND(unit-hw_cap), DMAR_CAP_SAGAW(unit-hw_cap), DMAR_CAP_MGAW(unit-hw_cap), DMAR_CAP_FRO(unit-hw_cap), @@ -385,8 +385,9 @@ dmar_print_caps(device_t dev, struct dma printf(\n); ecaphi = unit-hw_ecap 32; device_printf(dev, ecap=%b,, (u_int)unit-hw_ecap, - \020\001C\002QI\003DI\004IR\005EIM\007PT\010SC); - printf(%b, , ecaphi, \020); + \020\001C\002QI\003DI\004IR\005EIM\007PT\010SC\031ECS\032MTS + \033NEST\034DIS\035PASID\036PRS\037ERS\040SRS); + printf(%b, , ecaphi, \020\002NWFS\003EAFS); printf(mhmw=%d, iro=%d\n, DMAR_ECAP_MHMV(unit-hw_ecap), DMAR_ECAP_IRO(unit-hw_ecap)); } Modified: head/sys/x86/iommu/intel_reg.h == --- head/sys/x86/iommu/intel_reg.h Wed Feb 11 23:28:28 2015 (r278605) +++ head/sys/x86/iommu/intel_reg.h Wed Feb 11 23:30:46 2015 (r278606) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2013 The FreeBSD Foundation + * Copyright (c) 2013-2015 The FreeBSD Foundation * All rights reserved. * * This software was developed by Konstantin Belousov k...@freebsd.org @@ -79,6 +79,47 @@ typedef struct dmar_pte { #defineDMAR_PTE_ADDR_MASK 0xff000 /* Address Mask */ #defineDMAR_PTE_TM (1ULL 62)/* Transient Mapping */ +typedef struct dmar_irte { + uint64_t irte1; + uint64_t irte2; +} dmar_irte_t; +/* Source Validation Type */ +#defineDMAR_IRTE2_SVT_NONE (0ULL (82 - 64)) +#defineDMAR_IRTE2_SVT_RID (1ULL (82 - 64)) +#defineDMAR_IRTE2_SVT_BUS (2ULL (82 - 64)) +/* Source-id Qualifier */ +#defineDMAR_IRTE2_SQ_RID (0ULL (80 - 64)) +#defineDMAR_IRTE2_SQ_RID_N2(1ULL (80 - 64)) +#defineDMAR_IRTE2_SQ_RID_N21 (2ULL (80 - 64)) +#defineDMAR_IRTE2_SQ_RID_N210 (3ULL (80 - 64)) +/* Source Identifier */ +#defineDMAR_IRTE2_SID_RID(x) ((uint64_t)(x)) +#defineDMAR_IRTE2_SID_BUS(start, end) uint64_t)(start)) 8) | (end)) +/* Destination Id */ +#defineDMAR_IRTE1_DST_xAPIC(x) (((uint64_t)(x)) 40) +#defineDMAR_IRTE1_DST_x2APIC(x) (((uint64_t)(x)) 32) +/* Vector */ +#defineDMAR_IRTE1_V(x) (((uint64_t)x) 16) +#defineDMAR_IRTE1_IM_POSTED(1ULL 15)/* Posted */ +/* Delivery Mode */ +#defineDMAR_IRTE1_DLM_FM (0ULL 5) +#defineDMAR_IRTE1_DLM_LP (1ULL 5 +#defineDMAR_IRTE1_DLM_SMI (2ULL 5) +#defineDMAR_IRTE1_DLM_NMI (4ULL 5) +#defineDMAR_IRTE1_DLM_INIT (5ULL 5) +#defineDMAR_IRTE1_DLM_ExtINT (7ULL 5) +/* Trigger Mode */ +#defineDMAR_IRTE1_TM_EDGE (0ULL 4) +#defineDMAR_IRTE1_TM_LEVEL (1ULL 4) +/* Redirection Hint */ +#defineDMAR_IRTE1_RH_DIRECT(0ULL 3) +#defineDMAR_IRTE1_RH_SELECT(1ULL 3) +/* Destination Mode */ +#defineDMAR_IRTE1_DM_PHYSICAL (0ULL 2) +#defineDMAR_IRTE1_DM_LOGICAL (1ULL 2) +#defineDMAR_IRTE1_FPD (1ULL 1) /* Fault Processing Disable */ +#defineDMAR_IRTE1_P(1ULL) /* Present */ + /* Version register */ #defineDMAR_VER_REG0 #defineDMAR_MAJOR_VER(x) (((x) 4) 0xf) @@ -86,6 +127,8 @@ typedef struct dmar_pte { /* Capabilities register */ #defineDMAR_CAP_REG0x8 +#defineDMAR_CAP_PI (1ULL 59)/* Posted Interrupts */ +#defineDMAR_CAP_FL1GP (1ULL 56)/* First Level 1GByte Page */ #defineDMAR_CAP_DRD(1ULL 55)/* DMA Read Draining */ #defineDMAR_CAP_DWD(1ULL 54)/* DMA Write Draining */
svn commit: r278611 - head/contrib/elftoolchain/libdwarf
Author: emaste Date: Thu Feb 12 02:08:44 2015 New Revision: 278611 URL: https://svnweb.freebsd.org/changeset/base/278611 Log: libdwarf: Handle .rel relocations Some architectures use .rel relocations (for debug data), so they must be handled. This was discovered from ctfconvert on ARM object files. The lack of relocation handling caused all string lookups to return the string at offset 0 in .debug_str, typically FreeBSD clang version ... Reviewed by: gnn, imp, rpaulo (earlier version) Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D1819 Modified: head/contrib/elftoolchain/libdwarf/_libdwarf.h head/contrib/elftoolchain/libdwarf/dwarf_reloc.c head/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 head/contrib/elftoolchain/libdwarf/libdwarf.c head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Modified: head/contrib/elftoolchain/libdwarf/_libdwarf.h == --- head/contrib/elftoolchain/libdwarf/_libdwarf.h Thu Feb 12 00:50:54 2015(r278610) +++ head/contrib/elftoolchain/libdwarf/_libdwarf.h Thu Feb 12 02:08:44 2015(r278611) @@ -49,7 +49,7 @@ struct _libdwarf_globals { Dwarf_Handler errhand; Dwarf_Ptr errarg; - int applyrela; + int applyreloc; }; extern struct _libdwarf_globals _libdwarf; Modified: head/contrib/elftoolchain/libdwarf/dwarf_reloc.c == --- head/contrib/elftoolchain/libdwarf/dwarf_reloc.cThu Feb 12 00:50:54 2015(r278610) +++ head/contrib/elftoolchain/libdwarf/dwarf_reloc.cThu Feb 12 02:08:44 2015(r278611) @@ -33,8 +33,8 @@ dwarf_set_reloc_application(int apply) { int oldapply; - oldapply = _libdwarf.applyrela; - _libdwarf.applyrela = apply; + oldapply = _libdwarf.applyreloc; + _libdwarf.applyreloc = apply; return (oldapply); } Modified: head/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 == --- head/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3Thu Feb 12 00:50:54 2015(r278610) +++ head/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3Thu Feb 12 02:08:44 2015(r278611) @@ -24,7 +24,7 @@ .\ .\ $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $ .\ -.Dd June 26, 2011 +.Dd February 11, 2015 .Os .Dt DWARF_SET_RELOC_APPLICATION 3 .Sh NAME @@ -47,6 +47,8 @@ handled by the DWARF(3) library. If the argument .Ar apply holds a non-zero value, the library will process all the relevant +.Dq .rel +and .Dq .rela relocation sections and will apply the relocation records found to their corresponding DWARF sections. Modified: head/contrib/elftoolchain/libdwarf/libdwarf.c == --- head/contrib/elftoolchain/libdwarf/libdwarf.c Thu Feb 12 00:50:54 2015(r278610) +++ head/contrib/elftoolchain/libdwarf/libdwarf.c Thu Feb 12 02:08:44 2015(r278611) @@ -31,5 +31,5 @@ ELFTC_VCSID($Id: libdwarf.c 2070 2011-1 struct _libdwarf_globals _libdwarf = { .errhand= NULL, .errarg = NULL, - .applyrela = 1 + .applyreloc = 1 }; Modified: head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c == --- head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Thu Feb 12 00:50:54 2015(r278610) +++ head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Thu Feb 12 02:08:44 2015(r278611) @@ -50,36 +50,46 @@ static const char *debug_name[] = { }; static void -_dwarf_elf_apply_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data, -Elf_Data *symtab_data, int endian) +_dwarf_elf_write_reloc(Dwarf_Debug dbg, Elf_Data *symtab_data, int endian, +void *buf, uint64_t offset, GElf_Xword r_info, GElf_Sxword r_addend) { - Dwarf_Unsigned type; - GElf_Rela rela; GElf_Sym sym; - size_t symndx; - uint64_t offset; - int size, j; + int size; + + if (gelf_getsym(symtab_data, GELF_R_SYM(r_info), sym) == NULL) + return; + if ((size = _dwarf_get_reloc_size(dbg, GELF_R_TYPE(r_info))) == 0) + return; /* Unknown or non-absolute relocation. */ + if (endian == ELFDATA2MSB) + _dwarf_write_msb(buf, offset, sym.st_value + r_addend, size); + else + _dwarf_write_lsb(buf, offset, sym.st_value + r_addend, size); +} + +static void +_dwarf_elf_apply_rel_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data, +Elf_Data *symtab_data, int endian) +{ + GElf_Rel rel; + int j; j = 0; - while
svn commit: r278578 - head/sys/arm/arm
Author: andrew Date: Wed Feb 11 10:40:49 2015 New Revision: 278578 URL: https://svnweb.freebsd.org/changeset/base/278578 Log: Remove the non-EABI code from the DDB stack unwinder, we only support the ARM EABI now. Modified: head/sys/arm/arm/db_trace.c Modified: head/sys/arm/arm/db_trace.c == --- head/sys/arm/arm/db_trace.c Wed Feb 11 10:37:55 2015(r278577) +++ head/sys/arm/arm/db_trace.c Wed Feb 11 10:40:49 2015(r278578) @@ -50,7 +50,6 @@ __FBSDID($FreeBSD$); #include ddb/db_sym.h #include ddb/db_output.h -#ifdef __ARM_EABI__ /* * Definitions for the instruction interpreter. * @@ -453,131 +452,6 @@ db_stack_trace_cmd(struct unwind_state * } } } -#endif - -/* - * APCS stack frames are awkward beasts, so I don't think even trying to use - * a structure to represent them is a good idea. - * - * Here's the diagram from the APCS. Increasing address is _up_ the page. - * - * save code pointer [fp]- fp points to here - * return link value [fp, #-4] - * return sp value [fp, #-8] - * return fp value [fp, #-12] - * [saved v7 value] - * [saved v6 value] - * [saved v5 value] - * [saved v4 value] - * [saved v3 value] - * [saved v2 value] - * [saved v1 value] - * [saved a4 value] - * [saved a3 value] - * [saved a2 value] - * [saved a1 value] - * - * The save code pointer points twelve bytes beyond the start of the - * code sequence (usually a single STM) that created the stack frame. - * We have to disassemble it if we want to know which of the optional - * fields are actually present. - */ - -#ifndef __ARM_EABI__ /* The frame format is differend in AAPCS */ -static void -db_stack_trace_cmd(db_expr_t addr, db_expr_t count, boolean_t kernel_only) -{ - u_int32_t *frame, *lastframe; - c_db_sym_t sym; - const char *name; - db_expr_t value; - db_expr_t offset; - int scp_offset; - - frame = (u_int32_t *)addr; - lastframe = NULL; - scp_offset = -(get_pc_str_offset() 2); - - while (count-- frame != NULL !db_pager_quit) { - db_addr_t scp; - u_int32_t savecode; - int r; - u_int32_t *rp; - const char *sep; - - /* -* In theory, the SCP isn't guaranteed to be in the function -* that generated the stack frame. We hope for the best. -*/ - scp = frame[FR_SCP]; - - sym = db_search_symbol(scp, DB_STGY_ANY, offset); - if (sym == C_DB_SYM_NULL) { - value = 0; - name = (null); - } else - db_symbol_values(sym, name, value); - db_printf(%s() at , name); - db_printsym(scp, DB_STGY_PROC); - db_printf(\n); -#ifdef __PROG26 - db_printf(\tscp=0x%08x rlv=0x%08x (, scp, frame[FR_RLV] R15_PC); - db_printsym(frame[FR_RLV] R15_PC, DB_STGY_PROC); - db_printf()\n); -#else - db_printf(\tscp=0x%08x rlv=0x%08x (, scp, frame[FR_RLV]); - db_printsym(frame[FR_RLV], DB_STGY_PROC); - db_printf()\n); -#endif - db_printf(\trsp=0x%08x rfp=0x%08x, frame[FR_RSP], frame[FR_RFP]); - - savecode = ((u_int32_t *)scp)[scp_offset]; - if ((savecode 0x0e10) == 0x0800) { - /* Looks like an STM */ - rp = frame - 4; - sep = \n\t; - for (r = 10; r = 0; r--) { - if (savecode (1 r)) { - db_printf(%sr%d=0x%08x, - sep, r, *rp--); - sep = (frame - rp) % 4 == 2 ? - \n\t : ; - } - } - } - - db_printf(\n); - - /* -* Switch to next frame up -*/ - if (frame[FR_RFP] == 0) - break; /* Top of stack */ - - lastframe = frame; - frame = (u_int32_t *)(frame[FR_RFP]); - - if (INKERNEL((int)frame)) { - /* staying in kernel */ - if (frame = lastframe) { - db_printf(Bad frame pointer: %p\n, frame); - break; - } - } else if (INKERNEL((int)lastframe)) { - /* switch from user to kernel */ - if (kernel_only) -
Re: svn commit: r278473 - in head/sys: amd64/amd64 amd64/include amd64/vmm contrib/dev/acpica/include i386/i386 i386/include x86/acpica x86/include x86/x86 x86/xen
On Wed, Feb 11, 2015 at 12:43:39AM +, Rui Paulo wrote: On Feb 09, 2015, at 01:01 PM, Konstantin Belousov k...@freebsd.org wrote: Author: kib Date: Mon Feb 9 21:00:56 2015 New Revision: 278473 URL: https://svnweb.freebsd.org/changeset/base/278473 Log: Add x2APIC support. Enable it by default if CPU is capable. The hw.x2apic_enable tunable allows disabling it from the loader prompt. This breaks VMware Fusion when the host CPU has x2APIC support. In my case, mpt(4) was unable to receive interrupts and USB was similarly broken. It's possible that this is a VMware bug, but you might want to avoid turning this on when running under the VMware hypervisor. Neel pointed this out to me when the patch was reviewed. He told me that x2APIC does not work in Fusion 5.x, while it seems to be fixed in 7.x. https://communities.vmware.com/message/2173695?tstart=0 Upon further discussion with Neel and Peter, it was suggested that we enable enable x2APIC unconditionally, which seems what is done for Linux benchmarks. Is vmware 5.x is used while there is already at least version 7.x ? I have no idea about vmware product nomenclature and lifecycle. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278577 - in head/sys: arm/xscale/ixp425 dev/hwpmc
Author: andrew Date: Wed Feb 11 10:37:55 2015 New Revision: 278577 URL: https://svnweb.freebsd.org/changeset/base/278577 Log: The cpu_id macro was renamed in r278529, catch up with this new name. Modified: head/sys/arm/xscale/ixp425/if_npe.c head/sys/dev/hwpmc/hwpmc_armv7.c Modified: head/sys/arm/xscale/ixp425/if_npe.c == --- head/sys/arm/xscale/ixp425/if_npe.c Wed Feb 11 09:21:36 2015 (r278576) +++ head/sys/arm/xscale/ixp425/if_npe.c Wed Feb 11 10:37:55 2015 (r278577) @@ -285,7 +285,7 @@ unit2npeid(int unit) }; /* XXX check feature register instead */ return (unit 3 ? npeidmap[ - (cpu_id() CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1); + (cpu_ident() CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1); } static int Modified: head/sys/dev/hwpmc/hwpmc_armv7.c == --- head/sys/dev/hwpmc/hwpmc_armv7.cWed Feb 11 09:21:36 2015 (r278576) +++ head/sys/dev/hwpmc/hwpmc_armv7.cWed Feb 11 10:37:55 2015 (r278577) @@ -555,7 +555,7 @@ armv7_pcpu_init(struct pmc_mdep *md, int armv7_pcpu[cpu] = pac = malloc(sizeof(struct armv7_cpu), M_PMC, M_WAITOK|M_ZERO); - cpuid = cpu_id(); + cpuid = cpu_ident(); pac-cortex_ver = (cpuid CPU_ID_CORTEX_VER_SHIFT) \ CPU_ID_CORTEX_VER_MASK; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278565 - in head: . share/info
Author: bapt Date: Wed Feb 11 08:26:36 2015 New Revision: 278565 URL: https://svnweb.freebsd.org/changeset/base/278565 Log: Remove remnant from texinfo Deleted: head/share/info/ Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Wed Feb 11 08:20:07 2015(r278564) +++ head/Makefile.inc1 Wed Feb 11 08:26:36 2015(r278565) @@ -50,10 +50,6 @@ .include bsd.arch.inc.mk .include bsd.compiler.mk -# We must do share/info early so that installation of info `dir' -# entries works correctly. Do it first since it is less likely to -# grow dependencies on include and lib than vice versa. -# # We must do lib/ and libexec/ before bin/, because if installworld # installs a new /bin/sh, the 'make' command will *immediately* # use that new version. And the new (dynamically-linked) /bin/sh @@ -63,7 +59,7 @@ SRCDIR?= ${.CURDIR} .if defined(SUBDIR_OVERRIDE) SUBDIR=${SUBDIR_OVERRIDE} .else -SUBDIR=share/info lib libexec +SUBDIR=lib libexec SUBDIR+=bin .if ${MK_GAMES} != no SUBDIR+=games ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278579 - head/sys/boot/arm/ixp425/boot2
Author: gnn Date: Wed Feb 11 12:08:40 2015 New Revision: 278579 URL: https://svnweb.freebsd.org/changeset/base/278579 Log: Summary: Update CPU identification call to recent version. Modified: head/sys/boot/arm/ixp425/boot2/ixp425_board.c Modified: head/sys/boot/arm/ixp425/boot2/ixp425_board.c == --- head/sys/boot/arm/ixp425/boot2/ixp425_board.c Wed Feb 11 10:40:49 2015(r278578) +++ head/sys/boot/arm/ixp425/boot2/ixp425_board.c Wed Feb 11 12:08:40 2015(r278579) @@ -74,7 +74,7 @@ board_init(void) { struct board_config **pbp; - cputype = cpu_id() CPU_ID_CPU_MASK; + cputype = cpu_ident() CPU_ID_CPU_MASK; SET_FOREACH(pbp, boards) /* XXX pass down redboot board type */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r278616 - in head: . contrib/netbsd-tests/games etc etc/mtree etc/root games games/caesar games/fortune/datfiles release/scripts share/man/man4 share/man/man6 share/man/man7 share/mk s
PLEASE! Do NOT remove the grand digital clock (grdc). So many of us over the years have used it as a terminal keeper-aliver :) (and as a clock, to boot). I will be very sad if you remove grdc. -- Devin On Feb 11, 2015, at 9:35 PM, Colin Percival cperc...@freebsd.org wrote: Author: cperciva Date: Thu Feb 12 05:35:00 2015 New Revision: 278616 URL: https://svnweb.freebsd.org/changeset/base/278616 Log: Step 1 of eliminating the games distribution: Move binaries to /usr/bin; update paths; and include everything in the base distribution. The games distribution being optional made sense when there were more games and we had small disks; but the games-like games were moved into the ports tree a dozen years ago and the remaining utility-like games occupy less than 0.001% of my laptop's small hard drive. Meanwhile every new user is confronted by the question do you want games installed when they they try to install FreeBSD. The next steps will be: 2. Removing punch card (bcd, ppt), phase-of-moon (pom), clock (grdc), and caesar cipher (caesar, rot13) utilities. I intend to keep fortune, factor, morse, number, primes, and random, since there is evidence that those are still being used. 3. Merging src/games into src/usr.bin. This change will not be MFCed. Reviewed by:jmg Discussed at:EuroBSDCon Approved by:gjb (release-affecting changes) Modified: head/Makefile.inc1 head/ObsoleteFiles.inc head/contrib/netbsd-tests/games/t_factor.sh head/etc/login.conf head/etc/master.passwd head/etc/mtree/BSD.debug.dist head/etc/mtree/BSD.usr.dist head/etc/root/dot.cshrc head/etc/root/dot.login head/etc/root/dot.profile head/games/Makefile.inc head/games/caesar/rot13.sh head/games/fortune/datfiles/Makefile head/release/scripts/make-manifest.sh head/share/man/man4/led.4 head/share/man/man6/intro.6 head/share/man/man7/hier.7 head/share/mk/bsd.prog.mk head/share/skel/dot.cshrc head/share/skel/dot.login head/share/skel/dot.profile head/tools/build/mk/OptionalObsoleteFiles.inc head/tools/tools/nanobsd/gateworks/Files/root/.profile head/tools/tools/nanobsd/pcengines/Files/root/.cshrc head/tools/tools/nanobsd/pcengines/Files/root/.login head/tools/tools/nanobsd/rescue/Files/root/.cshrc head/usr.bin/whereis/pathnames.h head/usr.bin/whereis/whereis.1 head/usr.bin/whereis/whereis.c head/usr.sbin/bsdconfig/include/messages.subr head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh Modified: head/Makefile.inc1 == --- head/Makefile.inc1Thu Feb 12 04:31:17 2015(r278615) +++ head/Makefile.inc1Thu Feb 12 05:35:00 2015(r278616) @@ -189,9 +189,8 @@ OBJTREE=${MAKEOBJDIRPREFIX} OBJTREE=${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP=${OBJTREE}${.CURDIR}/tmp -# /usr/games added for fortune which depend on strfile -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin -XPATH=${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games +BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin +XPATH=${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin STRICTTMPPATH=${BPATH}:${XPATH} TMPPATH=${STRICTTMPPATH}:${PATH} @@ -807,9 +806,6 @@ ITOOLS+=makewhatis # Non-base distributions produced by the base system EXTRA_DISTRIBUTIONS=doc -.if ${MK_GAMES} != no -EXTRA_DISTRIBUTIONS+=games -.endif .if defined(LIB32TMP) ${MK_LIB32} != no EXTRA_DISTRIBUTIONS+=lib32 .endif Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.incThu Feb 12 04:31:17 2015(r278615) +++ head/ObsoleteFiles.incThu Feb 12 05:35:00 2015(r278616) @@ -38,6 +38,22 @@ # xargs -n1 | sort | uniq -d; # done +# 20150212: /usr/games moving into /usr/bin +OLD_FILES+=usr/games/bcd +OLD_FILES+=usr/games/caesar +OLD_FILES+=usr/games/factor +OLD_FILES+=usr/games/fortune +OLD_FILES+=usr/games/grdc +OLD_FILES+=usr/games/morse +OLD_FILES+=usr/games/number +OLD_FILES+=usr/games/pom +OLD_FILES+=usr/games/ppt +OLD_FILES+=usr/games/primes +OLD_FILES+=usr/games/random +OLD_FILES+=usr/games/rot13 +OLD_FILES+=usr/games/strfile +OLD_FILES+=usr/games/unstr +OLD_DIRS+=usr/games # 20150209: liblzma header OLD_FILES+=usr/include/lzma/lzma.h # 20150124: spl.9 and friends Modified: head/contrib/netbsd-tests/games/t_factor.sh == --- head/contrib/netbsd-tests/games/t_factor.shThu Feb 12 04:31:17 2015 (r278615) +++ head/contrib/netbsd-tests/games/t_factor.shThu Feb 12 05:35:00 2015 (r278616) @@ -27,13 +27,13 @@ expect() { echo ${2} expout -atf_check -s eq:0 -o
svn commit: r278616 - in head: . contrib/netbsd-tests/games etc etc/mtree etc/root games games/caesar games/fortune/datfiles release/scripts share/man/man4 share/man/man6 share/man/man7 share/mk sh...
Author: cperciva Date: Thu Feb 12 05:35:00 2015 New Revision: 278616 URL: https://svnweb.freebsd.org/changeset/base/278616 Log: Step 1 of eliminating the games distribution: Move binaries to /usr/bin; update paths; and include everything in the base distribution. The games distribution being optional made sense when there were more games and we had small disks; but the games-like games were moved into the ports tree a dozen years ago and the remaining utility-like games occupy less than 0.001% of my laptop's small hard drive. Meanwhile every new user is confronted by the question do you want games installed when they they try to install FreeBSD. The next steps will be: 2. Removing punch card (bcd, ppt), phase-of-moon (pom), clock (grdc), and caesar cipher (caesar, rot13) utilities. I intend to keep fortune, factor, morse, number, primes, and random, since there is evidence that those are still being used. 3. Merging src/games into src/usr.bin. This change will not be MFCed. Reviewed by: jmg Discussed at: EuroBSDCon Approved by: gjb (release-affecting changes) Modified: head/Makefile.inc1 head/ObsoleteFiles.inc head/contrib/netbsd-tests/games/t_factor.sh head/etc/login.conf head/etc/master.passwd head/etc/mtree/BSD.debug.dist head/etc/mtree/BSD.usr.dist head/etc/root/dot.cshrc head/etc/root/dot.login head/etc/root/dot.profile head/games/Makefile.inc head/games/caesar/rot13.sh head/games/fortune/datfiles/Makefile head/release/scripts/make-manifest.sh head/share/man/man4/led.4 head/share/man/man6/intro.6 head/share/man/man7/hier.7 head/share/mk/bsd.prog.mk head/share/skel/dot.cshrc head/share/skel/dot.login head/share/skel/dot.profile head/tools/build/mk/OptionalObsoleteFiles.inc head/tools/tools/nanobsd/gateworks/Files/root/.profile head/tools/tools/nanobsd/pcengines/Files/root/.cshrc head/tools/tools/nanobsd/pcengines/Files/root/.login head/tools/tools/nanobsd/rescue/Files/root/.cshrc head/usr.bin/whereis/pathnames.h head/usr.bin/whereis/whereis.1 head/usr.bin/whereis/whereis.c head/usr.sbin/bsdconfig/include/messages.subr head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Thu Feb 12 04:31:17 2015(r278615) +++ head/Makefile.inc1 Thu Feb 12 05:35:00 2015(r278616) @@ -189,9 +189,8 @@ OBJTREE=${MAKEOBJDIRPREFIX} OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp -# /usr/games added for fortune which depend on strfile -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin -XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games +BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin +XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} @@ -807,9 +806,6 @@ ITOOLS+=makewhatis # Non-base distributions produced by the base system EXTRA_DISTRIBUTIONS= doc -.if ${MK_GAMES} != no -EXTRA_DISTRIBUTIONS+= games -.endif .if defined(LIB32TMP) ${MK_LIB32} != no EXTRA_DISTRIBUTIONS+= lib32 .endif Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Feb 12 04:31:17 2015(r278615) +++ head/ObsoleteFiles.inc Thu Feb 12 05:35:00 2015(r278616) @@ -38,6 +38,22 @@ # xargs -n1 | sort | uniq -d; # done +# 20150212: /usr/games moving into /usr/bin +OLD_FILES+=usr/games/bcd +OLD_FILES+=usr/games/caesar +OLD_FILES+=usr/games/factor +OLD_FILES+=usr/games/fortune +OLD_FILES+=usr/games/grdc +OLD_FILES+=usr/games/morse +OLD_FILES+=usr/games/number +OLD_FILES+=usr/games/pom +OLD_FILES+=usr/games/ppt +OLD_FILES+=usr/games/primes +OLD_FILES+=usr/games/random +OLD_FILES+=usr/games/rot13 +OLD_FILES+=usr/games/strfile +OLD_FILES+=usr/games/unstr +OLD_DIRS+=usr/games # 20150209: liblzma header OLD_FILES+=usr/include/lzma/lzma.h # 20150124: spl.9 and friends Modified: head/contrib/netbsd-tests/games/t_factor.sh == --- head/contrib/netbsd-tests/games/t_factor.sh Thu Feb 12 04:31:17 2015 (r278615) +++ head/contrib/netbsd-tests/games/t_factor.sh Thu Feb 12 05:35:00 2015 (r278616) @@ -27,13 +27,13 @@ expect() { echo ${2} expout - atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1} + atf_check -s eq:0 -o file:expout -e empty /usr/bin/factor ${1} } atf_test_case overflow overflow_head() { atf_set descr Tests for overflow conditions - atf_set require.progs /usr/games/factor + atf_set require.progs /usr/bin/factor }
Re: svn commit: r278616 - in head: . contrib/netbsd-tests/games etc etc/mtree etc/root games games/caesar games/fortune/datfiles release/scripts share/man/man4 share/man/man6 share/man/man7 share/mk s
On 02/11/15 21:35, Colin Percival wrote: 2. Removing punch card (bcd, ppt), phase-of-moon (pom), clock (grdc), and caesar cipher (caesar, rot13) utilities. I intend to keep fortune, factor, morse, number, primes, and random, since there is evidence that those are still being used. If anyone has a desperate need for punch card support and can't possibly install it from the ports tree, please email me *off-list*. I don't want to have too much of a crazy bikeshed discussion about this. -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278615 - head/sys/contrib/vchiq/interface/vchiq_arm
Author: gonzo Date: Thu Feb 12 04:31:17 2015 New Revision: 278615 URL: https://svnweb.freebsd.org/changeset/base/278615 Log: - Perform bus_dmamap_sync on pagelist structure - Wire pages of bulk transfer buffer when preparing pagelist Modified: head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c Modified: head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c == --- head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c Thu Feb 12 04:15:55 2015(r278614) +++ head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c Thu Feb 12 04:31:17 2015(r278615) @@ -353,6 +353,16 @@ vchiq_platform_handle_timeout(VCHIQ_STAT * Local functions */ +static void +pagelist_page_free(vm_page_t pp) +{ + vm_page_lock(pp); + vm_page_unwire(pp, PQ_INACTIVE); + if (pp-wire_count == 0 pp-object == NULL) + vm_page_free(pp); + vm_page_unlock(pp); +} + /* There is a potential problem with partial cache lines (pages?) ** at the ends of the block when reading. If the CPU accessed anything in ** the same line (page?) then it may have pulled old data into the cache, @@ -406,8 +416,6 @@ create_pagelist(char __user *buf, size_t NULL, NULL, /* lockfunc, lockarg */ bi-pagelist_dma_tag); - - err = bus_dmamem_alloc(bi-pagelist_dma_tag, (void **)pagelist, BUS_DMA_COHERENT | BUS_DMA_WAITOK, bi-pagelist_dma_map); if (err) { @@ -444,6 +452,13 @@ create_pagelist(char __user *buf, size_t return (-ENOMEM); } + for (i = 0; i actual_pages; i++) { + vm_page_lock(pages[i]); + vm_page_wire(pages[i]); + vm_page_unhold(pages[i]); + vm_page_unlock(pages[i]); + } + pagelist-length = count; pagelist-type = type; pagelist-offset = offset; @@ -496,9 +511,10 @@ create_pagelist(char __user *buf, size_t g_fragments_base); } - /* XXX: optimize? INV operation for read WBINV for write? */ cpu_dcache_wbinv_range((vm_offset_t)buf, count); + bus_dmamap_sync(bi-pagelist_dma_tag, bi-pagelist_dma_map, BUS_DMASYNC_PREWRITE); + bi-pagelist = pagelist; return 0; @@ -563,12 +579,12 @@ free_pagelist(BULKINFO_T *bi, int actual } for (i = 0; i num_pages; i++) { - if (pagelist-type != PAGELIST_WRITE) + if (pagelist-type != PAGELIST_WRITE) { vm_page_dirty(pages[i]); + pagelist_page_free(pages[i]); + } } - vm_page_unhold_pages(pages, num_pages); - bus_dmamap_unload(bi-pagelist_dma_tag, bi-pagelist_dma_map); bus_dmamem_free(bi-pagelist_dma_tag, bi-pagelist, bi-pagelist_dma_map); bus_dmamap_destroy(bi-pagelist_dma_tag, bi-pagelist_dma_map); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r278618 - head/bin/pkill/tests
Author: ngie Date: Thu Feb 12 07:22:46 2015 New Revision: 278618 URL: https://svnweb.freebsd.org/changeset/base/278618 Log: Add debugging output to help track down the recent Jenkins failures Modified: head/bin/pkill/tests/pgrep-j_test.sh Modified: head/bin/pkill/tests/pgrep-j_test.sh == --- head/bin/pkill/tests/pgrep-j_test.shThu Feb 12 07:21:22 2015 (r278617) +++ head/bin/pkill/tests/pgrep-j_test.shThu Feb 12 07:22:46 2015 (r278618) @@ -40,7 +40,7 @@ if [ `id -u` -eq 0 ]; then if [ $pid1 = $pid2 ]; then echo ok 1 - $name else - echo not ok 1 - $name + echo not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)' fi [ -f ${PWD}/${base}_1_1.pid ] kill $(cat ${PWD}/${base}_1_1.pid) [ -f ${PWD}/${base}_1_2.pid ] kill $(cat ${PWD}/${base}_1_2.pid) @@ -66,7 +66,7 @@ if [ `id -u` -eq 0 ]; then if [ $pid1 = $pid2 ]; then echo ok 2 - $name else - echo not ok 2 - $name + echo not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)' fi [ -f ${PWD}/${base}_2_1.pid ] kill $(cat ${PWD}/${base}_2_1.pid) [ -f ${PWD}/${base}_2_2.pid ] kill $(cat ${PWD}/${base}_2_2.pid) @@ -87,7 +87,7 @@ if [ `id -u` -eq 0 ]; then if [ $pid = $(cat ${PWD}/${base}_3_1.pid) ]; then echo ok 3 - $name else - echo not ok 3 - $name + echo not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)' fi rm -f $sleep [ -f ${PWD}/${base}_3_1.pid ] kill $(cat $PWD/${base}_3_1.pid) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org